hr_lite 0.21.3 → 0.22.1

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

@@ -11,30 +11,17 @@
   </div>
 </div>
 
-<%= render "hr_lite/leave_requests/balance_chips" %>
+<%= render "hr_lite/leave_requests/balance_chips", compact: true %>
 
 <section class="hrl-card">
   <% if @requests.any? %>
-    <div class="hrl-table-wrap">
-      <table class="hrl-table hrl-table--stack">
-        <thead><tr><th>Type</th><th>Dates</th><th>Days</th><th>Status</th><th></th></tr></thead>
-        <tbody>
-          <% @requests.each do |request| %>
-            <tr>
-              <td data-label="Type"><span class="hrl-badge" style="background: <%= request.leave_type.color %>1f; color: <%= request.leave_type.color %>;"><%= request.leave_type.code %></span></td>
-              <td data-label="Dates"><%= request.date_range_label %></td>
-              <td data-label="Days" class="hrl-num"><%= request.days_count.to_f %></td>
-              <td data-label="Status">
-                <span class="hrl-badge <%= { "approved" => "hrl-badge--ok", "rejected" => "hrl-badge--bad", "cancelled" => "hrl-badge--muted" }[request.status] %>"><%= request.status.humanize %></span>
-              </td>
-              <td data-label="">
-                <a class="hrl-small" href="<%= hr_lite.leave_request_path(request) %>">View</a>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
+    <% @requests.each do |request| %>
+      <a class="hrl-listrow" href="<%= hr_lite.leave_request_path(request) %>">
+        <span><span class="hrl-badge hrl-badge--type" style="--hrl-type: <%= request.leave_type.color %>"><%= request.leave_type.code %></span> <%= request.leave_type.name %></span>
+        <%= hrl_request_status_badge(request.status) %>
+        <span class="hrl-small hrl-muted"><%= request.date_range_label %> · <%= pluralize(hrl_days(request.days_count), "day") %></span>
+      </a>
+    <% end %>
     <%= hrl_pagination %>
   <% else %>
     <p class="hrl-card--empty">No leave requests yet.</p>

data/app/views/hr_lite/leave_requests/new.html.erb

@@ -1,29 +1,37 @@
 <% content_for(:page_title) { "Apply for leave" } %>
+<% content_for(:back, "Leaves") %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Apply for leave</h1>
 </div>
 
-<%= render "hr_lite/leave_requests/balance_chips" %>
-<p class="hrl-small hrl-muted">Days beyond your balance are unpaid (loss of pay), cut from that month's salary.</p>
-
 <section class="hrl-card">
   <%= form_with model: @request, url: hr_lite.leave_requests_path, 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 %>
+      <%= f.label :leave_type_id, "Type", id: "hrl-leave-type", for: nil %>
+      <% left = @balances.index_by(&:leave_type_id) %>
+      <div class="hrl-chiprow" role="radiogroup" aria-labelledby="hrl-leave-type">
+        <% HrLite::LeaveType.active.each_with_index do |type, i| %>
+          <label><%= f.radio_button :leave_type_id, type.id, required: i.zero? %><span><%= type.name.sub(/ leave\z/i, "") %><%= " · #{hrl_days(left[type.id].available)} left" if left[type.id] %><%= " · Unpaid" unless type.paid %></span></label>
+        <% end %>
+      </div>
+      <p class="hrl-hint">Days beyond your balance are unpaid (loss of pay), cut from that month's salary.</p>
     </div>
     <div class="hrl-field">
       <%= f.label :start_date, "From" %>
-      <%= f.date_field :start_date %>
+      <%= f.date_field :start_date, required: true %>
     </div>
     <div class="hrl-field">
-      <%= f.label :end_date, "To" %>
+      <%= f.label :end_date, "To (leave blank for one day)" %>
       <%= f.date_field :end_date %>
     </div>
     <div class="hrl-field">
