hr_lite 0.21.3 → 0.22.1

data/app/views/hr_lite/admin/attendances/week.html.erb

@@ -0,0 +1,42 @@
+<% content_for(:page_title) { "Weekly hours" } %>
+<div class="hrl-page__head">
+  <h1 class="hrl-page__title">Weekly hours</h1>
+</div>
+
+<div class="hrl-row hrl-row--mb">
+  <a class="hrl-btn" href="<%= hr_lite.week_admin_attendances_path(date: @monday - 7) %>" aria-label="Previous week">&larr;</a>
+  <strong><%= @monday.strftime("%d %b") %> – <%= (@monday + 4).strftime("%d %b %Y") %></strong>
+  <a class="hrl-btn" href="<%= hr_lite.week_admin_attendances_path(date: @monday + 7) %>" aria-label="Next week">&rarr;</a>
+  <a class="hrl-btn" href="<%= hr_lite.admin_attendances_path %>">Day view</a>
+</div>
+<p class="hrl-small hrl-muted">Monday to Friday only — Saturday is not counted. The target drops by a day for each holiday or full-day leave<%= ", and this week counts only the days already over" if @monday + 4 >= Date.current %>.</p>
+
+<div class="hrl-kpis">
+  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @rows.size %></div><div class="hrl-kpi__label">People</div></div>
+  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @rows.count { |r| r[:below] } %></div><div class="hrl-kpi__label">Below target</div></div>
+</div>
+
+<div class="hrl-table-wrap">
+  <table class="hrl-table hrl-table--stack">
+    <thead><tr><th>Employee</th><th>Hours</th><th>Avg / day</th><th>Target</th><th>Status</th></tr></thead>
+    <tbody>
+      <% @rows.each do |row| %>
+        <tr>
+          <td data-label="Employee"><a class="hrl-card__link" href="<%= hr_lite.admin_attendance_path(row[:user].id, month: @monday.strftime("%Y-%m")) %>"><%= hr_display_name(row[:user]) %></a></td>
+          <td data-label="Hours"><%= row[:hours].round(1) %>h</td>
+          <td data-label="Avg / day"><%= row[:avg] ? "#{row[:avg].round(1)}h" : "—" %></td>
+          <td data-label="Target"><%= row[:target] ? "#{row[:target].round(1)}h" : "—" %></td>
+          <td data-label="Status">
+            <% if row[:below] %>
+              <span class="hrl-badge hrl-badge--bad">Below target</span>
+            <% elsif row[:target]&.positive? %>
+              <span class="hrl-badge hrl-badge--ok">Met</span>
+            <% else %>
+              <span class="hrl-badge hrl-badge--muted">—</span>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -37,7 +37,7 @@
               <td data-label="Due"><%= item.due_on&.strftime("%d %b %Y") || "—" %></td>
               <td data-label="">
                 <%= form_with url: hr_lite.complete_admin_checklist_path(item), method: :post do %>
-                  <%= text_field_tag :note, nil, placeholder: "Note" %>
+                  <%= text_field_tag :note, nil, placeholder: "Note", class: "hrl-input" %>
                   <%= submit_tag "Done", class: "hrl-btn hrl-btn--primary" %>
                 <% end %>
               </td>

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

@@ -5,7 +5,7 @@
 
 <%= render "hr_lite/admin/shared/approvals_tabs", active: :comp_off %>
 
-<div class="hrl-row" style="margin-bottom:.85rem;">
+<div class="hrl-row hrl-row--mb">
   <span class="hrl-small hrl-muted">Status</span>
   <% HrLite::CompOffRequest::STATUSES.each do |status| %>
     <a class="hrl-btn <%= 'hrl-btn--primary' if @status == status %>"
@@ -23,7 +23,7 @@
             <tr>
               <td data-label="Employee"><%= hr_display_name(request.user) %></td>
               <td data-label="Day worked"><%= request.date_worked.strftime("%a, %d %b %Y") %></td>
-              <td data-label="Credit" class="hrl-num"><%= request.credit_days.to_f %></td>
+              <td data-label="Credit" class="hrl-num"><%= hrl_days(request.credit_days) %></td>
               <td data-label=""><a class="hrl-btn" href="<%= hr_lite.admin_comp_off_request_path(request) %>">Open</a></td>
             </tr>
           <% end %>

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

