hr_lite 0.65.1 → 0.68.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b0957999e3f167132b2c25455182bbe1aeb986ba6aaa9928d54721692a2c07a
-  data.tar.gz: 0b60cf956f6ce373fab9300cbfbf32a2c3734a3bec9a19ff55d85fff13c91e7f
+  metadata.gz: ab802b6ea743100ee2edae138c1af298d2bf94e479c7b89318f573830eb0bd7f
+  data.tar.gz: 65f656038862fe47a5504839487118a2a13184ae129ed3ee5ddff8b2342ad066
 SHA512:
-  metadata.gz: 2ab5be9b791abad3013fddfeda2472bf333af6d156d0627a627071e25026cc9d30a9018927002be3d8bbffa84960bba0c05251e0fe31781d11ed44f4857148d7
-  data.tar.gz: 8b76610a5c37c3e5190aed833df733944b4e19716d4f7077e8a99f4f9042dcc4692871d94de58bd02829bce59fb2007da1ace55503912cb81521dbe7e27b9645
+  metadata.gz: 6f3290aac37da8961636beabff7d3a405b676a0b2a7b3f79d55175f4900b800cc33bbbccaf7bf0aaf398e8e14d56cc3ca23ec25607bc9d5723330c1f0ff4efca
+  data.tar.gz: dde58fd2cbb6743baf51adfd5864d06d05de2dbea92e7fe156e6db4780b372722433241354aabc64c3481f4b7d1bae0d890f7f02f8f43c094387467bfbd2c66b

data/CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.68.1] - 2026-11-08
+
+A late check-in no longer takes a second. No migrations.
+
+- **Leadership is not told each time the system adds an attendance penalty.** Every late check-in created 1 to 3 penalty rows, and each one emailed leadership and rang a bell for every leadership user (about 18 live notifications per penalty). That made a late check-in take up to 1.2 s. The audit log row is still written, and an HR removal still notifies leadership.
+
+## [0.68.0] - 2026-11-07
+
+HR takes a day out of leave when the person came in. No migrations.
+
+- **"Take <day> out of leave" on the attendance Fix panel.** When someone checks in on a day of approved full-day leave, HR (or an admin) opens that day's Fix panel, gives a reason and takes the day out. A one-day leave is cancelled; a longer one shrinks, or splits in two around a middle day, with its paid days going to the earlier part first. The day goes back to the balance, a `leave.day_cancelled` audit row is written, a computed payroll run is flagged for recompute, and the employee is told. Leave an admin approved can only be changed by an admin (0.67.0).
+
+## [0.67.0] - 2026-11-07
+
+An admin's decision stands over HR. No migrations.
+
+- **HR cannot change what an admin decided; an admin can change anything.** "Admin" is anyone holding `role.manage` (Super Admin by default). HR overrides the system as before, but is refused with "An admin decided this. Only an admin can change it." when the thing was last set by an admin: a work mode an admin set (same layer), leave an admin approved (cancel and fix), a WFH request an admin decided, and a punch an admin fixed. The admin is never refused, including over HR's own change. Who decided is read from the existing `set_by_id` / `decided_by_id` / `regularized_by_id`, so nothing is stored twice.
+
+## [0.66.0] - 2026-11-07
+
+Saturday can be a work-from-home day for everyone. No migrations.
+
+- **`config.wfh_weekdays`** (e.g. `[ 6 ]` for Saturday, default `[]`) makes those weekdays count as approved WFH for every employee, like permanent WFH: an off-site check-in is accepted at their home location instead of being refused, and the WFH work mode can be picked. A check-in inside an office radius is still In office that day. Other days are unchanged: off-site needs an approved WFH request.
+
 ## [0.65.1] - 2026-11-03
 
 - **Salary structures card has its own "Add salary structure" button.** It used to hide inside the employee's "More actions" menu, so the empty card ("payroll will skip this employee") gave no way to add one. More actions now holds only appraisal, designation change and PIP.

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

