hr_lite 0.54.0 → 0.55.0

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

@@ -14,7 +14,7 @@
     <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>
+        <span class="<%= class_names("hrl-badge", "hrl-badge--#{tone}": tone) %>" role="img" aria-label="<%= word %> <%= pluralize(@counts[kind], "day") %>"><%= word %> <%= @counts[kind] %></span>
       <% end %>
     </div>
   </div>
@@ -22,8 +22,8 @@
              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?</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>
+    <a class="hrl-btn" href="<%= hr_lite.new_regularization_request_path %>">Fix a day</a>
+    <a class="hrl-btn" href="<%= hr_lite.regularization_requests_path %>">Day fixes</a>
   </div>
 </section>
 
@@ -48,7 +48,7 @@
       <% if leave %><dt>Leave</dt><dd><%= leave.leave_type.name %></dd><% end %>
       <% if @day_info.kind == :holiday %><dt>Holiday</dt><dd><%= HrLite::Holiday.company_wide.for_office(HrLite::WorkingCalendar.office_for(hr_current_user.id)).where(date: @day).pick(: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 %>
+      <% if @day_ticket %><dt>Day fix</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>

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

@@ -20,7 +20,7 @@
     <% (first.cwday - 1).times do %><div></div><% end %>
     <% (first..@month.end_of_month).each do |date| %>
       <% cell_class, code =
-           if @holidays[date] then [ "hrl-mgrid__day--holiday", "H" ]
+           if @calendar.holiday?(date) then [ "hrl-mgrid__day--holiday", "H" ]
            elsif @calendar.weekend?(date) then "hrl-mgrid__day--weekend"
            elsif @leaves[date].any? then [ "hrl-mgrid__day--leave", "#{@leaves[date].size} off" ]
            end %>
@@ -40,7 +40,7 @@
 
   <%# Names only — the leave type is the employee's own business. Leave keeps its label's "(first half)" note. %>
   <% day = ->(d) { d.strftime("%a %-d %b") }
-     agenda = @holidays.values.flatten.map { |h| [ h.date, "#{day.(h.date)}: #{h.name} (holiday)" ] } +
+     agenda = @holidays.values.flatten.map { |h| [ h.date, "#{day.(h.date)}: #{h.name} (#{h.optional ? 'optional holiday' : 'holiday'})" ] } +
               @leaves.values.flatten.uniq.map { |r| [ [ r.start_date, first ].max, "#{[ r.start_date, r.end_date ].uniq.map(&day).join(' – ')}#{r.date_range_label[/ \(.+\)/]}: #{hr_display_name(r.user)}, on leave" ] } %>
   <% if agenda.any? %>
     <ul class="hrl-feed hrl-small hrl-mt">

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

@@ -9,7 +9,7 @@
 
 <section class="hrl-card">
   <p class="hrl-small hrl-muted">
-    Worked on a weekend or holiday? Request a comp-off — once an admin approves,
+    Worked on a weekend or holiday? Request a comp-off — once it is approved,
     <%= @comp_off_type ? "your #{@comp_off_type.name} balance is credited" : "a day is credited to your balance" %>
     and you spend it through the normal leave flow.
   </p>

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

@@ -18,7 +18,7 @@
       <%= f.label :half_day, "I worked only half the day (credits 0.5)" %>
     </div>
     <div class="hrl-field">
-      <%= f.label :reason, "What did you work on? (required)" %>
+      <%= f.label :reason, "What did you work on?" %>
       <%= f.text_area :reason, required: true %>
     </div>
     <div class="hrl-form-actions">

data/app/views/hr_lite/documents/_upload_form.html.erb

@@ -1,6 +1,6 @@
 <%# locals: document, url (where it posts), open (start expanded) — one upload form for My documents and HR's view of a person. %>
 <details class="hrl-card" <%= "open" if open || document.errors.any? %>>
-  <summary class="hrl-btn hrl-btn--primary">Upload a document</summary>
+  <summary class="hrl-btn">Upload a document</summary>
   <%= form_with model: document, url: url, method: :post, local: true, class: "hrl-mt" do |f| %>
     <%= render "hr_lite/shared/form_errors", record: document %>
     <div class="hrl-field">

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

@@ -19,8 +19,10 @@
       <dt>Bank</dt><dd><%= [ @profile.bank_name, @profile.masked_account ].compact.join(" ").presence || "—" %></dd>
     </dl>
     <a class="hrl-btn hrl-mt" href="<%= hr_lite.org_path %>">Org chart</a>
-    <p class="hrl-small hrl-muted hrl-mt">Something wrong? Ask leadership to correct it — changes are audited.</p>
-    <a class="hrl-btn hrl-mt" href="<%= hr_lite.resignation_path %>">Resignation</a>
+    <p class="hrl-small hrl-muted hrl-mt">Something wrong?
+      <%= link_to_if hr_can?("hr_request.raise"), "Ask leadership to correct it", hr_lite.new_hr_request_path, class: "hrl-card__link" %> — changes are audited.</p>
+    <hr>
+    <a class="hrl-btn" href="<%= hr_lite.resignation_path %>">Resignation</a>
   </section>
 <% else %>
   <p class="hrl-card hrl-card--empty">Your HR profile has not been set up yet.</p>

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

@@ -20,7 +20,8 @@
       <% @mine_pending.each do |req| %>
         <% title, detail, href = case req
              when HrLite::LeaveRequest then [ req.leave_type.name, "#{req.date_range_label} · #{pluralize(hrl_days(req.days_count), 'day')}", hr_lite.leave_request_path(req) ]
-             when HrLite::RegularizationRequest then [ "Attendance fix", "#{req.date.strftime('%a %-d %b')} · #{req.times_label}", hr_lite.regularization_requests_path ]
+             when HrLite::RegularizationRequest then [ "Day fix", "#{req.date.strftime('%a %-d %b')} · #{req.times_label}", hr_lite.regularization_requests_path ]
+             when HrLite::WfhRequest then [ "Work from home", [ req.start_date, req.end_date ].uniq.map { |d| d.strftime("%a %-d %b") }.join(" – "), hr_lite.wfh_requests_path ]
              else [ "Comp-off", "Worked #{req.date_worked.strftime('%a %-d %b')}", hr_lite.comp_off_requests_path ]
              end %>
         <a class="hrl-listrow" href="<%= href %>">
@@ -37,7 +38,6 @@
   <section class="hrl-card">
     <h2 class="hrl-card__title">On leave this week</h2>
     <%= render "hr_lite/leave_requests/out_list", leaves: @out_week, empty: "Nobody is on leave this week." %>
-    <a class="hrl-card__link" href="<%= hr_lite.team_path %>">Team board</a>
   </section>
 
   <% if @awards.any? %>

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

@@ -1,5 +1,6 @@
 <% content_for(:page_title) { "ID card" } %>
 <% content_for(:tabrow) { render "hr_lite/shared/person_tabs", user: @user } if params[:user_id] %>
+<% content_for(:back, "Employees") if params[:user_id] %>
 <% company = HrLite.config.company.call %>
 <% brand = company[:brand].presence || company[:name].presence || "HR" %>
 <% own = @user == hr_current_user %>
@@ -24,7 +25,7 @@
         </div>
         <div class="hrl-idcard__photo">
           <% if @profile.photo.attached? %>
-            <img src="<%= Rails.application.routes.url_helpers.rails_storage_proxy_path(@profile.photo, disposition: "inline", only_path: true) %>" alt="<%= hr_display_name(@user) %>">
+            <img src="<%= Rails.application.routes.url_helpers.rails_storage_proxy_path(@profile.photo, disposition: "inline", only_path: true, expires_in: 1.hour) %>" alt="<%= hr_display_name(@user) %>">
           <% else %>
             <span><%= hr_display_name(@user).to_s.scan(/\b[[:alpha:]]/).first(2).join.upcase %></span>
           <% end %>
@@ -63,6 +64,9 @@
   </div>
 
   <div class="hrl-idcard-actions">
+    <% if own && (@profile.blood_group.blank? || @profile.emergency_contact.blank?) && hr_can?("hr_request.raise") %>
+      <a class="hrl-card__link hrl-idcard-help" href="<%= hr_lite.new_hr_request_path %>">Missing details? Ask HR</a>
+    <% end %>
     <button type="button" class="hrl-btn hrl-btn--primary" data-hrl-print>Print</button>
     <button type="button" class="hrl-btn" data-hrl-share="id-card-<%= @profile.employee_code %>.png">Share</button>
     <% if own && @print_requested %>

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

@@ -6,10 +6,10 @@
   <% if types.any? %>
     <div class="hrl-row">
       <% types.each do |type| %>
-        <% balance = HrLite::LeaveBalance.for(user, type, HrLite::LeaveYear.current_key) %>
+        <% balance = HrLite::LeaveBalance.for(user, type, HrLite::LeaveYear.current_key); entitled = balance.entitled %>
         <% 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 pending.positive? %> · <%= hrl_days(pending) %> pending<% end %><% if (held = balance.penalty_days).positive? %> · <%= hrl_days(held) %> held for penalties<% end %>
+          <%= type.name %> · <%= hrl_days(entitled - balance.used) %> of <%= hrl_days(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/leave_requests/new.html.erb

@@ -7,38 +7,47 @@
 <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 %>
+    <% bad = ->(attr) { "hrl-#{attr}-error" if @request.errors[attr].any? } %>
+    <% say = ->(attr) { tag.p(@request.errors.full_messages_for(attr).to_sentence, id: bad.(attr), class: "hrl-hint hrl-hint--bad") if bad.(attr) } %>
     <div class="hrl-field">
       <%= 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| %>
+      <%= tag.div(class: "hrl-chiprow", role: "radiogroup", aria: { labelledby: "hrl-leave-type", describedby: bad.(:leave_type) }) do %>
+        <% HrLite::LeaveType.active.reject { |t| t.comp_off && (b = left[t.id]) && b.available <= 0 }.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] %><% if left[type.id] && (held = left[type.id].penalty_days).positive? %> · <%= hrl_days(held) %> held for penalties<% end %><%= " · Unpaid" unless type.paid %></span></label>
         <% end %>
-      </div>
+      <% end %>
+      <%= say.(:leave_type) %>
       <p class="hrl-hint">Days beyond your balance are unpaid (loss of pay), cut from that month's salary.<% if (capped = @balances.find { |b| b.penalty_days.positive? }) %> Today you can apply for at most <%= hrl_days(capped.applicable) %> days of <%= capped.leave_type.name %>, <%= hrl_days(capped.penalty_days) %> held for penalties.<% end %></p>
+      <% if (profile = HrLite::EmployeeProfile.find_by(user_id: hr_current_user.id))&.on_probation? %>
+        <p class="hrl-hint">On probation until <%= profile.probation_until.strftime("%d %b %Y") %>: at most 1 day of leave a month, of any type.</p>
+      <% end %>
     </div>
     <div class="hrl-field">
       <%= f.label :start_date, "From" %>
-      <%= f.date_field :start_date, required: true %>
+      <%= f.date_field :start_date, required: true, aria: { describedby: bad.(:start_date) } %>
+      <%= say.(:start_date) %>
     </div>
     <div class="hrl-field">
       <%= f.label :end_date, "To (leave blank for one day)" %>
-      <%= f.date_field :end_date %>
+      <%= f.date_field :end_date, aria: { describedby: bad.(:end_date) } %>
+      <%= say.(:end_date) %>
     </div>
     <div class="hrl-field">
       <%= f.label :half_day_part, "Day", id: "hrl-day-part", for: nil %>
-      <div class="hrl-chiprow" role="radiogroup" aria-labelledby="hrl-day-part">
+      <%= tag.div(class: "hrl-chiprow", role: "radiogroup", aria: { labelledby: "hrl-day-part", describedby: bad.(:half_day) }) do %>
         <% HrLite::DAY_PARTS.each do |label, value| %>
           <label><%= f.radio_button :half_day_part, value %><span><%= label %></span></label>
         <% end %>
-      </div>
+      <% end %>
+      <%= say.(:half_day) %>
     </div>
     <div class="hrl-field">
       <%= f.label :reason, "Reason (optional)" %>
       <%= f.text_area :reason %>
     </div>
     <div class="hrl-form-actions">
-      <%= f.submit "Submit request", class: "hrl-btn hrl-btn--primary" %>
+      <%= f.submit "Send for approval", class: "hrl-btn hrl-btn--primary" %>
       <a class="hrl-btn" href="<%= hr_lite.leave_requests_path %>">Cancel</a>
     </div>
   <% end %>

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

@@ -19,5 +19,7 @@
     <%= button_to "Cancel this leave", hr_lite.cancel_leave_request_path(@request), method: :post,
                   class: "hrl-btn hrl-btn--danger hrl-mt",
                   form: { data: { turbo_confirm: "Cancel this leave request?" } } %>
+  <% elsif @request.approved? %>
+    <p class="hrl-hint hrl-mt">This leave has started, so it can no longer be cancelled here. Ask HR if it needs cancelling.</p>
   <% end %>
 </section>

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

@@ -1,6 +1,6 @@
 <% content_for(:page_title) { "Org chart" } %>
 <div class="hrl-page__head">
-  <h1 class="hrl-page__title">Organisation</h1>
+  <h1 class="hrl-page__title">Org chart</h1>
 </div>
 
 <% if @own_chain.any? %>

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

@@ -1,16 +1,16 @@
-<% content_for(:page_title) { "Regularization" } %>
+<% content_for(:page_title) { "Day fixes" } %>
 <% content_for(:back, "Attendance") %>
 <div class="hrl-page__head">
-  <h1 class="hrl-page__title">My regularization tickets</h1>
+  <h1 class="hrl-page__title">Day fixes</h1>
   <div class="hrl-page__actions">
-    <a class="hrl-btn hrl-btn--primary" href="<%= hr_lite.new_regularization_request_path %>">Raise a ticket</a>
+    <a class="hrl-btn hrl-btn--primary" href="<%= hr_lite.new_regularization_request_path %>">Fix a day</a>
   </div>
 </div>
 
 <section class="hrl-card">
   <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.
+    Forgot to check in or out? Fix a day with the actual times — once your
+    manager or HR approves, your attendance for that day is fixed automatically.
   </p>
   <% if @requests.any? %>
     <div class="hrl-table-wrap">
@@ -26,7 +26,7 @@
               <td data-label="" class="<%= 'hrl-cell--void' unless request.pending? %>">
                 <% if request.pending? %>
                   <%= button_to "Cancel", hr_lite.cancel_regularization_request_path(request), method: :post,
-                                class: "hrl-btn hrl-btn--danger", form: { data: { turbo_confirm: "Cancel this ticket?" } } %>
+                                class: "hrl-btn hrl-btn--danger", form: { data: { turbo_confirm: "Cancel this day fix?" } } %>
                 <% end %>
               </td>
             </tr>
@@ -36,6 +36,6 @@
     </div>
     <%= hrl_pagination %>
   <% else %>
-    <p class="hrl-card--empty">No tickets yet.</p>
+    <p class="hrl-card--empty">No day fixes yet.</p>
   <% end %>
 </section>

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

@@ -1,14 +1,14 @@
-<% content_for(:page_title) { "Raise a regularization ticket" } %>
+<% content_for(:page_title) { "Fix a day" } %>
 <% content_for(:back, "Attendance") %>
 <div class="hrl-page__head">
-  <h1 class="hrl-page__title">Raise a regularization ticket</h1>
+  <h1 class="hrl-page__title">Fix a day</h1>
 </div>
 
 <section class="hrl-card">
   <%= 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 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>
+      <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 your manager or HR for approval.</p>
     <% end %>
     <div class="hrl-field">
       <%= f.label :date, "Which day needs fixing?" %>
@@ -25,11 +25,13 @@
       <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 does this day need fixing? (required)" %>
+      <%= f.label :reason, "Why does this day need fixing?" %>
       <%= f.text_area :reason, required: true %>
     </div>
+    <% fix_now = rule && @request.date && (probe = HrLite::RegularizationRequest.new(date: @request.date, user_id: hr_current_user.id)).self_fixable? %>
+    <% if fix_now %><p class="hrl-hint"><%= @request.date.strftime("%a %-d %b") %> is fixed as soon as you submit. Self-fixes left this week: <%= probe.self_fixes_left %>.</p><% end %>
     <div class="hrl-form-actions">
-      <%= f.submit "Raise ticket", class: "hrl-btn hrl-btn--primary" %>
+      <%= f.submit fix_now ? "Fix now" : "Send for approval", class: "hrl-btn hrl-btn--primary" %>
       <a class="hrl-btn" href="<%= hr_lite.regularization_requests_path %>">Cancel</a>
     </div>
   <% end %>

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

@@ -3,7 +3,7 @@
   <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 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 / <abbr title="Loss of pay: unpaid days">LOP</abbr> days</div></div>
 </div>
 <div class="hrl-grid hrl-grid--2">
   <section class="hrl-card">
@@ -46,7 +46,7 @@
     <%# 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><%= hrl_days(slip.payable_days) %> payable / <%= hrl_days(slip.effective_lop_days) %> LOP<% if slip.out_of_window_days.to_f.positive? %>
+    <dd><%= hrl_days(slip.payable_days) %> payable / <%= hrl_days(slip.effective_lop_days) %> <abbr title="Loss of pay: unpaid days">LOP</abbr><% 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>

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

@@ -33,7 +33,7 @@
         </td>
       </tr>
       <tr>
-        <td>Payable days: <%= @slip.payable_days %> / <%= @slip.days_in_month %> (LOP <%= @slip.effective_lop_days %>)</td>
+        <td>Payable days: <%= @slip.payable_days.to_s.delete_suffix(".0") %> / <%= @slip.days_in_month %> (unpaid <%= @slip.effective_lop_days.to_s.delete_suffix(".0") %>)</td>
         <td class="num"><% if @profile&.masked_account %>Bank: <%= @profile.bank_name %> <%= @profile.masked_account %><% end %></td>
       </tr>
     </tbody>

data/app/views/hr_lite/tax/_computation.html.erb

@@ -34,7 +34,7 @@
         <table class="hrl-table hrl-tax-working__table">
           <tbody>
             <tr><td>Salary paid so far this year</td><td class="hrl-num"><%= hrl_rupees(tax.paid_gross) %></td></tr>
-            <tr><td>Expected for the rest of the year (<%= hrl_rupees(tax.structure.monthly_gross) %> × <%= s.months_left %>)</td><td class="hrl-num"><%= hrl_rupees(tax.projected_gross) %></td></tr>
+            <tr><td>Expected for the rest of the year, before unpaid days (<%= hrl_rupees(tax.structure.monthly_gross) %> × <%= s.months_left %>)</td><td class="hrl-num"><%= hrl_rupees(tax.projected_gross) %></td></tr>
             <tr class="hrl-tax-working__total"><td>Gross salary for the year</td><td class="hrl-num"><%= hrl_rupees(s.gross) %></td></tr>
             <% if s.hra_exemption.positive? %><tr><td>Less HRA exemption (from rent)</td><td class="hrl-num">− <%= hrl_rupees(s.hra_exemption) %></td></tr><% end %>
             <tr><td>Less standard deduction</td><td class="hrl-num">− <%= hrl_rupees(s.standard_deduction) %></td></tr>

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

@@ -1,6 +1,6 @@
 <% content_for(:page_title) { "Tax" } %>
 <% submittable = @declaration.persisted? && (@declaration.draft? || @declaration.rejected?) %>
-<% locked = @declaration.verified? %>
+<% locked = @declaration.verified? || @declaration.submitted? %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Tax — <%= @declaration.label %></h1>
 </div>
@@ -13,7 +13,7 @@
 
   <section class="hrl-card">
     <p>
-      Declaration: <%= hrl_request_status_badge(@declaration.status == "verified" ? "approved" : @declaration.status) %>
+      Declaration: <% if @declaration.verified? %><span class="hrl-badge hrl-badge--ok">Verified</span><% elsif @declaration.rejected? %><span class="hrl-badge hrl-badge--bad">Sent back</span><% else %><%= hrl_request_status_badge(@declaration.status) %><% end %>
       <% if @declaration.note.present? %><span class="hrl-small hrl-muted">— <%= @declaration.note %></span><% end %>
     </p>
     <fieldset class="hrl-field" <%= "disabled" if locked %>>
@@ -26,7 +26,7 @@
         </div>
       <% end %>
     </fieldset>
-  </details>
+  </section>
 
   <details class="hrl-card" <%= "open" if @declaration.regime != "new" || @declaration.errors.any? %>>
     <summary class="hrl-btn">Investments and rent (old regime only)</summary>
@@ -69,7 +69,7 @@
       <% if submittable %><button type="submit" name="submit_to_hr" value="1" class="hrl-btn hrl-btn--primary">Submit to HR</button><% end %>
     </div>
   <% else %>
-    <p class="hrl-small hrl-muted">HR has verified this year's declaration. Ask HR to reopen it to change anything.</p>
+    <p class="hrl-small hrl-muted"><%= @declaration.verified? ? "HR has verified this year's declaration." : "Sent to HR to check the proof." %> To change anything, ask HR through Help › Ask HR.</p>
   <% end %>
 <% end %>
 <% content_for(:scripts) { javascript_include_tag "hr_lite/tax_preview", defer: true } %>

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

@@ -1,13 +1,13 @@
-<% content_for(:page_title) { "Team" } %>
+<% content_for(:page_title) { "Team board" } %>
 <div class="hrl-page__head">
-  <h1 class="hrl-page__title">Team — <%= @date == Date.current ? "today" : @date.strftime("%A, %d %B") %></h1>
+  <h1 class="hrl-page__title">Team board — <%= @date == Date.current ? "today" : @date.strftime("%A, %d %B") %></h1>
   <div class="hrl-page__actions">
-    <a class="hrl-btn" aria-label="Previous day" href="<%= hr_lite.team_path(date: (@date - 1).strftime("%Y-%m-%d")) %>">&larr;</a>
+    <a class="hrl-btn" href="<%= hr_lite.team_path(date: (@date - 1).strftime("%Y-%m-%d")) %>"><span aria-hidden="true">&lsaquo;</span> <%= @date == Date.current ? "Yesterday" : "Previous day" %></a>
     <% unless @date == Date.current %>
       <a class="hrl-btn" href="<%= hr_lite.team_path %>">Today</a>
     <% end %>
     <% if @date < Date.current %>
-      <a class="hrl-btn" aria-label="Next day" href="<%= hr_lite.team_path(date: (@date + 1).strftime("%Y-%m-%d")) %>">&rarr;</a>
+      <a class="hrl-btn" href="<%= hr_lite.team_path(date: (@date + 1).strftime("%Y-%m-%d")) %>">Next day <span aria-hidden="true">&rsaquo;</span></a>
     <% end %>
   </div>
 </div>
@@ -17,7 +17,7 @@
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= kpis[:checked_in] %></div><div class="hrl-kpi__label">Checked in</div></div>
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= kpis[:on_leave] %></div><div class="hrl-kpi__label">On leave</div></div>
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= kpis[:not_in] %></div><div class="hrl-kpi__label">Not in</div></div>
-  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @board.rows.size %></div><div class="hrl-kpi__label">Team size</div></div>
+  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @board.rows.size %></div><div class="hrl-kpi__label">People</div></div>
 </div>
 
 <% if @statuses %>
@@ -48,7 +48,8 @@
                   <span class="hrl-badge hrl-badge--muted">+<%= row.profile.buffer_minutes / 60 %>h buffer · <%= HrLite::EmployeeProfile::BUFFER_REASONS[row.profile.buffer_reason] %></span><% end %></span>
               </td>
               <% if (st = @statuses&.dig(row.user.id)) %>
-                <td data-label="Now"><span class="hrl-modes"><%= hrl_status_icons(st) %></span>
+                <%# A derived status (offline, leave, holiday) repeats the Status cell; phone cards skip it. %>
+                <td data-label="Now" class="<%= 'hrl-cell--void' unless st.primary.event || st.custom %>"><span class="hrl-modes"><%= hrl_status_icons(st) %></span>
                   <span class="hrl-small"><%= st.primary.place || st.primary.label %><% if st.overlay %> · <%= st.overlay.label %><% end %>
                     <% if (till = st.overlay&.until || (st.primary.until if st.primary.until.respond_to?(:hour))) %> · until <%= till.strftime("%H:%M") %><% end %></span>
                   <% if st.updated_at %><span class="hrl-small hrl-muted"> · since <%= st.updated_at.strftime("%H:%M") %></span><% end %>
@@ -66,5 +67,5 @@
     <p class="hrl-card--empty">Nobody to show<%= @rows ? " for these filters" : " for this date" %>.</p>
   <% end %>
   <p class="hrl-small hrl-muted hrl-mt">Forgot a punch yourself?
-    <a class="hrl-card__link" 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 %>">Fix a day</a></p>
 </section>

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

@@ -1,5 +1,6 @@
 <% content_for(:page_title) { "Timeline — #{hr_display_name(@person)}" } %>
 <% content_for(:tabrow) { render "hr_lite/shared/person_tabs", user: @person } if params[:user_id] %>
+<% content_for(:back, "Org chart") if params[:user_id] %>
 <% year_path = ->(y) { @person.id == hr_current_user.id ? hr_lite.timeline_path(year: y) : hr_lite.person_timeline_path(@person.id, year: y) } %>
 <% name = hr_display_name(@person) %>
 <div class="hrl-page__head">

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

@@ -6,14 +6,14 @@
 
 <section class="hrl-card">
   <h2 class="hrl-card__title">Request WFH</h2>
-  <p class="hrl-small hrl-muted">Pick dates from today up to <%= HrLite::WfhRequest::MAX_DAYS_AHEAD %> days ahead. HR approves or rejects. While a request is waiting you can still check in away from the office; HR sees the reason. A rejected date cannot.</p>
+  <p class="hrl-small hrl-muted">Pick dates from today up to <%= HrLite::WfhRequest::MAX_DAYS_AHEAD %> days ahead. Your manager or HR approves or rejects. While a request is waiting you can still check in away from the office; they see the reason. A rejected date cannot.</p>
   <%= form_with model: @request, url: hr_lite.wfh_requests_path, scope: :wfh_request, local: true do |f| %>
     <%= render "hr_lite/shared/form_errors", record: @request %>
     <% min, max = @window.first.iso8601, @window.last.iso8601 %>
     <div class="hrl-field"><%= f.label :start_date, "From" %><%= f.date_field :start_date, min: min, max: max, required: true %></div>
     <div class="hrl-field"><%= f.label :end_date, "To (same day for one day)" %><%= f.date_field :end_date, min: min, max: max, required: true %></div>
     <div class="hrl-field"><%= f.label :reason, "Why do you need WFH?" %><%= f.text_area :reason, rows: 3, required: true %></div>
-    <div class="hrl-form-actions"><%= f.submit "Send to HR", class: "hrl-btn hrl-btn--primary" %></div>
+    <div class="hrl-form-actions"><%= f.submit "Send for approval", class: "hrl-btn hrl-btn--primary" %></div>
   <% end %>
 </section>
 
@@ -27,7 +27,7 @@
       <% code, word, mod = marks[@day_status[date]] %>
       <div class="<%= class_names("hrl-mgrid__day", "hrl-mgrid__day--#{mod}": mod, "hrl-mgrid__day--today": date == Date.current) %>"
            role="group" aria-label="<%= date.strftime('%-d %b') %><%= ", #{word}" if word %>">
-        <span class="hrl-mgrid__num"><%= date.day %></span>
+        <span class="hrl-mgrid__num"><%= date.day == 1 ? date.strftime("%-d %b") : date.day %></span>
         <% if code %><span class="hrl-mgrid__tag"><%= code %></span><% end %>
       </div>
     <% end %>

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

@@ -2,7 +2,7 @@
 <% buckets = result.by_bucket
    totals = buckets.transform_values { |m| m.except("offline").values.sum }
    max = [ totals.values.max.to_f, 1 ].max
-   w = 12; gap = 4; h = 100
+   w = 12; gap = 8; h = 100 # gap 8 units: bars ~11px apart on screen
    fmt = { day: "%-d", week: "%-d %b", month: "%b" }[period.bucket] %>
 <section class="hrl-card">
   <h2 class="hrl-card__title">By <%= period.bucket %></h2>

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

@@ -29,7 +29,7 @@
         </tbody>
       </table>
     </div>
-    <p class="hrl-small hrl-muted">Shares are of tracked time (<%= hrl_duration(total) %>: working, breaks and out of office). Offline (<%= hrl_duration(result.offline) %>) is not included.</p>
+    <p class="hrl-small hrl-muted">Shares are of tracked time (<%= hrl_duration(total) %>: working, breaks and out of office). Offline (<%= hrl_duration(result.offline) %>) is not included. Stretches: how many separate times each mode ran.</p>
   <% else %>
     <p class="hrl-card--empty">Only offline time recorded.</p>
   <% end %>

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

@@ -20,12 +20,16 @@
       <a class="hrl-btn" href="<%= path.(period: period.kind, date: period.shift(1)) %>" aria-label="Next <%= period.kind %>">&rsaquo;</a>
     <% end %>
   </div>
-  <%= form_with url: path.({}), method: :get, local: true, class: "hrl-row" do %>
-    <input type="hidden" name="period" value="custom">
-    <% (local_assigns[:keep] || {}).each do |k, v| %><input type="hidden" name="<%= k %>" value="<%= v %>"><% end %>
-    <div class="hrl-field"><label for="wt-from">From</label><%= date_field_tag :from, period.from, max: Date.current, id: "wt-from" %></div>
-    <div class="hrl-field"><label for="wt-to">To</label><%= date_field_tag :to, period.to, max: Date.current, id: "wt-to" %></div>
-    <div class="hrl-form-actions"><button type="submit" class="hrl-btn">Show range</button></div>
+  <%# One picker on show: the date range stays folded unless it is what was asked for. %>
+  <%= tag.details open: params[:period] == "custom" do %>
+    <summary class="hrl-card__link">Pick your own dates</summary>
+    <%= form_with url: path.({}), method: :get, local: true, class: "hrl-row" do %>
+      <input type="hidden" name="period" value="custom">
+      <% (local_assigns[:keep] || {}).each do |k, v| %><input type="hidden" name="<%= k %>" value="<%= v %>"><% end %>
+      <div class="hrl-field"><label for="wt-from">From</label><%= date_field_tag :from, period.from, max: Date.current, id: "wt-from" %></div>
+      <div class="hrl-field"><label for="wt-to">To</label><%= date_field_tag :to, period.to, max: Date.current, id: "wt-to" %></div>
+      <div class="hrl-form-actions"><button type="submit" class="hrl-btn">Show range</button></div>
+    <% end %>
   <% end %>
 </section>
 
@@ -35,7 +39,8 @@
   <% office = result.by_mode["office"]; wfh = result.by_mode["wfh"]; field = result.by_mode["travelling"] + result.by_mode["outside_meeting"] %>
   <div class="hrl-kpis">
     <% [ [ "Attendance (check-in to check-out)", result.attendance ], [ "Working time (breaks included)", result.working + result.breaks ], [ "Of which breaks", result.breaks ],
-         [ "In office", office ], [ "Work from home", wfh ], [ "Travel and client meetings", field ], [ "Out of office", result.other ] ].each do |kpi_label, secs| %>
+         [ "In office", office ], [ "Work from home", wfh ], [ "Travel and client meetings", field ],
+         [ "Meetings and busy", result.by_mode["meeting"] + result.by_mode["busy"] ], [ "Out of office", result.other ] ].each do |kpi_label, secs| %>
       <div class="hrl-kpi"><div class="hrl-kpi__value"><%= hrl_duration(secs) %></div><div class="hrl-kpi__label"><%= kpi_label %></div></div>
     <% end %>
   </div>