@@ -9,7 +9,7 @@
 <section class="hrl-card">
   <dl class="hrl-deflist">
     <dt>Day worked</dt><dd><%= @request.date_worked.strftime("%A, %d %B %Y") %></dd>
-    <dt>Credit</dt><dd><%= @request.credit_days.to_f %> day</dd>
+    <dt>Credit</dt><dd><%= hrl_days(@request.credit_days) %> day</dd>
     <dt>Reason</dt><dd><%= @request.reason %></dd>
     <dt>Status</dt><dd><%= hrl_request_status_badge(@request.status) %></dd>
     <dt>Punch that day</dt>
@@ -40,7 +40,7 @@
         <%= f.text_area :decision_note, id: "approve_note" %>
       </div>
       <div class="hrl-form-actions">
-        <%= f.button "Approve — credit #{@request.credit_days.to_f} day",
+        <%= f.button "Approve — credit #{hrl_days(@request.credit_days)} day",
                      type: :submit, class: "hrl-btn hrl-btn--primary" %>
       </div>
     <% end %>

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

@@ -44,7 +44,7 @@
                 <%= button_to "Verify", hr_lite.verify_admin_document_path(doc),
                       method: :post, class: "hrl-btn hrl-btn--primary" %>
                 <%= form_with url: hr_lite.reject_admin_document_path(doc), method: :post, local: true do %>
-                  <%= text_field_tag :note, nil, placeholder: "What is wrong with it" %>
+                  <%= text_field_tag :note, nil, placeholder: "What is wrong with it", class: "hrl-input" %>
                   <%= submit_tag "Reject", class: "hrl-btn" %>
                 <% end %>
               </td>

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

@@ -1,14 +1,14 @@
 <section class="hrl-card">
   <%= form_with model: profile, url: url, method: method, scope: :employee_profile, local: true do |f| %>
     <%= render "hr_lite/shared/form_errors", record: profile %>
-    <%= f.hidden_field :user_id %>
     <% if profile.new_record? && profile.user_id.blank? %>
       <div class="hrl-field">
         <%= f.label :user_id, "Existing staff member" %>
         <%= f.select :user_id, HrLite.employees.map { |u| [ HrLite.display_name(u), u.id ] },
-                     include_blank: "— onboard a brand-new person below —" %>
+                     { include_blank: "— onboard a brand-new person below —" },
+                     data: { hrl_filter: "Filter existing staff" } %>
       </div>
-      <fieldset class="hrl-card" style="margin-bottom:.8rem;">
+      <fieldset class="hrl-card">
         <legend class="hrl-card__title">New login (onboarding)</legend>
         <p class="hrl-hint">Fill these ONLY for someone who has no account yet — their sign-in is
           created with the profile; there is no self sign-up.</p>
@@ -27,11 +27,13 @@
             password. Fill it only if you want to hand a password over yourself.</p>
         </div>
       </fieldset>
+    <% else %>
+      <%= f.hidden_field :user_id %>
     <% end %>
     <% if profile.persisted? %>
       <div class="hrl-field">
         <%= f.label :employee_code %>
-        <input class="hrl-input" type="text" value="<%= profile.employee_code %>" disabled>
+        <input class="hrl-input" type="text" id="employee_profile_employee_code" value="<%= profile.employee_code %>" disabled>
         <p class="hrl-hint">System-assigned; the prefix lives under Settings.</p>
       </div>
     <% else %>
@@ -51,15 +53,21 @@
       <% end %>
       <%= f.select :manager_id,
                    candidates.map { |u| [ HrLite.display_name(u), u.id ] },
-                   include_blank: "— nobody (top of the org) —" %>
+                   { include_blank: "— nobody (top of the org) —" },
+                   data: { hrl_filter: "Filter Reports to" } %>
     </div>
     <div class="hrl-field"><%= f.label :department %><%= f.text_field :department %></div>
     <div class="hrl-field"><%= f.label :work_location %><%= f.text_field :work_location %></div>
     <div class="hrl-field"><%= f.label :date_of_birth %><%= f.date_field :date_of_birth %></div>
     <div class="hrl-field"><%= f.label :date_of_joining %><%= f.date_field :date_of_joining %></div>
     <div class="hrl-field">
