hr_lite 0.53.0 → 0.54.0

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>
 

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

@@ -7,11 +7,11 @@
   </div>
 </div>
 
-<div class="hrl-kpis">
+<div class="hrl-kpis hrl-kpis--money">
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @slips.size %></div><div class="hrl-kpi__label">Slips</div></div>
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= hrl_money(@run.total_gross) %></div><div class="hrl-kpi__label">Gross</div></div>
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= hrl_money(@run.total_net) %></div><div class="hrl-kpi__label">Net payout</div></div>
-  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= hrl_money(@run.total_employer_cost) %></div><div class="hrl-kpi__label">Employer cost</div></div>
+  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= hrl_money(@run.total_employer_cost) %></div><div class="hrl-kpi__label">Employer contributions</div></div>
 </div>
 
 <% if @run.warnings.any? %>
@@ -29,12 +29,14 @@
     <% manager = hr_can?("payroll.manage", scope: :all) %>
     <% if manager && (@run.draft? || @run.review? || @run.processing?) %>
       <%= button_to @run.draft? ? "Compute" : "Recompute", hr_lite.compute_admin_payroll_run_path(@run),
-                    method: :post, class: "hrl-btn" %>
+                    method: :post, class: "hrl-btn",
+                    form: { data: { turbo_confirm: ("Recompute #{@run.label}? This clears #{hr_display_name(@run.first_approved_by)}'s approval." if @run.first_approved_by) } } %>
     <% end %>
     <% if @run.review? && hr_can?("payroll.approve", scope: :all) && @run.first_approved_by_id != hr_current_user.id %>
       <%= button_to @run.first_approved_by_id ? "Approve and publish" : "Approve", hr_lite.approve_admin_payroll_run_path(@run),
                     method: :post, class: "hrl-btn hrl-btn--primary",
-                    form: { data: { turbo_confirm: @run.first_approved_by_id ? "Approve #{@run.label}? This finalizes the run and publishes the slips." : "Approve #{@run.label}?" } } %>
+                    form: { data: { turbo_confirm: [ @run.first_approved_by_id ? "Approve #{@run.label}? This finalizes the run and publishes the slips." : "Approve #{@run.label}?",
+                                                     *("Blocking warnings: #{@run.blocking_warnings.join('; ')}" if @run.blocking_warnings.any?) ].join("\n\n") } } %>
     <% end %>
     <% if manager && @run.finalized? %>
       <%= button_to "Unlock", hr_lite.unlock_admin_payroll_run_path(@run), method: :post, class: "hrl-btn" %>

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

@@ -22,7 +22,8 @@
       <div class="hrl-field"><%= f.label :outcome_note, "Outcome note" %><%= f.text_area :outcome_note, rows: 3 %></div>
     <% end %>
     <div class="hrl-form-actions">
-      <%= f.submit plan.persisted? ? "Save" : "Start PIP", class: "hrl-btn hrl-btn--primary" %>
+      <%= f.submit plan.persisted? ? "Save" : "Start PIP", class: "hrl-btn hrl-btn--primary",
+                   data: { turbo_confirm: ("Save? Passed or failed closes the plan for good and tells the employee." if plan.persisted?) } %>
       <a class="hrl-btn" href="<%= hr_lite.admin_performance_plans_path %>">Cancel</a>
     </div>
   <% end %>

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

@@ -14,7 +14,7 @@
         <tbody>
           <% @policies.each do |policy| %>
             <tr>
-              <td data-label="Title"><%= policy.title %> <span class="hrl-badge hrl-badge--muted">v<%= policy.version %></span></td>
+              <td data-label="Title"><a class="hrl-card__link" href="<%= hr_lite.policy_path(policy) %>"><%= policy.title %></a> <span class="hrl-badge hrl-badge--muted">v<%= policy.version %></span></td>
               <td data-label="Kind"><%= policy.announcement? ? "Announcement" : "Policy" %></td>
               <td data-label="In force"><%= policy.effective_from.strftime("%d %b %Y") %></td>
               <td data-label="Still to acknowledge"><%= policy.announcement? ? "—" : policy.outstanding_for.count %></td>

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

