hr_lite 0.36.0 → 0.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91b052360d5658195be8a557e080ddcaea5660de77265ff6cb4d030b879f23a8
-  data.tar.gz: 32a1e1624df566187143af64b995b0af4a2db0c44463ff7600d0f6d7ed0f2e32
+  metadata.gz: ea9e044a63897a04e8618db0d7fa06e03aeedcde075aa2b6e834218b09bd733b
+  data.tar.gz: 36ce528066177bf11df3fd65c6a7d62bb503e2f2ca6b8a545c05d128cbd6f2b1
 SHA512:
-  metadata.gz: 0caced16fcf281925ba4ec901631dcffcd20e07aad5124781c67751298f1dfde737eb9ca60eaf4f3c100d47129a76a83bfb2ff93bd72d21db6de2834319dbc57
-  data.tar.gz: 8002305bba4b795098b2499a6765809a2a1aebf3c281fe715e7fc72f349ef3630cc653f2abbda98c32d03df4f5c223cbd4bf17e4ddb8b8404085aaa080a80f40
+  metadata.gz: 31d918ddc7dc1ad19b6c4d77a9aed5cc3767842019963690478769d4accad9772f755890a529359674676d6dab696d92acc440b36dc920063bba754abf09ac68
+  data.tar.gz: f74714fb54fd581fd49d0de6e3b3e38ac911ced19f511dda075353e634563d4b289bb379bc4fdd08391e3312067ed1dbe73905afd8831f0422070ba4331b613d

data/CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.37.1] - 2026-10-14
+
+- A WFH request still waiting for HR now lets the person check in away from the office on that day (HR has 24 hours to decide). The day is flagged "WFH request pending HR approval: <reason>", and HR gets the flagged-punch alert with that reason. HR was already told when the request was raised. Rejected requests and requests for other dates are still refused.
+
+## [0.37.0] - 2026-10-14
+
+- Home detection: a WFH check-in matches any approved home within 500 m, and the nearest one becomes active. From anywhere else the punch card asks "Is this your home location?". Yes saves the place as an approved, active home straight away (a GPS fix good to 500 m, fewer than three live homes, audit row `work_location.self_saved`). No checks in as Travelling. The question comes back at every check-in from a place that is not a home.
+- WFH locations: "Register here" saves an approved home at once, and the first one becomes active. With three live homes the employee can no longer use, switch or remove one (refused server-side too); HR has a Remove button on Admin → WFH locations, which now opens on approved homes. Removing a home never rewrites past attendance.
+- Travel: any WFH employee (not only field staff) may check in or out as Travelling away from their homes. A day begun at home that checks out away from every home must tick "I am travelling". A travel day can end at home without asking. No HR approval; the place is always shown.
+- Every punch records its place (office, home, travel), the matched home on check-in and check-out, and metres to the nearest home. New columns on `hr_lite_attendance_records`: `check_in_place`, `check_out_place`, `check_out_work_location_id`, `check_in_home_m`, `check_out_home_m` (migration 20261014031000; older days stay blank).
+- Daily trail: My work time (private), HR's per-person attendance and HR work time show "Check-in: Home (name) · 09:15 · 35 m from home · ±20 m", the same for check-out, and a "View route on Google Maps" link from start to end. Today's check-ins adds "Check-in: Home → Check-out: Travel" to each person.
+- Messages: `HOME_ASK_MESSAGE`, `HOME_CAP_MESSAGE`, `HOME_FIX_MESSAGE` and `TRAVEL_OUT_MESSAGE` replace `HOME_OFF_SITE_MESSAGE` and `NO_HOME_MESSAGE`. `WorkLocation::MAX_ACCURACY_M` is now 500 (was 100).
+- Choice rows (radio/checkbox) inside a `.hrl-field` keep their 44px row layout and 8px gaps (the field-staff check-in choices were affected too).
+
+## [0.36.1] - 2026-10-14
+
+- The home page punch card has a "Request WFH" button beside Apply leave (when the office geofence is on).
+- A check-in refused for being outside the office now carries a "Request WFH" button in the warning, straight to the WFH request form. Before, the only way there was a small link at the bottom of the punch card.
+
 ## [0.36.0] - 2026-10-13
 
 - Pick how long a mode lasts: Busy, Meeting and Out of office offer 15 min, 30 min, 1 h, 2 h, 4 h or 1 day (30 min preselected); Travelling and Client meeting also offer "Until I change it" (the default). Lunch and short break offer only lengths within their company limit — lunch 15 or 30 min by default — and one tap still takes the full limit; a longer break is refused. Every mode ends on its own at the picked time; the longest is a day. The choices are real radio buttons shown as 44px chips with 8px gaps.

data/app/assets/stylesheets/hr_lite/hr_lite.css

