hr_lite 0.21.2 → 0.22.0

data/app/controllers/hr_lite/home_controller.rb

@@ -2,9 +2,46 @@ module HrLite
   class HomeController < ApplicationController
     def index
       @latest_kudos = Kudo.recent.includes(:giver, kudo_mentions: :user).limit(3)
-      @out_today = LeaveRequest.active_on(Date.current).includes(:user)
-                               .where(user_id: HrLite.active_employees.map(&:id))
-                               .sort_by { |leave| hr_display_name(leave.user).downcase }
+      @out_week = LeaveRequest.approved.overlapping_range(Date.current.beginning_of_week, Date.current.end_of_week)
+                              .includes(:user).where(user_id: HrLite.active_employees.map(&:id))
+                              .sort_by { |leave| hr_display_name(leave.user).downcase }
+      @attention = attention_days
+      @waiting = Approval.pending_for(hr_current_user).count
+      @queue = queue_count
+      @mine_pending = [ LeaveRequest.includes(:leave_type), RegularizationRequest, CompOffRequest ]
+                      .flat_map { |scope| scope.pending.where(user_id: hr_current_user.id).order(created_at: :desc).limit(5) }
+                      .max_by(5, &:created_at)
+    end
+
+    private
+
+    # Requests with no routed flow are decided straight off the HR queues, scoped as those queues decide them.
+    def queue_count
+      leave = ApprovalFlow.for(LeaveRequest.name) ? 0 : decidable(LeaveRequest, "leave.approve")
+      leave + decidable(CompOffRequest, "leave.approve") + decidable(RegularizationRequest, "attendance.manage")
+    end
+
+    def decidable(model, key) = hr_scope(model.pending, key).where.not(user_id: hr_current_user.id).count
+
+    # Last week's days that still need a fix (absent, no check-out, flagged, short), minus those with a pending ticket.
+    def attention_days
+      range = (Date.current - 7)..(Date.current - 1)
+      days = DayStatus.new(user: hr_current_user, range: range)
+      pending = RegularizationRequest.pending.where(user_id: hr_current_user.id, date: range).pluck(:date)
+      profile = EmployeeProfile.find_by(user_id: hr_current_user.id)
+      (range.to_a - pending).filter_map do |date|
+        day = days.for(date)
+        # The day card offers no Fix on these; days outside employment are not absences.
+        next if %i[holiday weekend leave].include?(day.kind) || (profile && !profile.active_on?(date))
+
+        # Yesterday's open shift may still be running; the punch card offers its check-out.
+        reason = if day.kind == :absent then "Absent"
+        elsif day.record&.check_in_at && !day.record.check_out_at && date < Date.current - 1 then "No check-out"
+        elsif day.record&.flagged? then "Flagged"
+        elsif day.record&.short? && !day.record.regularized? then "Short day"
+        end
+        [ date, reason ] if reason
+      end
     end
   end
 end

data/app/controllers/hr_lite/hr_requests_controller.rb

@@ -12,7 +12,7 @@ module HrLite
     end
 
     def new
-      @request = HrRequest.new
+      @request = HrRequest.new(category: params[:category].presence_in(HrRequest::CATEGORIES))
     end
 
     def create

data/app/controllers/hr_lite/leave_requests_controller.rb

@@ -12,18 +12,22 @@ module HrLite
     end
 
     def new
-      @request = LeaveRequest.new(start_date: Date.current, end_date: Date.current)
+      @request = LeaveRequest.new(start_date: (parse_date_param(params[:date]) if params[:date].present?),
+                                  leave_type_id: params[:leave_type_id])
       @balances = balance_cards
+      @out_soon = colleagues_out_soon
     end
 
     def create
       @request = LeaveRequest.new(request_params.merge(user_id: hr_current_user.id))
+      @request.end_date ||= @request.start_date # a blank "To" means one day
       if @request.save
         # Say it now, not on the payslip: days past the balance are unpaid.
         short = @request.days_beyond_balance
-        redirect_to leave_requests_path, notice: "Leave request submitted.#{" #{short.to_s('F')} day(s) are beyond your balance and will be unpaid if approved." if short.positive?}"
+        redirect_to leave_requests_path, notice: "Leave request submitted.#{" #{helpers.hrl_days(short)} day(s) are beyond your balance and will be unpaid if approved." if short.positive?}"
       else
         @balances = balance_cards