-      <%= f.label :blood_group %>
-      <%= f.select :blood_group, HrLite::EmployeeProfile::BLOOD_GROUPS, include_blank: "—" %>
+      <%= f.label :blood_group, id: "hrl-blood-group", for: nil %>
+      <div class="hrl-chiprow" role="radiogroup" aria-labelledby="hrl-blood-group">
+        <label><%= f.radio_button :blood_group, "" %><span>Not set</span></label>
+        <% HrLite::EmployeeProfile::BLOOD_GROUPS.each do |g| %>
+          <label><%= f.radio_button :blood_group, g %><span><%= g %></span></label>
+        <% end %>
+      </div>
     </div>
     <div class="hrl-field"><%= f.label :emergency_contact, "Emergency contact (printed on the ID card)" %><%= f.telephone_field :emergency_contact %></div>
     <div class="hrl-field">

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

@@ -87,15 +87,15 @@
     <h2 class="hrl-card__title">Salary structures</h2>
     <% if @structures.any? %>
       <div class="hrl-table-wrap">
-        <table class="hrl-table">
+        <table class="hrl-table hrl-table--stack">
           <thead><tr><th>Effective</th><th class="hrl-num">Basic</th><th class="hrl-num">Gross</th><th></th></tr></thead>
           <tbody>
             <% @structures.each do |structure| %>
               <tr>
-                <td><%= structure.effective_from.strftime("%b %Y") %></td>
-                <td class="hrl-num"><%= hrl_money(structure.basic) %></td>
-                <td class="hrl-num"><%= hrl_money(structure.monthly_gross) %></td>
-                <td><a class="hrl-small" href="<%= hr_lite.edit_admin_employee_salary_structure_path(@profile, structure) %>">Edit</a></td>
+                <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>
               </tr>
             <% end %>
           </tbody>

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

@@ -34,12 +34,12 @@
                     <%= 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" %>
+                    <%= text_field_tag :decision_note, nil, placeholder: "Why not", 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 %>
+                    <%= text_field_tag :period_month, Date.current.strftime("%Y-%m"), size: 8, class: "hrl-input" %>
                     <%= submit_tag "Mark reimbursed", class: "hrl-btn" %>
                   <% end %>
                 <% end %>

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

@@ -7,17 +7,17 @@
 
 <section class="hrl-card">
   <div class="hrl-table-wrap">
-    <table class="hrl-table">
+    <table class="hrl-table hrl-table--stack">
       <thead>
         <tr><th>Employee</th><% @types.each do |type| %><th class="hrl-num"><%= type.code %></th><% end %></tr>
       </thead>
       <tbody>
         <% @employees.each do |employee| %>
           <tr>
-            <td><%= hr_display_name(employee) %></td>
+            <td data-label="Employee"><%= hr_display_name(employee) %></td>
             <% @types.each do |type| %>
               <% balance = HrLite::LeaveBalance.for(employee, type, @year) %>
-              <td class="hrl-num"><strong><%= balance.available.to_f %></strong> left<br><span class="hrl-small hrl-muted"><%= balance.used.to_f %>/<%= balance.entitled.to_f %> used</span></td>
+              <td data-label="<%= type.code %>" class="hrl-num"><span><strong><%= hrl_days(balance.available) %></strong> left<br><span class="hrl-small hrl-muted"><%= hrl_days(balance.used) %>/<%= hrl_days(balance.entitled) %> used</span></span></td>
             <% end %>
           </tr>
         <% end %>

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

@@ -8,7 +8,7 @@
 
 <%= render "hr_lite/admin/shared/approvals_tabs", active: :leaves %>
 
-<div class="hrl-row" style="margin-bottom:.8rem;">
+<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>
@@ -26,7 +26,7 @@
               <td data-label="Employee"><%= hr_display_name(request.user) %></td>
               <td data-label="Type"><%= request.leave_type.name %></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="Days" class="hrl-num"><%= hrl_days(request.days_count) %></td>
               <td data-label=""><a class="hrl-btn" href="<%= hr_lite.admin_leave_request_path(request) %>">Open</a></td>
             </tr>
           <% end %>

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

@@ -1,9 +1,7 @@
 <% content_for(:page_title) { "Leave decision" } %>
+<a class="hrl-backlink" href="<%= hr_lite.admin_leave_requests_path %>"><span aria-hidden="true">‹</span> Approvals</a>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title"><%= hr_display_name(@request.user) %></h1>
-  <div class="hrl-page__actions">
-    <a class="hrl-btn" href="<%= hr_lite.admin_leave_requests_path %>">Back</a>
-  </div>
 </div>
 
 <section class="hrl-card">
