hr_lite 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d6e999438a679338ca82e170c4e71ac3519476913ce34b86d5783c3a0f97671
-  data.tar.gz: 9a3ef8a6d6a6451f0563ff0f99979460d958e3d47f594d0e6de3b916cc4e8b41
+  metadata.gz: 175c2fc4265dd0055f39926d529060dedeb14386991eb9f43d1b3f0e80112dce
+  data.tar.gz: 733cc4423053d7ca4b8d27acd03165dd073481f767131731179432392a3be335
 SHA512:
-  metadata.gz: 953c47cc46554a8e953f0d125c5878d1d5b03344673f0e706d4c11718a410157dce3652cc3e0cbf414bd88989c13ae3c55f5d09b6fbc885ceb6447672a703583
-  data.tar.gz: ccaae3351ea83e10bb2b25c46966713a9cfad1a98909b0409ec286a9e64644293794675fb4c0ae5a9adac891a79546ac6929f996eb4a5f61c57a0f0b4d2c9cf7
+  metadata.gz: d26ff16fb6dc9bc592374a0920d659556b7ad8d466fccfa6a24084bfada3bd95fd4b756e2de2ae01138dab005d7e612fd58883b80e1a7ef333f53bd75748f191
+  data.tar.gz: 96b6f9c358ecba6d459da48a97cbdc866f5dbabb1a7ab1dff4345961cdf4e6780c0ae4f7dd56635a66aa41a5078b830423cb1740eada0acda5c4350b4d84590d

data/CHANGELOG.md

@@ -7,6 +7,11 @@ 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.

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

@@ -73,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
 

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!

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/show.html.erb

@@ -34,15 +34,19 @@
   </section>
 <% end %>
 
-<%# An approved leave that has not started yet can still be called off — the
+<%# 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/lib/hr_lite/version.rb

@@ -1,3 +1,3 @@
 module HrLite
-  VERSION = "0.27.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.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - kshitiz sinha