hr_lite 0.53.0 → 0.55.0

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

@@ -1,17 +1,20 @@
 <% content_for(:page_title) { @profile.employee_code } %>
 <% content_for(:tabrow) { render "hr_lite/shared/person_tabs", user: @profile.user } %>
+<% content_for(:back, "Employees") %>
+<% own = @profile.user_id == hr_current_user.id # your own pay and record are for someone else to change %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title"><%= hr_display_name(@profile.user) %> <span class="hrl-muted">(<%= @profile.employee_code %>)</span></h1>
   <div class="hrl-page__actions">
+    <% unless own %>
     <a class="hrl-btn" href="<%= hr_lite.edit_admin_employee_path(@profile) %>">Edit</a>
-    <%# Their records are the tabs above; the HR actions fold into one Manage button. %>
+    <%# Their records are the tabs above; the HR actions fold into one More actions button. %>
     <% if hr_superadmin? || hr_can?("salary.manage", scope: :all) %>
       <details>
-        <summary class="hrl-btn">Manage</summary>
+        <summary class="hrl-btn">More actions (appraisal, designation change, PIP, salary)</summary>
         <div class="hrl-row">
           <% if hr_superadmin? %>
             <a class="hrl-btn" href="<%= hr_lite.new_admin_employee_appraisal_path(@profile) %>">New appraisal</a>
-            <a class="hrl-btn" href="<%= hr_lite.new_admin_employee_designation_change_path(@profile) %>">Role change</a>
+            <a class="hrl-btn" href="<%= hr_lite.new_admin_employee_designation_change_path(@profile) %>">Designation change</a>
             <a class="hrl-btn" href="<%= hr_lite.new_admin_performance_plan_path(user_id: @profile.user_id) %>">Start PIP</a>
           <% end %>
           <% if hr_can?("salary.manage", scope: :all) %>
@@ -20,6 +23,7 @@
         </div>
       </details>
     <% end %>
+    <% end %>
   </div>
 </div>
 
@@ -30,7 +34,8 @@
       <dt>Proposed last day</dt><dd><%= @pending_resignation.proposed_last_day.strftime("%d %B %Y") %></dd>
       <% if @pending_resignation.reason.present? %><dt>Reason</dt><dd><%= @pending_resignation.reason %></dd><% end %>
     </dl>
-    <%= form_with url: hr_lite.accept_admin_resignation_path(@pending_resignation), method: :post, local: true do %>
+    <%= form_with url: hr_lite.accept_admin_resignation_path(@pending_resignation), method: :post, local: true,
+                  data: { turbo_confirm: "Accept #{hr_display_name(@profile.user)}'s resignation? Payroll and attendance end on the last day you set." } do %>
       <div class="hrl-field">
         <label for="res_last_day">Confirm last working day</label>
         <input type="date" id="res_last_day" name="last_day" class="hrl-input"
@@ -47,34 +52,6 @@
   </section>
 <% end %>
 
-<%# Stays on the page after an exit date is stamped. Accepting a resignation
-    stamps one, and hiding this card at that moment removed the only control
-    that revokes sign-in — during the notice period, when it is needed. %>
-<section class="hrl-card">
-  <h2 class="hrl-card__title"><%= @profile.date_of_exit ? "Revoke access" : "Offboard" %></h2>
-  <% if @profile.date_of_exit %>
-    <p class="hrl-small hrl-muted">Last day is <%= @profile.date_of_exit.strftime("%d %b %Y") %> —
-      attendance and payroll already clip to it. Run this on or after that day to revoke
-      sign-in. Records are never deleted.</p>
-  <% else %>
-    <p class="hrl-small hrl-muted">Stamps the last day (attendance and payroll clip to it) and revokes sign-in.
-      Records are never deleted.</p>
-  <% end %>
-  <%= form_with url: hr_lite.offboard_admin_employee_path(@profile), method: :post, local: true,
-                html: { data: { turbo_confirm: "Offboard #{hr_display_name(@profile.user)}?" } } do %>
-    <div class="hrl-field">
-      <label for="off_date">Last working day</label>
-      <input type="date" id="off_date" name="date_of_exit" class="hrl-input"
-             value="<%= @profile.date_of_exit || Date.current %>">
-    </div>
-    <div class="hrl-form-actions">
-      <button class="hrl-btn hrl-btn--danger" type="submit">
-        <%= @profile.date_of_exit ? "Revoke access now" : "Offboard employee" %>
-      </button>
-    </div>
-  <% end %>
-</section>
-
 <div class="hrl-grid hrl-grid--2">
   <section class="hrl-card">
     <h2 class="hrl-card__title">Profile</h2>