-      <%= f.label :half_day_part, "Day" %>
-      <%= f.select :half_day_part, HrLite::DAY_PARTS %>
+      <%= f.label :half_day_part, "Day", id: "hrl-day-part", for: nil %>
+      <div class="hrl-chiprow" role="radiogroup" aria-labelledby="hrl-day-part">
+        <% HrLite::DAY_PARTS.each do |label, value| %>
+          <label><%= f.radio_button :half_day_part, value %><span><%= label %></span></label>
+        <% end %>
+      </div>
     </div>
     <div class="hrl-field">
       <%= f.label :reason, "Reason (optional)" %>
@@ -35,3 +43,8 @@
     </div>
   <% end %>
 </section>
+
+<section class="hrl-card">
+  <h2 class="hrl-card__title">Out in the next 2 weeks</h2>
+  <%= render "hr_lite/leave_requests/out_list", leaves: @out_soon, empty: "Nobody is on leave in the next 2 weeks." %>
+</section>

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

@@ -1,17 +1,15 @@
 <% content_for(:page_title) { "Leave request" } %>
+<% content_for(:back, "Leaves") %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Leave request</h1>
-  <div class="hrl-page__actions">
-    <a class="hrl-btn" href="<%= hr_lite.leave_requests_path %>">Back</a>
-  </div>
 </div>
 
 <section class="hrl-card">
   <dl class="hrl-deflist">
     <dt>Type</dt><dd><%= @request.leave_type.name %></dd>
     <dt>Dates</dt><dd><%= @request.date_range_label %></dd>
-    <dt>Days</dt><dd><%= @request.days_count.to_f %></dd>
-    <dt>Status</dt><dd><span class="hrl-badge"><%= @request.status.humanize %></span></dd>
+    <dt>Days</dt><dd><%= hrl_days(@request.days_count) %></dd>
+    <dt>Status</dt><dd><%= hrl_request_status_badge(@request.status) %></dd>
     <% if @request.reason.present? %><dt>Reason</dt><dd><%= @request.reason %></dd><% end %>
     <% if @request.decision_note.present? %><dt>Decision note</dt><dd><%= @request.decision_note %></dd><% end %>
     <% if @request.decided_at %><dt>Decided</dt><dd><%= @request.decided_at.strftime("%d %b %Y") %> by <%= hr_display_name(@request.decided_by) %></dd><% end %>

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

@@ -2,7 +2,10 @@
 <div class="hrl-page__head"><h1 class="hrl-page__title">Loans &amp; advances</h1></div>
 
 <% if @loans.empty? %>
-  <section class="hrl-card"><p class="hrl-muted">You have no loans or salary advances.</p></section>
+  <section class="hrl-card">
+    <p class="hrl-muted">You have no loans or salary advances.</p>
+    <a class="hrl-card__link" href="<%= hr_lite.new_hr_request_path(category: "payroll_query") %>">Ask HR about an advance</a>
+  </section>
 <% else %>
   <section class="hrl-card">
     <p>Outstanding across everything: <strong><%= hrl_money(@outstanding) %></strong></p>
@@ -15,32 +18,27 @@
         <span class="hrl-badge <%= "hrl-badge--muted" unless loan.active? %>"><%= loan.status.humanize %></span>
       </h2>
       <% if loan.reason.present? %><p class="hrl-muted"><%= loan.reason %></p><% end %>
-      <div class="hrl-table-wrap">
-        <table class="hrl-table hrl-table--stack">
-          <tbody>
-            <tr><td data-label="Monthly instalment"><%= hrl_money(loan.monthly_instalment) %></td></tr>
-            <tr><td data-label="Repaid so far"><%= hrl_money(loan.repaid) %></td></tr>
-            <tr><td data-label="Outstanding"><strong><%= hrl_money(loan.outstanding) %></strong></td></tr>
-            <tr>
-              <td data-label="Next deduction">
-                <% amount = loan.instalment_for(@next_month) %>
-                <%= amount.positive? ? "#{hrl_money(amount)} in #{@next_month.strftime('%b %Y')}" : "—" %>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
+      <dl class="hrl-deflist">
+        <dt>Monthly instalment</dt><dd><%= hrl_money(loan.monthly_instalment) %></dd>
+        <dt>Repaid so far</dt><dd><%= hrl_money(loan.repaid) %></dd>
+        <dt>Outstanding</dt><dd><strong><%= hrl_money(loan.outstanding) %></strong></dd>
+        <dt>Next deduction</dt>
+        <dd>
+          <% amount = loan.instalment_for(@next_month) %>
+          <%= amount.positive? ? "#{hrl_money(amount)} in #{@next_month.strftime('%b %Y')}" : "—" %>
+        </dd>
+      </dl>
 
       <% if loan.loan_repayments.any? %>
         <h3 class="hrl-card__title">Already deducted</h3>
         <div class="hrl-table-wrap">