@@ -58,6 +58,7 @@ 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)
+        @edit_leave = @edit_record&.check_in_at && LeaveRequest.active_on(@edit_date).find_by(user_id: @employee.id, half_day: false)
         @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
@@ -73,9 +74,9 @@ module HrLite
         record = AttendanceRecord.find_or_initialize_by(user_id: @employee.id, date: date)
 
         note = params.dig(:attendance_record, :regularization_note).to_s.strip
-        if note.blank?
+        if note.blank? || HrLite.outranked?(hr_current_user, record.regularized_by_id)
           return redirect_to admin_attendance_path(@employee.id, date: date, month: date.strftime("%Y-%m")),
-                             alert: "A regularization note is required."
+                             alert: note.blank? ? "A regularization note is required." : HrLite::ADMIN_DECIDED
         end
 
         attrs = params.require(:attendance_record).permit(:check_in_at, :check_out_at, :status, :half_day_part)

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

@@ -49,8 +49,9 @@ module HrLite
         @request = find_recorded
         reason = params[:correction_reason].to_s.strip
         @request.errors.add(:base, "A reason is required to fix this leave") if reason.blank?
+        @request.errors.add(:base, HrLite::ADMIN_DECIDED) if HrLite.outranked?(hr_current_user, @request.decided_by_id)
         attrs = params.require(:leave_request).permit(:leave_type_id, :start_date, :end_date, :half_day_part)
-        if reason.present? && @request.correct!(actor: hr_current_user, attrs: attrs, reason: reason)
+        if @request.errors.empty? && @request.correct!(actor: hr_current_user, attrs: attrs, reason: reason)
           return redirect_to(admin_leave_request_path(@request), notice: "Leave fixed.")
         end
 
@@ -87,6 +88,21 @@ module HrLite
         end
       end
 
+      # One day out of approved full-day leave (they came in), from the attendance Fix panel.
+      def cancel_day
+        request = find_decidable
+        date = parse_date_param(params[:date])
+        note = params[:decision_note].to_s.strip
+        alert = if note.blank? then "A reason is required."
+        elsif HrLite.outranked?(hr_current_user, request.decided_by_id) then HrLite::ADMIN_DECIDED
+        elsif !(request.approved? && !request.half_day && date.between?(request.start_date, request.end_date) &&
+                request.cancellable_by?(hr_current_user)) then "That day cannot be taken out of this leave."
+        end
+        request.cancel_day!(date, actor: hr_current_user, note: note) unless alert
+        redirect_to admin_attendance_path(request.user_id, date: date, month: date.strftime("%Y-%m")),
+                    alert ? { alert: alert } : { notice: "#{date.strftime('%d %b')} taken out of leave. The day is back in the balance." }
+      end
+
       def reject
         request = find_decidable
         note = params[:decision_note].to_s.strip

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

@@ -69,6 +69,7 @@ module HrLite
         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?
+        return redirect_to admin_wfh_request_path(request), alert: HrLite::ADMIN_DECIDED if HrLite.outranked?(hr_current_user, request.decided_by_id)
 
         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)

data/app/models/hr_lite/attendance_penalty.rb

@@ -49,5 +49,11 @@ module HrLite
       end
       "#{why} So #{date.strftime('%a %-d %b')} needs #{minutes} min more before checkout."
     end
+
+    private
+
+    # The puncher creates these on every late check-in; telling leadership each time cost ~1 s per punch.
+    # The audit row stays, and an HR removal (update) still notifies.
+    def hr_lite_publish_policy_change(log) = (super unless log.action == "create")
   end
 end

data/app/models/hr_lite/leave_request.rb

@@ -102,7 +102,7 @@ module HrLite
       return false unless pending? || approved?
       return pending? || start_date > Date.current if user_id == actor.id
 
-      HrLite.admin?(actor) || HrLite.leadership?(actor)
+      (HrLite.admin?(actor) || HrLite.leadership?(actor)) && !HrLite.outranked?(actor, decided_by_id)
     end
 
     def cancel!(actor:, note: nil)