@@ -106,7 +83,7 @@
                 <td data-label="Effective"><%= structure.effective_from.strftime("%b %Y") %></td>
                 <td data-label="Basic" class="hrl-num"><%= hrl_money(structure.basic) %></td>
                 <td data-label="Gross" class="hrl-num"><%= hrl_money(structure.monthly_gross) %></td>
-                <td data-label=""><a class="hrl-btn" href="<%= hr_lite.edit_admin_employee_salary_structure_path(@profile, structure) %>">Edit</a></td>
+                <td data-label=""><% unless own %><a class="hrl-btn" href="<%= hr_lite.edit_admin_employee_salary_structure_path(@profile, structure) %>">Edit</a><% end %></td>
               </tr>
             <% end %>
           </tbody>
@@ -145,3 +122,33 @@
   <% end %>
 </section>
 <% end %>
+
+<%# Stays on the page after an exit date is stamped. Accepting a resignation
+    stamps one, and hiding this card at that moment removed the only control
+    that revokes sign-in — during the notice period, when it is needed. %>
+<% unless own %>
+<section class="hrl-card">
+  <h2 class="hrl-card__title"><%= @profile.date_of_exit ? "Revoke access" : "Offboard" %></h2>
+  <% if @profile.date_of_exit %>
+    <p class="hrl-small hrl-muted">Last day is <%= @profile.date_of_exit.strftime("%d %b %Y") %> —
+      attendance and payroll already clip to it. Run this on or after that day to revoke
+      sign-in. Records are never deleted.</p>
+  <% else %>
+    <p class="hrl-small hrl-muted">Stamps the last day (attendance and payroll clip to it) and revokes sign-in.
+      Records are never deleted.</p>
+  <% end %>
+  <%= form_with url: hr_lite.offboard_admin_employee_path(@profile), method: :post, local: true,
+                html: { data: { turbo_confirm: "Offboard #{hr_display_name(@profile.user)}?" } } do %>
+    <div class="hrl-field">
+      <label for="off_date">Last working day</label>
+      <input type="date" id="off_date" name="date_of_exit" class="hrl-input"
+             value="<%= @profile.date_of_exit || Date.current %>">
+    </div>
+    <div class="hrl-form-actions">
+      <button class="hrl-btn hrl-btn--danger" type="submit">
+        <%= @profile.date_of_exit ? "Revoke access now" : "Offboard employee" %>
+      </button>
+    </div>
+  <% end %>
+</section>
+<% end %>

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

@@ -18,7 +18,7 @@
               <td data-label="Monthly cap" class="hrl-num"><%= category.uncapped? ? "No cap" : hrl_money(category.monthly_cap) %></td>
               <td data-label="Receipt"><%= category.receipt_required ? "Required" : "Optional" %></td>
               <td data-label="Active"><%= category.active ? "Yes" : "No" %></td>
-              <td data-label=""><a class="hrl-small" href="<%= hr_lite.edit_admin_expense_category_path(category) %>">Edit</a></td>
+              <td data-label=""><a class="hrl-btn" href="<%= hr_lite.edit_admin_expense_category_path(category) %>">Edit</a></td>
             </tr>
           <% end %>
         </tbody>

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

@@ -4,7 +4,7 @@
 <section class="hrl-card">
   <div class="hrl-row">
     <% HrLite::Expense::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_expenses_path(status: status) %>"><%= status.humanize %></a>
     <% end %>
   </div>
@@ -26,6 +26,7 @@
                 <div class="hrl-small hrl-muted">
                   <%= expense.description %> · <%= expense.spent_on.strftime("%d %b %Y") %>
                 </div>
+                <% if expense.receipt.attached? %><a class="hrl-card__link" href="<%= hr_lite.receipt_admin_expense_path(expense) %>">Open receipt</a><% end %>
               </td>
               <td data-label="Amount" class="hrl-num"><%= hrl_money(expense.amount) %></td>
               <td data-label="">
@@ -33,13 +34,15 @@
                   <%= form_with url: hr_lite.approve_admin_expense_path(expense), method: :post do %>
                     <%= submit_tag "Approve", class: "hrl-btn hrl-btn--primary" %>
                   <% end %>