-          <table class="hrl-table hrl-table--stack">
-            <thead><tr><th>Month</th><th>Amount</th></tr></thead>
+          <table class="hrl-table">
+            <thead><tr><th>Month</th><th class="hrl-num">Amount</th></tr></thead>
             <tbody>
               <% loan.loan_repayments.sort_by(&:period_month).reverse.each do |r| %>
                 <tr>
-                  <td data-label="Month"><%= r.period_month.strftime("%b %Y") %></td>
-                  <td data-label="Amount" class="hrl-num"><%= hrl_money(r.amount) %></td>
+                  <td><%= r.period_month.strftime("%b %Y") %></td>
+                  <td class="hrl-num"><%= hrl_money(r.amount) %></td>
                 </tr>
               <% end %>
             </tbody>

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

@@ -12,7 +12,7 @@
           <% @policies.each do |policy| %>
             <tr>
               <td data-label="Policy">
-                <a href="<%= hr_lite.policy_path(policy) %>"><%= policy.title %></a>
+                <a class="hrl-btn" href="<%= hr_lite.policy_path(policy) %>"><%= policy.title %></a>
                 <span class="hrl-badge hrl-badge--muted">v<%= policy.version %></span>
               </td>
               <td data-label="In force"><%= policy.effective_from.strftime("%d %b %Y") %></td>

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

@@ -1,14 +1,14 @@
 <% content_for(:page_title) { "Regularization" } %>
+<% content_for(:back, "Attendance") %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">My regularization tickets</h1>
   <div class="hrl-page__actions">
-    <a class="hrl-btn" href="<%= hr_lite.attendance_path %>">My attendance</a>
     <a class="hrl-btn hrl-btn--primary" href="<%= hr_lite.new_regularization_request_path %>">Raise a ticket</a>
   </div>
 </div>
 
 <section class="hrl-card">
-  <p class="hrl-small hrl-muted" style="margin-top:0;">
+  <p class="hrl-small hrl-muted">
     Forgot to check in or out? Raise a ticket with the actual times — once an
     admin approves, your attendance for that day is fixed automatically.
   </p>

data/app/views/hr_lite/regularization_requests/new.html.erb

@@ -1,4 +1,5 @@
 <% content_for(:page_title) { "Raise a regularization ticket" } %>
+<% content_for(:back, "Attendance") %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Raise a regularization ticket</h1>
 </div>
@@ -7,23 +8,25 @@
   <%= form_with model: @request, url: hr_lite.regularization_requests_path, scope: :regularization_request, local: true do |f| %>
     <%= render "hr_lite/shared/form_errors", record: @request %>
     <% if (rule = HrLite.config.self_regularization) %>
-      <p class="hrl-small hrl-muted">A missed punch on a working day from today back to <%= rule[:within_days] %> days ago is fixed as soon as you submit, up to <%= rule[:per_week] %> times a week. Anything else goes to HR as a ticket.</p>
+      <p class="hrl-small hrl-muted">A missed punch or short day on a working day from today back to <%= rule[:within_days] %> days ago is fixed as soon as you submit, up to <%= rule[:per_week] %> times a week. Anything else goes to HR as a ticket.</p>
     <% end %>
     <div class="hrl-field">
       <%= f.label :date, "Which day needs fixing?" %>
-      <%= f.date_field :date, value: @request.date&.strftime("%Y-%m-%d"), max: Date.current %>
+      <%= f.date_field :date, value: @request.date&.strftime("%Y-%m-%d"), max: Date.current, required: true %>
     </div>
     <div class="hrl-field">