@@ -12,14 +10,14 @@
     <dt>Dates</dt><dd><%= @request.date_range_label %></dd>
     <%# Counted live, not from the create-time cache: a holiday added after
         the request was filed changes what the balance is actually debited. %>
-    <dt>Working days</dt><dd><%= HrLite::LeaveDayCounter.count(@request).to_f %></dd>
+    <dt>Working days</dt><dd><%= hrl_days(HrLite::LeaveDayCounter.count(@request)) %></dd>
     <dt>Status</dt><dd><span class="hrl-badge"><%= @request.status.humanize %></span></dd>
     <% if @request.reason.present? %><dt>Reason</dt><dd><%= @request.reason %></dd><% end %>
     <% unless @request.leave_type.unlimited? %>
       <dt>Balance</dt>
-      <dd><%= @balance.available.to_f %> of <%= @balance.entitled.to_f %> available</dd>
+      <dd><%= hrl_days(@balance.available) %> of <%= hrl_days(@balance.entitled) %> available</dd>
       <% if (@request.pending? || @request.approved?) && (short = @request.days_beyond_balance).positive? %>
-        <dt>Loss of pay</dt><dd><%= short.to_s("F") %> day(s) beyond the balance will be unpaid</dd>
+        <dt>Loss of pay</dt><dd><%= hrl_days(short) %> day(s) beyond the balance will be unpaid</dd>
       <% end %>
     <% end %>
     <% if @request.decision_note.present? %><dt>Decision note</dt><dd><%= @request.decision_note %></dd><% end %>

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

@@ -12,7 +12,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 ] },
-                                                @loan.user_id) %>
+                                                @loan.user_id),
+                   {}, data: { hrl_filter: "Type a name to filter" } %>
     </div>
     <div class="hrl-field">
       <%= f.label :principal, "Amount lent (₹)" %>

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

@@ -20,7 +20,7 @@
         <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 %> (<%= request.days_count.to_f %> d)
+            — <%= 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>
@@ -32,7 +32,7 @@
           <div class="hrl-feed__body">
             <strong><%= hr_display_name(request.user) %></strong>
             — comp-off for <%= request.date_worked.strftime("%d %b") %>
-            (<%= request.credit_days.to_f %> d)
+            (<%= hrl_days(request.credit_days) %> d)
           </div>
           <a class="hrl-btn" href="<%= hr_lite.admin_comp_off_request_path(request) %>">Decide</a>
         </div>
@@ -46,7 +46,7 @@
           <a class="hrl-btn" href="<%= hr_lite.admin_regularization_request_path(request) %>">Decide</a>
         </div>
       <% end %>
-      <a class="hrl-small" href="<%= hr_lite.admin_leave_requests_path %>">All requests</a>
+      <a class="hrl-card__link" href="<%= hr_lite.admin_leave_requests_path %>">All requests</a>
     </section>
   <% end %>
 

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

@@ -5,7 +5,7 @@
 
 <%= render "hr_lite/admin/shared/approvals_tabs", active: :regularizations %>
 
-<div class="hrl-row" style="margin-bottom:.85rem;">
+<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 %>"

data/app/views/hr_lite/admin/shared/_approvals_tabs.html.erb

@@ -1,13 +1,14 @@
 <%# locals: active (:leaves | :comp_off | :regularizations | :balances) %>
-<div class="hrl-row" style="margin-bottom:.85rem;">
-  <a class="hrl-btn <%= 'hrl-btn--primary' if active == :leaves %>"
+<% tab = ->(key) { tag.attributes(class: [ "hrl-btn", ("hrl-btn--primary" if active == key) ], aria: { current: ("page" if active == key) }) } %>
+<div class="hrl-row hrl-row--mb hrl-row--tabs">
+  <a <%= tab.(:leaves) %>
      href="<%= hr_lite.admin_leave_requests_path %>">Leaves</a>
-  <a class="hrl-btn <%= 'hrl-btn--primary' if active == :comp_off %>"
+  <a <%= tab.(:comp_off) %>
      href="<%= hr_lite.admin_comp_off_requests_path %>">Comp-off
     <% if (n = HrLite::CompOffRequest.pending.count).positive? %><span class="hrl-badge hrl-badge--warn"><%= n %></span><% end %></a>