@@ -62,11 +67,12 @@
   <% if records.any? %>
     <section class="hrl-card">
       <h2 class="hrl-card__title">Check-ins</h2>
+      <% all_punches = HrLite::AttendancePunch.where(user_id: records.map(&:user_id).uniq, date: records.map(&:date)).order(:at, :id).group_by { |p| [ p.user_id, p.date ] } # one query, not one a day %>
       <% records.each do |r| %>
         <div class="hrl-feed__item hrl-small"><div class="hrl-feed__body">
           <% if names %><strong><%= names[r.user_id] %></strong> · <% end %>
           <%= r.date.strftime("%a %-d %b") %><% if r.work_mode_label %> · <%= r.work_mode_label %><% end %>
-          <%= render "hr_lite/attendance/trail", record: r %>
+          <%= render "hr_lite/attendance/trail", record: r, punches: all_punches.fetch([ r.user_id, r.date ], []) %>
         </div></div>
       <% end %>
     </section>

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

@@ -117,6 +117,7 @@
 <%= javascript_include_tag "hr_lite/select_filter", defer: true %>
 <%= javascript_include_tag "hr_lite/search", defer: true %>
 <dialog class="hrl-search" data-hrl-search aria-label="Search">
+  <form method="dialog" class="hrl-search__close"><button class="hrl-btn" type="submit">Close</button></form>
   <form action="<%= hr_lite.search_path %>" method="get" role="search">
     <label class="hrl-sr-only" for="hrl-search-q">Search screens and people</label>
     <input id="hrl-search-q" class="hrl-input" type="search" name="q" placeholder="Search screens and people" autocomplete="off">