-                  <%= form_with url: hr_lite.reject_admin_expense_path(expense), method: :post do %>
-                    <%= text_field_tag :decision_note, nil, placeholder: "Why not", class: "hrl-input" %>
+                  <%= form_with url: hr_lite.reject_admin_expense_path(expense), method: :post, class: "hrl-row hrl-mt" do %>
+                    <%= label_tag "reject-expense-#{expense.id}", "Reason to reject", class: "hrl-sr-only" %>
+                    <%= text_field_tag :decision_note, nil, id: "reject-expense-#{expense.id}", placeholder: "Reason to reject", required: true, class: "hrl-input" %>
                     <%= submit_tag "Reject", class: "hrl-btn" %>
                   <% end %>
                 <% elsif expense.approved? %>
                   <%= form_with url: hr_lite.reimburse_admin_expense_path(expense), method: :post do %>
-                    <%= text_field_tag :period_month, Date.current.strftime("%Y-%m"), size: 8, class: "hrl-input" %>
+                    <%= label_tag "reimburse-month-#{expense.id}", "Paid with the payroll of", class: "hrl-sr-only" %>
+                    <%= month_field_tag :period_month, Date.current.strftime("%Y-%m"), id: "reimburse-month-#{expense.id}", required: true, class: "hrl-input" %>
                     <%= submit_tag "Mark reimbursed", class: "hrl-btn" %>
                   <% end %>
                 <% end %>

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

@@ -2,8 +2,9 @@
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Holidays <%= @year %></h1>
   <div class="hrl-page__actions">
-    <a class="hrl-btn" href="<%= hr_lite.admin_holidays_path(year: @year - 1) %>"><%= @year - 1 %></a>
-    <a class="hrl-btn" href="<%= hr_lite.admin_holidays_path(year: @year + 1) %>"><%= @year + 1 %></a>
+    <a class="hrl-btn hrl-btn--primary" href="#add-holiday">Add a holiday</a>
+    <a class="hrl-btn" href="<%= hr_lite.admin_holidays_path(year: @year - 1) %>">‹ <%= @year - 1 %></a>
+    <a class="hrl-btn" href="<%= hr_lite.admin_holidays_path(year: @year + 1) %>"><%= @year + 1 %> ›</a>
   </div>
 </div>
 
@@ -35,7 +36,7 @@
 </section>
 
 <div class="hrl-grid hrl-grid--2">
-  <section class="hrl-card">
+  <section class="hrl-card" id="add-holiday">
     <h2 class="hrl-card__title">Add one</h2>
     <%= form_with model: @holiday, url: hr_lite.admin_holidays_path, local: true do |f| %>
       <div class="hrl-field"><%= f.label :date %><%= f.date_field :date %></div>
@@ -58,10 +59,11 @@
           <%= select_tag :office_location_id, options_for_select(@offices), include_blank: "All offices", id: "bulk-office", data: { hrl_filter: ("Type an office" if @offices.size > 5) } %></div>
       <% end %>
       <div class="hrl-field">
-        <textarea name="lines" class="hrl-input" rows="6" placeholder="2026-11-09, Diwali&#10;2026-03-04, Holi"></textarea>
+        <label for="bulk-lines">One holiday a line: date, name</label>
+        <textarea name="lines" id="bulk-lines" class="hrl-input" rows="6" placeholder="2026-11-09, Diwali&#10;2026-03-04, Holi"></textarea>
       </div>
       <div class="hrl-form-actions">
-        <button type="submit" class="hrl-btn hrl-btn--primary">Add all</button>
+        <button type="submit" class="hrl-btn">Add all</button>
       </div>
     <% end %>
   </section>

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

@@ -4,7 +4,7 @@
 <section class="hrl-card">
   <div class="hrl-row">
     <% HrLite::HrRequest::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_hr_requests_path(status: status) %>"><%= status.humanize %></a>
     <% end %>
   </div>
@@ -21,7 +21,7 @@
           <% @requests.each do |request| %>
             <tr>
               <td data-label="Request">
-                <a href="<%= hr_lite.admin_hr_request_path(request) %>"><%= request.subject %></a>
+                <a class="hrl-card__link" href="<%= hr_lite.admin_hr_request_path(request) %>"><%= request.subject %></a>
                 <div class="hrl-small hrl-muted"><%= request.category_label %></div>
               </td>
               <td data-label="Who"><%= hr_display_name(request.user) %></td>
@@ -29,7 +29,7 @@
                 <%= request.assigned_to ? hr_display_name(request.assigned_to) : "—" %>
               </td>
               <td data-label="">
