hr_lite 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c475874de00a0db443998c37e4caeb3340e202584e094db29ef423c4902698
-  data.tar.gz: 849526338af6b16a5648a5163d140f0cda40b2fa3c34ef2a63a3d2f454761132
+  metadata.gz: 8d6e999438a679338ca82e170c4e71ac3519476913ce34b86d5783c3a0f97671
+  data.tar.gz: 9a3ef8a6d6a6451f0563ff0f99979460d958e3d47f594d0e6de3b916cc4e8b41
 SHA512:
-  metadata.gz: 38bf1cd87f1e283d7e8a54e60a18a19020fae7ff52feca24941f94dc40673c29d3a08a99d8c82699353f9958a99ffaf39ab8ae0a6c2e5e237ee1d96a567ae0c7
-  data.tar.gz: 390843351f21b51a9f2f17f1159214035349ecf8a689722d8dd429b803775715b322d6914fc251bb1808ad03c09c569f55beb0c85b634de8fefa41069b6317f1
+  metadata.gz: 953c47cc46554a8e953f0d125c5878d1d5b03344673f0e706d4c11718a410157dce3652cc3e0cbf414bd88989c13ae3c55f5d09b6fbc885ceb6447672a703583
+  data.tar.gz: ccaae3351ea83e10bb2b25c46966713a9cfad1a98909b0409ec286a9e64644293794675fb4c0ae5a9adac891a79546ac6929f996eb4a5f61c57a0f0b4d2c9cf7

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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_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)
@@ -91,6 +108,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_request.rb

@@ -123,6 +123,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 +248,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_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,6 +24,16 @@
   </dl>
 </section>
 
+<% 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 %>
+
 <%# An approved leave that has not started yet can still be called off — the
     balance is recomputed live, so cancelling gives the days straight back. %>
 <% if @request.cancellable_by?(hr_current_user) && !@request.pending? %>

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.27.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.27.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