-      <%= f.label :check_in_at, "Actual check-in (leave blank if only check-out is missing)" %>
-      <%= f.datetime_local_field :check_in_at, value: @request.check_in_at&.strftime("%Y-%m-%dT%H:%M"), max: Date.current.strftime("%Y-%m-%dT23:59") %>
+      <%= f.label :check_in_at, "Actual check-in" %>
+      <%= f.time_field :check_in_at, value: @request.check_in_at&.strftime("%H:%M") %>
+      <p class="hrl-hint">Leave blank if only check-out is missing.</p>
     </div>
     <div class="hrl-field">
-      <%= f.label :check_out_at, "Actual check-out (leave blank if only check-in is missing)" %>
-      <%= f.datetime_local_field :check_out_at, value: @request.check_out_at&.strftime("%Y-%m-%dT%H:%M"), max: Date.current.strftime("%Y-%m-%dT23:59") %>
+      <%= f.label :check_out_at, "Actual check-out" %>
+      <%= f.time_field :check_out_at, value: @request.check_out_at&.strftime("%H:%M") %>
+      <p class="hrl-hint">Leave blank if only check-in is missing. Short day? Leave both times blank and give the reason.</p>
     </div>
     <div class="hrl-field">
-      <%= f.label :reason, "Why was the punch missed? (required)" %>
-      <%= f.text_area :reason %>
+      <%= f.label :reason, "Why does this day need fixing? (required)" %>
+      <%= f.text_area :reason, required: true %>
     </div>
     <div class="hrl-form-actions">
       <%= f.submit "Raise ticket", class: "hrl-btn hrl-btn--primary" %>

data/app/views/hr_lite/resignations/show.html.erb

@@ -28,7 +28,7 @@
       <%= render "hr_lite/shared/form_errors", record: @new_resignation %>
       <div class="hrl-field">
         <%= f.label :proposed_last_day, "Proposed last working day" %>
-        <%= f.date_field :proposed_last_day %>
+        <%= f.date_field :proposed_last_day, required: true %>
       </div>
       <div class="hrl-field">
         <%= f.label :reason, "Reason (optional)" %>

data/app/views/hr_lite/salary_slips/_slip_detail.html.erb

@@ -1,4 +1,10 @@
 <%# locals: slip, profile — shared by employee show, admin show %>
+<div class="hrl-kpis hrl-kpis--money">
+  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= hrl_money(slip.net_pay) %></div><div class="hrl-kpi__label">Net pay</div></div>
+  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= hrl_money(slip.gross_earnings) %></div><div class="hrl-kpi__label">Gross</div></div>
+  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= hrl_money(slip.total_deductions) %></div><div class="hrl-kpi__label">Deductions</div></div>
+  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= hrl_days(slip.payable_days) %> / <%= hrl_days(slip.effective_lop_days) %></div><div class="hrl-kpi__label">Payable / LOP days</div></div>
+</div>
 <div class="hrl-grid hrl-grid--2">
   <section class="hrl-card">
     <h2 class="hrl-card__title">Earnings</h2>
@@ -36,12 +42,12 @@
 
 <section class="hrl-card">
   <dl class="hrl-deflist">
-    <dt>Net pay</dt><dd><strong><%= hrl_money(slip.net_pay) %></strong> (<%= hrl_amount_in_words(slip.net_pay) %>)</dd>
+    <dt>Net pay</dt><dd><strong><%= hrl_money(slip.net_pay) %></strong><br><span class="hrl-small hrl-muted"><%= hrl_amount_in_words(slip.net_pay) %></span></dd>
     <%# Out-of-window days are named rather than silently dropped: without them
         a mid-month joiner's row does not add up to the month. %>
     <dt>Days</dt>
-    <dd><%= slip.payable_days %> payable / <%= slip.effective_lop_days %> LOP<% if slip.out_of_window_days.to_f.positive? %>
-      / <%= slip.out_of_window_days %> outside employment<% end %> of <%= slip.days_in_month %></dd>
+    <dd><%= hrl_days(slip.payable_days) %> payable / <%= hrl_days(slip.effective_lop_days) %> LOP<% if slip.out_of_window_days.to_f.positive? %>
+      / <%= hrl_days(slip.out_of_window_days) %> outside employment<% end %> of <%= slip.days_in_month %></dd>
     <% if profile %>
       <dt>Employee code</dt><dd><%= profile.employee_code %></dd>
       <% if profile.masked_uan %><dt>PF UAN</dt><dd><%= profile.masked_uan %></dd><% end %>