-                <a class="hrl-small" href="<%= hr_lite.admin_hr_request_path(request) %>">Open</a>
+                <a class="hrl-btn" href="<%= hr_lite.admin_hr_request_path(request) %>">Open</a>
               </td>
             </tr>
           <% end %>

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

@@ -4,7 +4,7 @@
 <section class="hrl-card">
   <p class="hrl-small hrl-muted">
     <%= @request.category_label %> · <%= hr_display_name(@request.user) %> ·
-    <%= @request.created_at.to_date.strftime("%d %b %Y") %> ·
+    <%= @request.created_at.to_date.strftime("%d %b %Y") %>
     <%= hrl_request_status_badge(@request.status) %>
   </p>
   <% if @request.category == "id_card" %>
@@ -20,8 +20,8 @@
     <h2 class="hrl-card__title">Answer</h2>
     <%= form_with url: hr_lite.resolve_admin_hr_request_path(@request), method: :post do %>
       <div class="hrl-field">
-        <%= label_tag :resolution, "What you did" %>
-        <%= text_area_tag :resolution, nil, rows: 4 %>
+        <%= label_tag :resolution, "Answer to #{hr_display_name(@request.user)}" %>
+        <%= text_area_tag :resolution, nil, rows: 4, required: true %>
       </div>
       <div class="hrl-form-actions">
         <%= submit_tag "Send answer", class: "hrl-btn hrl-btn--primary" %>
@@ -33,7 +33,8 @@
         <%= label_tag :assignee_id, "Or hand it to somebody" %>
         <%= select_tag :assignee_id,
               options_for_select(HrLite.users_holding("hr_request.manage")
-                                       .map { |u| [ hr_display_name(u), u.id ] }) %>
+                                       .map { |u| [ hr_display_name(u), u.id ] }),
+              include_blank: "Choose…", required: true, data: { hrl_filter: "Type a name to filter" } %>
       </div>
       <div class="hrl-form-actions">
         <%= submit_tag "Assign", class: "hrl-btn" %>

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,10 +74,11 @@
 
   <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"></textarea>
+        <textarea name="decision_note" id="reject_note" class="hrl-input" required></textarea>
       </div>
       <div class="hrl-form-actions">
         <button class="hrl-btn hrl-btn--danger" type="submit">Reject</button>

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,16 +14,16 @@
         <% @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-small" href="<%= hr_lite.edit_admin_leave_type_path(type) %>">Edit</a>
+              <a class="hrl-btn" href="<%= hr_lite.edit_admin_leave_type_path(type) %>">Edit</a>
             </td>
           </tr>
         <% end %>
@@ -36,5 +36,5 @@
   <a class="hrl-btn" href="<%= hr_lite.admin_office_locations_path %>">Office locations</a>
   <a class="hrl-btn" href="<%= hr_lite.admin_holidays_path %>">Holidays</a>
   <a class="hrl-btn" href="<%= hr_lite.admin_expense_categories_path %>">Expense categories</a>
-  <a class="hrl-btn" href="<%= hr_lite.edit_admin_setting_path %>">Weekend policy</a>
+  <a class="hrl-btn" href="<%= hr_lite.edit_admin_setting_path %>">HR settings</a>
 </div>

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>

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

@@ -13,7 +13,7 @@
       <%= f.label :user_id, "Employee" %>
       <%= f.select :user_id, options_for_select(HrLite.employees.map { |u| [ hr_display_name(u), u.id ] },
                                                 @loan.user_id),
-                   {}, data: { hrl_filter: "Type a name to filter" } %>
+                   { include_blank: "Choose…" }, required: true, data: { hrl_filter: "Type a name to filter" } %>
     </div>
     <div class="hrl-field">
       <%= f.label :principal, "Amount lent (₹)" %>

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

@@ -18,7 +18,7 @@
               <td data-label="Coordinates"><%= office.lat %>, <%= office.lng %></td>
               <td data-label="Radius" class="hrl-num"><%= office.radius_m %> m</td>
               <td data-label="Active"><%= office.active ? "Yes" : "No" %></td>
-              <td data-label=""><a class="hrl-small" href="<%= hr_lite.edit_admin_office_location_path(office) %>">Edit</a></td>
+              <td data-label=""><a class="hrl-btn" href="<%= hr_lite.edit_admin_office_location_path(office) %>">Edit</a></td>
             </tr>
           <% end %>
         </tbody>

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

@@ -3,50 +3,29 @@
   <h1 class="hrl-page__title">HR overview</h1>
 </div>
 
