hr_lite 0.26.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c475874de00a0db443998c37e4caeb3340e202584e094db29ef423c4902698
-  data.tar.gz: 849526338af6b16a5648a5163d140f0cda40b2fa3c34ef2a63a3d2f454761132
+  metadata.gz: 175c2fc4265dd0055f39926d529060dedeb14386991eb9f43d1b3f0e80112dce
+  data.tar.gz: 733cc4423053d7ca4b8d27acd03165dd073481f767131731179432392a3be335
 SHA512:
-  metadata.gz: 38bf1cd87f1e283d7e8a54e60a18a19020fae7ff52feca24941f94dc40673c29d3a08a99d8c82699353f9958a99ffaf39ab8ae0a6c2e5e237ee1d96a567ae0c7
-  data.tar.gz: 390843351f21b51a9f2f17f1159214035349ecf8a689722d8dd429b803775715b322d6914fc251bb1808ad03c09c569f55beb0c85b634de8fefa41069b6317f1
+  metadata.gz: d26ff16fb6dc9bc592374a0920d659556b7ad8d466fccfa6a24084bfada3bd95fd4b756e2de2ae01138dab005d7e612fd58883b80e1a7ef333f53bd75748f191
+  data.tar.gz: 96b6f9c358ecba6d459da48a97cbdc866f5dbabb1a7ab1dff4345961cdf4e6780c0ae4f7dd56635a66aa41a5078b830423cb1740eada0acda5c4350b4d84590d

data/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.28.0] - 2026-10-10
+
+- HR and leadership can cancel any approved or pending leave at any time, past dates included. A reason is required; it is kept as the decision note and in the audit log. Employees still cancel their own leave only before it starts. A cancelled past day with no punch shows as absent.
+- Leave always accrues from the joining date. Somebody with no joining date (no HR profile) now accrues nothing instead of a full year, and the team balances grid flags them with "No joining date".
+
+## [0.27.0] - 2026-10-10
+
+- HR and admins can fix leave they recorded (type, dates, half day) at any time, past dates included, without cancelling it. A reason is required; it is kept as the decision note and in the audit log (`leave.corrected`), and the balance and loss-of-pay split are worked out again.
+
 ## [0.26.0] - 2026-10-10
 
 Two migrations: `hr_lite_ca_reviews`, and a data migration creating the CA role and giving Super Admin the new `payroll.verify` permission. Schedule `CaReviewReminderJob` weekly and `CaReviewOverdueJob` on 31 March.

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

@@ -5,6 +5,7 @@ module HrLite
         @year = sanitized_year
         @types = LeaveType.active.where(paid: true).where.not(annual_quota: nil)
         @employees = HrLite.employees.select { |employee| hr_reaches?("leave.view", employee) }
+        @no_joining_date = @employees.map(&:id) - EmployeeProfile.where(user_id: @employees.map(&:id)).where.not(date_of_joining: nil).pluck(:user_id)
       end
 
       # Manual credit/debit — also the comp-off credit mechanism.

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

@@ -37,6 +37,23 @@ module HrLite
         render :new, status: :unprocessable_entity
       end
 
+      # Leave HR recorded is fixed in place, any time, with a reason.
+      def edit
+        @request = find_recorded
+      end
+
+      def update
+        @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?
+        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)
+          return redirect_to(admin_leave_request_path(@request), notice: "Leave fixed.")
+        end
+
+        render :edit, status: :unprocessable_entity
+      end
+
       def approve
         request = find_decidable
         if request.approve!(actor: hr_current_user, note: params[:decision_note].presence)
@@ -56,12 +73,14 @@ module HrLite
       # not be released at all, and the quota stayed spent.
       def cancel
         request = find_decidable
-        if request.cancellable_by?(hr_current_user)
-          request.cancel!(actor: hr_current_user)
-          redirect_to admin_leave_requests_path, notice: "Leave cancelled — the balance is released."
+        note = params[:decision_note].to_s.strip
+        if !request.cancellable_by?(hr_current_user)
+          redirect_to admin_leave_request_path(request), alert: "This leave can no longer be cancelled."
+        elsif note.blank?
+          redirect_to admin_leave_request_path(request), alert: "A reason is required to cancel."
         else
-          redirect_to admin_leave_request_path(request),
-                      alert: "Only pending leave, or approved leave that has not started, can be cancelled."
+          request.cancel!(actor: hr_current_user, note: note)
+          redirect_to admin_leave_requests_path, notice: "Leave cancelled — the balance is released."
         end
       end
 