@@ -346,6 +346,9 @@ fieldset { border: 0; margin: 0; padding: 0; min-width: 0; }
 .hrl-field textarea { min-height: 90px; resize: vertical; }
 .hrl-filter { appearance: none; margin-bottom: var(--hrl-gap-target); } /* select_filter.js search box above its select */
 .hrl-field--check { display: flex; align-items: center; gap: .55rem; min-height: var(--hrl-target); }
+.hrl-field--check + .hrl-field--check { margin-top: var(--hrl-gap-target); }
+/* A choice row inside a .hrl-field keeps its row layout (.hrl-field label would make it a block). */
+.hrl-field label.hrl-field--check { display: flex; font-size: inherit; font-weight: 400; margin-bottom: 0; }
 .hrl-field--check input {
   width: 1.15rem; height: 1.15rem; min-height: 0; flex: 0 0 auto;
   accent-color: var(--hrl-accent);

data/app/controllers/hr_lite/admin/attendances_controller.rb

@@ -55,7 +55,8 @@ module HrLite
         @counts[:absent] -= 1 if @month.all_month.cover?(Date.current) && @day_status.for(Date.current).kind == :absent
         @edit_date = params[:date].present? ? parse_date_param(params[:date]) : nil
         @edit_record = @edit_date && AttendanceRecord.find_or_initialize_by(user_id: @employee.id, date: @edit_date)
-        @punches = AttendanceRecord.for_month(@month).where(user_id: @employee.id).where.not(check_in_at: nil).order(:date)
+        @punches = AttendanceRecord.for_month(@month).where(user_id: @employee.id).where.not(check_in_at: nil)
+                                   .includes(:work_location, :check_out_work_location).order(:date)
         @offices = OfficeLocation.active.to_a
       end
 

data/app/controllers/hr_lite/admin/work_locations_controller.rb

@@ -1,10 +1,11 @@
 module HrLite
   module Admin
-    # HR approves the WFH locations employees register. Coordinates are only
-    # shown here, inside attendance.view reach.
+    # HR sees every home employees save, decides any still pending, and is
+    # the only one who changes a person's homes once they have MAX_LIVE.
+    # Coordinates are only shown here, inside attendance.view reach.
     class WorkLocationsController < BaseController
       def index
-        @status = params[:status].presence_in(WorkLocation::STATUSES) || "pending"
+        @status = params[:status].presence_in(WorkLocation::STATUSES) || "approved"
         @locations = paginate(hr_scope(WorkLocation.where(status: @status), "attendance.view")
                                 .includes(:user).order(created_at: :desc))
       end
@@ -20,6 +21,13 @@ module HrLite
         decide("rejected", note)
       end
 
+      # Past attendance keeps its own coordinates and place; nothing is rewritten.
+      def remove
+        location = hr_scope(WorkLocation.live, "attendance.manage").where.not(user_id: hr_current_user.id).find(params[:id])
+        location.remove!(actor: hr_current_user)
+        redirect_to admin_work_locations_path(status: "removed"), notice: "#{location.name} removed for #{HrLite.display_name(location.user)}."
+      end
+
       private
 
       def decide(status, note)

data/app/controllers/hr_lite/admin/work_time_controller.rb

@@ -32,7 +32,7 @@ module HrLite
         end
 
         @result = WorkModeDurations.call(ids, @period)
-        @records = @person ? AttendanceRecord.where(user_id: @person.id, date: @period.from..@period.to).where.not(check_in_at: nil).order(:date).limit(400) : []
+        @records = @person ? AttendanceRecord.includes(:work_location, :check_out_work_location).where(user_id: @person.id, date: @period.from..@period.to).where.not(check_in_at: nil).order(:date).limit(400) : []
       end
     end
   end

data/app/controllers/hr_lite/attendance_controller.rb

@@ -52,11 +52,13 @@ module HrLite
 
     def punch(kind)
       field = params.fetch(:field, {}).permit(:mode, :purpose, :place).to_h
-      result = AttendancePuncher.call(user: hr_current_user, kind: kind, field: field, **punch_params.to_h.symbolize_keys)
+      result = AttendancePuncher.call(user: hr_current_user, kind: kind, field: field, travel: params[:place] == "travel",
+                                      save_home: params[:save_home] == "1" || params[:place] == "home", **punch_params.to_h.symbolize_keys)
       if result.ok?
         time = Time.current.strftime("%H:%M")
         redirect_to attendance_path, notice: "#{kind == :check_in ? 'Checked in' : 'Checked out'} at #{time}."
       else
+        flash[:punch_offer] = result.offer.to_s if result.offer
         redirect_to attendance_path, alert: result.error
       end
     end

data/app/controllers/hr_lite/work_locations_controller.rb

@@ -1,7 +1,12 @@
 module HrLite
   # Employee's own WFH locations. Scoping to hr_current_user is the
   # authorization; coordinates arrive only from the device capture.
+  # Self-registered homes count at once; at MAX_LIVE only HR changes them.
   class WorkLocationsController < ApplicationController
+    CAP_MESSAGE = "You have #{WorkLocation::MAX_LIVE} home locations. Ask HR to change one.".freeze
+
+    before_action :refuse_at_cap, only: %i[activate remove]
+
     def index
       @locations = WorkLocation.live.where(user_id: hr_current_user.id).order(:created_at)
       @location = WorkLocation.new
@@ -9,17 +14,18 @@ module HrLite
 
     def create
       @location = WorkLocation.new(params.permit(:name, :address, :lat, :lng, :accuracy_m)
-                                         .merge(user_id: hr_current_user.id, status: "pending"))
+                                         .merge(user_id: hr_current_user.id, status: "approved", decided_at: Time.current))
       saved = WorkLocation.transaction { HrLite.user_klass.lock.find(hr_current_user.id) && @location.save }
       unless saved
         @locations = WorkLocation.live.where(user_id: hr_current_user.id).order(:created_at)
         return render :index, status: :unprocessable_entity
       end
 