+<%# The Inbox badge's count and rows, so the board never counts what the Inbox hides. %>
+<% pending = hrl_inbox_count %>
 <div class="hrl-kpis">
-  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @kpis[:pending] %></div><div class="hrl-kpi__label">Pending approvals</div></div>
+  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= pending %></div><div class="hrl-kpi__label">Pending approvals</div></div>
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @kpis[:on_leave] %></div><div class="hrl-kpi__label">On leave today</div></div>
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @kpis[:flagged] %></div><div class="hrl-kpi__label">Flagged punches</div></div>
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @kpis[:missing_checkout] %></div><div class="hrl-kpi__label">Missing checkouts</div></div>
 </div>
 
-<% if @query.empty? %>
+<% if pending.zero? && @kpis.except(:pending).values.all?(&:zero?) %>
   <p class="hrl-card hrl-card--empty">All present and accounted for.</p>
 <% else %>
-  <% if @kpis[:pending].positive? %>
+  <% if pending.positive? %>
     <section class="hrl-card">
       <h2 class="hrl-card__title">Pending approvals</h2>
-      <% @query.pending_requests.limit(HrLite::Admin::OverviewController::SECTION_CAP).each do |request| %>
+      <% hrl_inbox_rows(HrLite::Admin::OverviewController::SECTION_CAP).each do |tab, request| %>
+        <% what, href = hrl_inbox_item(tab, request) %>
         <div class="hrl-feed__item">
-          <div class="hrl-feed__body">
-            <strong><%= hr_display_name(request.user) %></strong>
-            — <%= request.leave_type.name %>, <%= request.date_range_label %> (<%= hrl_days(request.days_count) %> d)
-          </div>
-          <a class="hrl-btn" href="<%= hr_lite.admin_leave_request_path(request) %>">Decide</a>
-        </div>
-      <% end %>
-      <%# Comp-off and regularization are approvals too. Listing leave alone
-          left both queues invisible on the board that exists to surface work. %>
-      <% @query.pending_comp_offs.limit(HrLite::Admin::OverviewController::SECTION_CAP).each do |request| %>
-        <div class="hrl-feed__item">
-          <div class="hrl-feed__body">
-            <strong><%= hr_display_name(request.user) %></strong>
-            — comp-off for <%= request.date_worked.strftime("%d %b") %>
-            (<%= hrl_days(request.credit_days) %> d)
-          </div>
-          <a class="hrl-btn" href="<%= hr_lite.admin_comp_off_request_path(request) %>">Decide</a>
-        </div>
-      <% end %>
-      <% @query.pending_regularizations.limit(HrLite::Admin::OverviewController::SECTION_CAP).each do |request| %>
-        <div class="hrl-feed__item">
-          <div class="hrl-feed__body">
-            <strong><%= hr_display_name(request.user) %></strong>
-            — attendance fix for <%= request.date.strftime("%d %b") %>
-          </div>
-          <a class="hrl-btn" href="<%= hr_lite.admin_regularization_request_path(request) %>">Decide</a>
+          <div class="hrl-feed__body"><strong><%= hr_display_name(request.user) %></strong> — <%= what %></div>
+          <a class="hrl-btn" href="<%= href %>">Decide</a>
         </div>
       <% end %>
-      <a class="hrl-card__link" href="<%= hr_lite.admin_leave_requests_path %>">All requests</a>
+      <a class="hrl-card__link" href="<%= hr_lite.approvals_path %>">All requests</a>
     </section>
   <% end %>
 

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

@@ -13,7 +13,8 @@
     <div class="hrl-field">
       <%= f.label :user_id, "Employee" %>
       <%= f.select :user_id, options_for_select(HrLite.employees.map { |u| [ hr_display_name(u), u.id ] },
-                                                @item.user_id) %>
+                                                @item.user_id),
+                   { include_blank: "Choose…" }, required: true, data: { hrl_filter: "Type a name to filter" } %>
     </div>
     <div class="hrl-field">
       <%= f.label :component_id, "Item" %>

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

@@ -2,7 +2,7 @@
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Payroll runs</h1>
   <div class="hrl-page__actions">
-    <a class="hrl-btn hrl-btn--primary" href="<%= hr_lite.new_admin_payroll_run_path %>">New run</a>
+    <% if hr_can?("payroll.manage", scope: :all) %><a class="hrl-btn hrl-btn--primary" href="<%= hr_lite.new_admin_payroll_run_path %>">New run</a><% end %>
   </div>
 </div>
 
@@ -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 %>