@@ -132,6 +132,36 @@ module HrLite
       true
     end
 
+    # The person came in on a day of approved leave: HR takes that day out.
+    # One day is a cancel; otherwise the leave shrinks, or splits around a
+    # middle day (paid days go to the earlier part first). `used` is
+    # computed, so the day goes back to the balance.
+    def cancel_day!(date, actor:, note:)
+      return cancel!(actor: actor, note: note) if start_date == end_date
+
+      transaction do
+        last = end_date
+        if date == start_date then self.start_date = date + 1
+        else
+          self.end_date = date - 1
+          if date < last
+            later = dup.tap { |r| r.assign_attributes(start_date: date + 1, end_date: last) }
+            kept = paid_days && [ paid_days, LeaveDayCounter.count(self) ].min
+            self.class.insert!(later.attributes.except("id", "created_at", "updated_at")
+                                    .merge("days_count" => LeaveDayCounter.count(later), "paid_days" => kept && paid_days - kept))
+            self.paid_days = kept
+          end
+        end
+        self.days_count = LeaveDayCounter.count(self)
+        save!
+        audit!("day_cancelled", actor, "#{date}: #{note}")
+        flag_computed_runs!
+      end
+      Notifications.publish("leave.cancelled", title: "HR took #{date.strftime('%d %b')} out of your leave", body: note,
+                                               path: "/leave_requests", bell_to: [ user ])
+      true
+    end
+
     # HR fixes leave it recorded — any time, even past dates — without a
     # cancel. Re-run as a fresh recording so the create checks and the
     # balance / loss-of-pay split are worked out exactly as the first time.

data/app/services/hr_lite/attendance_puncher.rb

@@ -141,7 +141,7 @@ module HrLite
 
       # 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
+      return OFF_SITE_MESSAGE unless @wfh || profile&.permanent_wfh || HrLite.config.wfh_weekdays.include?(Date.current.wday)
 
       @mode, @place = "wfh", "home"
       return if (@location = covering_home)

data/app/services/hr_lite/work_mode_switch.rb

@@ -53,6 +53,7 @@ module HrLite
     def call
       return fail!("Pick a work mode.") unless SELECTABLE.include?(@mode)
       return fail!("A reason is required for an HR change.") if @source == "hr" && @p[:reason].blank?
+      return fail!(HrLite::ADMIN_DECIDED) if @source == "hr" && HrLite.outranked?(@actor, open_setter_id)
 
       status = WorkStatus.for(@user.id, at: @now)
       return fail!("#{status.primary.label} today — work modes are off. Use the leave screen to change it.") if %w[holiday on_leave sick_leave].include?(status.primary.mode)
@@ -73,6 +74,8 @@ module HrLite
 
     def fail!(message) = Result.new(nil, message)
 
+    def open_setter_id = WorkModeEvent.open.where(user_id: @user.id, layer: WorkModeEvent::MODES.dig(@mode, 1)).pick(:set_by_id)
+
     def checked_in?
       @record = AttendanceRecord.find_by(user_id: @user.id, date: @now.in_time_zone(HrLite.config.time_zone).to_date)
       @record&.check_in_at.present? && @record.check_out_at.nil?
@@ -83,7 +86,7 @@ module HrLite
     def office_attrs = base
 
     def wfh_attrs
-      approved = WfhRequest.approved_for(@user.id, @record.date) ||
+      approved = WfhRequest.approved_for(@user.id, @record.date) || HrLite.config.wfh_weekdays.include?(@record.date.wday) ||
                  EmployeeProfile.where(user_id: @user.id).pick(:permanent_wfh)
       return "WFH needs an approved WFH request for today." unless approved
 

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

@@ -60,7 +60,21 @@
 <% end %>
 
 <% if @edit_date %>