-      AuditLog.record!(action: "work_location.requested", subject: @location, actor: hr_current_user, changes: { "name" => @location.name })
-      notify("work_location.requested", "#{HrLite.display_name(hr_current_user)} registered a WFH location: #{@location.name}",
+      @location.make_active! unless WorkLocation.active_for(hr_current_user.id)
+      AuditLog.record!(action: "work_location.self_saved", subject: @location, actor: hr_current_user, changes: { "name" => @location.name })
+      notify("work_location.requested", "#{HrLite.display_name(hr_current_user)} saved a home location: #{@location.name}",
              "/admin/work_locations", HrLite.admin_users)
-      redirect_to work_locations_path, notice: "Location sent to HR for approval."
+      redirect_to work_locations_path, notice: "#{@location.name} saved as a home location."
     end
 
     def activate
@@ -35,6 +41,12 @@ module HrLite
 
     private
 
+    def refuse_at_cap
+      return if WorkLocation.live.where(user_id: hr_current_user.id).count < WorkLocation::MAX_LIVE
+
+      redirect_to work_locations_path, alert: CAP_MESSAGE
+    end
+
     def notify(event, title, path, to)
       Notifications.publish(event, title: title, path: path, bell_to: to)
     rescue => e

data/app/controllers/hr_lite/work_time_controller.rb

@@ -7,7 +7,7 @@ module HrLite
     def show
       @period, @period_error = WorkModeDurations::Period.from_params(params, Date.current)
       @result = WorkModeDurations.call([ hr_current_user.id ], @period)
-      @records = AttendanceRecord.where(user_id: hr_current_user.id, date: @period.from..@period.to)
+      @records = AttendanceRecord.includes(:work_location, :check_out_work_location).where(user_id: hr_current_user.id, date: @period.from..@period.to)
                                  .where.not(check_in_at: nil).order(:date).limit(400)
     end
   end

data/app/models/hr_lite/attendance_record.rb

@@ -11,14 +11,25 @@ module HrLite
                    "outside_meeting" => "Client meeting" }.freeze
     # Check-in and check-out further apart than this are called out on the board.
     PUNCH_GAP_ALERT_M = 500
+    # Where each punch happened, set by AttendancePuncher.
+    PLACES = { "office" => "Office", "home" => "Home", "travel" => "Travel" }.freeze
 
     belongs_to :user, class_name: HrLite.config.user_class
     belongs_to :regularized_by, class_name: HrLite.config.user_class, optional: true
     belongs_to :wfh_request, optional: true
     belongs_to :work_location, optional: true
+    belongs_to :check_out_work_location, class_name: "HrLite::WorkLocation", optional: true
 
     def remote? = work_mode.present? && work_mode != "office"
     def work_mode_label = WORK_MODES[work_mode]
+    def place_label(side) = PLACES[public_send("#{side}_place")]
+
+    # The day's start and end as a Google Maps route, one tap from the trail.
+    def route_url
+      return unless check_in_lat && check_in_lng && check_out_lat && check_out_lng
+
+      "https://www.google.com/maps/dir/?api=1&origin=#{check_in_lat},#{check_in_lng}&destination=#{check_out_lat},#{check_out_lng}"
+    end
 
     validates :date, presence: true, uniqueness: { scope: :user_id }
     validates :status, inclusion: { in: STATUSES }

data/app/models/hr_lite/wfh_request.rb

@@ -23,6 +23,7 @@ module HrLite
     STATUSES.each { |s| define_method("#{s}?") { status == s } }
 
     def self.approved_for(user_id, date) = approved.where(user_id: user_id).overlapping(date, date).first
+    def self.pending_for(user_id, date) = pending.where(user_id: user_id).overlapping(date, date).first
 
     # HR grants WFH outright: approved on creation, up to HR_MAX_DAYS long.
     def self.grant!(user_id:, by:, start_date:, end_date:, reason:)

data/app/models/hr_lite/work_location.rb

@@ -4,8 +4,8 @@ module HrLite
   class WorkLocation < ApplicationRecord
     STATUSES = %w[pending approved rejected removed].freeze
     MAX_LIVE = 3