@@ -15,7 +15,8 @@
       <%= f.label :acknowledgement_required, "Policy — everyone must acknowledge it (untick for an announcement)" %>
     </div>
     <div class="hrl-form-actions">
-      <%= f.submit "Publish", class: "hrl-btn hrl-btn--primary" %>
+      <%= f.submit "Publish", class: "hrl-btn hrl-btn--primary",
+                   data: { turbo_confirm: "Publish and notify #{pluralize(HrLite.active_employees.size, 'person')} by email?" } %>
       <a class="hrl-btn" href="<%= hr_lite.admin_policies_path %>">Cancel</a>
     </div>
   <% end %>

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

@@ -54,7 +54,7 @@
     <%= form_with url: hr_lite.reject_admin_regularization_request_path(@request), method: :post, local: true do |f| %>
       <div class="hrl-field">
         <%= f.label :decision_note, "Reason (required)", for: "reject_note" %>
-        <%= f.text_area :decision_note, id: "reject_note" %>
+        <%= f.text_area :decision_note, id: "reject_note", required: true %>
       </div>
       <div class="hrl-form-actions">
         <%= f.button "Reject", type: :submit, class: "hrl-btn hrl-btn--danger" %>

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

@@ -40,7 +40,8 @@
     <% end %>
 
     <div class="hrl-form-actions">
-      <%= f.submit "Save", class: "hrl-btn hrl-btn--primary" %>
+      <%= f.submit "Save", class: "hrl-btn hrl-btn--primary",
+                   data: { turbo_confirm: ("Save? Everyone holding #{role.name} gets these permissions at once." if role.persisted?) } %>
       <a class="hrl-btn" href="<%= hr_lite.admin_roles_path %>">Cancel</a>
     </div>
   <% end %>

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

@@ -38,13 +38,15 @@
     </div>
   <% end %>
 
