hr_lite 0.40.2 → 0.48.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beaf157b1f52eee0cddeed95c889cf3b27712630941baacd5b60fbfd1ba2b481
-  data.tar.gz: 8a22145f2f009a31103bbe27f63e3d1418d0c051789bf0922e12a3ef9bc5e119
+  metadata.gz: 3780e666e11b64f65243366d445d5f45ee6740eaee2ba3b67c3c4afd5524c630
+  data.tar.gz: e28d1822a25528f83491a9c14bb8ff79aa79c3a63735e93714e9cb96874099b3
 SHA512:
-  metadata.gz: e7aa940b9bd69ecf36183e72b9188923be608d9304abe86a9cbb676d55a8235a77505f55a581e6e8ab4516fa3f24460915ad26ce11e3693a1b31f551f875b034
-  data.tar.gz: 0e1ae948beda575e12fe9ad9b01608eac52bc4ea276d0e7a2292ce6a71b39d14e126af1248cd78de389bd696abef87a496ae3e60930e47e107dd99cf20c2b7a1
+  metadata.gz: 8ca3e1262c00c6c81477dcda625defdc91bf4e80fd159cc9f6e46ec011867b920398e1cd680fbd9942407b4743d093779759718cad771dc5bd44fff564454cf2
+  data.tar.gz: '0395753ca5277c0aa9a01063ced7362531d4514f8d785e07e7dd717c50c5237a9482d38e575396d7ae9891886e2aeeceef813e4143d131990ddf4835993342d9'

data/CHANGELOG.md

@@ -7,6 +7,69 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.48.2] - 2026-10-16
+
+- Breaks count as working time. The standard day is 8h 30m including its break, but My work time (and HR's work time report) showed "Working time 8h 00m" for a full 8h 30m shift, because lunch and short breaks were left out. The KPI now reads "Working time (breaks included)" (8h 30m for that shift), and breaks show as "Of which breaks". The daily table's columns are "Working (breaks incl.)" and "Of which breaks". Only the display changed: attendance, penalties, half day and pay already used check-in to check-out.
+
+## [0.48.1] - 2026-10-16
+
+- A choice the punch needs can't be missed on a phone any more. Examples: "Is this your home location?" (Yes, save it / No, I am travelling) and "I am travelling — check out here". The choice sits in the red box, and the page scrolls it to the middle of the screen when the card loads. If the button is tapped without a choice, the page scrolls back to it (the browser's own "select an option" note still shows). Checked at 360 px: the box comes into view, the check-out is held until it's ticked, then it goes through.
+
+## [0.48.0] - 2026-10-16
+
+- When location is blocked, the punch card's message ("Location is blocked. To allow it:") and its steps now show in a red box instead of small grey text. The box clears on the next try.
+- New iPhone steps. Location Services can be on while Safari is still blocked, so the steps now cover all three settings: turn on Location Services; on that screen set Safari Websites (or Chrome, Firefox, Edge) to While Using the App; and for Safari, set Settings → Apps → Safari → Location to Allow (or Ask). Then reload. From the Home Screen app, close and reopen it instead. Checked in the iOS 26 Simulator: tapping Check in and choosing Don't Allow shows these steps in red.
+
+## [0.47.0] - 2026-10-16
+
+- Penalty hours build up and limit leave. A person's attendance penalties (late, after 11:00, short day) add up with no yearly reset until HR removes them. Every 5 hours holds half a day and 10 hours a full day, the same for everyone: 100h = 10 days.
+- In Settings, HR picks "Penalties come off" a leave type (for example Earned leave); with no type picked, penalties limit nothing. The balance itself is not cut: 12 stays 12. You can apply for at most 12 − 10 = 2 days, rounded down to half days. Past that, the request is refused: "For these dates you can apply for at most 2 days of Earned leave — 10 days held for penalties". Other leave types keep today's rule, where days past the balance are unpaid.
+- A "Penalty hours" section on the employee's Attendance page, and on HR's page for that person, shows the hours held, the days they hold, and every HR removal (hours, who, when, reason). HR can remove any number of hours with a required reason: remove 50 of 100 and 50 stay, or remove all of it to settle to 0. The employee gets a bell and an email, and the audit log records it. Removing a single penalty works as before.
+- HR's team attendance view shows "Penalties 100h 00m · 10 days" on each person who has any, linking to their section.
+- "Held for penalties" and "You can apply" show on the employee's balances page, the leave chips, the apply form (with today's limit) and HR's balances grid.
+- Migrations: `hr_lite_settings.penalty_leave_type_id` and `hr_lite_penalty_removals`.
+
+## [0.46.0] - 2026-10-15
+
+- Every check-in and check-out is kept. Checking in again, a repeat check-out and an HR reset used to overwrite the day's check-out, including its time and GPS. Now each punch is saved as its own row: time, GPS, accuracy, place and distance from home. Those rows are never edited or deleted, and saving a change to one raises an error. When a day has more than one in/out pair, "All punches: In 09:30 Office · Out 11:45 Office · In 12:10 Office · Out 18:05 Office" shows on the employee's Today card, their day detail and My work time, and on HR's "Where they punched". A day HR reset with Reset check-in keeps its old punches on show.
+- The day record is still the summary: first check-in to latest check-out. Hours, short day, half day and penalties count the same as before, and the gap between two sessions still counts as worked.
+- Migration: `hr_lite_attendance_punches`. Days punched before this release have no punch rows and show as before.
+
+## [0.45.0] - 2026-10-15
+
+- HR can change a WFH request after deciding it. On an approved or rejected request, the "Change this WFH" card lets HR set new dates and switch between Approved and Rejected, with a required reason. For example, a request rejected for 19–23 Oct can be approved for 20–21 Oct only. Past dates are allowed so a request can match the days actually worked from home, up to 60 days long. It can't clash with that person's other pending or approved WFH. The audit log records the old and new dates and decision ("wfh.changed"), and the employee gets the approved/rejected notice with the reason. Attendance days already punched are not rewritten.
+
+## [0.44.0] - 2026-10-15
+
+- HR can reset today's punch when someone taps by mistake again (after their one "Check in again" is used). On the employee's attendance page, tap today, give the reason, then pick a reset. Each one asks OK/Cancel first. **Reset check-out** puts them back in: the first check-in stands, their work mode reopens, and they check out later. **Reset check-in** clears the whole day so they check in fresh. Both are audited and the employee is notified.
+- Removing a day's punch now also lifts that check-in's late penalties, recorded as removed by HR with the reason. Before, checking in again was charged twice.
+- `data-turbo-confirm` can sit on a button as well as a form, so one form can hold several confirmed actions.
+
+## [0.43.0] - 2026-10-15
+
+- Shorter day: HR can give one employee 30, 60 or 90 minutes off the working day, for example for a long commute. It's set on their profile, with a required reason. The reason is encrypted, kept out of the audit trail, and seen only by HR. Their day becomes the Settings day minus the allowance (8h30 − 90 min = 7h). That drives their "+30 min", "Short by", checkout due time, half-day line check and slot picker. They see "Your day 7h 00m" on their attendance card. This is separate from the late buffer, which still only delays the late clock.
+- `EmployeeProfile.day_minutes_for(user_id)` is the one place that works out a person's day.
+- Migration: `hours_allowance_minutes` and `hours_allowance_reason` on `hr_lite_employee_profiles`.
+
+## [0.42.1] - 2026-10-15
+
+- "Check in again" works once a day, and only inside the hours HR sets in Settings (default 09:00–20:00). Once it has been used, or outside those hours, the card shows "Check in again is open once a day, 09:00–20:00." with no button, and the server refuses the punch with the same message. This replaces 0.41.0's "as many times as needed".
+- Migration: `hr_lite_attendance_records.rechecked_in_at`, stamped on the re-check-in.
+
+## [0.42.0] - 2026-10-15
+
+- HR sets the working day in Admin › Settings. The working day is check-in to check-out with the break included (default 510 min = 8h 30m). Settings also hold the half-day line (default 255 min = 4h 15m) and the hours when "Check in again" is open (default 09:00–20:00). Changes are audited.
+- A short day is measured in hours worked, not by the clock. The checkout due time is the first check-in + the working day + that day's penalties, so someone who comes at 9:00 and leaves at 17:30 has done 8h30 and gets no "+30 min". Before, the due time was the slot start + 8h30, so an early start still counted as short.
+- A day becomes a half day, with the notice, only when the hours worked are under the half-day line ("You worked 4.0h on 06 Jul, under 4h15 — marked half day"). Short of the working day but above the line: only the +30 min on the next working day. Before, anything under 8h was a half day.
+- One working day for everyone: probation staff no longer need 9h.
+- `config.work_hours` still turns the hours rules on (nil = off), and `week` is still read. `day` and `probation_day` are no longer read. `AttendanceSlot::DAY_MINUTES` is removed. The slot picker shows each check-out time from the Settings day.
+- Migration: four columns on `hr_lite_settings`.
+
+## [0.41.0] - 2026-10-15
+
+- Check out asks first: "Check out now? Your check-out is saved as soon as you press OK." The check-out is recorded only on OK; Cancel leaves you checked in. This covers both the day's Check out and "Check out yesterday's shift".
+- Check in again: after checking out, the card offers "Check in again", as many times as needed in a day. It reopens the day. The first check-in time stands and the check-out is cleared until the next one. The gap shows as Offline on the work-mode timeline, so working time excludes it, and the new session takes this punch's work mode. Re-checking in does not apply the late-arrival rules again. "Update check-out" is gone: check in again, then check out.
+
 ## [0.40.2] - 2026-10-15
 
 - ID card: a long name no longer runs off the card. When someone has no name and their email stands in for it ("sageashish2714@gmail.com"), it breaks before the "@" onto a second line. Any other unbroken word breaks wherever it has to.