data/app/views/hr_lite/salary_slips/index.html.erb

@@ -4,31 +4,60 @@
 </div>
 
 <section class="hrl-card">
-  <h2 class="hrl-card__title">My salary</h2>
-  <% if (breakup = @structure&.breakup) %>
-    <p class="hrl-small hrl-muted">Current salary from <%= @structure.effective_from.strftime("%d %b %Y") %></p>
+  <h2 class="hrl-card__title">Slips</h2>
+  <% if @slips.any? %>
     <div class="hrl-table-wrap">
-      <%# Three narrow columns fit a 320px phone; stacking repeated the headings on every line. %>
-      <table class="hrl-table hrl-table--tight hrl-small">
-        <thead><tr><th>Component</th><th class="hrl-num">Monthly</th><th class="hrl-num">Yearly</th></tr></thead>
+      <table class="hrl-table hrl-table--stack">
+        <thead><tr><th>Period</th><th class="hrl-num">Net pay</th><th></th></tr></thead>
         <tbody>
-          <% { "Earnings" => breakup[:earnings].merge("Gross" => breakup[:monthly_gross]),
-               "Deductions" => breakup[:deductions].merge("In-hand before tax" => breakup[:in_hand]),
-               "Employer contributions" => breakup[:employer].merge("CTC" => breakup[:monthly_ctc]) }.each do |section, lines| %>
-            <tr><th colspan="3"><%= section %></th></tr>
-            <% lines.each do |label, amount| %>
-              <% weight = label == lines.keys.last ? :strong : :span %>
-              <tr>
-                <td data-label="Component"><%= content_tag(weight, label) %></td>
-                <td data-label="Monthly" class="hrl-num"><%= content_tag(weight, hrl_rupees(amount)) %></td>
-                <td data-label="Yearly" class="hrl-num"><%= content_tag(weight, hrl_rupees(breakup[:yearly].fetch(label, amount * 12))) %></td>
-              </tr>
-            <% end %>
+          <% @slips.each do |slip| %>
+            <tr>
+              <td data-label="Period"><%= slip.period_month.strftime("%B %Y") %></td>
+              <td data-label="Net pay" class="hrl-num"><strong><%= hrl_money(slip.net_pay) %></strong></td>
+              <td data-label="">
+                <a class="hrl-btn" href="<%= hr_lite.salary_slip_path(slip) %>">View</a>
+                <a class="hrl-btn" href="<%= hr_lite.salary_slip_path(slip, format: :pdf) %>">PDF</a>
+              </td>
+            </tr>
           <% end %>
         </tbody>
       </table>
     </div>
-    <p class="hrl-small hrl-muted">Income tax (TDS) depends on your declarations and is shown on each slip.</p>
+    <%= hrl_pagination %>
+  <% else %>
+    <p class="hrl-card--empty">No published salary slips yet.<% if (day = HrLite.config.slip_release_day) %> Each month's slip opens on the <%= day.ordinalize %> of the next month.<% end %></p>
+  <% end %>
+</section>
+
+<section class="hrl-card">
+  <h2 class="hrl-card__title">My salary</h2>
+  <% if (breakup = @structure&.breakup) %>
+    <p class="hrl-small hrl-muted">Current salary from <%= @structure.effective_from.strftime("%d %b %Y") %></p>
+    <details>
+      <summary class="hrl-btn">Show salary structure</summary>
+      <div class="hrl-table-wrap hrl-mt">
+        <%# Three narrow columns fit a 320px phone; stacking repeated the headings on every line. %>
+        <table class="hrl-table hrl-table--tight hrl-small">
+          <thead><tr><th>Component</th><th class="hrl-num">Monthly</th><th class="hrl-num">Yearly</th></tr></thead>
+          <tbody>
+            <% { "Earnings" => breakup[:earnings].merge("Gross" => breakup[:monthly_gross]),
+                 "Deductions" => breakup[:deductions].merge("In-hand before tax" => breakup[:in_hand]),
+                 "Employer contributions" => breakup[:employer].merge("CTC" => breakup[:monthly_ctc]) }.each do |section, lines| %>
+              <tr><th colspan="3"><%= section %></th></tr>
+              <% lines.each do |label, amount| %>
+                <% weight = label == lines.keys.last ? :strong : :span %>
+                <tr>
+                  <td data-label="Component"><%= content_tag(weight, label) %></td>
+                  <td data-label="Monthly" class="hrl-num"><%= content_tag(weight, hrl_rupees(amount)) %></td>
+                  <td data-label="Yearly" class="hrl-num"><%= content_tag(weight, hrl_rupees(breakup[:yearly].fetch(label, amount * 12))) %></td>
+                </tr>
+              <% end %>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+      <p class="hrl-small hrl-muted">Income tax (TDS) depends on your declarations and is shown on each slip.</p>
+    </details>
   <% end %>
   <% @upcoming.each do |structure| %>
     <% upcoming = structure.breakup(on: structure.effective_from) %>