-  <a class="hrl-btn <%= 'hrl-btn--primary' if active == :regularizations %>"
+  <a <%= tab.(:regularizations) %>
      href="<%= hr_lite.admin_regularization_requests_path %>">Regularization
     <% if (n = HrLite::RegularizationRequest.pending.count).positive? %><span class="hrl-badge hrl-badge--warn"><%= n %></span><% end %></a>
-  <a class="hrl-btn <%= 'hrl-btn--primary' if active == :balances %>"
+  <a <%= tab.(:balances) %>
      href="<%= hr_lite.admin_leave_balances_path %>">Balances</a>
 </div>

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

@@ -1,7 +1,7 @@
 <% content_for(:page_title) { "Appraisal" } %>
+<a class="hrl-backlink" href="<%= hr_lite.appraisals_path %>"><span aria-hidden="true">‹</span> Appraisals</a>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Appraisal — <%= @appraisal.period_label %></h1>
-  <div class="hrl-page__actions"><a class="hrl-btn" href="<%= hr_lite.appraisals_path %>">Back</a></div>
 </div>
 
 <section class="hrl-card">

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

@@ -39,7 +39,7 @@
               <td data-label="Waiting"><%= time_ago_in_words(approval.created_at) %></td>
               <td data-label="">
                 <% if (path = hrl_approval_path(approval)) %>
-                  <a class="hrl-small" href="<%= path %>">Open</a>
+                  <a class="hrl-btn" href="<%= path %>">Open</a>
                 <% end %>
               </td>
             </tr>

data/app/views/hr_lite/attendance/_month_grid.html.erb

@@ -1,8 +1,10 @@
-<%# locals: month (Date, any day in month), day_status (HrLite::DayStatus), link_builder (optional lambda date -> url) %>
+<%# locals: month (Date, any day in month), day_status (HrLite::DayStatus), link_builder (optional lambda date -> url or nil), pending_dates (optional Set of dates with a pending ticket) %>
 <% first = month.beginning_of_month
    last = month.end_of_month
-   link_builder = local_assigns[:link_builder] %>
-<div class="hrl-mgrid" role="grid" aria-label="Attendance for <%= month.strftime('%B %Y') %>">
+   link_builder = local_assigns[:link_builder]
+   pending_dates = local_assigns[:pending_dates]
+   states = HrLite::ApplicationHelper::DAY_STATES %>
+<div class="hrl-mgrid" role="group" aria-label="Attendance for <%= month.strftime('%B %Y') %>">
   <% %w[Mo Tu We Th Fr Sa Su].each do |d| %>
     <div class="hrl-mgrid__head"><%= d %></div>
   <% end %>
@@ -11,31 +13,24 @@
   <% end %>
   <% (first..last).each do |date| %>
     <% day = day_status.for(date)
-       classes = {
-         present: "hrl-mgrid__day--present", half_day: "hrl-mgrid__day--half",
-         leave: "hrl-mgrid__day--leave", half_day_leave: "hrl-mgrid__day--leave",
-         holiday: "hrl-mgrid__day--holiday", weekend: "hrl-mgrid__day--weekend",
-         absent: "hrl-mgrid__day--absent", upcoming: "hrl-mgrid__day--muted"
-       }[day.kind] %>
-    <div class="hrl-mgrid__day <%= classes %>" role="gridcell">
-      <% if day.record&.flagged? %><span class="hrl-mgrid__flag" title="<%= day.record.flag_note %>"></span><% end %>
-      <span class="hrl-mgrid__num">
-        <% if link_builder %>
-          <a href="<%= link_builder.call(date) %>"><%= date.day %></a>
-        <% else %>
-          <%= date.day %>
-        <% end %>
-      </span>
-      <% if day.record&.check_in_at %>
-        <span class="hrl-mgrid__tag"><%= day.record.check_in_at.strftime("%H:%M") %><% if day.record.check_out_at %><br><%= day.record.check_out_at.strftime("%H:%M") %><% end %></span>
-      <% elsif day.kind == :absent %>
-        <span class="hrl-mgrid__tag">absent</span>
-      <% end %>
+       # Today with no punch yet is not a lost day; only the views say so (payroll still reads DayStatus).
+       code, word, mod = date == Date.current && day.kind == :absent ? [ "Today", "Today, not checked in yet", "today" ] : states[day.kind] %>
+    <% pending = pending_dates&.include?(date) %>
+    <div class="<%= class_names("hrl-mgrid__day", "hrl-mgrid__day--#{mod}", "hrl-mgrid__day--today": date == Date.current, "hrl-mgrid__day--pending": pending) %>" role="group"
+         aria-label="<%= date.strftime('%-d %b') %>, <%= word %><%= ', worked' if %i[holiday weekend].include?(day.kind) && day.record&.check_in_at %><%= ', Flagged' if day.record&.flagged? %><%= ', fix pending' if pending %>">
+      <% if day.record&.flagged? %><span class="hrl-mgrid__flag" aria-hidden="true"></span><% end %>
+      <% url = link_builder&.call(date) %>
+      <span class="hrl-mgrid__num"><%= url ? link_to(date.day, url) : date.day %></span>
+      <% if code %><span class="hrl-mgrid__tag"><%= code %></span><% end %>
     </div>
   <% end %>
 </div>
 <div class="hrl-legend hrl-small">