-    MAX_ACCURACY_M = 100 # a vaguer fix can't pin a home
     FENCE_M = 500
+    MAX_ACCURACY_M = FENCE_M # owner 2026-10-14: a fix good to the 500 m fence may pin a home
 
     belongs_to :user, class_name: HrLite.config.user_class
     belongs_to :decided_by, class_name: HrLite.config.user_class, optional: true

data/app/services/hr_lite/attendance_puncher.rb

@@ -7,22 +7,29 @@ module HrLite
     # What the browser can legitimately report (geo_punch.js).
     GEO_STATUSES = %w[ok denied unavailable timeout insecure].freeze
     OFF_SITE_MESSAGE = "You are not within the office location. Please request Work From Home (WFH) approval from HR.".freeze
-    HOME_OFF_SITE_MESSAGE = "You are outside your registered WFH location. Please select an approved location " \
-                            "or switch to Travelling Mode if you are travelling.".freeze
-    NO_HOME_MESSAGE = "You have WFH today but no approved WFH location. Register one under WFH locations and ask HR to approve it.".freeze
+    HOME_ASK_MESSAGE = "You are not at any of your home locations. Is this your home location? " \
+                       "Answer on the card below and check in again.".freeze
+    HOME_CAP_MESSAGE = "You already have #{WorkLocation::MAX_LIVE} home locations. Ask HR to change one, or choose Travelling.".freeze
+    HOME_FIX_MESSAGE = "Your location is not precise enough to save as home (#{WorkLocation::MAX_ACCURACY_M} m or better). " \
+                       "Step outside or wait for GPS and try again.".freeze
+    TRAVEL_OUT_MESSAGE = "You checked in at home and are away from your home locations now. Choose Travelling to check out here.".freeze
     FIELD_MODES = %w[travelling outside_meeting].freeze
 
-    Result = Struct.new(:record, :error, keyword_init: true) do
+    # offer: :home or :travel — the choice the punch card should put in front of the person.
+    Result = Struct.new(:record, :error, :offer, keyword_init: true) do
       def ok? = error.nil?
     end
 
     # field: { mode:, purpose:, place: } — a field-staff check-in away from the office.
-    def self.call(user:, kind:, lat: nil, lng: nil, accuracy_m: nil, geo_status: "ok", field: {})
-      new(user, kind.to_sym, lat, lng, accuracy_m, geo_status.to_s, field.to_h.symbolize_keys).call
+    # travel: a WFH punch away from every home; save_home: keep this spot as a home.
+    def self.call(user:, kind:, lat: nil, lng: nil, accuracy_m: nil, geo_status: "ok", field: {}, travel: false, save_home: false)
+      new(user, kind.to_sym, lat, lng, accuracy_m, geo_status.to_s, field.to_h.symbolize_keys, travel:, save_home:).call
     end
 
-    def initialize(user, kind, lat, lng, accuracy_m, geo_status, field = {})
+    def initialize(user, kind, lat, lng, accuracy_m, geo_status, field = {}, travel: false, save_home: false)
       @user = user
+      @travel = travel
+      @save_home = save_home
       @field = field.transform_values { |v| v.to_s.strip.presence }.compact
       @kind = kind
       @lat = lat.presence
@@ -42,11 +49,14 @@ module HrLite
       end
 
       if (error = geofence_error)
-        return Result.new(error: error)
+        return Result.new(error: error, offer: @offer)
       end
 
       record = resolve_record
       return Result.new(error: "No open check-in to close.") if record.nil?
+      if @kind == :check_out && (error = check_out_place_error(record))
+        return Result.new(error: error, offer: @offer)
+      end
 
       record.with_lock do
         case @kind
@@ -57,10 +67,12 @@ module HrLite
           record.work_mode = @mode
           record.work_location_id = @location&.id
           record.wfh_request_id = @wfh&.id if @mode == "wfh"
+          record.add_flag!("WFH request pending HR approval: #{@wfh.reason}") if @wfh&.pending?
         when :check_out
           return Result.new(record: record, error: "Check in first.") if record.check_in_at.blank?
 
           stamp(record, :check_out) # repeat check-out overwrites: last out wins
+          record.check_out_work_location_id = @location&.id
         else
           return Result.new(error: "Unknown punch #{@kind}.")
         end
@@ -95,12 +107,13 @@ module HrLite
     # the day's work_mode: inside an office radius is office (even on a WFH
     # day); a field-staff check-in that says where and why is travelling or
     # outside_meeting; approved WFH (dated or permanent) must be within the
-    # active approved home location's fence. Anything else is refused.
+    # fence of any of their approved homes (the nearest one is picked), or
+    # saved as a new home on the spot, or Travelling. Anything else is refused.
     def geofence_error
       return unless @kind == :check_in && HrLite.config.office_geofence && OfficeLocation.active.exists?
       return location_error unless @lat && @lng
       if in_office?
-        @mode = "office"
+        @mode, @place = "office", "office"
         return
       end
 