+        @out_soon = colleagues_out_soon
         render :new, status: :unprocessable_entity
       end
     end
@@ -51,6 +55,13 @@ module HrLite
       end
     end
 
+    # Approved leave only, name and dates; the type stays private (see _out_list).
+    def colleagues_out_soon
+      LeaveRequest.approved.overlapping_range(Date.current, Date.current + 14)
+                  .where(user_id: HrLite.active_employees.map(&:id)).where.not(user_id: hr_current_user.id)
+                  .includes(:user).order(:start_date, :id).to_a
+    end
+
     def request_params
       params.require(:leave_request).permit(:leave_type_id, :start_date, :end_date, :half_day, :half_day_part, :reason)
     end

data/app/controllers/hr_lite/regularization_requests_controller.rb

@@ -34,12 +34,20 @@ module HrLite
       return "Ticket raised — an admin will review it." unless rule
       return "Fixed. #{helpers.pluralize(@request.self_fixes_left, 'self-fix')} left this week." if @request.approved?
 
-      "Sent to HR as a ticket — you can fix only a missed punch on a working day in the last #{rule[:within_days]} days yourself, " \
+      "Sent to HR as a ticket — you can fix only a missed punch or short day on a working day in the last #{rule[:within_days]} days yourself, " \
         "#{rule[:per_week]} times a week."
     end
 
     def request_params
-      params.require(:regularization_request).permit(:date, :check_in_at, :check_out_at, :reason)
+      p = params.require(:regularization_request).permit(:date, :check_in_at, :check_out_at, :reason)
+      # The form sends times only: pin them to the day; a check-out before check-in is the next morning (night shift).
+      in_at, out_at = p.values_at(:check_in_at, :check_out_at).map do |t|
+        Time.zone.parse("#{p[:date]} #{t}") if t.present?
+      rescue ArgumentError # an impossible date or time ("25:99") is left blank for the model to refuse
+        nil
+      end
+      out_at += 1.day if in_at && out_at && out_at < in_at
+      p.merge(check_in_at: in_at, check_out_at: out_at)
     end
   end
 end

data/app/controllers/hr_lite/tax_declarations_controller.rb

@@ -5,6 +5,8 @@ module HrLite
   class TaxDeclarationsController < ApplicationController
     def show
       @declaration = current_declaration || build_declaration
+      # A saved draft holds only its claims; the rest still need a line to fill.
+      fill_missing_sections(@declaration)
       @regime = @declaration.regime
     end
 
@@ -23,6 +25,8 @@ module HrLite
       end
 
       if @declaration.update(declaration_params)
+        return submit if params[:submit_to_hr] # Submit to HR saves what is on screen first
+
         redirect_to tax_declaration_path, notice: "Saved."
       else
         # Re-render needs the full set of lines back, or the form loses the

data/app/helpers/hr_lite/application_helper.rb