-  <span class="hrl-badge hrl-badge--ok">Present</span>
-  <span class="hrl-badge hrl-badge--bad">Absent</span>
-  <span class="hrl-badge hrl-badge--muted">Upcoming</span>
+  <% states.except(:upcoming).each_value do |code, word, mod| %>
+    <span class="hrl-badge hrl-mgrid__key hrl-mgrid__day--<%= mod %>"><%= code %> <%= word %></span>
+  <% end %>
+  <span class="hrl-badge hrl-mgrid__key hrl-mgrid__day--today">Today</span>
+  <span class="hrl-badge hrl-mgrid__key"><span class="hrl-mgrid__flag" aria-hidden="true"></span> Flagged</span>
+  <% if pending_dates %><span class="hrl-badge hrl-mgrid__key hrl-mgrid__day--pending">Fix pending</span><% end %>
+  <span class="hrl-badge hrl-mgrid__key hrl-mgrid__day--muted">Upcoming</span>
 </div>

data/app/views/hr_lite/attendance/_punch_card.html.erb

@@ -9,15 +9,17 @@
 <section class="hrl-card">
   <h2 class="hrl-card__title">Today, <%= Date.current.strftime("%d %b") %></h2>
 
-  <div class="hrl-row hrl-small" style="margin-bottom:.6rem;">
-    <% if record&.check_in_at %>
+  <div class="hrl-row hrl-row--mb hrl-small">
+    <% if record&.check_in_at && !record.check_out_at %>
+      <span class="hrl-badge hrl-badge--ok">In since <%= record.check_in_at.strftime("%H:%M") %> · <%= hrl_duration(Time.current - record.check_in_at) %> so far</span>
+    <% elsif record&.check_in_at %>
       <span class="hrl-badge hrl-badge--ok">In <%= record.check_in_at.strftime("%H:%M") %></span>
     <% end %>
     <% if record&.check_out_at %>
       <span class="hrl-badge hrl-badge--muted">Out <%= record.check_out_at.strftime("%H:%M") %></span>
     <% end %>
     <% if record&.flagged? %>
-      <span class="hrl-badge hrl-badge--bad" title="<%= record.flag_note %>">Flagged</span>
+      <span class="hrl-badge hrl-badge--bad">Flagged</span>
     <% end %>
     <% if open_yesterday %>
       <span class="hrl-badge hrl-badge--warn">Yesterday still open —
@@ -26,36 +28,56 @@
       <span class="hrl-muted">Not checked in yet.</span>
     <% end %>
   </div>
+  <% if record&.flagged? %>
+    <p class="hrl-small">Flagged: <%= record.flag_note %></p>
+  <% end %>
 
   <% if open_yesterday %>
     <%= form_with url: hr_lite.check_out_attendance_path, method: :post, local: true,
-                  html: { data: { "hrl-geo-punch": true } } do %>
+                  html: { data: { "hrl-geo-punch": true, "hrl-geo-required": HrLite.config.require_punch_location.presence } } do %>
       <input type="hidden" name="lat"><input type="hidden" name="lng">
       <input type="hidden" name="accuracy_m"><input type="hidden" name="geo_status">
       <button type="submit" class="hrl-btn hrl-btn--big hrl-btn--block">
         Check out yesterday's shift
       </button>
-      <p class="hrl-small hrl-muted" data-hrl-geo-status hidden></p>
+      <p class="hrl-small hrl-muted" data-hrl-geo-status role="status" aria-live="polite"></p>
     <% end %>
   <% elsif record&.check_in_at.blank? %>
     <%= form_with url: hr_lite.check_in_attendance_path, method: :post, local: true,