@@ -108,21 +121,74 @@ module HrLite
       if profile&.field_staff && FIELD_MODES.include?(@field[:mode])
         return "Say why and where you are checking in from the field." unless @field[:purpose] && @field[:place]
 
-        @mode = @field[:mode]
+        @mode, @place = @field[:mode], "travel"
         return
       end
 
-      @wfh = WfhRequest.approved_for(@user.id, Date.current)
+      # A request HR has not decided yet still lets the person work; the day is flagged for HR.
+      @wfh = WfhRequest.approved_for(@user.id, Date.current) || WfhRequest.pending_for(@user.id, Date.current)
       return OFF_SITE_MESSAGE unless @wfh || profile&.permanent_wfh
 
-      @location = WorkLocation.active_for(@user.id)
-      return NO_HOME_MESSAGE unless @location
-      return HOME_OFF_SITE_MESSAGE unless precise_within?(WorkLocation::FENCE_M) && @location.covers?(@lat, @lng)
+      @mode, @place = "wfh", "home"
+      return if (@location = covering_home)
+      return save_home if @save_home
+
+      @offer = :home
+      return HOME_ASK_MESSAGE unless @travel
+
+      @mode, @place = "travelling", "travel"
+      nil
+    end
+
+    # A day begun at home or travelling ends at a home, in the office, or
+    # travelling; leaving home for elsewhere has to be said out loud.
+    def check_out_place_error(record)
+      return unless %w[home travel].include?(record.check_in_place) && @lat && @lng
+
+      if in_office? then @place = "office"
+      elsif (@location = covering_home) then @place = "home"
+      elsif @travel || record.check_in_place == "travel" then @place = "travel"
+      else
+        @offer = :travel
+        return TRAVEL_OUT_MESSAGE
+      end
+      nil
+    end
+
+    def homes = @homes ||= WorkLocation.approved.where(user_id: @user.id).to_a
+
+    # The nearest approved home whose fence this fix is inside; it becomes the active one.
+    def covering_home
+      return unless precise_within?(WorkLocation::FENCE_M)
+
+      home = homes.select { |h| h.covers?(@lat, @lng) }.min_by { |h| Geo.distance_m(h.lat, h.lng, @lat.to_f, @lng.to_f) }
+      home&.make_active! unless home&.active
+      home
+    end
+
+    # "Is this your home?" — yes. Saved approved and active at once while
+    # the person has fewer than MAX_LIVE homes; HR sees it in the audit log.
+    def save_home
+      return HOME_FIX_MESSAGE unless precise_within?(WorkLocation::MAX_ACCURACY_M)
+
+      count = WorkLocation.live.where(user_id: @user.id).count
+      return HOME_CAP_MESSAGE if count >= WorkLocation::MAX_LIVE
 
-      @mode = "wfh"
+      @location = WorkLocation.create!(user_id: @user.id, name: "Home #{count + 1}", lat: @lat, lng: @lng,
+                                       accuracy_m: @accuracy_m, status: "approved", decided_at: Time.current)
+      @location.make_active!
+      @homes = nil
+      AuditLog.record!(action: "work_location.self_saved", subject: @location, actor: @user, changes: { "name" => @location.name })
       nil
     end
 
+    # Metres to the nearest approved home; nil without a fix or a home.
+    def home_m
+      return unless @lat && @lng
+
+      homes.map { |h| Geo.distance_m(h.lat, h.lng, @lat.to_f, @lng.to_f) }.min&.round
+    end
+
     # Check-in opens the day's system-set mode; check-out ends everything and
     # opens Offline. The timeline keeps every earlier row.
     def track_work_mode(record)
@@ -154,6 +220,8 @@ module HrLite
       record.public_send("#{side}_lat=", @lat)
       record.public_send("#{side}_lng=", @lng)
       record.public_send("#{side}_accuracy_m=", @accuracy_m)
+      record.public_send("#{side}_place=", @place || ("office" if @lat && @lng && in_office?))
+      record.public_send("#{side}_home_m=", home_m)
     end
 
     def already_in_message(record)

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

@@ -36,15 +36,17 @@
       <div class="hrl-feed__item hrl-small">
         <div class="hrl-feed__body">
           <strong><%= record.date.strftime("%a %-d %b") %></strong>
+          <%# Days punched before places were recorded keep the older office/WFH lines. %>
           <% [ [ "In", record.check_in_at, record.check_in_lat, record.check_in_lng ],
                [ "Out", record.check_out_at, record.check_out_lat, record.check_out_lng ] ].each do |label, at, lat, lng| %>
-            <% next unless at %>
+            <% next unless at && record.check_in_place.nil? %>
             <div class="hrl-punch-line"><%= label %> <%= at.strftime("%H:%M") %> · <%= record.remote? ? record.work_mode_label : (HrLite::OfficeLocation.place(lat, lng, @offices) || "No GPS") %>
               <% if lat && lng %>
                 · <a class="hrl-card__link" href="https://www.google.com/maps?q=<%= lat %>,<%= lng %>" target="_blank" rel="noopener noreferrer">Map<span class="hrl-sr-only"> of <%= label.downcase %> <%= record.date.strftime("%-d %b") %></span></a>
               <% end %>
             </div>
           <% end %>