@@ -91,6 +110,8 @@ module HrLite
 
       def find_decidable = decidable.find(params[:id])
 
+      def find_recorded = decidable.approved.where.not(created_by_id: nil).where("created_by_id <> user_id").find(params[:id])
+
       def recordable = hr_scope(EmployeeProfile.includes(:user), "leave.approve").where.not(user_id: hr_current_user.id)
     end
   end

data/app/models/hr_lite/leave_balance.rb

@@ -97,7 +97,8 @@ module HrLite
     # nil when the person joins only after this leave year ends.
     def accrual_start(range)
       doj = employment_window.first
-      return range.first if doj.nil? || doj <= range.first
+      return nil if doj.nil? # no joining date, no accrual — never a full year by default
+      return range.first if doj <= range.first
 
       start = doj.day <= 15 ? doj.beginning_of_month : doj.next_month.beginning_of_month
       start > range.last ? nil : start

data/app/models/hr_lite/leave_request.rb

@@ -91,23 +91,25 @@ module HrLite
 
     # Owner may cancel while pending, or an approved future leave (quota
     # returns automatically because `used` is computed). Admins may cancel
-    # any pending/approved future leave.
+    # anybody else's pending/approved leave at any time, past dates included.
     def cancellable_by?(actor)
-      return false unless pending? || (approved? && start_date > Date.current)
+      return false unless pending? || approved?
+      return pending? || start_date > Date.current if user_id == actor.id
 
-      user_id == actor.id || HrLite.admin?(actor) || HrLite.leadership?(actor)
+      HrLite.admin?(actor) || HrLite.leadership?(actor)
     end
 
-    def cancel!(actor:)
+    def cancel!(actor:, note: nil)
       was_approved = approved?
       transaction do
         self.status = "cancelled"
         self.decided_by_id = actor.id
         self.decided_at = Time.current
+        self.decision_note = note if note.present?
         save!
         # Cancelling an APPROVED leave hands the days back to the balance, so
         # it is a quota change as much as a status change.
-        audit!("cancelled", actor, was_approved ? "was approved" : nil)
+        audit!("cancelled", actor, [ note.presence, was_approved ? "was approved" : nil ].compact.join("; ").presence)
         # And nobody should still be asked to decide a request that has been
         # called off — it would sit in their inbox for ever.
         approval_route.cancel_all!
@@ -123,6 +125,24 @@ module HrLite
       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.
+    def correct!(actor:, attrs:, reason:)
+      fixed = false
+      transaction do
+        assign_attributes(attrs.merge(status: "pending", paid_days: nil, half_day: false))
+        raise ActiveRecord::Rollback unless valid?(:create) && save(validate: false)
+
+        audit!("corrected", actor, reason)
+        fixed = approve_outright!(actor: actor, note: "Corrected: #{reason}") || raise(ActiveRecord::Rollback)
+      end
+      errors.add(:base, "Not enough #{leave_type.name} balance") unless fixed || errors.any?
+      fixed
+    end
+
+    def recorded_by_hr? = created_by_id.present? && created_by_id != user_id
+
     def date_range_label
       if start_date == end_date
         "#{start_date.strftime('%d %b')}#{half_day ? " (#{half_day_part.present? ? "#{half_day_part} half" : 'half day'})" : ''}"
@@ -230,8 +250,6 @@ module HrLite
       )
     end
 
-    def recorded_by_hr? = created_by_id.present? && created_by_id != user_id
-
     # The balance covers whole half-days only, never less than nothing.
     def covered_by(available) = [ (BigDecimal(available.to_s) * 2).floor / BigDecimal(2), 0 ].max
 

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

@@ -14,7 +14,7 @@
       <tbody>
         <% @employees.each do |employee| %>
           <tr>
-            <td data-label="Employee"><%= hr_display_name(employee) %></td>
+            <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>

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