-                  html: { data: { "hrl-geo-punch": true } } do %>
+                  html: { data: { "hrl-geo-punch": true, "hrl-geo-required": HrLite.config.require_punch_location.presence } } do %>
       <input type="hidden" name="lat"><input type="hidden" name="lng">
       <input type="hidden" name="accuracy_m"><input type="hidden" name="geo_status">
       <button type="submit" class="hrl-btn hrl-btn--primary hrl-btn--big hrl-btn--block">Check in</button>
-      <p class="hrl-small hrl-muted" data-hrl-geo-status hidden></p>
+      <p class="hrl-small hrl-muted" data-hrl-geo-status role="status" aria-live="polite"></p>
     <% end %>
   <% else %>
     <%= form_with url: hr_lite.check_out_attendance_path, method: :post, local: true,
-                  html: { data: { "hrl-geo-punch": true } } do %>
+                  html: { data: { "hrl-geo-punch": true, "hrl-geo-required": HrLite.config.require_punch_location.presence } } do %>
       <input type="hidden" name="lat"><input type="hidden" name="lng">
       <input type="hidden" name="accuracy_m"><input type="hidden" name="geo_status">
       <button type="submit" class="hrl-btn hrl-btn--big hrl-btn--block">
         <%= record.check_out_at ? "Update check-out" : "Check out" %>
       </button>
-      <p class="hrl-small hrl-muted" data-hrl-geo-status hidden></p>
+      <p class="hrl-small hrl-muted" data-hrl-geo-status role="status" aria-live="polite"></p>
     <% end %>
   <% end %>
 
-  <a class="hrl-small" href="<%= hr_lite.attendance_path %>">View my month</a>
+  <% if local_assigns[:attention].present? %><p class="hrl-small hrl-muted hrl-mt">Needs a fix</p><% end %>
+  <% local_assigns[:attention]&.each do |date, reason| %>
+    <div class="hrl-feed__item hrl-row">
+      <div class="hrl-feed__body"><%= date.strftime("%a %-d %b") %> · <%= reason %></div>
+      <a class="hrl-btn" href="<%= hr_lite.new_regularization_request_path(date: date) %>">Fix<span class="hrl-sr-only"> <%= date.strftime("%a %-d %b") %></span></a>
+    </div>
+  <% end %>
+
+  <a class="hrl-card__link" href="<%= hr_lite.attendance_path %>">View my month</a>
+
+  <% if local_assigns.key?(:attention) %>
+    <div class="hrl-row">
+      <a class="hrl-btn" href="<%= hr_lite.new_leave_request_path %>">Apply leave</a>
+      <a class="hrl-btn" href="<%= hr_lite.new_regularization_request_path %>">Fix a punch</a>
+      <a class="hrl-btn" href="<%= hr_lite.new_comp_off_request_path %>">Comp-off</a>
+      <% if hr_lite_route?(:salary_slips_path) %><a class="hrl-btn" href="<%= hr_lite.salary_slips_path %>">Payslip</a><% end %>
+    </div>
+  <% end %>
 </section>

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

@@ -6,20 +6,49 @@
 <%= render "hr_lite/attendance/punch_card" %>
 
 <section class="hrl-card">
-  <div class="hrl-row" style="margin-bottom:.6rem;">
-    <a class="hrl-btn" href="<%= hr_lite.attendance_path(month: (@month - 1.month).strftime("%Y-%m")) %>">&larr;</a>
+  <% prev_m, next_m = @month - 1.month, @month + 1.month %>
+  <div class="hrl-row hrl-row--mb">
+    <a class="hrl-btn" href="<%= hr_lite.attendance_path(month: prev_m.strftime("%Y-%m")) %>" aria-label="Previous month, <%= prev_m.strftime("%B %Y") %>"><span aria-hidden="true">&lsaquo;</span> <%= prev_m.strftime("%b") %></a>
     <strong><%= @month.strftime("%B %Y") %></strong>