+          <% if record.check_in_place %><%= render "hr_lite/attendance/trail", record: record %><% end %>
           <% if (gap = record.punch_gap_m) %>
             <div class="<%= gap > HrLite::AttendanceRecord::PUNCH_GAP_ALERT_M ? "hrl-badge hrl-badge--warn" : "hrl-muted" %>"><%= (gap / 1000.0).round(1) %> km apart</div>
           <% end %>

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

@@ -32,6 +32,11 @@
             <input type="text" class="hrl-input" name="decision_note" id="reject-loc-<%= location.id %>" required placeholder="Reason to reject">
             <button type="submit" class="hrl-btn hrl-btn--danger">Reject</button>
           <% end %>
+        <% elsif location.approved? && location.user_id != hr_current_user.id %>
+          <%= button_to hr_lite.remove_admin_work_location_path(location), method: :post, class: "hrl-btn hrl-btn--danger",
+                        form: { data: { turbo_confirm: "Remove #{location.name} for #{hr_display_name(location.user)}?" } } do %>
+            Remove<span class="hrl-sr-only"> <%= location.name %></span>
+          <% end %>
         <% end %>
       </div>
     <% end %>

data/app/views/hr_lite/attendance/_punch_card.html.erb

@@ -21,6 +21,9 @@
     <% if record&.work_mode_label %>
       <span class="hrl-badge hrl-badge--ok"><%= record.work_mode_label %></span>
     <% end %>
+    <% if record&.check_in_place == "home" && record.work_location %>
+      <span class="hrl-badge hrl-badge--muted"><%= record.work_location.name %> · <%= HrLite::WorkLocation::FENCE_M %> m</span>
+    <% end %>
     <% if record&.flagged? %>
       <span class="hrl-badge hrl-badge--bad">Flagged</span>
     <% end %>
@@ -68,6 +71,17 @@
           <div class="hrl-field"><label for="field-place">Destination or client</label><input type="text" class="hrl-input" id="field-place" name="field[place]" maxlength="120"></div>
         </details>
       <% end %>
+      <% if flash[:punch_offer] == "home" %>
+        <fieldset class="hrl-field">
+          <legend class="hrl-small">Is this your home location?</legend>
+          <% if HrLite::WorkLocation.live.where(user_id: hr_current_user.id).count < HrLite::WorkLocation::MAX_LIVE %>
+            <label class="hrl-field--check"><input type="radio" name="place" value="home" required> Yes, save this place as a home location</label>
+          <% else %>
+            <p class="hrl-small"><%= HrLite::WorkLocationsController::CAP_MESSAGE %></p>
+          <% end %>
+          <label class="hrl-field--check"><input type="radio" name="place" value="travel" required> No, I am travelling</label>
+        </fieldset>
+      <% end %>
       <button type="submit" class="hrl-btn hrl-btn--primary hrl-btn--big hrl-btn--block">Check in</button>
       <p class="hrl-small hrl-muted" data-hrl-geo-status role="status" aria-live="polite"></p>
     <% end %>
@@ -76,6 +90,9 @@
                   html: { data: { "hrl-geo-punch": true, "hrl-geo-required": HrLite.config.require_punch_location.presence } } do %>
       <input type="hidden" name="lat"><input type="hidden" name="lng">
       <input type="hidden" name="accuracy_m"><input type="hidden" name="geo_status">
+      <% if flash[:punch_offer] == "travel" %>
+        <div class="hrl-field"><label class="hrl-field--check"><input type="checkbox" name="place" value="travel" required> I am travelling — check out here</label></div>
+      <% end %>
       <button type="submit" class="hrl-btn hrl-btn--big hrl-btn--block">
         <%= record.check_out_at ? "Update check-out" : "Check out" %>
       </button>
@@ -104,6 +121,7 @@
   <% if local_assigns.key?(:attention) %>
     <div class="hrl-row">
       <a class="hrl-btn" href="<%= hr_lite.new_leave_request_path %>">Apply leave</a>
+      <% if HrLite.config.office_geofence %><a class="hrl-btn" href="<%= hr_lite.wfh_requests_path %>">Request WFH</a><% end %>
       <a class="hrl-btn" href="<%= hr_lite.new_regularization_request_path %>">Fix a punch</a>
       <a class="hrl-btn" href="<%= hr_lite.new_comp_off_request_path %>">Comp-off</a>
       <% if hr_lite_route?(:salary_slips_path) %><a class="hrl-btn" href="<%= hr_lite.salary_slips_path %>">Payslip</a><% end %>

data/app/views/hr_lite/attendance/_trail.html.erb