@@ -1,31 +1,30 @@
 module HrLite
   module ApplicationHelper
     NAV_ITEMS = [
-      { label: "Home",       path: :root_path,           match: [ "/" ] },
-      { label: "Attendance", path: :attendance_path,     match: [ "/attendance", "/regularization_requests" ] },
-      { label: "Leaves",     path: :leave_requests_path, match: [ "/leave_requests", "/leave_balances", "/comp_off_requests" ] },
-      { label: "Team",       path: :team_path,           match: [ "/team" ] },
-      { label: "Calendar",   path: :calendar_path,       match: [ "/calendar", "/holidays" ] },
-      # After Calendar deliberately: the phone tab bar shows the first four
-      # and this screen is empty for everybody who is not an approver, so it
-      # belongs in "More" rather than displacing something everybody uses.
+      { label: "Home",       path: :root_path,           match: [ "/" ], group: "My work" },
+      { label: "Attendance", path: :attendance_path,     match: [ "/attendance", "/regularization_requests" ], group: "My work" },
+      { label: "Leaves",     path: :leave_requests_path, match: [ "/leave_requests", "/leave_balances", "/comp_off_requests" ], group: "My work" },
+      { label: "Team",       path: :team_path,           match: [ "/team" ], group: "My work" },
+      # The phone tab bar shows the first four; the rest fill the More sheet,
+      # one label per group, so a group's items must stay together.
+      { label: "Calendar",   path: :calendar_path,       match: [ "/calendar", "/holidays" ], group: "Time" },
+      { label: "Expenses",   path: :expenses_path,       match: [ "/expenses" ], group: "Money" },
+      { label: "Benefits",   path: :benefits_path,       match: [ "/benefits" ], group: "Money" },
+      { label: "Slips",      path: :salary_slips_path,   match: [ "/salary_slips" ], group: "Money" },
+      { label: "Tax",        path: :tax_declaration_path, match: [ "/tax_declaration" ], group: "Money" },
+      { label: "Loans",      path: :loans_path,          match: [ "/loans" ], group: "Money" },
+      { label: "Profile",    path: :employee_profile_path, match: [ "/profile", "/resignation" ], group: "Me" },
+      { label: "Documents",  path: :documents_path,      match: [ "/documents" ], group: "Me" },
+      { label: "ID card",    path: :id_card_path,        match: [ "/id_card" ], group: "Me" },
+      { label: "Career",     path: :career_path,         match: [ "/career", "/appraisals" ], group: "Me" },
+      { label: "Policies",   path: :policies_path,       match: [ "/policies" ], group: "Company" },
+      { label: "Ask HR",     path: :hr_requests_path,    match: [ "/hr_requests" ], group: "Company" },
+      { label: "Org",        path: :org_path,            match: [ "/org" ], group: "Company" },
+      { label: "Kudos",      path: :kudos_path,          match: [ "/kudos" ], group: "Company" },
       # Employee tier all the same — holding an approval IS the authorisation,
       # so a manager and a stand-in covering for one reach the same screen.
-      { label: "Approvals",  path: :approvals_path,      match: [ "/approvals" ],
-        if: -> { HrLite::ApprovalFlow.where(active: true).exists? } },
-      { label: "Expenses",   path: :expenses_path,       match: [ "/expenses" ] },
-      { label: "Benefits",   path: :benefits_path,       match: [ "/benefits" ] },
-      { label: "Policies",   path: :policies_path,       match: [ "/policies" ] },
-      { label: "Ask HR",     path: :hr_requests_path,    match: [ "/hr_requests" ] },
-      { label: "Org",        path: :org_path,            match: [ "/org" ] },
-      { label: "Kudos",      path: :kudos_path,          match: [ "/kudos" ] },
-      { label: "Slips",      path: :salary_slips_path,   match: [ "/salary_slips" ] },
-      { label: "Career",     path: :career_path,         match: [ "/career", "/appraisals" ] },
-      { label: "Profile",    path: :employee_profile_path, match: [ "/profile", "/resignation" ] },
-      { label: "Documents",  path: :documents_path,      match: [ "/documents" ] },
-      { label: "ID card",    path: :id_card_path,        match: [ "/id_card" ] },
-      { label: "Tax",        path: :tax_declaration_path, match: [ "/tax_declaration" ] },
-      { label: "Loans",      path: :loans_path,          match: [ "/loans" ] }
+      { label: "Approvals",  path: :approvals_path,      match: [ "/approvals" ], group: "Company",
+        if: -> { HrLite::ApprovalFlow.where(active: true).exists? } }
     ].freeze
 
     ADMIN_NAV_ITEMS = [
@@ -60,6 +59,14 @@ module HrLite
       { label: "Loans",   path: :admin_loans_path,        match: [ "/admin/loans" ] }
     ].freeze
 
+    # DayStatus kind => [code, word, month-grid cell modifier]: the code keeps a state readable without its colour.
+    DAY_STATES = {
+      present: [ "P", "Present", "present" ], half_day: [ "½", "Half day", "half" ],
+      leave: [ "L", "Leave", "leave" ], half_day_leave: [ "½L", "Half-day leave", "half-leave" ],
+      holiday: [ "H", "Holiday", "holiday" ], weekend: [ "WO", "Weekly off", "weekend" ],
+      absent: [ "A", "Absent", "absent" ], upcoming: [ nil, "Upcoming", "muted" ]
+    }.freeze
+
     # The ID card's QR: office address and phone as plain text, so any phone
     # camera shows who to call about a found card. No URL, nothing to host.
     def hrl_office_qr_svg(company, brand)
@@ -78,12 +85,16 @@ module HrLite
       hr_lite.respond_to?(helper_name)
     end
 