-    <a class="hrl-btn" href="<%= hr_lite.attendance_path(month: (@month + 1.month).strftime("%Y-%m")) %>">&rarr;</a>
-    <span class="hrl-right hrl-small hrl-muted">
-      Present <%= @counts[:present] %> · Half <%= @counts[:half_day] %> · Absent <%= @counts[:absent] %>
-    </span>
+    <a class="hrl-btn" href="<%= hr_lite.attendance_path(month: next_m.strftime("%Y-%m")) %>" aria-label="Next month, <%= next_m.strftime("%B %Y") %>"><%= next_m.strftime("%b") %> <span aria-hidden="true">&rsaquo;</span></a>
+    <div class="hrl-row hrl-right">
+      <% { present: "ok", half_day: "ok", leave: nil, absent: "bad" }.each do |kind, tone| %>
+        <% code, word = HrLite::ApplicationHelper::DAY_STATES[kind] %>
+        <span class="<%= class_names("hrl-badge", "hrl-badge--#{tone}": tone) %>" role="img" aria-label="<%= word %> <%= pluralize(@counts[kind], "day") %>"><%= code %> <%= @counts[kind] %></span>
+      <% end %>
+    </div>
   </div>
-  <%= render "hr_lite/attendance/month_grid", month: @month, day_status: @day_status %>
+  <%= render "hr_lite/attendance/month_grid", month: @month, day_status: @day_status, pending_dates: @pending_dates,
+             link_builder: ->(d) { hr_lite.attendance_path(month: @month.strftime("%Y-%m"), day: d.iso8601, anchor: "day") if d <= Date.current } %>
   <p class="hrl-small hrl-muted hrl-mt">Forgot to check in or out on some day?
     <a href="<%= hr_lite.new_regularization_request_path %>">Raise a regularization ticket</a>
     · <a href="<%= hr_lite.regularization_requests_path %>">My tickets</a></p>
 </section>
 
+<% if @day %>
+  <% rec, leave = @day_info.record, @day_info.leave
+     part = rec&.half_day_part.presence || leave&.half_day_part.presence
+     open_today = @day == Date.current && @day_info.kind == :absent
+     tone = { present: "ok", half_day: "ok", absent: "bad", holiday: "warn", weekend: "muted" }[@day_info.kind] unless open_today %>
+  <section class="hrl-card" id="day">
+    <h2 class="hrl-card__title"><%= @day.strftime("%a, %-d %b") %>
+      <span class="<%= class_names("hrl-badge", "hrl-badge--#{tone}": tone) %>"><%= open_today ? "Not checked in yet" : HrLite::ApplicationHelper::DAY_STATES[@day_info.kind][1] %></span></h2>
+    <dl class="hrl-deflist">
+      <dt>In</dt><dd><%= rec&.check_in_at&.strftime("%H:%M") || "—" %></dd>
+      <dt>Out</dt><dd><%= rec&.check_out_at&.strftime("%H:%M") || "—" %></dd>
+      <dt>Worked</dt><dd><%= hrl_duration(rec&.worked_duration) %></dd>
+      <% if part %><dt>Half</dt><dd><%= HrLite::DAY_PARTS.rassoc(part)&.first %></dd><% end %>
+      <% if leave %><dt>Leave</dt><dd><%= leave.leave_type.name %></dd><% end %>
+      <% if @day_info.kind == :holiday %><dt>Holiday</dt><dd><%= HrLite::Holiday.find_by(date: @day)&.name %></dd><% end %>
+      <% if rec&.flagged? %><dt>Flag</dt><dd><%= rec.flag_note %></dd><% end %>
+      <% if @day_ticket %><dt>Ticket</dt><dd><%= hrl_request_status_badge(@day_ticket.status) %> <%= @day_ticket.times_label %></dd><% end %>
+    </dl>
+    <% unless %i[holiday weekend leave].include?(@day_info.kind) || @day_ticket&.pending? %>
+      <a class="hrl-btn hrl-btn--primary hrl-btn--block hrl-mt" href="<%= hr_lite.new_regularization_request_path(date: @day) %>">Fix this day</a>
+    <% end %>
+  </section>
+<% end %>
+
 <% content_for :scripts do %>
   <%= javascript_include_tag "hr_lite/geo_punch", defer: true %>
 <% end %>

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

@@ -7,7 +7,7 @@
   <% else %>
     <div class="hrl-table-wrap">
       <table class="hrl-table hrl-table--stack">
-        <thead><tr><th>Benefit</th><th>Cover</th><th>Since</th><th>Dependants</th></tr></thead>
+        <thead><tr><th>Benefit</th><th class="hrl-num">Cover</th><th>Since</th><th class="hrl-num">Dependants</th></tr></thead>
         <tbody>
           <% @enrolments.each do |enrolment| %>
             <% benefit = enrolment.benefit %>