@@ -0,0 +1,13 @@
+<%# locals: record — one day's start and end: time, place, metres from home, GPS accuracy, route. %>
+<% [ [ :check_in, "Check-in" ], [ :check_out, "Check-out" ] ].each do |side, label| %>
+  <% next unless (at = record.public_send("#{side}_at")) %>
+  <% home_m = record.public_send("#{side}_home_m")
+     accuracy = record.public_send("#{side}_accuracy_m")
+     home = side == :check_in ? record.work_location : record.check_out_work_location %>
+  <div class="hrl-punch-line"><%= label %>: <%= record.place_label(side) || "Unknown place" %><% if home && record.public_send("#{side}_place") == "home" %> (<%= home.name %>)<% end %> · <%= at.strftime("%H:%M") %>
+    <% if home_m %> · <%= number_with_delimiter(home_m) %> m from home<% end %>
+    <% if accuracy %> · ±<%= accuracy %> m<% end %></div>
+<% end %>
+<% if (route = record.route_url) %>
+  <div class="hrl-punch-line"><a class="hrl-card__link" href="<%= route %>" target="_blank" rel="noopener noreferrer">View route on Google Maps<span class="hrl-sr-only"> for <%= record.date.strftime("%-d %b") %></span></a></div>
+<% end %>

data/app/views/hr_lite/home/_today_checkins.html.erb