-    def hrl_nav_link(item)
-      href = hr_lite.public_send(item[:path])
-      active = item[:match].any? do |prefix|
-        prefix == "/" ? request.path == href : request.path.start_with?("#{hr_lite.root_path.chomp('/')}#{prefix}")
+    def hrl_nav_active?(item)
+      item[:match].any? do |prefix|
+        prefix == "/" ? request.path == hr_lite.public_send(item[:path]) : request.path.start_with?("#{hr_lite.root_path.chomp('/')}#{prefix}")
       end
-      link_to item[:label], href, class: "hrl-nav__link #{'hrl-nav__link--active' if active}"
+    end
+
+    def hrl_nav_link(item)
+      active = hrl_nav_active?(item)
+      link_to item[:label], hr_lite.public_send(item[:path]),
+              class: "hrl-nav__link #{'hrl-nav__link--active' if active}", aria: { current: ("page" if active) }
     end
 
     # Mention-marker-aware, XSS-safe kudos message rendering. Every literal
@@ -140,6 +151,9 @@ module HrLite
       HrLite::AmountInWords.words(amount)
     end
 
+    # Day counts without a trailing ".0": 1.0 -> "1", 0.5 -> "0.5"; nil is unknown, not zero.
+    def hrl_days(days) = days.nil? ? "\u2014" : number_with_precision(days, precision: 1, strip_insignificant_zeros: true)
+
     def hrl_duration(seconds)
       return "\u2014" if seconds.nil?
 
@@ -156,8 +170,7 @@ module HrLite
       when :half_day_leave then hrl_status_badge("Half-day leave (#{row.leave.leave_type.code})", "hrl-badge--warn", worked_hint(row))
       when :upcoming then hrl_status_badge("\u2014", "hrl-badge--muted")
       when :absent
-        label = row.date_today? ? "Not in yet" : "Absent"
-        hrl_status_badge(label, "hrl-badge--bad")
+        row.date_today? ? hrl_status_badge("Not in yet", "hrl-badge--muted") : hrl_status_badge("Absent", "hrl-badge--bad")
       else # :present / :half_day punch
         record = row.record
         if record.check_out_at

data/app/jobs/hr_lite/attendance_close_job.rb

@@ -1,7 +1,8 @@
 module HrLite
   # Closes the working day that ended last: a run at 23:55 closes today, and a
   # retry or late run after midnight (or a morning schedule) closes yesterday.
-  # A punch left open is checked out at the day's end and paid as a half day.
+  # A punch left open is checked out at the day's end and paid as a half day,
+  # and so is a closed punch short of config.work_hours.
   # Nobody punched in already reads as absent (DayStatus), so they are only
   # told. Leave days are left alone.
   class AttendanceCloseJob < ApplicationJob
@@ -21,6 +22,10 @@ module HrLite
           record.update!(check_out_at: date.end_of_day, status: "half_day",
                          regularization_note: AttendanceRecord::AUTO_CHECKOUT_NOTE)
           tell(user, date, "attendance.missed_check_out", "You didn't check out on #{day} — marked half day")
+        elsif !record.regularized? && record.status == "present" && record.short?
+          record.update!(status: "half_day", regularization_note: AttendanceRecord::SHORT_DAY_NOTE)
+          tell(user, date, "attendance.short_day",
+               "You worked #{(record.worked_duration / 3600.0).round(1)} of #{record.required_hours}h on #{day} — marked half day")
         end
       end
     end

data/app/models/hr_lite/approval.rb

@@ -14,6 +14,11 @@ module HrLite
     scope :pending, -> { where(status: "pending") }
     scope :at_position, ->(position) { where(position: position) }
     scope :recent_first, -> { order(created_at: :desc) }
+    # Rows addressed to `user`, plus rows of anybody who has delegated to them while away.
+    scope :pending_for, lambda { |user|
+      standing_in_for = ApprovalDelegation.live_on(Date.current).where(to_user_id: user.id).pluck(:from_user_id)
+      pending.where(approver_id: [ user.id, *standing_in_for ])
+    }
 
     STATUSES.each { |s| define_method("#{s}?") { status == s } }
 

data/app/models/hr_lite/attendance_record.rb

@@ -2,6 +2,11 @@ module HrLite
   class AttendanceRecord < ApplicationRecord
     STATUSES = %w[present half_day].freeze
     AUTO_CHECKOUT_NOTE = "Auto check-out: no check-out punched".freeze