@@ -49,28 +78,3 @@
     <% end %>
   <% end %>
 </section>
-
-<section class="hrl-card">
-  <% if @slips.any? %>
-    <div class="hrl-table-wrap">
-      <table class="hrl-table hrl-table--stack">
-        <thead><tr><th>Period</th><th>Net pay</th><th></th></tr></thead>
-        <tbody>
-          <% @slips.each do |slip| %>
-            <tr>
-              <td data-label="Period"><%= slip.period_month.strftime("%B %Y") %></td>
-              <td data-label="Net pay" class="hrl-num"><strong><%= hrl_money(slip.net_pay) %></strong></td>
-              <td data-label="">
-                <a class="hrl-btn" href="<%= hr_lite.salary_slip_path(slip) %>">View</a>
-                <a class="hrl-btn" href="<%= hr_lite.salary_slip_path(slip, format: :pdf) %>">PDF</a>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-    <%= hrl_pagination %>
-  <% else %>
-    <p class="hrl-card--empty">No published salary slips yet.<% if (day = HrLite.config.slip_release_day) %> Each month's slip opens on the <%= day.ordinalize %> of the next month.<% end %></p>
-  <% end %>
-</section>

data/app/views/hr_lite/shared/_bell.html.erb

@@ -1,3 +1,3 @@
 <% if (bell = HrLite.config.notifications&.call(hr_current_user)) %>
-  <a class="hrl-bell" href="<%= bell[:url] %>">Notifications<% if bell[:unread].to_i.positive? %> <span class="hrl-bell__count"><%= bell[:unread] %></span><% end %></a>
+  <a class="hrl-bell" href="<%= bell[:url] %>">Notifications<% if bell[:unread].to_i.positive? %> <span class="hrl-bell__count"><%= bell[:unread] %><span class="hrl-sr-only"> unread</span></span><% end %></a>
 <% end %>

data/app/views/hr_lite/shared/_form_errors.html.erb

@@ -1,5 +1,5 @@
 <% if record.errors.any? %>
-  <div class="hrl-errors">
+  <div class="hrl-errors" role="alert" tabindex="-1" id="hrl-errors" autofocus>
     <strong><%= pluralize(record.errors.count, "problem") %> prevented saving:</strong>
     <ul>
       <% record.errors.full_messages.each do |message| %>

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

@@ -1,4 +1,5 @@
 <% content_for(:page_title) { "Tax declaration" } %>
+<% submittable = @declaration.persisted? && (@declaration.draft? || @declaration.rejected?) %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Tax declaration — <%= @declaration.label %></h1>
 </div>
@@ -24,24 +25,29 @@
 
   <section class="hrl-card">
     <div class="hrl-field">
-      <%= f.label :regime, "Tax regime" %>
-      <%= f.select :regime, [ [ "New regime (lower rates, no deductions)", "new" ],
-                              [ "Old regime (deductions apply)", "old" ] ] %>
-      <span class="hrl-small hrl-muted">
-        The deductions below only reduce tax under the old regime.
-      </span>
+      <%= f.label :regime, "Tax regime", id: "hrl-tax-regime", for: nil %>
+      <div role="radiogroup" aria-labelledby="hrl-tax-regime">
+        <% [ [ "new", "New regime", "Lower rates, no deductions." ],
+             [ "old", "Old regime", "The deductions below reduce your tax." ] ].each do |value, name, hint| %>
+          <div class="hrl-field--check">
+            <%= f.radio_button :regime, value %>
+            <%= f.label :regime, value: value do %><span><%= name %><span class="hrl-hint"><%= hint %></span></span><% end %>
+          </div>
+        <% end %>
+      </div>
     </div>
   </section>
 