-  <%= form_with url: hr_lite.admin_role_assignments_path(@role), method: :post, local: true do %>
+  <%= form_with url: hr_lite.admin_role_assignments_path(@role), method: :post, local: true,
+                data: { turbo_confirm: "Give the #{@role.name} role to the person you picked? Their access changes at once." } do %>
     <div class="hrl-field">
       <%= label_tag :user_id, "Add somebody to this role" %>
       <% held = @role.role_assignments.map(&:user_id) %>
       <%= select_tag :user_id,
             options_for_select(HrLite.employees.reject { |u| held.include?(u.id) }
-                                     .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 "Add", class: "hrl-btn hrl-btn--primary" %>

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

@@ -39,7 +39,7 @@
               <% end %>
             </td>
             <td data-label="">
-              <a class="hrl-small" href="<%= hr_lite.edit_admin_role_path(role) %>">Edit</a>
+              <a class="hrl-btn" href="<%= hr_lite.edit_admin_role_path(role) %>">Edit</a>
             </td>
           </tr>
         <% end %>

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

@@ -68,16 +68,20 @@
           the open-ended top rate.
         </p>
         <% slabs = Array(table["slabs"]) %>
-        <% (slabs + [ nil, nil ]).each_with_index do |row, index| %>
-          <div class="hrl-row">
+        <% num = ->(v) { v && number_with_precision(v, precision: 4, strip_insignificant_zeros: true) } %>
+        <div class="hrl-slabs">
+          <span class="hrl-small" aria-hidden="true">From ₹</span>
+          <span class="hrl-small" aria-hidden="true">Up to ₹</span>
+          <span class="hrl-small" aria-hidden="true">Rate (0.05 = 5%)</span>
+          <% (slabs + [ nil, nil ]).each_with_index do |row, index| %>
             <%= text_field_tag "statutory_rate_card[income_tax][#{regime}][slabs][#{index}][from]",
-                               row&.first, placeholder: "From ₹", inputmode: "decimal" %>
+                               num.(row&.first), class: "hrl-input", inputmode: "decimal", "aria-label": "Band #{index + 1} from ₹" %>
             <%= text_field_tag "statutory_rate_card[income_tax][#{regime}][slabs][#{index}][to]",
-                               row&.at(1), placeholder: "Up to ₹ (blank = top)", inputmode: "decimal" %>
+                               num.(row&.at(1)), class: "hrl-input", inputmode: "decimal", "aria-label": "Band #{index + 1} up to ₹ (blank = top)" %>
             <%= text_field_tag "statutory_rate_card[income_tax][#{regime}][slabs][#{index}][rate]",
-                               row&.last, placeholder: "Rate (0.05)", inputmode: "decimal" %>
-          </div>
-        <% end %>
+                               num.(row&.last), class: "hrl-input", inputmode: "decimal", "aria-label": "Band #{index + 1} rate" %>
+          <% end %>
+        </div>
       </fieldset>
     <% end %>
 

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

@@ -48,6 +48,7 @@
     <% end %>
     <div class="hrl-form-actions">
       <%= f.submit "Record amounts", class: "hrl-btn" %>
+      <%= f.submit "Record and verify", name: "verify", class: "hrl-btn" %>
     </div>
   </section>
 <% end %>
@@ -55,16 +56,17 @@
 <section class="hrl-card">
   <h2 class="hrl-card__title">Decide</h2>
   <div class="hrl-row">
+    <% unproven = @declaration.tax_declaration_items.reject { |item| item.proofs.attached? }.map { |item| item.section_label.split(" — ").first } %>
     <%= button_to "Accept all and verify", hr_lite.accept_all_admin_tax_declaration_path(@declaration),
-          method: :post, class: "hrl-btn hrl-btn--primary" %>
-    <%= button_to "Verify the amounts recorded above", hr_lite.verify_admin_tax_declaration_path(@declaration),
-          method: :post, class: "hrl-btn" %>
+          method: :post, class: "hrl-btn hrl-btn--primary",
+          form: { data: { turbo_confirm: [ "Accept every claimed amount and verify? The employee can no longer edit it.",
+                                           ("No proof attached: #{unproven.to_sentence}." if unproven.any?) ].compact.join(" ") } } %>
   </div>
   <%= form_with url: hr_lite.reject_admin_tax_declaration_path(@declaration),
                 method: :post, local: true do %>
     <div class="hrl-field">
       <%= label_tag :note, "What is missing (required to send back)" %>
-      <%= text_field_tag :note %>
+      <%= text_field_tag :note, nil, class: "hrl-input" %>
     </div>
     <%= submit_tag "Send back", class: "hrl-btn" %>
   <% end %>

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

@@ -33,7 +33,7 @@
   <section class="hrl-card">
     <h2 class="hrl-card__title">Reject</h2>
     <%= form_with url: hr_lite.reject_admin_wfh_request_path(@request), method: :post, local: true do |f| %>
-      <div class="hrl-field"><%= f.label :decision_note, "Remark (required)", for: "reject_note" %><%= f.text_area :decision_note, id: "reject_note" %></div>
+      <div class="hrl-field"><%= f.label :decision_note, "Remark (required)", for: "reject_note" %><%= f.text_area :decision_note, id: "reject_note", required: true %></div>
       <div class="hrl-form-actions"><%= f.button "Reject", type: :submit, class: "hrl-btn hrl-btn--danger" %></div>
     <% end %>
   </section>

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

@@ -45,13 +45,14 @@
               </td>
             </tr>
           <% end %>
-          <%# The HR queues this viewer decides; Open lands on that queue's own page. %>
+          <%# The HR queues this viewer decides; Open lands on the request itself where it has a page. %>
           <% rows.each do |tab, record| %>
+            <% what, href = hrl_inbox_item(tab, record) %>
             <tr>
-              <td data-label="Request"><strong><%= tab[:label] %></strong></td>
+              <td data-label="Request"><strong><%= what %></strong></td>
               <td data-label="From"><%= hr_display_name(record.user) %></td>
               <td data-label="Waiting"><%= time_ago_in_words(record.created_at) %></td>
-              <td data-label=""><a class="hrl-btn" href="<%= hr_lite.public_send(tab[:path]) %>">Open</a></td>
+              <td data-label=""><a class="hrl-btn" href="<%= href %>">Open</a></td>
             </tr>
           <% end %>
         </tbody>

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

@@ -1,6 +1,6 @@
-<%# The person's own status (text + emoji), Slack-style. Independent of check-in. %>
+<%# The person's own status, Slack-style. Independent of check-in. Quick picks are words: no emoji in the UI. %>
 <% custom = status.custom
-   picks = %w[🏠 🏢 ✈️ 🚗 🚆 🏖️ 🤒 🤧 🩺 🍽️ ☕ 🎧 🎯 💻 📞 📅 🗓️ 🤝 💼 📍 🧳 🏔️ 🌴 🏕️ 📝 📊 🔒 🚫 ⏳ 🔕 🎉 🙏 👶 👨‍👩‍👧 🏥 📚 🎤 🛠️ 🌙 🌧️] %>
+   picks = [ "In a meeting", "On a call", "Focus time", "At lunch", "Commuting", "Travelling", "At a client", "Out sick" ] %>
 <% if custom %>
   <div class="hrl-row hrl-row--mb hrl-small">
     <span class="hrl-custom-status"><% if custom.emoji %><span aria-hidden="true"><%= custom.emoji %></span> <% end %><%= custom.title || "Status" %></span>
@@ -10,15 +10,13 @@
 <% end %>
 <details>
   <summary class="hrl-btn hrl-btn--block"><%= custom ? "Change my status" : "Set a status" %></summary>
-  <%= form_with url: hr_lite.status_work_mode_path, method: :post, local: true, data: { "hrl-emoji-form": true } do %>
-    <div class="hrl-field"><label for="st-emoji">Emoji</label>
-      <input class="hrl-input" id="st-emoji" name="emoji" maxlength="16" value="<%= custom&.emoji %>" placeholder="Pick or type one" autocomplete="off">
-      <div class="hrl-emoji-grid" role="group" aria-label="Pick an emoji">
-        <% picks.each do |e| %><button type="button" class="hrl-emoji" data-hrl-emoji="<%= e %>" aria-label="Use <%= e %>"><%= e %></button><% end %>
+  <%= form_with url: hr_lite.status_work_mode_path, method: :post, local: true do %>
+    <div class="hrl-field"><label for="st-text">What's your status?</label>
+      <input class="hrl-input" id="st-text" name="text" maxlength="100" value="<%= custom&.title %>" placeholder="e.g. Visiting the Ladakh camp">
+      <div class="hrl-row hrl-mt" role="group" aria-label="Quick picks">
+        <% picks.each do |text| %><button type="button" class="hrl-btn" data-hrl-pick="<%= text %>"><%= text %></button><% end %>
       </div>
     </div>
-    <div class="hrl-field"><label for="st-text">What's your status?</label>
-      <input class="hrl-input" id="st-text" name="text" maxlength="100" value="<%= custom&.title %>" placeholder="e.g. Visiting the Ladakh camp"></div>
     <div class="hrl-field"><label for="st-clear">Clear after</label>
       <%= select_tag :clear_after, options_for_select([ [ "30 minutes", "30" ], [ "1 hour", "60" ], [ "4 hours", "240" ], [ "Today", "today" ], [ "Don't clear", "never" ] ], "today"), id: "st-clear" %></div>
     <button type="submit" class="hrl-btn hrl-btn--primary">Save status</button>

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

@@ -93,6 +93,14 @@
         </fieldset></div>
       <% end %>
       <button type="submit" class="hrl-btn hrl-btn--primary hrl-btn--big hrl-btn--block"><%= record&.check_out_at ? "Check in again" : "Check in" %></button>
+      <% if HrLite.config.attendance_slots && !record&.check_out_at %>
+        <%# The late rules AttendancePuncher#apply_slot_rules applies, shifted by the person's buffer like there. %>
+        <% shift = HrLite::EmployeeProfile.where(user_id: hr_current_user.id).pick(:buffer_minutes).to_i
+           by = HrLite::AttendanceSlot.start_minute_for(hr_current_user.id, Date.current) + HrLite::AttendanceSlot::GRACE_MINUTES + shift
+           at = ->(minute) { HrLite::AttendanceSlot.label(minute + shift) } %>
+        <p class="hrl-small hrl-mt">Check in by <strong><%= HrLite::AttendanceSlot.label(by) %></strong>. Later adds 30 min to your day for every half hour;
+          after <%= at.(HrLite::AttendanceSlot::CARRY_AFTER_MINUTE) %> also 1 hour on each of the next 2 working days; after <%= at.(HrLite::AttendanceSlot::HALF_DAY_AFTER_MINUTE) %> the day is a half day.</p>
+      <% end %>
       <p class="hrl-small hrl-muted" data-hrl-geo-status role="status" aria-live="polite"></p>
     <% end %>
   <% elsif record.check_out_at.nil? %>

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

@@ -20,9 +20,11 @@
   </div>
   <%= 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>
+  <p class="hrl-small hrl-muted hrl-mt">Forgot to check in or out on some day?</p>
+  <div class="hrl-row">
+    <a class="hrl-btn" href="<%= hr_lite.new_regularization_request_path %>">Raise a regularization ticket</a>
+    <a class="hrl-btn" href="<%= hr_lite.regularization_requests_path %>">My tickets</a>
+  </div>
 </section>
 
 <% if HrLite.config.attendance_slots %>

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

@@ -2,10 +2,11 @@
   <h1 class="hrl-page__title">Hello, <%= hr_display_name(hr_current_user) %></h1>
 </div>
 
-<% if (@waiting + @queue).positive? %>
+<% waiting = @waiting + hrl_inbox_count %>
+<% if waiting.positive? %>
   <section class="hrl-card">
-    <h2 class="hrl-card__title"><%= pluralize(@waiting + @queue, "request") %> waiting on you</h2>
-    <a class="hrl-btn hrl-btn--primary hrl-mt" href="<%= @waiting.positive? ? hr_lite.approvals_path : hr_lite.admin_leave_requests_path %>">Review requests</a>
+    <h2 class="hrl-card__title"><%= pluralize(waiting, "request") %> waiting on you</h2>
+    <a class="hrl-btn hrl-btn--primary hrl-mt" href="<%= hr_lite.approvals_path %>">Review requests</a>
   </section>
 <% end %>
 

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

@@ -7,8 +7,9 @@
     <div class="hrl-row">
       <% types.each do |type| %>
         <% balance = HrLite::LeaveBalance.for(user, type, HrLite::LeaveYear.current_key) %>
+        <% pending = HrLite::LeaveRequest.pending.where(user_id: user.id, leave_type_id: type.id, start_date: HrLite::LeaveYear.range(HrLite::LeaveYear.current_key)).sum(&:days_count) %>
         <span class="hrl-badge hrl-badge--type" style="--hrl-type: <%= type.color %>">
-          <%= type.name %> · <%= hrl_days(balance.available) %> of <%= hrl_days(balance.entitled) %> left<% if (held = balance.penalty_days).positive? %> · <%= hrl_days(held) %> held for penalties<% end %>
+          <%= type.name %> · <%= hrl_days(balance.available) %> of <%= hrl_days(balance.entitled) %> left<% if pending.positive? %> · <%= hrl_days(pending) %> pending<% end %><% if (held = balance.penalty_days).positive? %> · <%= hrl_days(held) %> held for penalties<% end %>
         </span>
       <% end %>
     </div>

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

@@ -21,7 +21,7 @@
       <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>Outstanding</dt><dd><strong><%= loan.active? ? hrl_money(loan.outstanding) : "—" %></strong></dd>
         <dt>Next deduction</dt>
         <dd>
           <% amount = loan.instalment_for(@next_month) %>

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

@@ -35,7 +35,8 @@
         <%= f.text_area :reason %>
       </div>
       <div class="hrl-form-actions">
-        <%= f.submit "Submit resignation", class: "hrl-btn hrl-btn--primary" %>
+        <%= f.submit "Submit resignation", class: "hrl-btn hrl-btn--primary",
+                     data: { turbo_confirm: "Submit your resignation? Leadership is told straight away." } %>
       </div>
     <% end %>
   </section>

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

@@ -9,17 +9,17 @@
   <section class="hrl-card">
     <h2 class="hrl-card__title">Earnings</h2>
     <div class="hrl-table-wrap">
-      <table class="hrl-table">
+      <table class="hrl-table hrl-table--stack">
         <thead><tr><th>Component</th><th class="hrl-num">Full</th><th class="hrl-num">Earned</th></tr></thead>
         <tbody>
           <% slip.earnings_rows.each do |row| %>
             <tr>
-              <td><%= row["label"] %></td>
-              <td class="hrl-num"><%= hrl_money(row["full_amount"]) %></td>
-              <td class="hrl-num"><%= hrl_money(row["amount"]) %></td>
+              <td data-label="Component"><%= row["label"] %></td>
+              <td data-label="Full" class="hrl-num"><%= hrl_money(row["full_amount"]) %></td>
+              <td data-label="Earned" class="hrl-num"><%= hrl_money(row["amount"]) %></td>
             </tr>
           <% end %>
-          <tr><td><strong>Gross</strong></td><td></td><td class="hrl-num"><strong><%= hrl_money(slip.gross_earnings) %></strong></td></tr>
+          <tr><td data-label="Component"><strong>Gross</strong></td><td class="hrl-cell--void"></td><td data-label="Earned" class="hrl-num"><strong><%= hrl_money(slip.gross_earnings) %></strong></td></tr>
         </tbody>
       </table>
     </div>

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

@@ -7,6 +7,7 @@
       <% end %>
       <div class="pdf-company"><%= company[:name] %></div>
       <% if company[:address].present? %><div class="pdf-muted"><%= company[:address] %></div><% end %>
+      <% if (contact = company.values_at(:phone, :email, :website).compact_blank).any? %><div class="pdf-muted"><%= contact.join(" · ") %></div><% end %>
     </div>
     <div style="text-align:right;">
       <h1>Salary slip</h1>

data/app/views/hr_lite/work_time/_bars.html.erb

@@ -7,11 +7,12 @@
 <section class="hrl-card">
   <h2 class="hrl-card__title">By <%= period.bucket %></h2>
   <div class="hrl-chart-scroll">
-    <svg class="hrl-bars" viewBox="0 0 <%= buckets.size * (w + gap) %> <%= h + 14 %>" role="img"
+    <svg class="hrl-bars" style="--hrl-bars-n: <%= buckets.size %>" viewBox="0 0 <%= buckets.size * (w + gap) %> <%= h + 14 %>" role="img"
          aria-label="Time per <%= period.bucket %> stacked by work mode; tallest bar <%= hrl_duration(max) %>; details in the table">
       <% buckets.each_with_index do |(key, modes), i| %>
         <% x = i * (w + gap); y = h %>
-        <a href="<%= path.(period: period.bucket == :day ? "day" : (period.bucket == :week ? "week" : "month"), date: key) %>">
+        <a href="<%= path.(period: period.bucket == :day ? "day" : (period.bucket == :week ? "week" : "month"), date: key) %>"
+           aria-label="<%= key.strftime(period.bucket == :day ? "%a %-d %b" : fmt) %>: <%= hrl_duration(totals[key]) %>">
           <% modes.except("offline").sort.each do |mode, secs| %>
             <% next unless secs.positive? %>
             <% bh = secs / max * h; y -= bh %>
@@ -28,7 +29,7 @@
     </svg>
   </div>
   <details class="hrl-small">
-    <summary>Show as a table</summary>
+    <summary class="hrl-card__link">Show as a table</summary>
     <table class="hrl-table">
       <thead><tr><th><%= period.bucket.to_s.capitalize %></th><th class="hrl-num">Working (breaks incl.)</th><th class="hrl-num">Of which breaks</th><th class="hrl-num">Total</th></tr></thead>
       <tbody>

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

@@ -21,9 +21,17 @@
 <body>
   <div class="wrap">
     <div class="card">
-      <div class="brand"><%= HrLite.config.company.call[:name].presence || "HR" %></div>
+      <% company = HrLite.config.company.call %>
+      <%# Mail clients strip data: URIs, so this is the host's absolute https logo, not logo_url. %>
+      <% if company[:email_logo_url].present? %>
+        <img src="<%= company[:email_logo_url] %>" alt="<%= company[:name] %>" height="40" style="display:block; height:40px; width:auto; border:0; margin-bottom:12px;">
+      <% end %>
+      <div class="brand"><%= company[:name].presence || "HR" %></div>
       <%= yield %>
-      <p class="foot">Sent by the HR system. Do not reply to this email.</p>
+      <p class="foot">
+        Sent by the HR system of <%= company[:name].presence || "your company" %>. Do not reply to this email.
+        <% if (contact = company.values_at(:phone, :email, :website).compact_blank).any? %><br>Questions: <%= contact.join(" · ") %><% end %>
+      </p>
     </div>
   </div>
 </body>

data/app/views/layouts/hr_lite/mailer.text.erb

@@ -1,6 +1,9 @@
-<%= HrLite.config.company.call[:name].presence || "HR" %>
+<% company = HrLite.config.company.call %>
+<%= company[:name].presence || "HR" %>
 
 <%= yield %>
 
 --
 Sent by the HR system. Do not reply to this email.
+<% if (contact = company.values_at(:phone, :email, :website).compact_blank).any? %>Questions: <%= contact.join(" · ") %>
+<% end %>

data/config/routes.rb

@@ -115,7 +115,7 @@ HrLite::Engine.routes.draw do
     end
     resources :reports, only: %i[index show]
     resources :expenses, only: :index do
-      member { post :approve; post :reject; post :reimburse }
+      member { post :approve; post :reject; post :reimburse; get :receipt }
     end
     resources :hr_requests, only: %i[index show] do
       member { post :assign; post :resolve }

data/lib/hr_lite/amount_in_words.rb

@@ -10,15 +10,17 @@ module HrLite
 
     module_function
 
+    # Paise are spelled too: a slip showing ₹99,612.91 must not say "six hundred thirteen".
     def words(amount)
-      rupees = Money.round_rupee(amount).to_i
-      return "Zero rupees" if rupees.zero?
+      paise = (Money.d(amount) * 100).round(0, BigDecimal::ROUND_HALF_UP).to_i
+      return "Zero rupees" if paise.zero?
 
+      rupees, cents = paise.abs.divmod(100)
       # A negative amount rendered as bare " rupees": no group was >= its
       # divisor, so nothing was ever appended.
-      sentence = groups(rupees.abs).join(" ")
-      sentence = "minus #{sentence}" if rupees.negative?
-      "#{sentence.capitalize} rupees"
+      sentence = rupees.zero? ? "zero" : groups(rupees).join(" ")
+      sentence = "minus #{sentence}" if paise.negative?
+      "#{sentence.capitalize} rupees#{" and #{two_digit(cents)} paise" if cents.positive?}"
     end
 
     def groups(rupees)

data/lib/hr_lite/statutory_seeds.rb

@@ -22,7 +22,7 @@ module HrLite
           income_tax: card[:income_tax].transform_values { |regime| stringify_regime(regime) },
           notes: StatutoryRateCard::SOURCES[effective_from] ||
                  "Shipped with hr_lite #{HrLite::VERSION}. Confirm with your accountant, then record who verified it.",
-          verified_by: (StatutoryRateCard::SOURCES.key?(effective_from) ? "hr_lite #{HrLite::VERSION} (official source in the notes)" : nil),
+          verified_by: (StatutoryRateCardRecord::SHIPPED_SIGN_OFF if StatutoryRateCard::SOURCES.key?(effective_from)),
           verified_on: (Date.current if StatutoryRateCard::SOURCES.key?(effective_from))
         )
         "rate card FY #{FinancialYear.label(effective_from)}"

data/lib/hr_lite/version.rb

@@ -1,3 +1,3 @@
 module HrLite
-  VERSION = "0.53.0"
+  VERSION = "0.54.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.54.0
 platform: ruby
 authors:
 - kshitiz sinha