@@ -0,0 +1,30 @@
+<% content_for(:page_title) { "Fix leave" } %>
+<a class="hrl-backlink" href="<%= hr_lite.admin_leave_request_path(@request) %>"><span aria-hidden="true">‹</span> Leave</a>
+<div class="hrl-page__head">
+  <h1 class="hrl-page__title">Fix leave — <%= hr_display_name(@request.user) %></h1>
+  <p class="hrl-page__sub">Change the type, dates or day. The balance and loss of pay are worked out again, and they get an email.</p>
+</div>
+
+<section class="hrl-card">
+  <%= form_with model: @request, url: hr_lite.admin_leave_request_path(@request), method: :patch, local: true do |f| %>
+    <%= render "hr_lite/shared/form_errors", record: @request %>
+    <div class="hrl-field">
+      <%= f.label :leave_type_id, "Type" %>
+      <%= f.collection_select :leave_type_id, HrLite::LeaveType.active, :id, :name %>
+    </div>
+    <div class="hrl-field"><%= f.label :start_date, "From" %><%= f.date_field :start_date %></div>
+    <div class="hrl-field"><%= f.label :end_date, "To" %><%= f.date_field :end_date %></div>
+    <div class="hrl-field">
+      <%= f.label :half_day_part, "Day" %>
+      <%= f.select :half_day_part, HrLite::DAY_PARTS %>
+    </div>
+    <div class="hrl-field">
+      <%= label_tag :correction_reason, "Reason for the fix (required)" %>
+      <%= text_area_tag :correction_reason, params[:correction_reason], required: true, class: "hrl-input" %>
+    </div>
+    <div class="hrl-form-actions">
+      <%= f.submit "Save fix", class: "hrl-btn hrl-btn--primary" %>
+      <a class="hrl-btn" href="<%= hr_lite.admin_leave_request_path(@request) %>">Back</a>
+    </div>
+  <% end %>
+</section>

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

@@ -24,15 +24,29 @@
   </dl>
 </section>
 
-<%# An approved leave that has not started yet can still be called off — the
+<% if @request.approved? && @request.recorded_by_hr? %>
+  <section class="hrl-card">
+    <h2 class="hrl-card__title">Fix</h2>
+    <p class="hrl-small hrl-muted">Recorded by HR. Change it any time — no need to cancel.</p>
+    <div class="hrl-form-actions">
+      <a class="hrl-btn" href="<%= hr_lite.edit_admin_leave_request_path(@request) %>">Fix this leave</a>
+    </div>
+  </section>
+<% end %>
+
+<%# HR can call off approved leave at any time, past dates included — the
     balance is recomputed live, so cancelling gives the days straight back. %>
 <% if @request.cancellable_by?(hr_current_user) && !@request.pending? %>
   <section class="hrl-card">
     <h2 class="hrl-card__title">Cancel</h2>
-    <p class="hrl-small hrl-muted">Releases the days back to their balance. Only possible
-      before the leave starts.</p>
+    <p class="hrl-small hrl-muted">Releases the days back to their balance. A past day with
+      no punch will then show as absent.</p>
     <%= form_with url: hr_lite.cancel_admin_leave_request_path(@request), method: :post, local: true,
                   html: { data: { turbo_confirm: "Cancel this approved leave?" } } do %>
+      <div class="hrl-field">
+        <label for="cancel_note">Reason (required)</label>
+        <textarea name="decision_note" id="cancel_note" class="hrl-input" required></textarea>
+      </div>
       <div class="hrl-form-actions">
         <button class="hrl-btn hrl-btn--danger" type="submit">Cancel this leave</button>
       </div>

data/config/routes.rb

@@ -60,7 +60,7 @@ HrLite::Engine.routes.draw do
     resources :attendances, only: %i[index show update], param: :user_id do
       collection { get :week }
     end
-    resources :leave_requests, only: %i[index show new create] do
+    resources :leave_requests, only: %i[index show new create edit update] do
       member { post :approve; post :reject; post :cancel }
     end
     resources :leave_balances, only: :index do

data/lib/hr_lite/version.rb

@@ -1,3 +1,3 @@
 module HrLite
-  VERSION = "0.26.0"
+  VERSION = "0.28.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.28.0
 platform: ruby
 authors:
 - kshitiz sinha
@@ -262,6 +262,7 @@ files:
 - app/views/hr_lite/admin/hr_requests/index.html.erb
 - app/views/hr_lite/admin/hr_requests/show.html.erb
 - app/views/hr_lite/admin/leave_balances/index.html.erb
+- app/views/hr_lite/admin/leave_requests/edit.html.erb
 - app/views/hr_lite/admin/leave_requests/index.html.erb
 - app/views/hr_lite/admin/leave_requests/new.html.erb
 - app/views/hr_lite/admin/leave_requests/show.html.erb