-  <section class="hrl-card">
-    <h2 class="hrl-card__title">What you are claiming</h2>
+  <details class="hrl-card" <%= "open" if @declaration.regime != "new" || @declaration.errors.any? %>>
+    <summary class="hrl-btn">Deductions (old regime only)</summary>
     <%= f.fields_for :tax_declaration_items do |item| %>
       <div class="hrl-field">
         <%= item.hidden_field :section %>
         <%= item.label :declared_amount, item.object.section_label %>
         <%= item.text_field :declared_amount,
               value: item.object.declared_amount&.to_s("F"), inputmode: "decimal" %>
-        <%= item.text_field :label, placeholder: "What it is (optional)" %>
+        <%= item.label :label, "What it is (optional)", class: "hrl-mt hrl-muted" %>
+        <%= item.text_field :label %>
         <% if item.object.persisted? && item.object.verified_amount %>
           <span class="hrl-small hrl-muted">
             HR verified <%= hrl_money(item.object.verified_amount) %>
@@ -50,19 +56,18 @@
       </div>
     <% end %>
     <p>Total claimed: <strong><%= hrl_money(@declaration.declared_total) %></strong></p>
-    <div class="hrl-form-actions">
-      <%= f.submit "Save draft", class: "hrl-btn hrl-btn--primary" %>
-    </div>
-  </section>
-<% end %>
+  </details>
 
-<% if @declaration.persisted? && (@declaration.draft? || @declaration.rejected?) %>
-  <section class="hrl-card">
+  <% if submittable %>
     <p class="hrl-muted hrl-small">
       Submitting locks it for HR to check. They can send it back if the proof
       does not match.
     </p>
-    <%= button_to "Submit to HR", hr_lite.submit_tax_declaration_path,
-          method: :post, class: "hrl-btn hrl-btn--primary" %>
-  </section>
+  <% end %>
+  <div class="hrl-form-actions">
+    <%= f.submit "Save draft", class: submittable ? "hrl-btn" : "hrl-btn hrl-btn--primary" %>
+    <% if submittable %>
+      <button type="submit" name="submit_to_hr" value="1" class="hrl-btn hrl-btn--primary">Submit to HR</button>
+    <% end %>
+  </div>
 <% end %>

data/app/views/hr_lite/team/show.html.erb

@@ -33,7 +33,7 @@
                   <span class="hrl-small hrl-muted"> · <%= row.profile.designation %></span><% end %></span>
               </td>
               <td data-label="Status"><%= hrl_team_status(row) %></td>
-              <td data-label="Hours" class="hrl-num"><%= hrl_duration(row.day_seconds) %></td>
+              <td data-label="Hours <%= @date == Date.current ? "today" : "that day" %>" class="hrl-num"><%= hrl_duration(row.day_seconds) %></td>
               <td data-label="Hours this month" class="hrl-num"><%= hrl_duration(row.month_seconds) %></td>
             </tr>
           <% end %>
@@ -44,5 +44,5 @@
     <p class="hrl-card--empty">Nobody to show for this date.</p>
   <% end %>
   <p class="hrl-small hrl-muted hrl-mt">Forgot a punch yourself?
-    <a href="<%= hr_lite.new_regularization_request_path %>">Raise a regularization ticket</a>.</p>
+    <a class="hrl-card__link" href="<%= hr_lite.new_regularization_request_path %>">Raise a regularization ticket</a></p>
 </section>

data/app/views/layouts/hr_lite/application.html.erb

@@ -13,6 +13,7 @@
   <% end %>
 </head>
 <body class="hrl-body">