+    SHORT_DAY_NOTE = "Short day: under the required hours".freeze
+    # Half days the close job set (not HR); an approved ticket lifts them.
+    AUTO_NOTES = [ AUTO_CHECKOUT_NOTE, SHORT_DAY_NOTE ].freeze
+    # Check-in and check-out further apart than this are called out on the board.
+    PUNCH_GAP_ALERT_M = 500
 
     belongs_to :user, class_name: HrLite.config.user_class
     belongs_to :regularized_by, class_name: HrLite.config.user_class, optional: true
@@ -26,6 +31,27 @@ module HrLite
       check_out_at - check_in_at
     end
 
+    # config.work_hours: probation days need more hours. Nil when the rule is
+    # off, and on Saturdays (a working Saturday has no hours rule).
+    def required_hours
+      rule = HrLite.config.work_hours
+      return if rule.nil? || date.saturday?
+
+      EmployeeProfile.find_by(user_id: user_id)&.on_probation?(date) ? rule[:probation_day] : rule[:day]
+    end
+
+    def short?
+      hours = required_hours
+      !!(hours && worked_duration && worked_duration < hours.hours)
+    end
+
+    # Metres between where the day was checked in and checked out.
+    def punch_gap_m
+      return unless check_in_lat && check_in_lng && check_out_lat && check_out_lng
+
+      Geo.distance_m(check_in_lat, check_in_lng, check_out_lat, check_out_lng)
+    end
+
     def add_flag!(note)
       self.flagged = true
       self.flag_note = [ flag_note.presence, note ].compact.join("; ")

data/app/models/hr_lite/employee_profile.rb

@@ -22,6 +22,7 @@ module HrLite
 
     TAX_REGIMES = %w[new old].freeze
     BLOOD_GROUPS = %w[A+ A- B+ B- AB+ AB- O+ O-].freeze
+    normalizes :blood_group, with: ->(v) { v.presence } # the "Not set" chip posts ""
     # The ID-card photo. Images a browser can print; content-sniffed like
     # Document, so the check is on the real bytes.
     PHOTO_TYPES = %w[image/jpeg image/png image/webp].freeze

data/app/models/hr_lite/hr_request.rb

@@ -26,7 +26,8 @@ module HrLite
 
     after_create_commit :notify_desk
 
-    def category_label = category.humanize.sub(/\AId\b/, "ID")
+    def self.category_label(category) = category.humanize.sub(/\AId\b/, "ID")
+    def category_label = self.class.category_label(category)
 
     def assign!(actor:, assignee:)
       update!(assigned_to_id: assignee.id, status: "in_progress")

data/app/models/hr_lite/office_location.rb

@@ -13,6 +13,18 @@ module HrLite
       active.any? { |office| Geo.distance_m(office.lat, office.lng, lat, lng) <= office.radius_m }
     end
 
+    # Where a punch happened, for the admin board: the office whose radius
+    # covers it, else "Off-site · 3.2 km from Head Office". Nil without GPS.
+    def self.place(lat, lng, offices = active.to_a)
+      return if lat.nil? || lng.nil?
+
+      office = offices.min_by { |o| Geo.distance_m(o.lat, o.lng, lat, lng) }
+      return "Off-site" unless office
+
+      metres = Geo.distance_m(office.lat, office.lng, lat, lng)
+      metres <= office.radius_m ? office.name : "Off-site · #{(metres / 1000.0).round(1)} km from #{office.name}"
+    end
+
     # For flag notes: "1.2 km from Head Office". Nil when no offices exist.
     def self.nearest(lat, lng)
       active.min_by { |office| Geo.distance_m(office.lat, office.lng, lat, lng) }

data/app/models/hr_lite/regularization_request.rb

@@ -31,7 +31,7 @@ module HrLite
     end
 
     def times_label
-      [ check_in_at&.strftime("%H:%M"), check_out_at&.strftime("%H:%M") ].compact.join(" – ").presence || "—"
+      [ check_in_at&.strftime("%H:%M"), check_out_at&.strftime("%H:%M") ].compact.join(" – ").presence || "Short day"
     end
 
     # Current punch state for the approver's context.
@@ -49,10 +49,15 @@ module HrLite
       day = punch
       fills_gap = (check_in_at.nil? || !day&.check_in_at) &&
                   (check_out_at.nil? || !day&.check_out_at || day.regularization_note == AttendanceRecord::AUTO_CHECKOUT_NOTE)