@@ -6,10 +6,12 @@
      if r
        parts << "In #{r.check_in_at.strftime('%H:%M')}#{" (#{p.late_minutes} min late)" if p.late?}"
        parts << (r.check_out_at ? "Out #{r.check_out_at.strftime('%H:%M')} · #{hrl_duration(r.worked_duration)} worked" : "#{hrl_duration(Time.current - r.check_in_at)} so far")
+       parts << [ r.place_label(:check_in) && "Check-in: #{r.place_label(:check_in)}",
+                  r.place_label(:check_out) && "Check-out: #{r.place_label(:check_out)}" ].compact.join(" → ").presence
      else
        parts << "Not checked in yet"
      end
-     parts.join(" · ")
+     parts.compact.join(" · ")
    end %>
 <section class="hrl-card">
   <h2 class="hrl-card__title">Today's check-ins</h2>

data/app/views/hr_lite/wfh_requests/index.html.erb

@@ -6,7 +6,7 @@
 
 <section class="hrl-card">
   <h2 class="hrl-card__title">Request WFH</h2>
-  <p class="hrl-small hrl-muted">Pick dates from today up to <%= HrLite::WfhRequest::MAX_DAYS_AHEAD %> days ahead. HR approves or rejects; only approved dates let you check in away from the office.</p>
+  <p class="hrl-small hrl-muted">Pick dates from today up to <%= HrLite::WfhRequest::MAX_DAYS_AHEAD %> days ahead. HR approves or rejects. While a request is waiting you can still check in away from the office; HR sees the reason. A rejected date cannot.</p>
   <%= form_with model: @request, url: hr_lite.wfh_requests_path, scope: :wfh_request, local: true do |f| %>
     <%= render "hr_lite/shared/form_errors", record: @request %>
     <% min, max = @window.first.iso8601, @window.last.iso8601 %>

data/app/views/hr_lite/work_locations/index.html.erb

@@ -5,9 +5,11 @@
 </div>
 
 <section class="hrl-card">
-  <p class="hrl-small hrl-muted">On an approved WFH day you check in within <%= HrLite::WorkLocation::FENCE_M %> m of your active location.
-    Register up to <%= HrLite::WorkLocation::MAX_LIVE %> places; HR approves each one. Your location is read only when you check in or tap
+  <% at_cap = @locations.size >= HrLite::WorkLocation::MAX_LIVE %>
+  <p class="hrl-small hrl-muted">On a WFH day you check in within <%= HrLite::WorkLocation::FENCE_M %> m of any of your homes; the nearest one is picked for you.
+    Save up to <%= HrLite::WorkLocation::MAX_LIVE %> places; after that only HR changes them. Your location is read only when you check in or tap
     "Register here" — never tracked in between. Teammates see "Home", never the address.</p>
+  <% if at_cap %><p class="hrl-small"><%= HrLite::WorkLocationsController::CAP_MESSAGE %></p><% end %>
   <% if @locations.any? %>
     <% @locations.each do |location| %>
       <div class="hrl-feed__item hrl-row">
@@ -18,11 +20,13 @@
           <% if location.address.present? %><div class="hrl-small hrl-muted"><%= location.address %></div><% end %>
           <% if location.decision_note.present? %><div class="hrl-small hrl-muted">HR: <%= location.decision_note %></div><% end %>
         </div>
-        <% if location.approved? && !location.active? %>
-          <%= button_to "Use this", hr_lite.activate_work_location_path(location), method: :post, class: "hrl-btn" %>
+        <% unless at_cap %>
+          <% if location.approved? && !location.active? %>
+            <%= button_to "Use this", hr_lite.activate_work_location_path(location), method: :post, class: "hrl-btn" %>
+          <% end %>
+          <%= button_to "Remove", hr_lite.remove_work_location_path(location), method: :post, class: "hrl-btn hrl-btn--danger",
+                        form: { data: { turbo_confirm: "Remove #{location.name}?" } } %>
         <% end %>
-        <%= button_to "Remove", hr_lite.remove_work_location_path(location), method: :post, class: "hrl-btn hrl-btn--danger",
-                      form: { data: { turbo_confirm: "Remove #{location.name}?" } } %>
       </div>
     <% end %>
   <% else %>

data/app/views/hr_lite/work_time/_report.html.erb

@@ -65,8 +65,8 @@
       <% records.each do |r| %>
         <div class="hrl-feed__item hrl-small"><div class="hrl-feed__body">
           <% if names %><strong><%= names[r.user_id] %></strong> · <% end %>
-          <%= r.date.strftime("%a %-d %b") %> · in <%= r.check_in_at.strftime("%H:%M") %> · out <%= r.check_out_at&.strftime("%H:%M") || "—" %>
-          <% if r.work_mode_label %> · <%= r.work_mode_label %><% end %>
+          <%= r.date.strftime("%a %-d %b") %><% if r.work_mode_label %> · <%= r.work_mode_label %><% end %>
+          <%= render "hr_lite/attendance/trail", record: r %>
         </div></div>
       <% end %>
     </section>

data/app/views/layouts/hr_lite/application.html.erb

@@ -86,7 +86,9 @@
           <a class="hrl-backlink" href="<%= hr_lite.public_send(tab[:path]) %>"><span aria-hidden="true">‹</span> <%= tab[:label] %></a>
         <% end %>
         <% if flash[:notice].present? %><div class="hrl-flash hrl-flash--ok" role="status"><%= flash[:notice] %></div><% end %>
-        <% if flash[:alert].present? %><div class="hrl-flash hrl-flash--warn" role="alert"><%= flash[:alert] %></div><% end %>
+        <% if flash[:alert].present? %><div class="hrl-flash hrl-flash--warn" role="alert"><%= flash[:alert] %>
+          <% if flash[:alert] == HrLite::AttendancePuncher::OFF_SITE_MESSAGE %><div class="hrl-mt"><a class="hrl-btn" href="<%= hr_lite.wfh_requests_path %>">Request WFH</a></div><% end %>
+        </div><% end %>
         <%= yield %>
       </main>
     </div>

data/config/routes.rb

@@ -91,7 +91,7 @@ HrLite::Engine.routes.draw do
       member { post :approve; post :reject }
     end
     resources :work_locations, only: :index do
-      member { post :approve; post :reject }
+      member { post :approve; post :reject; post :remove }
     end
     get "work_modes", to: "work_modes#index", as: :work_modes
     get "work_time", to: "work_time#index", as: :work_time

data/db/migrate/20261014031000_add_punch_places_to_hr_lite_attendance_records.rb

@@ -0,0 +1,10 @@
+class AddPunchPlacesToHrLiteAttendanceRecords < ActiveRecord::Migration[8.1]
+  def change
+    add_column :hr_lite_attendance_records, :check_in_place, :string
+    add_column :hr_lite_attendance_records, :check_out_place, :string
+    add_column :hr_lite_attendance_records, :check_out_work_location_id, :bigint
+    add_column :hr_lite_attendance_records, :check_in_home_m, :integer
+    add_column :hr_lite_attendance_records, :check_out_home_m, :integer
+    add_index :hr_lite_attendance_records, :check_out_work_location_id
+  end
+end

data/lib/hr_lite/version.rb

@@ -1,3 +1,3 @@
 module HrLite
-  VERSION = "0.36.0"
+  VERSION = "0.37.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.1
 platform: ruby
 authors:
 - kshitiz sinha
@@ -355,6 +355,7 @@ files:
 - app/views/hr_lite/attendance/_penalties.html.erb
 - app/views/hr_lite/attendance/_punch_card.html.erb
 - app/views/hr_lite/attendance/_slot.html.erb
+- app/views/hr_lite/attendance/_trail.html.erb
 - app/views/hr_lite/attendance/_work_mode.html.erb
 - app/views/hr_lite/attendance/show.html.erb
 - app/views/hr_lite/benefits/index.html.erb
@@ -484,6 +485,7 @@ files:
 - db/migrate/20261013130100_add_office_location_to_hr_lite_employee_profiles.rb
 - db/migrate/20261013140000_add_calendar_and_crm_to_hr_lite_work_mode_events.rb
 - db/migrate/20261013140100_add_custom_status_to_hr_lite_work_mode_events.rb
+- db/migrate/20261014031000_add_punch_places_to_hr_lite_attendance_records.rb
 - lib/generators/hr_lite/install/install_generator.rb
 - lib/generators/hr_lite/install/templates/AFTER_INSTALL
 - lib/generators/hr_lite/install/templates/initializer.rb