-  <section class="hrl-card" id="regularize">
+<div id="regularize">
+  <% if @edit_leave %>
+    <section class="hrl-card">
+      <h2 class="hrl-card__title">Checked in on leave</h2>
+      <%= form_with url: hr_lite.cancel_day_admin_leave_request_path(@edit_leave, date: @edit_date), method: :post, local: true do %>
+        <p>Approved <%= @edit_leave.leave_type.name %>, <%= @edit_leave.date_range_label %>.</p>
+        <div class="hrl-field">
+          <label for="cancel_day_note">Why take this day out of the leave? (required)</label>
+          <textarea name="decision_note" id="cancel_day_note" class="hrl-input" required></textarea>
+        </div>
+        <button type="submit" class="hrl-btn hrl-btn--primary">Take <%= @edit_date.strftime("%d %b") %> out of leave</button>
+      <% end %>
+    </section>
+  <% end %>
+  <section class="hrl-card">
     <h2 class="hrl-card__title">Fix <%= @edit_date.strftime("%A, %d %B") %></h2>
     <% if @edit_record.flagged? %>
       <p class="hrl-small"><span class="hrl-badge hrl-badge--bad">Flagged</span> <%= @edit_record.flag_note %></p>
@@ -99,4 +113,5 @@
       <% end %>
     <% end %>
   </section>
+</div>
 <% end %>

data/config/routes.rb

@@ -91,7 +91,7 @@ HrLite::Engine.routes.draw do
       member { get :summary; patch :shorter_day; 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 }
+      member { post :approve; post :reject; post :cancel; post :cancel_day }
     end
     resources :leave_balances, only: :index do
       collection { post :adjust }

data/lib/hr_lite/configuration.rb

@@ -24,6 +24,8 @@ module HrLite
                   :attendance_slots,
                   # true = check-in only inside an active office radius, unless WFH is approved for the day
                   :office_geofence,
+                  # e.g. [6] — weekdays (Date#wday) that are WFH for everyone, like a standing approval
+                  :wfh_weekdays,
                   # ->(user, from, to) { [{ id:, title:, starts_at:, ends_at: }] } — timed,
                   # accepted events; starts Meeting mode by itself. Pairs with calendar_users.
                   :calendar_events,
@@ -130,6 +132,7 @@ module HrLite
       @require_punch_location = false
       @attendance_slots       = false
       @office_geofence        = false
+      @wfh_weekdays           = []
       @hiring                 = nil
       @read_sheet             = ->(path, filename) {
         raise ArgumentError, "Upload the sheet as a .csv file." unless filename.to_s.downcase.end_with?(".csv")

data/lib/hr_lite/version.rb

@@ -1,3 +1,3 @@
 module HrLite
-  VERSION = "0.65.1"
+  VERSION = "0.68.1"
 end

data/lib/hr_lite.rb

@@ -25,6 +25,7 @@ module HrLite
 
   # Full day / first half / second half — one picker for leave and attendance.
   DAY_PARTS = [ [ "Full day", "" ], [ "First half", "first" ], [ "Second half", "second" ] ].freeze
+  ADMIN_DECIDED = "An admin decided this. Only an admin can change it.".freeze
   class << self
     def config
       @config ||= Configuration.new
@@ -85,6 +86,14 @@ module HrLite
       can?(user, "payroll.manage", scope: :all)
     end
 
+    # An admin (role.manage) decision stands: anyone else, HR included, is
+    # outranked by it; an admin may change anyone's.
+    def outranked?(actor, decider_id)
+      return false if decider_id.blank? || can?(actor, "role.manage", scope: :all)
+
+      (decider = user_klass.find_by(id: decider_id)).present? && can?(decider, "role.manage", scope: :all)
+    end
+
     # An access list, cleaned — read now only by the 0.6.0 upgrade migration.
     # One stray comma in an ENV var ("a@x.com,,b@x.com") used to put "" in the
     # list, and a user whose email was blank then MATCHED it and was handed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.65.1
+  version: 0.68.1
 platform: ruby
 authors:
 - kshitiz sinha