-      fills_gap && !day&.regularized? && !self.class.exists?(user_id: user_id, date: date, status: "rejected") &&
+      (fills_gap || short_day_ticket?) && !day&.regularized? && !self.class.exists?(user_id: user_id, date: date, status: "rejected") &&
         self_fixes_left.positive?
     end
 
+    # No times, just a reason: "my hours were short that day, accept them".
+    def short_day_ticket?
+      check_in_at.nil? && check_out_at.nil? && !!punch&.short?
+    end
+
     # Self-fixes the user still has in this ticket's Mon–Sun week.
     def self_fixes_left
       week = date.beginning_of_week(:monday)..date.end_of_week(:monday)
@@ -86,7 +91,7 @@ module HrLite
         end
 
         # Lifts only the close job's half day; one HR set on purpose stays.
-        record.status = "present" if record.status.blank? || record.regularization_note == AttendanceRecord::AUTO_CHECKOUT_NOTE
+        record.status = "present" if record.status.blank? || AttendanceRecord::AUTO_NOTES.include?(record.regularization_note)
         record.regularized_by_id = actor.id
         record.regularized_at = Time.current
         record.regularization_note = "Ticket ##{id}: #{reason}"
@@ -163,7 +168,7 @@ module HrLite
     end
 
     def at_least_one_time
-      return if check_in_at || check_out_at
+      return if check_in_at || check_out_at || short_day_ticket?
 
       errors.add(:base, "Propose a check-in time, a check-out time, or both")
     end
@@ -173,6 +178,7 @@ module HrLite
 
       [ [ :check_in_at, check_in_at ], [ :check_out_at, check_out_at ] ].each do |attr, time|
         next unless time
+        next if attr == :check_out_at && check_in_at && time.to_date == date + 1 && time < check_in_at + 1.day # night shift
 
         errors.add(attr, "must be on #{date.strftime('%d %b')}") unless time.to_date == date
       end

data/app/services/hr_lite/attendance_puncher.rb

@@ -1,8 +1,8 @@
 module HrLite
   # The single write path for employee punches. Race-safe (DB unique index +
-  # row lock + in-lock re-check), never blocked by geolocation: a punch
-  # without GPS or outside every office radius is recorded AND flagged —
-  # denying GPS must not stop anyone from working.
+  # row lock + in-lock re-check). A punch outside every office radius is
+  # recorded AND flagged; one without GPS is too, unless
+  # config.require_punch_location refuses it.
   class AttendancePuncher
     # What the browser can legitimately report (geo_punch.js).
     GEO_STATUSES = %w[ok denied unavailable timeout insecure].freeze
@@ -29,6 +29,11 @@ module HrLite
     end
 
     def call
+      if HrLite.config.require_punch_location && (@lat.nil? || @lng.nil?)
+        return Result.new(error: "Location is required to punch. Turn on location and try again, " \
+                                 "or raise a regularization ticket.")
+      end
+
       record = resolve_record
       return Result.new(error: "No open check-in to close.") if record.nil?
 

data/app/views/hr_lite/admin/assets/index.html.erb

@@ -39,13 +39,14 @@
             <td data-label="">
               <% if asset.assigned? %>
                 <%= form_with url: hr_lite.take_back_admin_asset_path(asset), method: :post do %>
-                  <%= text_field_tag :condition_note, nil, placeholder: "Condition" %>
+                  <%= text_field_tag :condition_note, nil, placeholder: "Condition", class: "hrl-input" %>
                   <%= submit_tag "Take back", class: "hrl-btn" %>
                 <% end %>
               <% elsif asset.available? %>
                 <%= form_with url: hr_lite.assign_admin_asset_path(asset), method: :post do %>
                   <%= select_tag :user_id,
-                        options_for_select(HrLite.employees.map { |u| [ hr_display_name(u), u.id ] }) %>
+                        options_for_select(HrLite.employees.map { |u| [ hr_display_name(u), u.id ] }), class: "hrl-input",
+                        data: { hrl_filter: "Type a name to filter" } %>
                   <%= submit_tag "Hand over", class: "hrl-btn" %>
                 <% end %>
               <% end %>

data/app/views/hr_lite/admin/assets/new.html.erb

