hr_lite 0.54.0 → 0.56.0

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

@@ -14,8 +14,8 @@
           <tr>
             <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><% if (held = balance.penalty_days).positive? %><br><span class="hrl-small"><%= hrl_days(held) %> held for penalties</span><% end %></span></td>
+              <% balance = HrLite::LeaveBalance.for(employee, type, @year); used = balance.used; entitled = balance.entitled # each once: both query %>
+              <td data-label="<%= type.code %>" class="hrl-num"><span><strong><%= hrl_days(entitled - used) %></strong> left<br><span class="hrl-small hrl-muted"><%= hrl_days(used) %>/<%= hrl_days(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 %>
@@ -28,10 +28,12 @@
 <section class="hrl-card">
   <h2 class="hrl-card__title">Adjust a balance</h2>
   <p class="hrl-small hrl-muted">Positive credits (comp-off), negative debits. Fully audited.</p>
-  <%= form_with url: hr_lite.adjust_admin_leave_balances_path, method: :post, local: true do %>
+  <%= form_with url: hr_lite.adjust_admin_leave_balances_path, method: :post, local: true,
+                data: { turbo_confirm: "Change this leave balance? It shows on the person's leave at once." } do %>
     <div class="hrl-field">
       <label for="adj_user">Employee</label>
-      <select name="user_id" id="adj_user" class="hrl-input">
+      <select name="user_id" id="adj_user" class="hrl-input" required data-hrl-filter="Type a name to filter">
+        <option value="">Choose…</option>
         <% @employees.each do |employee| %>
           <option value="<%= employee.id %>"><%= hr_display_name(employee) %></option>
         <% end %>

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

@@ -8,8 +8,7 @@
 
 <div class="hrl-row hrl-row--mb">
   <% HrLite::LeaveRequest::STATUSES.each do |status| %>
-    <a class="hrl-btn <%= 'hrl-btn--primary' if @status == status %>"
-       href="<%= hr_lite.admin_leave_requests_path(status: status) %>"><%= status.humanize %></a>
+    <%= link_to status.humanize, hr_lite.admin_leave_requests_path(status: status), class: "hrl-btn", aria: { current: ("true" if @status == status) } %>
   <% end %>
 </div>
 

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

@@ -15,7 +15,7 @@
     <% if @request.reason.present? %><dt>Reason</dt><dd><%= @request.reason %></dd><% end %>
     <% unless @request.leave_type.unlimited? %>
       <dt>Balance</dt>
-      <dd><%= hrl_days(@balance.available) %> of <%= hrl_days(@balance.entitled) %> available</dd>
+      <dd><%= hrl_days(@balance.available(as_of: @request.start_date)) %> of <%= hrl_days(@balance.entitled(as_of: @request.start_date)) %> available</dd>
       <% if (@request.pending? || @request.approved?) && (short = @request.days_beyond_balance).positive? %>
         <dt>Loss of pay</dt><dd><%= hrl_days(short) %> day(s) beyond the balance will be unpaid</dd>
       <% end %>
@@ -60,7 +60,8 @@
     <%# Approve and reject are two separate forms on purpose. Rails binds the
         CSRF token to the form's OWN action, so one form retargeted with
         `formaction:` can never pass verification on the second endpoint. %>
-    <%= form_with url: hr_lite.approve_admin_leave_request_path(@request), method: :post, local: true do %>
+    <%= form_with url: hr_lite.approve_admin_leave_request_path(@request), method: :post, local: true,
+                  html: { data: { turbo_confirm: "Approve #{hr_display_name(@request.user)}'s leave, #{@request.date_range_label}?" } } do %>
       <div class="hrl-field">
         <label for="approve_note">Note (optional)</label>
         <textarea name="decision_note" id="approve_note" class="hrl-input"></textarea>
@@ -73,7 +74,8 @@
 
   <section class="hrl-card">
     <h2 class="hrl-card__title">Reject</h2>
-    <%= form_with url: hr_lite.reject_admin_leave_request_path(@request), method: :post, local: true do %>
+    <%= form_with url: hr_lite.reject_admin_leave_request_path(@request), method: :post, local: true,
+                  html: { data: { turbo_confirm: "Reject #{hr_display_name(@request.user)}'s leave, #{@request.date_range_label}?" } } do %>
       <div class="hrl-field">
         <label for="reject_note">Reason (required)</label>
         <textarea name="decision_note" id="reject_note" class="hrl-input" required></textarea>

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

@@ -1,10 +1,10 @@
 <% content_for(:page_title) { "Edit leave type" } %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Edit <%= @leave_type.name %></h1>
-  <div class="hrl-page__actions">
-    <%= button_to "Delete", hr_lite.admin_leave_type_path(@leave_type), method: :delete,
+</div>
+<%= render "form", leave_type: @leave_type, url: hr_lite.admin_leave_type_path(@leave_type), method: :patch %>
+<div class="hrl-row hrl-mt">
+  <%= button_to "Delete", hr_lite.admin_leave_type_path(@leave_type), method: :delete,
                   class: "hrl-btn hrl-btn--danger",
                   form: { data: { turbo_confirm: "Delete this leave type?" } } %>
-  </div>
 </div>
-<%= render "form", leave_type: @leave_type, url: hr_lite.admin_leave_type_path(@leave_type), method: :patch %>

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

@@ -14,13 +14,13 @@
         <% @leave_types.each do |type| %>
           <tr>
             <td data-label="Type">
-              <span class="hrl-badge" style="background: <%= type.color %>1f; color: <%= type.color %>;"><%= type.code %></span>
+              <span class="hrl-badge hrl-badge--type" style="--hrl-type: <%= type.color %>"><%= type.code %></span>
               <%= type.name %>
               <% unless type.active %><span class="hrl-badge hrl-badge--muted">Inactive</span><% end %>
             </td>
-            <td data-label="Quota" class="hrl-num"><%= type.unlimited? ? "Unlimited" : type.annual_quota.to_f %></td>
+            <td data-label="Quota" class="hrl-num"><%= type.unlimited? ? "Unlimited" : "#{hrl_days(type.annual_quota)} days" %></td>
             <td data-label="Accrual"><%= type.accrual.humanize %></td>
-            <td data-label="Carry cap" class="hrl-num"><%= type.carry_forward_cap.to_f %></td>
+            <td data-label="Carry cap" class="hrl-num"><%= type.carry_forward_cap ? "#{hrl_days(type.carry_forward_cap)} days" : "—" %></td>
             <td data-label="Paid"><%= type.paid ? "Yes" : "No" %></td>
             <td data-label="">
               <a class="hrl-btn" href="<%= hr_lite.edit_admin_leave_type_path(type) %>">Edit</a>

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

@@ -10,7 +10,7 @@
   <p>Outstanding across every active loan: <strong><%= hrl_money(@outstanding) %></strong></p>
   <div class="hrl-row">
     <% HrLite::Loan::STATUSES.each do |status| %>
-      <a class="hrl-btn <%= "hrl-btn--primary" if @status == status %>"
+      <a class="hrl-btn" <%= "aria-current=true" if @status == status %>
          href="<%= hr_lite.admin_loans_path(status: status) %>"><%= status.humanize %></a>
     <% end %>
   </div>
@@ -31,7 +31,7 @@
               <td data-label="Instalment" class="hrl-num"><%= hrl_money(loan.monthly_instalment) %></td>
               <td data-label="Outstanding" class="hrl-num"><%= hrl_money(loan.outstanding) %></td>
               <td data-label="">
-                <a class="hrl-small" href="<%= hr_lite.admin_loan_path(loan) %>">Open</a>
+                <a class="hrl-btn" href="<%= hr_lite.admin_loan_path(loan) %>">Open</a>
               </td>
             </tr>
           <% end %>

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

@@ -4,18 +4,14 @@
 </div>
 
 <section class="hrl-card">
-  <div class="hrl-table-wrap">
-    <table class="hrl-table hrl-table--stack">
-      <tbody>
-        <tr><td data-label="Status"><%= @loan.status.humanize %></td></tr>
-        <tr><td data-label="Monthly instalment"><%= hrl_money(@loan.monthly_instalment) %></td></tr>
-        <tr><td data-label="Starts"><%= @loan.starts_on.strftime("%b %Y") %></td></tr>
-        <tr><td data-label="Repaid"><%= hrl_money(@loan.repaid) %></td></tr>
-        <tr><td data-label="Outstanding"><strong><%= hrl_money(@loan.outstanding) %></strong></td></tr>
-        <% if @loan.reason.present? %><tr><td data-label="Reason"><%= @loan.reason %></td></tr><% end %>
-      </tbody>
-    </table>
-  </div>
+  <dl class="hrl-deflist">
+    <dt>Status</dt><dd><%= @loan.status.humanize %></dd>
+    <dt>Monthly instalment</dt><dd><%= hrl_money(@loan.monthly_instalment) %></dd>
+    <dt>Starts</dt><dd><%= @loan.starts_on.strftime("%b %Y") %></dd>
+    <dt>Repaid</dt><dd><%= hrl_money(@loan.repaid) %></dd>
+    <dt>Outstanding</dt><dd><strong><%= hrl_money(@loan.outstanding) %></strong></dd>
+    <% if @loan.reason.present? %><dt>Reason</dt><dd><%= @loan.reason %></dd><% end %>
+  </dl>
 
   <% if @loan.active? %>
     <div class="hrl-row">

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

@@ -1,10 +1,10 @@
 <% content_for(:page_title) { "Edit office" } %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Edit <%= @office_location.name %></h1>
-  <div class="hrl-page__actions">
-    <%= button_to "Delete", hr_lite.admin_office_location_path(@office_location), method: :delete,
+</div>
+<%= render "form", office_location: @office_location, url: hr_lite.admin_office_location_path(@office_location), method: :patch %>
+<div class="hrl-row hrl-mt">
+  <%= button_to "Delete", hr_lite.admin_office_location_path(@office_location), method: :delete,
                   class: "hrl-btn hrl-btn--danger",
                   form: { data: { turbo_confirm: "Remove this office?" } } %>
-  </div>
 </div>
-<%= render "form", office_location: @office_location, url: hr_lite.admin_office_location_path(@office_location), method: :patch %>

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

@@ -10,7 +10,7 @@
   <% if @runs.any? %>
     <div class="hrl-table-wrap">
       <table class="hrl-table hrl-table--stack">
-        <thead><tr><th>Period</th><th>Status</th><th>Slips</th><th>Net total</th><th></th></tr></thead>
+        <thead><tr><th>Period</th><th>Status</th><th>Slips</th><th>Net payout</th><th></th></tr></thead>
         <tbody>
           <% @runs.each do |run| %>
             <tr>
@@ -19,7 +19,7 @@
                 <span class="hrl-badge <%= { "published" => "hrl-badge--ok", "finalized" => "hrl-badge--warn", "draft" => "hrl-badge--muted" }[run.status] %>"><%= run.status.humanize %></span>
               </td>
               <td data-label="Slips" class="hrl-num"><%= run.salary_slips.size %></td>
-              <td data-label="Net total" class="hrl-num"><%= hrl_money(run.total_net) %></td>
+              <td data-label="Net payout" class="hrl-num"><%= hrl_money(run.total_net) %></td>
               <td data-label=""><a class="hrl-btn" href="<%= hr_lite.admin_payroll_run_path(run) %>">Open</a></td>
             </tr>
           <% end %>

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

@@ -2,7 +2,7 @@
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Payroll — <%= @run.label %></h1>
   <div class="hrl-page__actions">
-    <a class="hrl-btn" href="<%= hr_lite.admin_payroll_line_items_path(month: @run.period_month.strftime("%Y-%m")) %>">One-off items</a>
+    <% if hr_can?("payroll.manage", scope: :all) %><a class="hrl-btn" href="<%= hr_lite.admin_payroll_line_items_path(month: @run.period_month.strftime("%Y-%m")) %>">One-off items</a><% end %>
     <a class="hrl-btn" href="<%= hr_lite.admin_payroll_runs_path %>">All runs</a>
   </div>
 </div>
@@ -29,7 +29,7 @@
     <% manager = hr_can?("payroll.manage", scope: :all) %>
     <% if manager && (@run.draft? || @run.review? || @run.processing?) %>
       <%= button_to @run.draft? ? "Compute" : "Recompute", hr_lite.compute_admin_payroll_run_path(@run),
-                    method: :post, class: "hrl-btn",
+                    method: :post, class: @run.draft? ? "hrl-btn hrl-btn--primary" : "hrl-btn",
                     form: { data: { turbo_confirm: ("Recompute #{@run.label}? This clears #{hr_display_name(@run.first_approved_by)}'s approval." if @run.first_approved_by) } } %>
     <% end %>
     <% if @run.review? && hr_can?("payroll.approve", scope: :all) && @run.first_approved_by_id != hr_current_user.id %>
@@ -56,6 +56,9 @@
   <p class="hrl-small hrl-muted hrl-mt">
     <% if @run.review? %>
       <%= @run.first_approved_by ? "Approved by #{hr_display_name(@run.first_approved_by)} on #{@run.first_approved_at.strftime('%-d %b')} — one more approver (HR or Super Admin) publishes it." : "Needs two approvals (HR and Super Admin). If nobody approves by the 3rd, a run with no blocking warnings is approved automatically." %>
+    <% elsif @run.processing? %>
+      <% content_for(:head) { tag.meta("http-equiv": "refresh", content: "3") } %>
+      Computing… this page refreshes until the slips are ready.
     <% elsif @run.auto_approved_at %>
       Approved automatically on <%= @run.auto_approved_at.strftime("%-d %b") %> — nobody had approved it by the 3rd.
     <% end %>
@@ -66,20 +69,20 @@
   <% if @slips.any? %>
     <div class="hrl-table-wrap">
       <table class="hrl-table hrl-table--stack">
-        <thead><tr><th>Employee</th><th>Days</th><th>LOP</th><th>Gross</th><th>Deductions</th><th>Net</th><th></th></tr></thead>
+        <thead><tr><th>Employee</th><th>Paid days</th><th><abbr title="Loss of pay: unpaid days">LOP</abbr></th><th>Gross</th><th>Deductions</th><th>Net</th><th></th></tr></thead>
         <tbody>
           <% @slips.each do |slip| %>
             <tr>
               <td data-label="Employee"><%= hr_display_name(slip.user) %></td>
-              <td data-label="Days" class="hrl-num"><%= slip.payable_days %></td>
-              <td data-label="LOP" class="hrl-num">
-                <%= slip.effective_lop_days %>
+              <td data-label="Paid days" class="hrl-num"><%= hrl_days(slip.payable_days) %></td>
+              <td data-label="Unpaid (LOP)" class="hrl-num">
+                <%= hrl_days(slip.effective_lop_days) %>
                 <% if slip.lop_override %><span class="hrl-badge hrl-badge--warn">override</span><% end %>
               </td>
               <td data-label="Gross" class="hrl-num"><%= hrl_money(slip.gross_earnings) %></td>
               <td data-label="Deductions" class="hrl-num"><%= hrl_money(slip.total_deductions) %></td>
               <td data-label="Net" class="hrl-num"><strong><%= hrl_money(slip.net_pay) %></strong></td>
-              <td data-label=""><a class="hrl-small" href="<%= hr_lite.admin_salary_slip_path(slip) %>">Detail</a></td>
+              <td data-label=""><a class="hrl-btn" href="<%= hr_lite.admin_salary_slip_path(slip) %>">Detail</a></td>
             </tr>
           <% end %>
         </tbody>

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

@@ -17,7 +17,7 @@
               <td data-label="Title"><a class="hrl-card__link" href="<%= hr_lite.policy_path(policy) %>"><%= policy.title %></a> <span class="hrl-badge hrl-badge--muted">v<%= policy.version %></span></td>
               <td data-label="Kind"><%= policy.announcement? ? "Announcement" : "Policy" %></td>
               <td data-label="In force"><%= policy.effective_from.strftime("%d %b %Y") %></td>
-              <td data-label="Still to acknowledge"><%= policy.announcement? ? "—" : policy.outstanding_for.count %></td>
+              <td data-label="Still to acknowledge"><% if policy.announcement? %>—<% else %><% waiting = policy.outstanding_for.to_a %><details><summary class="hrl-btn"><%= pluralize(waiting.size, "person") %></summary><%= waiting.map { |u| hr_display_name(u) }.to_sentence %></details><% end %></td>
             </tr>
           <% end %>
         </tbody>

data/app/views/hr_lite/admin/policies/new.html.erb

@@ -8,12 +8,12 @@
   <%= form_with model: @policy, url: hr_lite.admin_policies_path, method: :post, local: true do |f| %>
     <%= render "hr_lite/shared/form_errors", record: @policy %>
     <div class="hrl-field"><%= f.label :title %><%= f.text_field :title, required: true %></div>
-    <div class="hrl-field"><%= f.label :body, "Text" %><%= f.text_area :body, rows: 10, required: true %></div>
-    <div class="hrl-field"><%= f.label :effective_from, "In force from" %><%= f.date_field :effective_from %></div>
     <div class="hrl-field hrl-field--check">
       <%= f.check_box :acknowledgement_required %>
       <%= f.label :acknowledgement_required, "Policy — everyone must acknowledge it (untick for an announcement)" %>
     </div>
+    <div class="hrl-field"><%= f.label :body, "Text" %><%= f.text_area :body, rows: 10, required: true %></div>
+    <div class="hrl-field"><%= f.label :effective_from, "In force from" %><%= f.date_field :effective_from %></div>
     <div class="hrl-form-actions">
       <%= f.submit "Publish", class: "hrl-btn hrl-btn--primary",
                    data: { turbo_confirm: "Publish and notify #{pluralize(HrLite.active_employees.size, 'person')} by email?" } %>

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

@@ -1,13 +1,12 @@
-<% content_for(:page_title) { "Regularization tickets" } %>
+<% content_for(:page_title) { "Day fixes" } %>
 <div class="hrl-page__head">
-  <h1 class="hrl-page__title">Regularization tickets</h1>
+  <h1 class="hrl-page__title">Day fixes</h1>
 </div>
 
 <div class="hrl-row hrl-row--mb">
   <span class="hrl-small hrl-muted">Status</span>
   <% HrLite::RegularizationRequest::STATUSES.each do |status| %>
-    <a class="hrl-btn <%= 'hrl-btn--primary' if @status == status %>"
-       href="<%= hr_lite.admin_regularization_requests_path(status: status) %>"><%= status.humanize %></a>
+    <%= link_to status.humanize, hr_lite.admin_regularization_requests_path(status: status), class: "hrl-btn", aria: { current: ("true" if @status == status) } %>
   <% end %>
 </div>
 

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

@@ -1,10 +1,7 @@
 <% content_for(:page_title) { "Ticket — #{hr_display_name(@request.user)}" } %>
+<a class="hrl-backlink" href="<%= hr_lite.admin_regularization_requests_path %>"><span aria-hidden="true">‹</span> Approvals</a>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Regularization — <%= hr_display_name(@request.user) %></h1>
-  <div class="hrl-page__actions">
-    <a class="hrl-btn" href="<%= hr_lite.admin_regularization_requests_path %>">All tickets</a>
-    <a class="hrl-btn" href="<%= hr_lite.admin_attendance_path(@request.user_id, month: @request.date.strftime("%Y-%m")) %>">Their month</a>
-  </div>
 </div>
 
 <section class="hrl-card">
@@ -28,6 +25,7 @@
         <% if @request.decision_note.present? %> · <%= @request.decision_note %><% end %></dd>
     <% end %>
   </dl>
+  <a class="hrl-card__link" href="<%= hr_lite.admin_attendance_path(@request.user_id, month: @request.date.strftime("%Y-%m")) %>">Their month</a>
 </section>
 
 <% if @request.pending? %>
@@ -38,7 +36,8 @@
     <%# Approve and reject are two separate forms on purpose. Rails binds the
         CSRF token to the form's OWN action, so one form retargeted with
         `formaction:` can never pass verification on the second endpoint. %>
-    <%= form_with url: hr_lite.approve_admin_regularization_request_path(@request), method: :post, local: true do |f| %>
+    <%= form_with url: hr_lite.approve_admin_regularization_request_path(@request), method: :post, local: true,
+                  html: { data: { turbo_confirm: "Write the proposed times onto #{hr_display_name(@request.user)}'s attendance for #{@request.date.strftime('%d %b %Y')}?" } } do |f| %>
       <div class="hrl-field">
         <%= f.label :decision_note, "Note (optional)", for: "approve_note" %>
         <%= f.text_area :decision_note, id: "approve_note" %>

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

@@ -9,7 +9,7 @@
   <%= form_with url: hr_lite.admin_reports_path, method: :get, local: true do %>
     <div class="hrl-field">
       <%= label_tag :month, "Month" %>
-      <%= text_field_tag :month, @month.strftime("%Y-%m"), placeholder: "YYYY-MM" %>
+      <%= month_field_tag :month, @month.strftime("%Y-%m"), max: Date.current.strftime("%Y-%m"), class: "hrl-input" %>
     </div>
     <div class="hrl-form-actions">
       <%= submit_tag "Change month", class: "hrl-btn" %>
@@ -26,11 +26,8 @@
           <tr>
             <td data-label="Report"><%= label %></td>
             <td data-label="">
-              <a class="hrl-small"
-                 href="<%= hr_lite.admin_report_path(name, month: @month.strftime("%Y-%m")) %>">Open</a>
-              &nbsp;
-              <a class="hrl-small"
-                 href="<%= hr_lite.admin_report_path(name, month: @month.strftime("%Y-%m"), format: :csv) %>">CSV</a>
+              <a class="hrl-btn" href="<%= hr_lite.admin_report_path(name, month: @month.strftime("%Y-%m")) %>">Open</a>
+              <a class="hrl-btn" href="<%= hr_lite.admin_report_path(name, month: @month.strftime("%Y-%m"), format: :csv) %>">CSV</a>
             </td>
           </tr>
         <% end %>

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

@@ -1,7 +1,21 @@
 <% content_for(:page_title) { @reports_title = HrLite::Admin::ReportsController::REPORTS[@name] } %>
+<% content_for(:back) { "Reports" } %>
+<%# The screen reads like the rest of the app; the CSV keeps raw values for spreadsheets. %>
+<% heading = ->(h) { h == "LOP" ? "Unpaid days (LOP)" : h }
+   shown = lambda do |header, value|
+     if value.blank? then "—"
+     elsif header == "Amount" then hrl_money(value)
+     elsif header.in?([ "Joined", "Left", "Spent on" ]) then Date.parse(value.to_s).strftime("%d %b %Y")
+     elsif header == "Status" then value.to_s.humanize
+     elsif value.is_a?(Float) then hrl_days(value)
+     else value
+     end
+   end %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title"><%= HrLite::Admin::ReportsController::REPORTS[@name] %></h1>
   <div class="hrl-page__actions">
+    <a class="hrl-btn" href="<%= hr_lite.admin_report_path(@name, month: @month.prev_month.strftime("%Y-%m")) %>">‹ <%= @month.prev_month.strftime("%b %Y") %></a>
+    <% if @month.next_month <= Date.current %><a class="hrl-btn" href="<%= hr_lite.admin_report_path(@name, month: @month.next_month.strftime("%Y-%m")) %>"><%= @month.next_month.strftime("%b %Y") %> ›</a><% end %>
     <a class="hrl-btn"
        href="<%= hr_lite.admin_report_path(@name, month: @month.strftime("%Y-%m"), format: :csv) %>">Download CSV</a>
   </div>
@@ -15,13 +29,13 @@
     <div class="hrl-table-wrap">
       <table class="hrl-table hrl-table--stack">
         <thead>
-          <tr><% @rows.first.keys.each do |header| %><th><%= header %></th><% end %></tr>
+          <tr><% @rows.first.keys.each do |header| %><th><%= heading.(header) %></th><% end %></tr>
         </thead>
         <tbody>
           <% @rows.each do |row| %>
             <tr>
               <% row.each do |header, value| %>
-                <td data-label="<%= header %>"><%= value %></td>
+                <td data-label="<%= heading.(header) %>"><%= shown.(header, value) %></td>
               <% end %>
             </tr>
           <% end %>

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

@@ -7,8 +7,8 @@
       <% if role.system? %>
         <%= f.text_field :name, disabled: true %>
         <span class="hrl-small hrl-muted">
-          Built-in roles keep their name — the upgrade path and the seed both
-          identify them by it. The permissions below are yours to change.
+          Built-in roles keep their name, because the system finds them by it.
+          The permissions below are yours to change.
         </span>
       <% else %>
         <%= f.text_field :name %>
@@ -20,8 +20,9 @@
     </div>
 
     <% HrLite::Permissions.grouped.each do |group, keys| %>
-      <fieldset>
-        <legend><%= group %></legend>
+      <% granted = keys.count { |k| (role.grant_map[k] || "none") != "none" } %>
+      <details class="hrl-card" <%= "open" if granted.positive? %>>
+        <summary class="hrl-btn hrl-btn--block"><%= group %> · <%= granted %> of <%= keys.size %> granted</summary>
         <% keys.each do |key| %>
           <% held = role.grant_map[key] || "none" %>
           <div class="hrl-field">
@@ -36,7 +37,7 @@
                   id: "grants_#{key.tr('.', '_')}" %>
           </div>
         <% end %>
-      </fieldset>
+      </details>
     <% end %>
 
     <div class="hrl-form-actions">

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

@@ -11,8 +11,9 @@
 <section class="hrl-card">
   <h2 class="hrl-card__title">Tax working</h2>
   <dl class="hrl-deflist">
-    <% @slip.tax_details_hash.each do |key, value| %>
-      <dt><%= key.humanize %></dt><dd><%= value %></dd>
+    <% @slip.tax_details_hash.except("high_income_review").each do |key, value| %>
+      <dt><%= key == "fy_tds_already_deducted" ? "TDS already deducted this year" : key.humanize %></dt>
+      <dd><%= key.in?(%w[regime months_remaining]) ? value.to_s.humanize : hrl_money(value) %></dd>
     <% end %>
   </dl>
   <% if @slip.tax_details_hash["high_income_review"] == "true" %>

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

@@ -5,6 +5,7 @@
     <div class="hrl-field">
       <%= f.label :annual_ctc, "Annual CTC (₹ a year)" %>
       <%= f.number_field :annual_ctc, step: 1, min: 1, required: true, value: (structure.annual_ctc || breakup&.dig(:annual_ctc))&.round %>
+      <% if structure.annual_ctc %><p class="hrl-hint">= <%= hrl_money(structure.annual_ctc) %> a year</p><% end %>
       <p class="hrl-hint">The only amount you type. Saving splits it: Basic 50%, HRA 50% of Basic in a metro (40% elsewhere), employer PF, ESI and gratuity (4.81% of Basic) inside the CTC, the rest as special allowance.</p>
     </div>
     <div class="hrl-field">

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

@@ -6,11 +6,13 @@
 <section class="hrl-card">
   <%= form_with model: @setting, url: hr_lite.admin_setting_path, method: :patch, local: true do |f| %>
     <%= render "hr_lite/shared/form_errors", record: @setting %>
+    <h2 class="hrl-card__title">Working week</h2>
     <div class="hrl-field">
       <%= f.label :weekend_policy, "Weekly off policy" %>
-      <%= f.select :weekend_policy, HrLite::Setting::WEEKEND_POLICIES.map { |p| [ p.humanize, p ] } %>
+      <%= f.select :weekend_policy, { "Sunday only" => "sun_only", "Saturday and Sunday" => "sat_sun", "Sunday, 2nd and 4th Saturday" => "second_fourth_sat_sun" }.select { |_, v| v.in?(HrLite::Setting::WEEKEND_POLICIES) } %>
       <p class="hrl-hint">Drives working-day math everywhere: leave counting, attendance, payroll.</p>
     </div>
+    <h2 class="hrl-card__title hrl-mt">Breaks</h2>
     <div class="hrl-field">
       <%= f.label :lunch_break_minutes, "Lunch break limit (minutes)" %>
       <%= f.number_field :lunch_break_minutes, min: 5, max: 120 %>
@@ -20,6 +22,7 @@
       <%= f.label :short_break_minutes, "Short break limit (minutes)" %>
       <%= f.number_field :short_break_minutes, min: 1, max: 60 %>
     </div>
+    <h2 class="hrl-card__title hrl-mt">Working day</h2>
     <div class="hrl-field">
       <%= f.label :day_minutes, "Working day (minutes, break included)" %>
       <%= f.number_field :day_minutes, min: 240, max: 720, step: 15 %>
@@ -39,6 +42,7 @@
       <%= 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>
+    <h2 class="hrl-card__title hrl-mt">Penalties and codes</h2>
     <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" } %>

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

@@ -18,8 +18,8 @@
 
     <fieldset>
       <legend>Provident fund</legend>
-      <% { employee_rate: "Employee rate (0.12 = 12%)", employer_rate: "Employer rate",
-           eps_rate: "EPS rate", wage_ceiling: "PF wage ceiling (₹)",
+      <% { employee_rate: "Employee rate (0.12 = 12%)", employer_rate: "Employer rate (0.12 = 12%)",
+           eps_rate: "EPS rate (0.0833 = 8.33%)", wage_ceiling: "PF wage ceiling (₹)",
            eps_wage_ceiling: "EPS wage ceiling (₹)", edli_rate: "EDLI rate",
            edli_ceiling: "EDLI ceiling (₹)", admin_rate: "PF admin rate" }.each do |key, label| %>
         <div class="hrl-field">
@@ -32,7 +32,7 @@
 
     <fieldset>
       <legend>ESI</legend>
-      <% { employee_rate: "Employee rate", employer_rate: "Employer rate",
+      <% { employee_rate: "Employee rate (0.0075 = 0.75%)", employer_rate: "Employer rate (0.0325 = 3.25%)",
            gross_ceiling: "Gross ceiling (₹)" }.each do |key, label| %>
         <div class="hrl-field">
           <%= label_tag "statutory_rate_card_esi_#{key}", label %>

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

@@ -16,10 +16,12 @@
     <table class="hrl-table hrl-table--stack">
       <thead><tr><th>Year</th><th>PF ceiling</th><th>ESI ceiling</th><th>Verified</th><th></th></tr></thead>
       <tbody>
+        <% live = HrLite::StatutoryRateCardRecord.effective_for(Date.current.beginning_of_month) %>
         <% @cards.each do |card| %>
           <tr>
             <td data-label="Year">
               <strong>FY <%= card.financial_year %></strong>
+              <% if card == live %><span class="hrl-badge hrl-badge--ok">In force</span><% end %>
               <div class="hrl-small hrl-muted">from <%= card.effective_from.strftime("%d %b %Y") %></div>
             </td>
             <td data-label="PF ceiling" class="hrl-num"><%= HrLite::Money.format(card.to_card[:pf][:wage_ceiling]) %></td>
@@ -33,7 +35,7 @@
               <% end %>
             </td>
             <td data-label="">
-              <a class="hrl-small" href="<%= hr_lite.edit_admin_statutory_rate_card_path(card) %>">Edit</a>
+              <a class="hrl-btn" href="<%= hr_lite.edit_admin_statutory_rate_card_path(card) %>">Edit</a>
             </td>
           </tr>
         <% end %>

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

@@ -26,7 +26,7 @@
               <td data-label="Regime"><%= declaration.regime.humanize %></td>
               <td data-label="Claimed" class="hrl-num"><%= hrl_money(declaration.declared_total) %></td>
               <td data-label="">
-                <a class="hrl-small" href="<%= hr_lite.admin_tax_declaration_path(declaration) %>">Check</a>
+                <a class="hrl-btn" href="<%= hr_lite.admin_tax_declaration_path(declaration) %>">Check</a>
               </td>
             </tr>
           <% end %>

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

@@ -53,6 +53,7 @@
   </section>
 <% end %>
 
+<% if @declaration.submitted? %>
 <section class="hrl-card">
   <h2 class="hrl-card__title">Decide</h2>
   <div class="hrl-row">
@@ -71,3 +72,4 @@
     <%= submit_tag "Send back", class: "hrl-btn" %>
   <% end %>
 </section>
+<% end %>

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

@@ -3,7 +3,22 @@
   <h1 class="hrl-page__title">Work from home</h1>
 </div>
 
-<section class="hrl-card">
+<% if @grantable.any? %>
+  <section class="hrl-card">
+    <h2 class="hrl-card__title">Give WFH</h2>
+    <p class="hrl-small hrl-muted">Approved straight away, up to <%= HrLite::WfhRequest::HR_MAX_DAYS %> days from today or later.</p>
+    <%= form_with url: hr_lite.admin_wfh_requests_path, method: :post, local: true do %>
+      <div class="hrl-field"><label for="grant-user">Employee</label><%= select_tag :user_id, options_for_select(@grantable.map { |u| [ hr_display_name(u), u.id ] }), include_blank: "Choose one", required: true, id: "grant-user", data: { hrl_filter: ("Type a name to filter" if @grantable.size > 5) } %></div>
+      <div class="hrl-field"><label for="grant-from">From</label><%= date_field_tag :start_date, Date.current, min: Date.current, required: true, id: "grant-from" %></div>
+      <div class="hrl-field"><label for="grant-to">To</label><%= date_field_tag :end_date, Date.current, min: Date.current, required: true, id: "grant-to" %></div>
+      <div class="hrl-field"><label for="grant-reason">Reason</label><%= text_area_tag :reason, nil, rows: 2, required: true, id: "grant-reason" %></div>
+      <div class="hrl-form-actions"><button type="submit" class="hrl-btn hrl-btn--primary">Give WFH</button></div>
+    <% end %>
+  </section>
+<% end %>
+
+<details class="hrl-card"<%= " open" if request.query_string.present? %>>
+  <summary class="hrl-btn hrl-btn--block">Filter</summary>
   <%= form_with url: hr_lite.admin_wfh_requests_path, method: :get, local: true do %>
     <div class="hrl-field"><label for="wfh-from">From</label><%= date_field_tag :from, @from, id: "wfh-from" %></div>
     <div class="hrl-field"><label for="wfh-to">To</label><%= date_field_tag :to, @to, id: "wfh-to" %></div>
@@ -19,7 +34,7 @@
       <a class="hrl-btn" href="<%= hr_lite.admin_wfh_requests_path %>">Reset</a>
     </div>
   <% end %>
-</section>
+</details>
 
 <div class="hrl-kpis">
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @kpis[:requested] %></div><div class="hrl-kpi__label">Employees requested</div></div>
@@ -48,20 +63,6 @@
   <% end %>
 </section>
 
-<% if @grantable.any? %>
-  <section class="hrl-card">
-    <h2 class="hrl-card__title">Give WFH</h2>
-    <p class="hrl-small hrl-muted">Approved straight away, up to <%= HrLite::WfhRequest::HR_MAX_DAYS %> days from today or later.</p>
-    <%= form_with url: hr_lite.admin_wfh_requests_path, method: :post, local: true do %>
-      <div class="hrl-field"><label for="grant-user">Employee</label><%= select_tag :user_id, options_for_select(@grantable.map { |u| [ hr_display_name(u), u.id ] }), include_blank: "Choose one", required: true, id: "grant-user", data: { hrl_filter: ("Type a name to filter" if @grantable.size > 5) } %></div>
-      <div class="hrl-field"><label for="grant-from">From</label><%= date_field_tag :start_date, Date.current, min: Date.current, required: true, id: "grant-from" %></div>
-      <div class="hrl-field"><label for="grant-to">To</label><%= date_field_tag :end_date, Date.current, min: Date.current, required: true, id: "grant-to" %></div>
-      <div class="hrl-field"><label for="grant-reason">Reason</label><%= text_area_tag :reason, nil, rows: 2, required: true, id: "grant-reason" %></div>
-      <div class="hrl-form-actions"><button type="submit" class="hrl-btn hrl-btn--primary">Give WFH</button></div>
-    <% end %>
-  </section>
-<% end %>
-
 <section class="hrl-card">
   <h2 class="hrl-card__title">Schedules <%= @from.strftime("%-d %b") %> – <%= @to.strftime("%-d %b") %></h2>
   <% if @requests.any? %>