data/lib/hr_lite/notifications.rb

@@ -131,14 +131,17 @@ module HrLite
         # Rescued PER RECIPIENT. Wrapping the whole loop meant one bad address
         # or a single enqueue failure silently dropped everyone after it — on
         # a team-wide leave notice, most of the team.
-        Array(email_to).compact.uniq.each do |user|
+        users = Array(email_to).compact.uniq
+        # One query for everyone's Busy/Meeting end, not one per recipient.
+        held_until = HrLite.config.office_geofence ? WorkStatus.do_not_disturb_for(users.map(&:id)) : {}
+        users.each do |user|
           next if user.email.blank?
 
           begin
             mail = EventMailer.event(to: user.email, subject: title, heading: title,
                                      body: body, lines: lines, path: path, link_url: link_url)
             # Busy or in a meeting: the email waits until that ends.
-            held = WorkStatus.do_not_disturb_until(user.id) if HrLite.config.office_geofence
+            held = held_until[user.id]
             held ? mail.deliver_later(wait_until: held) : mail.deliver_later
           rescue => e
             Rails.logger.error("[hr_lite] event email failed: #{e.class}: #{e.message}")

data/lib/hr_lite/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.55.0
 platform: ruby
 authors:
 - kshitiz sinha
@@ -171,6 +171,7 @@ files:
 - app/jobs/hr_lite/leave_year_rollover_job.rb
 - app/jobs/hr_lite/payroll_auto_approve_job.rb
 - app/jobs/hr_lite/payroll_auto_draft_job.rb
+- app/jobs/hr_lite/payroll_compute_job.rb
 - app/jobs/hr_lite/slips_ready_job.rb
 - app/jobs/hr_lite/work_mode_expire_job.rb
 - app/mailers/hr_lite/application_mailer.rb