@@ -6,8 +6,12 @@
     <%= render "hr_lite/shared/form_errors", record: @asset %>
     <div class="hrl-field"><%= f.label :name %><%= f.text_field :name %></div>
     <div class="hrl-field">
-      <%= f.label :category %>
-      <%= f.select :category, HrLite::Asset::CATEGORIES.map { |c| [ c.humanize, c ] } %>
+      <%= f.label :category, id: "hrl-asset-category", for: nil %>
+      <div class="hrl-chiprow" role="radiogroup" aria-labelledby="hrl-asset-category">
+        <% HrLite::Asset::CATEGORIES.each do |c| %>
+          <label><%= f.radio_button :category, c, required: true %><span><%= c.humanize %></span></label>
+        <% end %>
+      </div>
     </div>
     <div class="hrl-field">
       <%= f.label :serial_number, "Serial number (optional)" %>

data/app/views/hr_lite/admin/attendances/index.html.erb

@@ -3,13 +3,14 @@
   <h1 class="hrl-page__title">Team attendance</h1>
 </div>
 
-<div class="hrl-row" style="margin-bottom:.8rem;">
-  <a class="hrl-btn" href="<%= hr_lite.admin_attendances_path(date: @date - 1) %>">&larr;</a>
+<div class="hrl-row hrl-row--mb">
+  <a class="hrl-btn" href="<%= hr_lite.admin_attendances_path(date: @date - 1) %>" aria-label="Previous day, <%= (@date - 1).strftime("%A %-d %B") %>">&larr;</a>
   <strong><%= @date.strftime("%A, %d %B %Y") %></strong>
-  <a class="hrl-btn" href="<%= hr_lite.admin_attendances_path(date: @date + 1) %>">&rarr;</a>
+  <a class="hrl-btn" href="<%= hr_lite.admin_attendances_path(date: @date + 1) %>" aria-label="Next day, <%= (@date + 1).strftime("%A %-d %B") %>">&rarr;</a>
   <% unless @date == Date.current %>
     <a class="hrl-btn" href="<%= hr_lite.admin_attendances_path %>">Today</a>
   <% end %>
+  <a class="hrl-btn" href="<%= hr_lite.week_admin_attendances_path(date: @date) %>">Weekly hours</a>
 </div>
 
 <div class="hrl-kpis">
@@ -22,9 +23,20 @@
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @records.values.count { |r| r.check_in_at && r.check_out_at.nil? } %></div><div class="hrl-kpi__label">Still in</div></div>
 </div>
 
+<% if @places.values.any?(&:any?) %>
+  <section class="hrl-card">
+    <h2 class="hrl-card__title">Where people punched</h2>
+    <% { check_in: "Checked in at", check_out: "Checked out at" }.each do |side, label| %>
+      <% next if @places[side].empty? %>
+      <p class="hrl-small"><strong><%= label %>:</strong>
+        <%= @places[side].sort_by { |place, n| [ -n, place ] }.map { |place, n| "#{place} #{n}" }.join(" · ") %></p>
+    <% end %>
+  </section>
+<% end %>
+
 <div class="hrl-table-wrap">
   <table class="hrl-table hrl-table--stack">
-    <thead><tr><th>Employee</th><th>In</th><th>Out</th><th>Status</th><th></th></tr></thead>
+    <thead><tr><th>Employee</th><th>In</th><th>Out</th><th>Location</th><th>Status</th><th></th></tr></thead>
     <tbody>
       <% @employees.each do |employee| %>
         <% record = @records[employee.id] %>
@@ -32,9 +44,28 @@
           <td data-label="Employee"><%= hr_display_name(employee) %></td>
           <td data-label="In"><%= record&.check_in_at&.strftime("%H:%M") || "—" %></td>
           <td data-label="Out"><%= record&.check_out_at&.strftime("%H:%M") || "—" %></td>
+          <td data-label="Location" class="hrl-small">
+            <div>
+              <% if record&.check_in_at %>
+                <div>In: <%= HrLite::OfficeLocation.place(record.check_in_lat, record.check_in_lng, @offices) || "No GPS" %></div>
+              <% end %>
+              <% if record&.check_out_at %>
+                <div>Out: <%= HrLite::OfficeLocation.place(record.check_out_lat, record.check_out_lng, @offices) || "No GPS" %></div>
+              <% end %>
+              <% if (gap = record&.punch_gap_m) %>
+                <% apart = "#{(gap / 1000.0).round(1)} km apart" %>
+                <% if gap > HrLite::AttendanceRecord::PUNCH_GAP_ALERT_M %>
+                  <div><span class="hrl-badge hrl-badge--warn"><%= apart %></span></div>
+                <% else %>
+                  <div class="hrl-muted"><%= apart %></div>
+                <% end %>
+              <% end %>
+              <% unless record&.check_in_at %>—<% end %>
+            </div>
+          </td>
           <td data-label="Status">
             <% if record&.flagged? %>