+  <a class="hrl-skip" href="#hrl-main">Skip to content</a>
   <div class="hrl-shell">
     <%# Keka-style left rail on desktop; slides away on phones (tabbar takes over). %>
     <aside class="hrl-side" aria-label="HR navigation">
@@ -25,9 +26,11 @@
       </a>
 
       <nav class="hrl-side__nav">
-        <span class="hrl-side__group">My work</span>
-        <% hrl_nav_items(HrLite::ApplicationHelper::NAV_ITEMS).each do |item| %>
-          <%= hrl_nav_link(item) %>
+        <% hrl_nav_items(HrLite::ApplicationHelper::NAV_ITEMS).chunk { |item| item[:group] }.each do |group, items| %>
+          <span class="hrl-side__group"><%= group %></span>
+          <% items.each do |item| %>
+            <%= hrl_nav_link(item) %>
+          <% end %>
         <% end %>
 
         <% if hr_admin? || hr_leadership? || hr_can?("expense.approve", scope: :team) %>
@@ -73,10 +76,15 @@
           <% end %>
         </a>
         <%= render "hr_lite/shared/bell" %>
-        <span class="hrl-appbar__user"><%= hr_display_name(hr_current_user) %></span>
+        <% profile = hr_lite.employee_profile_path if hr_lite_route?(:employee_profile_path) %>
+        <%= tag.a hr_display_name(hr_current_user), href: profile, class: "hrl-appbar__user" %>
       </header>
 
-      <main class="hrl-main">
+      <main class="hrl-main" id="hrl-main" tabindex="-1">
+        <%# A sub-screen names its parent tab: content_for(:back, "Leaves"). %>
+        <% if (tab = HrLite::ApplicationHelper::NAV_ITEMS.find { |i| i[:label] == content_for(:back) }) %>
+          <a class="hrl-backlink" href="<%= hr_lite.public_send(tab[:path]) %>"><span aria-hidden="true">‹</span> <%= tab[:label] %></a>
+        <% end %>
         <% if flash[:notice].present? %><div class="hrl-flash hrl-flash--ok" role="status"><%= flash[:notice] %></div><% end %>
         <% if flash[:alert].present? %><div class="hrl-flash hrl-flash--warn" role="alert"><%= flash[:alert] %></div><% end %>
         <%= yield %>
@@ -95,10 +103,17 @@
       <%= hrl_nav_link(item) %>
     <% end %>
     <details class="hrl-tabbar__more">
-      <summary class="hrl-nav__link">More</summary>
+      <% lit = rest.any? { |i| hrl_nav_active?(i) } || request.path.include?("/admin/") %>
+      <%= tag.summary "More", class: [ "hrl-nav__link", ("hrl-nav__link--active" if lit) ], aria: { current: ("true" if lit) } %>
       <div class="hrl-sheet">
-        <% rest.each do |item| %>
-          <%= hrl_nav_link(item) %>
+        <% if HrLite.config.back_link %>
+          <a class="hrl-nav__link hrl-side__back" href="<%= HrLite.config.back_link[:url] %>"><%= HrLite.config.back_link[:label] %></a>
+        <% end %>
+        <% rest.chunk { |item| item[:group] }.each do |group, items| %>
+          <span class="hrl-side__group"><%= group %></span>
+          <% items.each do |item| %>
+            <%= hrl_nav_link(item) %>
+          <% end %>
         <% end %>
         <% if hr_admin? || hr_leadership? || hr_can?("expense.approve", scope: :team) %>
           <span class="hrl-side__group">Manage</span>
@@ -126,6 +141,7 @@
   <%= javascript_include_tag "hr_lite/confirm", defer: true %>
   <%= javascript_include_tag "hr_lite/mention", defer: true %>
   <%= javascript_include_tag "hr_lite/nav", defer: true %>
+  <%= javascript_include_tag "hr_lite/select_filter", defer: true %>
   <%= yield :scripts %>
 </body>
 </html>

data/config/routes.rb

@@ -54,7 +54,9 @@ HrLite::Engine.routes.draw do
   namespace :admin do
     resources :policies, only: %i[index new create]
     get "overview", to: "overview#index"
-    resources :attendances, only: %i[index show update], param: :user_id
+    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
       member { post :approve; post :reject; post :cancel }
     end