data/app/assets/javascripts/hr_lite/confirm.js

@@ -18,7 +18,8 @@
       var form = event.target;
       if (!form || form.nodeName !== "FORM") return;
 
-      var message = form.getAttribute("data-turbo-confirm");
+      // A button can carry its own prompt (one form, several actions).
+      var message = (event.submitter && event.submitter.getAttribute("data-turbo-confirm")) || form.getAttribute("data-turbo-confirm");
       if (message && !window.confirm(message)) {
         event.preventDefault();
         event.stopPropagation();

data/app/assets/javascripts/hr_lite/geo_punch.js

@@ -19,13 +19,16 @@
     var ua = navigator.userAgent;
     var ios = /iPhone|iPad|iPod/.test(ua) || (/Macintosh/.test(ua) && navigator.maxTouchPoints > 1);
     if (ios) {
+      // Location Services can be on while Safari Websites (or the browser app) is set
+      // to Never, or this site to Deny — the usual iPhone block.
       var app = /CriOS/.test(ua) ? "Chrome" : /FxiOS/.test(ua) ? "Firefox" : /EdgiOS/.test(ua) ? "Edge" : null;
-      return [
+      var steps = [
         "Open Settings → Privacy & Security → Location Services and turn it on.",
-        app ? "In Settings, open Apps → " + app + " → Location and choose While Using the App."
-            : "In Settings, open Apps → Safari → Location and choose Allow (or Ask).",
-        "Come back here, reload the page and tap again."
+        "On that screen, scroll down to " + (app || "Safari Websites") + " and choose While Using the App."
       ];
+      if (!app) steps.push("Then open Settings → Apps → Safari → Location and choose Allow (or Ask).");
+      steps.push(navigator.standalone ? "Close this app fully, open it again and tap again." : "Reload this page and tap again.");
+      return steps;
     }
     if (/Android/.test(ua)) {
       var samsung = /SamsungBrowser/.test(ua);
@@ -49,6 +52,7 @@
   function showHelp(label, headline) {
     if (!label) return;
     label.textContent = headline;
+    label.classList.replace("hrl-muted", "hrl-errors") || label.classList.add("hrl-errors"); // red until the next try
     var list = document.createElement("ol");
     list.className = "hrl-geo-help";
     locationSteps().forEach(function (step) {
@@ -69,6 +73,13 @@
     var button = form.querySelector("[type=submit]");
     var label = form.querySelector("[data-hrl-geo-status]");
     var required = form.hasAttribute("data-hrl-geo-required");
+    // A choice the punch needs (home or travelling) sits mid-card on a phone and was
+    // missed: bring it into view now, and again if the button is tapped without it.
+    var choose = form.querySelector("[data-hrl-must-choose]");
+    if (choose) {
+      choose.scrollIntoView({ block: "center" });
+      form.addEventListener("invalid", function () { choose.scrollIntoView({ block: "center" }); }, true);
+    }
     var locating = false;
 
     function send(status) {
@@ -88,7 +99,7 @@
       event.preventDefault();
       locating = true;
       if (button) { button.disabled = true; button.setAttribute("aria-busy", "true"); }
-      if (label) { label.hidden = false; label.textContent = "Getting location…"; }
+      if (label) { label.hidden = false; label.classList.replace("hrl-errors", "hrl-muted"); label.textContent = "Getting location…"; }
 
       if (!navigator.geolocation) {
         if (required) hold("This browser cannot share your location. Open this page in Chrome or Safari.");

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

@@ -260,7 +260,7 @@ details > form > button[type=submit], details > form > .hrl-btn { margin-top: .2
 .hrl-listrow > :first-child { display: inline-flex; align-items: center; gap: var(--hrl-s-1); line-height: var(--hrl-lh-tight); }
 /* The punch status stays in the accessibility tree (no `hidden`) so its first message is announced; empty, it takes no space. */
 [data-hrl-geo-status]:empty { margin: 0; }
-.hrl-geo-help { margin: var(--hrl-s-2) 0 0; padding-left: var(--hrl-s-4); color: var(--hrl-ink); }
+.hrl-geo-help { margin: var(--hrl-s-2) 0 0; padding-left: var(--hrl-s-4); color: inherit; }
 .hrl-geo-help li + li { margin-top: var(--hrl-s-1); }
 .hrl-grid { display: grid; gap: .85rem; grid-template-columns: 1fr; margin-bottom: .85rem; }
 .hrl-grid > * { min-width: 0; }

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

@@ -11,6 +11,7 @@ module HrLite
         @employees = @employees.select { |user| visible.include?(user.id) } if visible
         @records = AttendanceRecord.for_date(@date).where(user_id: @employees.map(&:id)).index_by(&:user_id)
         @flagged_count = @records.values.count(&:flagged?)
+        @penalty_minutes = AttendancePenalty.held_minutes(@employees.map(&:id))
         # "How many people punched where": off-site punches count as one place.
         @offices = OfficeLocation.active.to_a
         @places = %i[check_in check_out].index_with do |side|
@@ -62,7 +63,8 @@ module HrLite
 
       # Regularization: fix punches with a mandatory note, fully audited.
       # Clearing both punch times deletes the record (that is how an
-      # erroneous punch is removed).
+      # erroneous punch is removed). Reset check-in does the same; reset
+      # check-out leaves them checked in, so they can check in or out again.
       def update
         @employee = find_manageable_employee
         date = parse_date_param(params[:date])
@@ -75,7 +77,7 @@ module HrLite
         end
 
         attrs = params.require(:attendance_record).permit(:check_in_at, :check_out_at, :status, :half_day_part)
-        if attrs[:check_in_at].blank? && attrs[:check_out_at].blank?
+        if params[:reset] == "check_in" || (attrs[:check_in_at].blank? && attrs[:check_out_at].blank?)
           # Nothing to remove used to still write a `destroy` audit row with
           # subject_id 0 and email the employee that a punch was removed.
           unless record.persisted?
@@ -84,6 +86,9 @@ module HrLite
           end
 
           record.destroy
+          # Its late penalties go too, so checking in again is not charged twice.
+          AttendancePenalty.active.where(attendance_record_id: record.id)
+                           .find_each { |p| p.update!(removed_at: Time.current, removed_by_id: hr_current_user.id, removal_reason: note) }
           log_regularization(record, note, removed: true)
           return redirect_to admin_attendance_path(@employee.id, month: date.strftime("%Y-%m")),
                              notice: "Punch removed."
@@ -98,6 +103,7 @@ module HrLite
         end
 
         record.assign_attributes(attrs)
+        record.clear_check_out if params[:reset] == "check_out"
         record.half_day_part = attrs[:half_day_part].presence if attrs.key?(:half_day_part)
         record.status = record.half_day_part ? "half_day" : "present" if attrs.key?(:half_day_part)
         record.status = "present" if record.status.blank?
@@ -107,6 +113,10 @@ module HrLite
 
         if record.save
           log_regularization(record, note, removed: false)
+          if params[:reset] == "check_out" && date == Date.current
+            WorkModeEvent.start!(user_id: @employee.id, mode: record.work_mode || "office", source: "hr",
+                                 actor: hr_current_user, attendance_record: record)
+          end
           redirect_to admin_attendance_path(@employee.id, month: date.strftime("%Y-%m")),
                       notice: "Attendance updated."
         else
@@ -144,6 +154,25 @@ module HrLite
         redirect_to admin_attendance_path(@employee.id, month: month), notice: "Penalty removed."
       end
 
+      # HR settles part or all of a person's penalty hours with a reason; the rest stays.
+      def remove_penalty_hours
+        @employee = find_manageable_employee
+        minutes = (params[:hours].to_f * 60).round
+        reason = params[:reason].to_s.strip
+        held = AttendancePenalty.held_minutes(@employee.id)[@employee.id].to_i
+        back = admin_attendance_path(@employee.id, anchor: "penalties")
+        return redirect_to back, alert: "A reason is required." if reason.blank?
+        return redirect_to back, alert: "Remove between 0.5h and #{helpers.hrl_days(held / 60.0)}h." unless minutes.positive? && minutes <= held
+
+        removal = PenaltyRemoval.create!(user_id: @employee.id, minutes: minutes, reason: reason, removed_by_id: hr_current_user.id)
+        hours = helpers.hrl_days(minutes / 60.0)
+        AuditLog.record!(action: "attendance.penalty_hours_removed", subject: removal, actor: hr_current_user,
+                         changes: { "minutes" => minutes, "reason" => reason })
+        Notifications.publish("attendance.penalty_removed", title: "HR removed #{hours}h of your penalties", body: reason,
+                                                            path: "/attendance#penalties", bell_to: [ @employee ], email_to: [ @employee ])
+        redirect_to back, notice: "Removed #{hours}h of penalties."
+      end
+
       private
 
       # Viewing somebody's month and rewriting their punches are different

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

@@ -116,7 +116,7 @@ module HrLite
           :date_of_exit, :probation_until, :department, :work_location, :pan_number, :pf_uan, :esi_number,
           :bank_account_number, :bank_ifsc, :bank_name, :tax_regime, :declared_annual_deductions,
           :fy_opening_gross, :fy_opening_tds, :blood_group, :emergency_contact,
-          :buffer_minutes, :buffer_reason, :buffer_note, :permanent_wfh, :field_staff, :office_location_id
+          :buffer_minutes, :buffer_reason, :buffer_note, :hours_allowance_minutes, :hours_allowance_reason, :permanent_wfh, :field_staff, :office_location_id
         )
       end
 

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

@@ -7,7 +7,8 @@ module HrLite
 
       def update
         @setting = Setting.instance
-        if @setting.update(params.require(:setting).permit(:weekend_policy, :employee_code_prefix, :lunch_break_minutes, :short_break_minutes))
+        if @setting.update(params.require(:setting).permit(:weekend_policy, :employee_code_prefix, :lunch_break_minutes, :short_break_minutes,
+                                                          :day_minutes, :half_day_below_minutes, :recheck_in_from, :recheck_in_until, :penalty_leave_type_id))
           redirect_to edit_admin_setting_path, notice: "Settings saved."
         else
           render :edit, status: :unprocessable_entity

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

@@ -1,7 +1,7 @@
 module HrLite
   module Admin
     # WFH board (counts, who is home on a date, every schedule) and the
-    # decision screen. Viewing is attendance.view, deciding attendance.manage.
+    # decision screen. Viewing is attendance.view, deciding and changing attendance.manage.
     class WfhRequestsController < BaseController
       def index
         @from = params[:from].present? ? parse_date_param(params[:from]) : Date.current
@@ -64,6 +64,19 @@ module HrLite
         redirect_to admin_wfh_request_path(request), alert: "Only pending requests can be decided."
       end
 
+      # HR changes an approved or rejected request: dates (past allowed) and/or decision, with a reason.
+      def update
+        request = decidable.where(status: %w[approved rejected]).find(params[:id])
+        note = params[:decision_note].to_s.strip
+        return redirect_to admin_wfh_request_path(request), alert: "A reason is required to change WFH." if note.blank?
+
+        request.change!(actor: hr_current_user, start_date: params[:start_date], end_date: params[:end_date],
+                        status: params[:status].presence_in(%w[approved rejected]) || request.status, note: note)
+        redirect_to admin_wfh_request_path(request), notice: "WFH changed for #{hr_display_name(request.user)}."
+      rescue ActiveRecord::RecordInvalid => e
+        redirect_to admin_wfh_request_path(request), alert: "Could not change WFH: #{e.record.errors.full_messages.to_sentence}"
+      end
+
       private
 
       # Nobody decides their own request; out-of-scope ids are a 404.

data/app/jobs/hr_lite/attendance_close_job.rb

@@ -2,7 +2,7 @@ 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,
-  # and so is a closed punch short of config.work_hours.
+  # and so is a closed punch under the half-day line HR sets in Settings.
   # Nobody punched in already reads as absent (DayStatus), so they are only
   # told. Leave days, and each person's weekends and office holidays, are left alone.
   class AttendanceCloseJob < ApplicationJob
@@ -22,10 +22,11 @@ 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?
+        elsif !record.regularized? && record.status == "present" && record.below_half_day?
           record.update!(status: "half_day", regularization_note: AttendanceRecord::SHORT_DAY_NOTE)
+          line = Setting.instance.half_day_below_minutes
           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")
+               "You worked #{(record.worked_duration / 3600.0).round(1)}h on #{day}, under #{line / 60}h#{format('%02d', line % 60)} — marked half day")
         end
         penalize_short_day(record) if record&.check_out_at
       end

data/app/models/hr_lite/attendance_penalty.rb

@@ -25,6 +25,16 @@ module HrLite
       ((date + 1)..(date + 31)).select { |d| calendar.working_day?(d) }.first(count)
     end
 
+    # Penalty minutes still held per person: every active penalty ever, less the
+    # hours HR removed. They build up until HR removes them; never below 0.
+    def self.held_minutes(user_ids)
+      removed = PenaltyRemoval.where(user_id: user_ids).group(:user_id).sum(:minutes)
+      active.where(user_id: user_ids).group(:user_id).sum(:minutes).to_h { |id, m| [ id, [ m - removed[id].to_i, 0 ].max ] }
+    end
+
+    # Every 5h held is half a day of leave: 7h = 0.5, 10h = 1, 100h = 10.
+    def self.days_for(minutes) = (minutes / 300) * 0.5
+
     def label = REASONS.fetch(reason)
   end
 end

data/app/models/hr_lite/attendance_punch.rb

@@ -0,0 +1,14 @@
+module HrLite
+  # One check-in or check-out as it happened. Append-only: checking in again,
+  # a repeat check-out or an HR reset changes the day record, never these.
+  class AttendancePunch < ApplicationRecord
+    belongs_to :user, class_name: HrLite.config.user_class
+
+    validates :kind, inclusion: { in: %w[in out] }
+
+    def readonly? = persisted?
+
+    # "In 09:30 Office" — the day's punches read as one line.
+    def to_s = [ kind == "in" ? "In" : "Out", at.strftime("%H:%M"), AttendanceRecord::PLACES[place] ].compact.join(" ")
+  end
+end

data/app/models/hr_lite/attendance_record.rb

@@ -51,27 +51,45 @@ 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]
+    # The working day HR sets in Settings, less the person's allowance. Nil when
+    # the host turns hours rules off (config.work_hours), and on Saturdays.
+    def required_minutes
+      EmployeeProfile.day_minutes_for(user_id) unless HrLite.config.work_hours.nil? || date.saturday?
     end
 
+    # Hours worked, not the clock: an early start counts.
     def short?
-      hours = required_hours
-      !!(hours && worked_duration && worked_duration < hours.hours)
+      worked_under?(required_minutes)
+    end
+
+    def below_half_day?
+      worked_under?(required_minutes && Setting.instance.half_day_below_minutes)
     end
 
-    # config.attendance_slots: slot start + 8h30 + the day's active penalties.
+    # config.attendance_slots: first check-in + the working day + the day's active penalties.
     def required_check_out_at
       return unless HrLite.config.attendance_slots && check_in_at
 
       extra = AttendancePenalty.active.where(user_id: user_id, date: date).sum(:minutes)
-      date.in_time_zone(HrLite.config.time_zone) +
-        (AttendanceSlot.start_minute_for(user_id, date) + AttendanceSlot::DAY_MINUTES + extra).minutes
+      check_in_at + (EmployeeProfile.day_minutes_for(user_id) + extra).minutes
+    end
+
+    def worked_under?(minutes) = !!(minutes && worked_duration && worked_duration < minutes.minutes)
+
+    # Check in again after checking out: once a day, inside the hours HR sets in Settings.
+    def recheck_in_open?(at = Time.current)
+      s = Setting.instance
+      now = at.in_time_zone(HrLite.config.time_zone).strftime("%H:%M")
+      check_out_at.present? && rechecked_in_at.nil? && now >= s.recheck_in_from && now < s.recheck_in_until
+    end
+
+    # Every check-in and check-out of the day, oldest first, kept even after an HR reset.
+    def punches = AttendancePunch.where(user_id: user_id, date: date).order(:at, :id).to_a
+
+    # Drops the check-out so the person is in again (check in again, HR reset).
+    def clear_check_out(**attrs)
+      assign_attributes(check_out_at: nil, check_out_lat: nil, check_out_lng: nil, check_out_accuracy_m: nil,
+                        check_out_place: nil, check_out_home_m: nil, check_out_work_location_id: nil, **attrs)
     end
 
     # Metres between where the day was checked in and checked out.

data/app/models/hr_lite/attendance_slot.rb

@@ -7,7 +7,6 @@ module HrLite
     START_MINUTES = [ 540, 570, 600, 630 ].freeze # 09:00 09:30 10:00 10:30
     DEFAULT_START_MINUTE = 600
     PERIODS = { "day" => "Today", "week" => "This week", "month" => "This month" }.freeze
-    DAY_MINUTES = 510 # 8h30m from slot to checkout
     GRACE_MINUTES = 5
     STEP_MINUTES = 30
     CARRY_AFTER_MINUTE = 660 # 11:00 — +1h on the next 2 working days

data/app/models/hr_lite/employee_profile.rb

@@ -33,6 +33,17 @@ module HrLite
     validates :buffer_reason, inclusion: { in: BUFFER_REASONS.keys }, if: :buffer_minutes
     validates :buffer_note, presence: true, if: -> { buffer_minutes && buffer_reason == "other" }
 
+    # HR-granted shorter day (e.g. a long commute): minutes off the Settings
+    # day, so 90 off 8h30 is 7h. Only HR sees the reason (encrypted).
+    HOURS_ALLOWANCE_MINUTES = [ 30, 60, 90 ].freeze
+    encrypts :hours_allowance_reason
+    normalizes :hours_allowance_minutes, with: ->(v) { v.presence }
+    validates :hours_allowance_minutes, inclusion: { in: HOURS_ALLOWANCE_MINUTES }, allow_nil: true
+    validates :hours_allowance_reason, presence: true, if: :hours_allowance_minutes
+
+    # One person's working day: HR's day in Settings less their allowance.
+    def self.day_minutes_for(user_id) = Setting.instance.day_minutes - where(user_id: user_id).pick(:hours_allowance_minutes).to_i
+
     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 ""

data/app/models/hr_lite/leave_balance.rb

@@ -71,6 +71,17 @@ module HrLite
       entitled(as_of: as_of) - used
     end
 
+    # What can be applied for: available less days held for penalties, in half days.
+    def applicable(as_of: Date.current) = ([ available(as_of: as_of) - penalty_days, 0 ].max * 2).floor / 2.0
+
+    # Days held off the leave type HR picks in Settings. The balance itself is
+    # not cut; leave can be applied for only up to available less these.
+    def penalty_days
+      return 0 unless leave_type_id && leave_type_id == Setting.instance.penalty_leave_type_id
+
+      AttendancePenalty.days_for(AttendancePenalty.held_minutes(user_id)[user_id].to_i)
+    end
+
     private
 
     # Quota earned by as_of, before carry/adjustments. Monthly accrual

data/app/models/hr_lite/leave_request.rb

@@ -362,15 +362,22 @@ module HrLite
       errors.add(:base, "During probation only 1 day of leave a month is allowed") if taken + days_count > 1
     end
 
-    # Only comp-off is refused past its balance: it is earned credit, never
-    # borrowed. Any other type's excess becomes loss of pay at approval.
+    # Refused past the balance: comp-off (earned credit, never borrowed) and a
+    # balance with days held for penalties. Any other excess becomes loss of pay at approval.
     def sufficient_balance
       return unless start_date && end_date && leave_type
-      return if leave_type.unlimited? || !leave_type.comp_off || errors.any?
+      return if leave_type.unlimited? || errors.any?
 
-      if LeaveDayCounter.count(self) > balance.available(as_of: start_date)
-        errors.add(:base, "Not enough #{leave_type.name} balance")
-      end
+      held = balance.penalty_days
+      return unless leave_type.comp_off || held.positive?
+
+      left = balance.applicable(as_of: start_date)
+      return if LeaveDayCounter.count(self) <= left
+
+      return errors.add(:base, "Not enough #{leave_type.name} balance") unless held.positive?
+
+      days = ->(n) { ActiveSupport::NumberHelper.number_to_rounded(n, precision: 1, strip_insignificant_zeros: true) }
+      errors.add(:base, "For these dates you can apply for at most #{days.(left)} days of #{leave_type.name} — #{days.(held)} #{held == 1 ? 'day' : 'days'} held for penalties")
     end
   end
 end

data/app/models/hr_lite/penalty_removal.rb

@@ -0,0 +1,13 @@
+module HrLite
+  # HR took hours off a person's penalty total, with a reason; the rest stays.
+  # Append-only, so every settlement stays on the person's record.
+  class PenaltyRemoval < ApplicationRecord
+    belongs_to :user, class_name: HrLite.config.user_class
+    belongs_to :removed_by, class_name: HrLite.config.user_class
+
+    validates :minutes, numericality: { only_integer: true, greater_than: 0 }
+    validates :reason, presence: true
+
+    def readonly? = persisted?
+  end
+end

data/app/models/hr_lite/setting.rb

@@ -5,9 +5,17 @@ module HrLite
 
     WEEKEND_POLICIES = %w[sun_only sat_sun second_fourth_sat_sun].freeze
 
+    # Attendance penalties come off this leave type's balance (none: they stay as time).
+    belongs_to :penalty_leave_type, class_name: "HrLite::LeaveType", optional: true
+
     validates :weekend_policy, inclusion: { in: WEEKEND_POLICIES }
     validates :lunch_break_minutes, numericality: { only_integer: true, in: 5..120 }
     validates :short_break_minutes, numericality: { only_integer: true, in: 1..60 }
+    # The working day is check-in to check-out, break included (8h30 = 8h + 30m).
+    validates :day_minutes, numericality: { only_integer: true, in: 240..720 }
+    validates :half_day_below_minutes, numericality: { only_integer: true, greater_than: 0, less_than: :day_minutes }
+    validates :recheck_in_from, :recheck_in_until, format: { with: /\A([01]\d|2[0-3]):[0-5]\d\z/, message: "must be HH:MM" }
+    validate { errors.add(:recheck_in_until, "must be after the start") if recheck_in_from.to_s >= recheck_in_until.to_s }
     validates :employee_code_prefix, presence: true,
                                      format: { with: /\A[A-Za-z]{1,10}-?\z/, message: "letters only (max 10), optionally ending in -" }
 

data/app/models/hr_lite/wfh_request.rb

@@ -12,7 +12,9 @@ module HrLite
 
     validates :start_date, :end_date, :reason, presence: true
     validates :status, inclusion: { in: STATUSES }
-    validate :dates_in_window, :no_overlap, on: :create
+    validate :dates_in_window, on: :create
+    validate :no_overlap
+    validate :changed_dates, on: :update, if: -> { start_date_changed? || end_date_changed? }
 
     scope :pending, -> { where(status: "pending") }
     scope :approved, -> { where(status: "approved") }
@@ -59,6 +61,16 @@ module HrLite
                "/admin/wfh_requests/#{id}", HrLite.admin_users)
     end
 
+    # HR changes a decided request after the fact: dates, decision or both, with a reason.
+    def change!(actor:, start_date:, end_date:, status:, note:)
+      was = "#{dates_label}, #{self.status}"
+      update!(start_date: start_date, end_date: end_date, status: status, decided_by_id: actor.id,
+              decided_at: Time.current, decision_note: note)
+      AuditLog.record!(action: "wfh.changed", subject: self, actor: actor,
+                       changes: { "was" => was, "now" => "#{dates_label}, #{status}", "note" => note })
+      announce("wfh.#{status}", "HR changed your WFH — #{dates_label}, #{status}", note, "/wfh_requests", [ user ])
+    end
+
     def notify_requested
       AuditLog.record!(action: "wfh.requested", subject: self, actor: user,
                        changes: { "dates" => dates_label, "reason" => reason })
@@ -100,10 +112,18 @@ module HrLite
     end
 
     def no_overlap
-      return unless start_date && end_date && user_id
+      return unless start_date && end_date && user_id && %w[pending approved].include?(status)
 
-      clash = self.class.live.where(user_id: user_id).overlapping(start_date, end_date).exists?
+      clash = self.class.live.where(user_id: user_id).where.not(id: id).overlapping(start_date, end_date).exists?
       errors.add(:base, "You already have a pending or approved WFH request on some of these dates") if clash
     end
+
+    # HR may move a request into the past to match the days actually worked.
+    def changed_dates
+      return unless start_date && end_date
+
+      errors.add(:end_date, "must be on or after the start date") if end_date < start_date
+      errors.add(:end_date, "HR can set at most #{HR_MAX_DAYS} days at a time") if days > HR_MAX_DAYS
+    end
   end
 end

data/app/services/hr_lite/attendance_puncher.rb

@@ -61,13 +61,24 @@ module HrLite
       record.with_lock do
         case @kind
         when :check_in
-          return Result.new(record: record, error: already_in_message(record)) if record.check_in_at.present?
-
-          stamp(record, :check_in)
-          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?
+          if (reopen = record.check_out_at.present?)
+            # Checking in again reopens the day: the first check-in stands, the
+            # gap stays Offline on the work-mode timeline.
+            unless record.recheck_in_open?
+              s = Setting.instance
+              return Result.new(record: record, error: "Check in again is open once a day, #{s.recheck_in_from}–#{s.recheck_in_until}.")
+            end
+
+            record.clear_check_out(rechecked_in_at: Time.current)
+          else
+            return Result.new(record: record, error: already_in_message(record)) if record.check_in_at.present?
+
+            stamp(record, :check_in)
+            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?
+          end
         when :check_out
           return Result.new(record: record, error: "Check in first.") if record.check_in_at.blank?
 
@@ -79,7 +90,10 @@ module HrLite
 
         apply_geo_flags(record)
         record.save!
-        apply_slot_rules(record) if @kind == :check_in && HrLite.config.attendance_slots
+        AttendancePunch.create!(user_id: record.user_id, date: record.date, attendance_record_id: record.id,
+                                kind: @kind == :check_in ? "in" : "out", at: reopen ? record.rechecked_in_at : record.public_send("#{@kind}_at"),
+                                lat: @lat, lng: @lng, accuracy_m: @accuracy_m, place: punch_place, home_m: home_m, work_location_id: @location&.id)
+        apply_slot_rules(record) if @kind == :check_in && !reopen && HrLite.config.attendance_slots
         track_work_mode(record) if HrLite.config.office_geofence
       end
       notify_if_flagged(record)
@@ -193,7 +207,7 @@ module HrLite
     # opens Offline. The timeline keeps every earlier row.
     def track_work_mode(record)
       if @kind == :check_in
-        WorkModeEvent.start!(user_id: @user.id, mode: record.work_mode || "office", source: "system",
+        WorkModeEvent.start!(user_id: @user.id, mode: @mode || record.work_mode || "office", source: "system",
                              attendance_record: record, wfh_request_id: record.wfh_request_id,
                              work_location_id: record.work_location_id, title: @field[:purpose], destination: @field[:place])
       else
@@ -220,10 +234,12 @@ 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}_place=", punch_place)
       record.public_send("#{side}_home_m=", home_m)
     end
 
+    def punch_place = @place || ("office" if @lat && @lng && in_office?)
+
     def already_in_message(record)
       "Already checked in at #{record.check_in_at.in_time_zone(HrLite.config.time_zone).strftime('%H:%M')}."
     end

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

@@ -41,7 +41,10 @@
       <% @employees.each do |employee| %>
         <% record = @records[employee.id] %>
         <tr>
-          <td data-label="Employee"><%= hr_display_name(employee) %></td>
+          <td data-label="Employee"><%= hr_display_name(employee) %>
+            <% if (held = @penalty_minutes[employee.id].to_i).positive? %>
+              <br><a class="hrl-card__link hrl-small" href="<%= hr_lite.admin_attendance_path(employee.id, anchor: "penalties") %>">Penalties <%= hrl_duration(held * 60) %> · <%= hrl_days(HrLite::AttendancePenalty.days_for(held)) %> days</a>
+            <% end %></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">

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

@@ -86,6 +86,15 @@
         <%= f.submit "Save fix", class: "hrl-btn hrl-btn--primary" %>
         <a class="hrl-btn" href="<%= hr_lite.admin_attendance_path(@employee.id, month: @month.strftime("%Y-%m")) %>">Cancel</a>
       </div>
+      <%# A mistaken punch today: put them back in, or clear the day so they check in again. %>
+      <% if @edit_date == Date.current && @edit_record.check_in_at %>
+        <div class="hrl-form-actions">
+          <% if @edit_record.check_out_at %>
+            <button type="submit" name="reset" value="check_out" class="hrl-btn" data-turbo-confirm="Reset today's check-out? They are checked in again and can check out later.">Reset check&#8209;out</button>
+          <% end %>
+          <button type="submit" name="reset" value="check_in" class="hrl-btn hrl-btn--danger" data-turbo-confirm="Reset today's check-in? The whole day is cleared and they check in again.">Reset check&#8209;in</button>
+        </div>
+      <% end %>
     <% end %>
   </section>
 <% end %>

data/app/views/hr_lite/admin/employees/_form.html.erb

@@ -90,6 +90,11 @@
       </div>
       <div class="hrl-field"><%= f.label :buffer_note, "Buffer note (HR only; required for Other)" %><%= f.text_area :buffer_note, rows: 2 %></div>
     <% end %>
+    <div class="hrl-field">
+      <%= f.label :hours_allowance_minutes, "Shorter day (e.g. a long commute; lowers the hours they must work)" %>
+      <%= f.select :hours_allowance_minutes, HrLite::EmployeeProfile::HOURS_ALLOWANCE_MINUTES.map { |m| [ "#{m} min less", m ] }, include_blank: "None" %>
+    </div>
+    <div class="hrl-field"><%= f.label :hours_allowance_reason, "Shorter day reason (HR only; required)" %><%= f.text_area :hours_allowance_reason, rows: 2 %></div>
     <% if HrLite.config.office_geofence %>
       <div class="hrl-field hrl-field--check"><%= f.check_box :permanent_wfh %><%= f.label :permanent_wfh, "Permanent work from home (every working day counts as approved WFH; check-in still within 500 m of their approved home location)" %></div>
       <div class="hrl-field hrl-field--check"><%= f.check_box :field_staff %><%= f.label :field_staff, "Field staff (e.g. sales: may check in from anywhere as Travelling or Client meeting, with purpose and place)" %></div>

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

@@ -15,7 +15,7 @@
             <td data-label="Employee"><%= hr_display_name(employee) %><% if @no_joining_date.include?(employee.id) %><br><span class="hrl-badge hrl-badge--bad">No joining date — no leave accrues</span><% end %></td>
             <% @types.each do |type| %>
               <% balance = HrLite::LeaveBalance.for(employee, type, @year) %>
-              <td data-label="<%= type.code %>" class="hrl-num"><span><strong><%= hrl_days(balance.available) %></strong> left<br><span class="hrl-small hrl-muted"><%= hrl_days(balance.used) %>/<%= hrl_days(balance.entitled) %> used</span></span></td>
+              <td data-label="<%= type.code %>" class="hrl-num"><span><strong><%= hrl_days(balance.available) %></strong> left<br><span class="hrl-small hrl-muted"><%= hrl_days(balance.used) %>/<%= hrl_days(balance.entitled) %> used</span><% if (held = balance.penalty_days).positive? %><br><span class="hrl-small"><%= hrl_days(held) %> held for penalties</span><% end %></span></td>
             <% end %>
           </tr>
         <% end %>

data/app/views/hr_lite/admin/settings/edit.html.erb

@@ -20,6 +20,30 @@
       <%= f.label :short_break_minutes, "Short break limit (minutes)" %>
       <%= f.number_field :short_break_minutes, min: 1, max: 60 %>
     </div>
+    <div class="hrl-field">
+      <%= f.label :day_minutes, "Working day (minutes, break included)" %>
+      <%= f.number_field :day_minutes, min: 240, max: 720, step: 15 %>
+      <p class="hrl-hint">Check-in to check-out. 510 = 8h 30m (8h work + 30m break). Leaving earlier adds 30 min to the next working day.</p>
+    </div>
+    <div class="hrl-field">
+      <%= f.label :half_day_below_minutes, "Half day below (minutes worked)" %>
+      <%= f.number_field :half_day_below_minutes, min: 15, step: 15 %>
+      <p class="hrl-hint">Working fewer minutes than this marks the day a half day and tells the person. 255 = 4h 15m.</p>
+    </div>
+    <div class="hrl-field">
+      <%= f.label :recheck_in_from, "Check in again: from" %>
+      <%= f.time_field :recheck_in_from %>
+    </div>
+    <div class="hrl-field">
+      <%= f.label :recheck_in_until, "Check in again: until" %>
+      <%= f.time_field :recheck_in_until %>
+      <p class="hrl-hint">After checking out, a person can check in again once a day inside these hours.</p>
+    </div>
+    <div class="hrl-field">
+      <%= f.label :penalty_leave_type_id, "Penalties come off" %>
+      <%= f.collection_select :penalty_leave_type_id, HrLite::LeaveType.active, :id, :name, { include_blank: "No leave (penalties stay as time)" }, data: { hrl_filter: "Type a leave type to filter" } %>
+      <p class="hrl-hint">Every working day of penalty time this leave year holds one day of this leave, in half days, and leave past it is refused. Removing a penalty gives the day back.</p>
+    </div>
     <div class="hrl-field">
       <%= f.label :employee_code_prefix, "Employee code prefix" %>
       <%= f.text_field :employee_code_prefix %>

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

@@ -38,3 +38,20 @@
     <% end %>
   </section>
 <% end %>
+
+<% if @decidable && (@request.approved? || @request.rejected?) %>
+  <section class="hrl-card">
+    <h2 class="hrl-card__title">Change this WFH</h2>
+    <%= form_with url: hr_lite.admin_wfh_request_path(@request), method: :patch, local: true do |f| %>
+      <div class="hrl-field"><%= f.label :start_date, "From" %><%= f.date_field :start_date, value: @request.start_date, required: true %></div>
+      <div class="hrl-field"><%= f.label :end_date, "To" %><%= f.date_field :end_date, value: @request.end_date, required: true %></div>
+      <fieldset class="hrl-field">
+        <legend class="hrl-small">Decision</legend>
+        <label class="hrl-field--check"><%= f.radio_button :status, "approved", checked: @request.approved? %> Approved</label>
+        <label class="hrl-field--check"><%= f.radio_button :status, "rejected", checked: @request.rejected? %> Rejected</label>
+      </fieldset>
+      <div class="hrl-field"><%= f.label :decision_note, "Reason for the change (required)", for: "change_note" %><%= f.text_area :decision_note, id: "change_note", required: true %></div>
+      <div class="hrl-form-actions"><%= f.button "Save change", type: :submit, class: "hrl-btn hrl-btn--primary" %></div>
+    <% end %>
+  </section>
+<% end %>

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

@@ -1,3 +1,21 @@
+<%# The running total: penalties add up until HR removes hours; every 5h holds half a day of leave. %>
+<% held = HrLite::AttendancePenalty.held_minutes(user.id)[user.id].to_i
+   leave_type = HrLite::Setting.instance.penalty_leave_type %>
+<section class="hrl-card" id="penalties">
+  <h2 class="hrl-card__title">Penalty hours</h2>
+  <p><strong><%= hrl_duration(held * 60) %></strong> held · <%= hrl_days(HrLite::AttendancePenalty.days_for(held)) %> days<%= " of #{leave_type.name}" if leave_type %></p>
+  <p class="hrl-hint">Penalties add up until HR removes them. Every 5 hours holds half a day of leave, which can't be applied for.</p>
+  <% HrLite::PenaltyRemoval.where(user_id: user.id).includes(:removed_by).order(created_at: :desc).each do |removal| %>
+    <div class="hrl-feed__item hrl-small"><div class="hrl-feed__body">Removed <%= hrl_duration(removal.minutes * 60) %> on <%= removal.created_at.strftime("%-d %b %Y") %> by <%= hr_display_name(removal.removed_by) %>: <%= removal.reason %></div></div>
+  <% end %>
+  <% if local_assigns[:removable] && held.positive? %>
+    <%= form_with url: hr_lite.remove_penalty_hours_admin_attendance_path(user.id), method: :post, local: true, class: "hrl-mt" do %>
+      <div class="hrl-field"><label for="hrl-remove-hours">Hours to remove</label><input type="number" class="hrl-input" id="hrl-remove-hours" name="hours" min="0.5" step="0.5" max="<%= held / 60.0 %>" required></div>
+      <div class="hrl-field"><label for="hrl-remove-hours-reason">Reason (required)</label><input type="text" class="hrl-input" id="hrl-remove-hours-reason" name="reason" required></div>
+      <div class="hrl-form-actions"><button type="submit" class="hrl-btn">Remove hours</button></div>
+    <% end %>
+  <% end %>
+</section>
 <% penalties = HrLite::AttendancePenalty.where(user_id: user.id, date: month.all_month).order(:date, :id) %>
 <section class="hrl-card">
   <h2 class="hrl-card__title">Penalties in <%= month.strftime("%B") %></h2>

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

@@ -1,4 +1,6 @@
 <% record = HrLite::AttendanceRecord.find_by(user_id: hr_current_user.id, date: Date.current) %>
+<%# Checking out by mistake was common; the OK is the deliberate step. Checking in again reopens the day. %>
+<% checkout_confirm = "Check out now? Your check-out is saved as soon as you press OK." %>
 <%# A shift that runs past midnight leaves yesterday's record open.
     AttendancePuncher already closes it, but this card looked only at today,
     so after midnight it offered "Check in" and the night's punch never
@@ -21,6 +23,9 @@
     <% if record&.work_mode_label %>
       <span class="hrl-badge hrl-badge--ok"><%= record.work_mode_label %></span>
     <% end %>
+    <% if HrLite::EmployeeProfile.where(user_id: hr_current_user.id).pick(:hours_allowance_minutes) %>
+      <span class="hrl-badge hrl-badge--muted">Your day <%= hrl_duration(HrLite::EmployeeProfile.day_minutes_for(hr_current_user.id) * 60) %></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 %>
@@ -34,6 +39,10 @@
       <span class="hrl-muted">Not checked in yet.</span>
     <% end %>
   </div>
+  <%# Checked in again: every earlier in and out stays on show. %>
+  <% if record && (punches = record.punches).size > 2 %>
+    <p class="hrl-small">All punches: <%= punches.join(" · ") %></p>
+  <% end %>
   <% if HrLite.config.attendance_slots %>
     <%= render "hr_lite/attendance/slot", record: record %>
   <% end %>
@@ -46,7 +55,7 @@
 
   <% if open_yesterday %>
     <%= form_with url: hr_lite.check_out_attendance_path, method: :post, local: true,
-                  html: { data: { "hrl-geo-punch": true, "hrl-geo-required": HrLite.config.require_punch_location.presence } } do %>
+                  html: { data: { "hrl-geo-punch": true, "hrl-geo-required": HrLite.config.require_punch_location.presence, "turbo-confirm": checkout_confirm } } do %>
       <input type="hidden" name="lat"><input type="hidden" name="lng">
       <input type="hidden" name="accuracy_m"><input type="hidden" name="geo_status">
       <button type="submit" class="hrl-btn hrl-btn--big hrl-btn--block">
@@ -54,7 +63,7 @@
       </button>
       <p class="hrl-small hrl-muted" data-hrl-geo-status role="status" aria-live="polite"></p>
     <% end %>
-  <% elsif record&.check_in_at.blank? %>
+  <% elsif record&.check_in_at.blank? || record.recheck_in_open? %>
     <%= form_with url: hr_lite.check_in_attendance_path, method: :post, local: true,
                   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">
@@ -72,32 +81,35 @@
         </details>
       <% end %>
       <% if flash[:punch_offer] == "home" %>
-        <fieldset class="hrl-field">
-          <legend class="hrl-small">Is this your home location?</legend>
+        <%# A choice the punch needs: red, and geo_punch.js scrolls it into view on a phone. %>
+        <div class="hrl-errors" data-hrl-must-choose><fieldset class="hrl-field">
+          <legend class="hrl-small">Is this your home location? Choose one to check in.</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>
+        </fieldset></div>
       <% end %>
-      <button type="submit" class="hrl-btn hrl-btn--primary hrl-btn--big hrl-btn--block">Check in</button>
+      <button type="submit" class="hrl-btn hrl-btn--primary hrl-btn--big hrl-btn--block"><%= record&.check_out_at ? "Check in again" : "Check in" %></button>
       <p class="hrl-small hrl-muted" data-hrl-geo-status role="status" aria-live="polite"></p>
     <% end %>
-  <% else %>
+  <% elsif record.check_out_at.nil? %>
     <%= form_with url: hr_lite.check_out_attendance_path, method: :post, local: true,
-                  html: { data: { "hrl-geo-punch": true, "hrl-geo-required": HrLite.config.require_punch_location.presence } } do %>
+                  html: { data: { "hrl-geo-punch": true, "hrl-geo-required": HrLite.config.require_punch_location.presence, "turbo-confirm": checkout_confirm } } 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>
+        <div class="hrl-field hrl-errors" data-hrl-must-choose><label class="hrl-field--check"><input type="checkbox" name="place" value="travel" required> Tick to confirm: 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" %>
+        Check out
       </button>
       <p class="hrl-small hrl-muted" data-hrl-geo-status role="status" aria-live="polite"></p>
     <% end %>
+  <% else %>
+    <p class="hrl-small hrl-muted">Check in again is open once a day, <%= HrLite::Setting.instance.recheck_in_from %>–<%= HrLite::Setting.instance.recheck_in_until %>.</p>
   <% end %>
 
   <% if local_assigns[:attention].present? %><p class="hrl-small hrl-muted hrl-mt">Needs a fix</p><% end %>

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

@@ -21,7 +21,7 @@
   <%= form_with url: hr_lite.slot_attendance_path, method: :post, local: true, class: "hrl-mt" do %>
     <div class="hrl-field">
       <label for="hrl-slot-start">Check-in slot</label>
-      <%= select_tag :start_minute, options_for_select(HrLite::AttendanceSlot::START_MINUTES.map { |m| [ "#{HrLite::AttendanceSlot.label(m)} – out #{HrLite::AttendanceSlot.label(m + HrLite::AttendanceSlot::DAY_MINUTES)}", m ] }, start), id: "hrl-slot-start" %>
+      <%= select_tag :start_minute, options_for_select(HrLite::AttendanceSlot::START_MINUTES.map { |m| [ "#{HrLite::AttendanceSlot.label(m)} – out #{HrLite::AttendanceSlot.label(m + HrLite::EmployeeProfile.day_minutes_for(hr_current_user.id))}", m ] }, start), id: "hrl-slot-start" %>
     </div>
     <div class="hrl-field">
       <label for="hrl-slot-period">For</label>

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

@@ -8,6 +8,9 @@
     <% if home_m %> · <%= number_with_delimiter(home_m) %> m from home<% end %>
     <% if accuracy %> · ±<%= accuracy %> m<% end %></div>
 <% end %>
+<% if (punches = record.punches).size > 2 %>
+  <div class="hrl-punch-line">All punches: <%= punches.join(" · ") %></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/attendance/show.html.erb

@@ -40,6 +40,7 @@
     <dl class="hrl-deflist">
       <dt>In</dt><dd><%= rec&.check_in_at&.strftime("%H:%M") || "—" %></dd>
       <dt>Out</dt><dd><%= rec&.check_out_at&.strftime("%H:%M") || "—" %></dd>
+      <% if rec && (punches = rec.punches).size > 2 %><dt>All punches</dt><dd><%= punches.join(" · ") %></dd><% end %>
       <dt>Worked</dt><dd><%= hrl_duration(rec&.worked_duration) %></dd>
       <% if part %><dt>Half</dt><dd><%= HrLite::DAY_PARTS.rassoc(part)&.first %></dd><% end %>
       <% if leave %><dt>Leave</dt><dd><%= leave.leave_type.name %></dd><% end %>

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

@@ -16,6 +16,7 @@
         <dt><%= balance.leave_type.comp_off ? "Credited" : "Entitled" %></dt><dd><%= hrl_days(balance.entitled) %></dd>
         <dt>Used</dt><dd><%= hrl_days(balance.used) %></dd>
         <dt>Available</dt><dd><strong><%= hrl_days(balance.available) %></strong></dd>
+        <% if (held = balance.penalty_days).positive? %><dt>Held for penalties</dt><dd><%= hrl_days(held) %></dd><dt>You can apply</dt><dd><%= hrl_days(balance.applicable) %></dd><% end %>
         <% if balance.carried_forward.positive? %><dt>Carried forward</dt><dd><%= hrl_days(balance.carried_forward) %></dd><% end %>
         <% if balance.adjustment.nonzero? %><dt>Adjustments</dt><dd><%= hrl_days(balance.adjustment) %> <span class="hrl-muted hrl-small"><%= balance.adjustment_note %></span></dd><% end %>
       </dl>

data/app/views/hr_lite/leave_requests/_balance_chips.html.erb

@@ -8,7 +8,7 @@
       <% types.each do |type| %>
         <% balance = HrLite::LeaveBalance.for(user, type, HrLite::LeaveYear.current_key) %>
         <span class="hrl-badge hrl-badge--type" style="--hrl-type: <%= type.color %>">
-          <%= type.name %> · <%= hrl_days(balance.available) %> of <%= hrl_days(balance.entitled) %> left
+          <%= type.name %> · <%= hrl_days(balance.available) %> of <%= hrl_days(balance.entitled) %> left<% if (held = balance.penalty_days).positive? %> · <%= hrl_days(held) %> held for penalties<% end %>
         </span>
       <% end %>
     </div>

data/app/views/hr_lite/leave_requests/new.html.erb

@@ -12,10 +12,10 @@
       <% left = @balances.index_by(&:leave_type_id) %>
       <div class="hrl-chiprow" role="radiogroup" aria-labelledby="hrl-leave-type">
         <% HrLite::LeaveType.active.each_with_index do |type, i| %>
-          <label><%= f.radio_button :leave_type_id, type.id, required: i.zero? %><span><%= type.name.sub(/ leave\z/i, "") %><%= " · #{hrl_days(left[type.id].available)} left" if left[type.id] %><%= " · Unpaid" unless type.paid %></span></label>
+          <label><%= f.radio_button :leave_type_id, type.id, required: i.zero? %><span><%= type.name.sub(/ leave\z/i, "") %><%= " · #{hrl_days(left[type.id].available)} left" if left[type.id] %><% if left[type.id] && (held = left[type.id].penalty_days).positive? %> · <%= hrl_days(held) %> held for penalties<% end %><%= " · Unpaid" unless type.paid %></span></label>
         <% end %>
       </div>
-      <p class="hrl-hint">Days beyond your balance are unpaid (loss of pay), cut from that month's salary.</p>
+      <p class="hrl-hint">Days beyond your balance are unpaid (loss of pay), cut from that month's salary.<% if (capped = @balances.find { |b| b.penalty_days.positive? }) %> Today you can apply for at most <%= hrl_days(capped.applicable) %> days of <%= capped.leave_type.name %>, <%= hrl_days(capped.penalty_days) %> held for penalties.<% end %></p>
     </div>
     <div class="hrl-field">
       <%= f.label :start_date, "From" %>

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

@@ -30,11 +30,11 @@
   <details class="hrl-small">
     <summary>Show as a table</summary>
     <table class="hrl-table">
-      <thead><tr><th><%= period.bucket.to_s.capitalize %></th><th class="hrl-num">Working</th><th class="hrl-num">Breaks</th><th class="hrl-num">Total</th></tr></thead>
+      <thead><tr><th><%= period.bucket.to_s.capitalize %></th><th class="hrl-num">Working (breaks incl.)</th><th class="hrl-num">Of which breaks</th><th class="hrl-num">Total</th></tr></thead>
       <tbody>
         <% buckets.each do |key, modes| %>
           <tr><td><%= key.strftime(period.bucket == :day ? "%a %-d %b" : fmt) %></td>
-            <td class="hrl-num"><%= hrl_duration(HrLite::WorkModeDurations::WORKING.sum { |m| modes[m] }) %></td>
+            <td class="hrl-num"><%= hrl_duration((HrLite::WorkModeDurations::WORKING + HrLite::WorkModeDurations::BREAKS).sum { |m| modes[m] }) %></td>
             <td class="hrl-num"><%= hrl_duration(HrLite::WorkModeDurations::BREAKS.sum { |m| modes[m] }) %></td>
             <td class="hrl-num"><%= hrl_duration(totals[key]) %></td></tr>
         <% end %>

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

@@ -34,12 +34,12 @@
 <% else %>
   <% office = result.by_mode["office"]; wfh = result.by_mode["wfh"]; field = result.by_mode["travelling"] + result.by_mode["outside_meeting"] %>
   <div class="hrl-kpis">
-    <% [ [ "Attendance (check-in to check-out)", result.attendance ], [ "Working time", result.working ], [ "Breaks", result.breaks ],
+    <% [ [ "Attendance (check-in to check-out)", result.attendance ], [ "Working time (breaks included)", result.working + result.breaks ], [ "Of which breaks", result.breaks ],
          [ "In office", office ], [ "Work from home", wfh ], [ "Travel and client meetings", field ], [ "Out of office", result.other ] ].each do |kpi_label, secs| %>
       <div class="hrl-kpi"><div class="hrl-kpi__value"><%= hrl_duration(secs) %></div><div class="hrl-kpi__label"><%= kpi_label %></div></div>
     <% end %>
   </div>
-  <p class="hrl-small hrl-muted">Working time = in office, work from home, travelling, client and other meetings, and busy. It is time in those modes, not a measure of output.
+  <p class="hrl-small hrl-muted">Working time = in office, work from home, travelling, client and other meetings, busy, and the breaks taken during the day — an 8h 30m shift includes its break. It is time in those modes, not a measure of output.
     Recorded on <%= pluralize(result.days_with_data.size, "day") %>.</p>
 
   <%= render "hr_lite/work_time/donut", result: result, label: label %>

data/config/routes.rb

@@ -73,7 +73,7 @@ HrLite::Engine.routes.draw do
     get "overview", to: "overview#index"
     resources :attendances, only: %i[index show update], param: :user_id do
       collection { get :week }
-      member { post :slot; post :unlock_slot; post :remove_penalty }
+      member { post :slot; post :unlock_slot; post :remove_penalty; post :remove_penalty_hours }
     end
     resources :leave_requests, only: %i[index show new create edit update] do
       member { post :approve; post :reject; post :cancel }
@@ -87,7 +87,7 @@ HrLite::Engine.routes.draw do
     resources :regularization_requests, only: %i[index show] do
       member { post :approve; post :reject }
     end
-    resources :wfh_requests, only: %i[index show create] do
+    resources :wfh_requests, only: %i[index show create update] do
       member { post :approve; post :reject }
     end
     resources :work_locations, only: :index do

data/db/migrate/20261015090000_add_working_day_to_hr_lite_settings.rb

@@ -0,0 +1,8 @@
+class AddWorkingDayToHrLiteSettings < ActiveRecord::Migration[8.1]
+  def change
+    add_column :hr_lite_settings, :day_minutes, :integer, null: false, default: 510
+    add_column :hr_lite_settings, :half_day_below_minutes, :integer, null: false, default: 255
+    add_column :hr_lite_settings, :recheck_in_from, :string, null: false, default: "09:00"
+    add_column :hr_lite_settings, :recheck_in_until, :string, null: false, default: "20:00"
+  end
+end

data/db/migrate/20261015091000_add_rechecked_in_at_to_hr_lite_attendance_records.rb

@@ -0,0 +1,5 @@
+class AddRecheckedInAtToHrLiteAttendanceRecords < ActiveRecord::Migration[8.1]
+  def change
+    add_column :hr_lite_attendance_records, :rechecked_in_at, :datetime
+  end
+end

data/db/migrate/20261015092000_add_hours_allowance_to_hr_lite_employee_profiles.rb

@@ -0,0 +1,6 @@
+class AddHoursAllowanceToHrLiteEmployeeProfiles < ActiveRecord::Migration[8.1]
+  def change
+    add_column :hr_lite_employee_profiles, :hours_allowance_minutes, :integer
+    add_column :hr_lite_employee_profiles, :hours_allowance_reason, :text
+  end
+end

data/db/migrate/20261015100000_create_hr_lite_attendance_punches.rb

@@ -0,0 +1,20 @@
+class CreateHrLiteAttendancePunches < ActiveRecord::Migration[8.1]
+  def change
+    create_table :hr_lite_attendance_punches do |t|
+      t.bigint :user_id, null: false
+      t.date :date, null: false
+      t.bigint :attendance_record_id
+      t.string :kind, null: false
+      t.datetime :at, null: false
+      t.decimal :lat, precision: 9, scale: 6
+      t.decimal :lng, precision: 9, scale: 6
+      t.integer :accuracy_m
+      t.string :place
+      t.integer :home_m
+      t.bigint :work_location_id
+
+      t.timestamps
+    end
+    add_index :hr_lite_attendance_punches, [ :user_id, :date ]
+  end
+end

data/db/migrate/20261016090000_add_penalty_leave_type_to_hr_lite_settings.rb

@@ -0,0 +1,5 @@
+class AddPenaltyLeaveTypeToHrLiteSettings < ActiveRecord::Migration[8.1]
+  def change
+    add_column :hr_lite_settings, :penalty_leave_type_id, :bigint
+  end
+end

data/db/migrate/20261016091000_create_hr_lite_penalty_removals.rb

@@ -0,0 +1,13 @@
+class CreateHrLitePenaltyRemovals < ActiveRecord::Migration[8.1]
+  def change
+    create_table :hr_lite_penalty_removals do |t|
+      t.bigint :user_id, null: false
+      t.integer :minutes, null: false
+      t.text :reason, null: false
+      t.bigint :removed_by_id, null: false
+
+      t.timestamps
+    end
+    add_index :hr_lite_penalty_removals, :user_id
+  end
+end

data/lib/hr_lite/configuration.rb

@@ -65,9 +65,9 @@ module HrLite
       @self_regularization = value
     end
 
-    # nil = no hours rule. { day: 8, probation_day: 9, week: 40 } = a closed
-    # Mon–Fri punch short of its day's hours is closed as a half day, and a
-    # week under `week` hours (pro rata for holidays and leave) is flagged.
+    # nil = no hours rule. Set = the day rules run on the working day and the
+    # half-day line HR sets in Settings (`day` and `probation_day` here are no
+    # longer read), and a week under `week` hours (pro rata) is flagged.
     def work_hours=(value)
       ok = value.nil? || (value.is_a?(Hash) && %i[day probation_day week].all? { |k| value[k].is_a?(Numeric) && value[k].positive? })
       raise ArgumentError, "work_hours must be nil or { day:, probation_day:, week: } (positive numbers), got #{value.inspect}" unless ok

data/lib/hr_lite/notifications.rb

@@ -21,6 +21,7 @@ module HrLite
       "attendance.missed_check_in"  => { bell: true, email: true, leadership_email: false, leadership_bell: false },
       "attendance.missed_check_out" => { bell: true, email: true, leadership_email: false, leadership_bell: false },
       "attendance.short_day" => { bell: true, email: true, leadership_email: false, leadership_bell: false },
+      "attendance.penalty_removed" => { bell: true, email: true, leadership_email: false, leadership_bell: false },
       "payroll.finalized"     => { bell: false, email: false, leadership_email: true,  leadership_bell: true  },
       "ca.flagged" => { bell: true, email: true, leadership_email: false, leadership_bell: false },
       "ca.reminder" => { bell: true, email: true, leadership_email: false, leadership_bell: false },

data/lib/hr_lite/version.rb

@@ -1,3 +1,3 @@
 module HrLite
-  VERSION = "0.40.2"
+  VERSION = "0.48.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.40.2
+  version: 0.48.2
 platform: ruby
 authors:
 - kshitiz sinha
@@ -184,6 +184,7 @@ files:
 - app/models/hr_lite/asset.rb
 - app/models/hr_lite/asset_assignment.rb
 - app/models/hr_lite/attendance_penalty.rb
+- app/models/hr_lite/attendance_punch.rb
 - app/models/hr_lite/attendance_record.rb
 - app/models/hr_lite/attendance_slot.rb
 - app/models/hr_lite/audit_log.rb
@@ -211,6 +212,7 @@ files:
 - app/models/hr_lite/office_location.rb
 - app/models/hr_lite/payroll_line_item.rb
 - app/models/hr_lite/payroll_run.rb
+- app/models/hr_lite/penalty_removal.rb
 - app/models/hr_lite/performance_plan.rb
 - app/models/hr_lite/policy.rb
 - app/models/hr_lite/policy_acknowledgement.rb
@@ -486,6 +488,12 @@ files:
 - 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
+- db/migrate/20261015090000_add_working_day_to_hr_lite_settings.rb
+- db/migrate/20261015091000_add_rechecked_in_at_to_hr_lite_attendance_records.rb
+- db/migrate/20261015092000_add_hours_allowance_to_hr_lite_employee_profiles.rb
+- db/migrate/20261015100000_create_hr_lite_attendance_punches.rb
+- db/migrate/20261016090000_add_penalty_leave_type_to_hr_lite_settings.rb
+- db/migrate/20261016091000_create_hr_lite_penalty_removals.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