-              <span class="hrl-badge hrl-badge--bad" title="<%= record.flag_note %>">Flagged</span>
+              <span class="hrl-badge hrl-badge--bad">Flagged</span> <span class="hrl-small"><%= record.flag_note %></span>
             <% elsif record&.check_in_at %>
               <span class="hrl-badge hrl-badge--ok"><%= record.status.humanize %><%= " (#{record.half_day_part} half)" if record.half_day_part %></span>
             <% else %>
@@ -43,7 +74,7 @@
             <% if record&.regularized? %><span class="hrl-badge">Fixed</span><% end %>
           </td>
           <td data-label="">
-            <a class="hrl-small" href="<%= hr_lite.admin_attendance_path(employee.id, date: @date, month: @date.strftime("%Y-%m")) %>">Edit / half day</a>
+            <a class="hrl-card__link" href="<%= hr_lite.admin_attendance_path(employee.id, date: @date, month: @date.strftime("%Y-%m"), anchor: "regularize") %>">Edit / half day</a>
           </td>
         </tr>
       <% end %>

data/app/views/hr_lite/admin/attendances/show.html.erb

@@ -7,16 +7,20 @@
 </div>
 
 <section class="hrl-card">
-  <div class="hrl-row" style="margin-bottom:.6rem;">
-    <a class="hrl-btn" href="<%= hr_lite.admin_attendance_path(@employee.id, month: (@month - 1.month).strftime("%Y-%m")) %>">&larr;</a>
+  <% prev_m, next_m = @month - 1.month, @month + 1.month %>
+  <div class="hrl-row hrl-row--mb">
+    <a class="hrl-btn" href="<%= hr_lite.admin_attendance_path(@employee.id, month: prev_m.strftime("%Y-%m")) %>" aria-label="Previous month, <%= prev_m.strftime("%B %Y") %>"><span aria-hidden="true">&lsaquo;</span> <%= prev_m.strftime("%b") %></a>
     <strong><%= @month.strftime("%B %Y") %></strong>
-    <a class="hrl-btn" href="<%= hr_lite.admin_attendance_path(@employee.id, month: (@month + 1.month).strftime("%Y-%m")) %>">&rarr;</a>
-    <span class="hrl-right hrl-small hrl-muted">
-      Present <%= @counts[:present] %> · Half <%= @counts[:half_day] %> · Absent <%= @counts[:absent] %>
-    </span>
+    <a class="hrl-btn" href="<%= hr_lite.admin_attendance_path(@employee.id, month: next_m.strftime("%Y-%m")) %>" aria-label="Next month, <%= next_m.strftime("%B %Y") %>"><%= next_m.strftime("%b") %> <span aria-hidden="true">&rsaquo;</span></a>
+    <div class="hrl-row hrl-right">
+      <% { present: "ok", half_day: "ok", leave: nil, absent: "bad" }.each do |kind, tone| %>
+        <% code, word = HrLite::ApplicationHelper::DAY_STATES[kind] %>
+        <span class="<%= class_names("hrl-badge", "hrl-badge--#{tone}": tone) %>" role="img" aria-label="<%= word %> <%= pluralize(@counts[kind], "day") %>"><%= code %> <%= @counts[kind] %></span>
+      <% end %>
+    </div>
   </div>
   <%= render "hr_lite/attendance/month_grid", month: @month, day_status: @day_status,
-             link_builder: ->(date) { hr_lite.admin_attendance_path(@employee.id, date: date, month: @month.strftime("%Y-%m")) } %>
+             link_builder: ->(date) { hr_lite.admin_attendance_path(@employee.id, date: date, month: @month.strftime("%Y-%m"), anchor: "regularize") if date <= Date.current } %>
   <p class="hrl-small hrl-muted hrl-mt">Tap a date to fix its punches.</p>
 </section>