hr_lite 0.53.0 → 0.55.0

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

@@ -13,7 +13,7 @@
   </section>
 <% end %>
 
-<% rows = hrl_inbox_rows %>
+<% rows = hrl_inbox_rows.reject { |_, record| @in_flow.include?([ record.class.polymorphic_name, record.id ]) } %>
 <section class="hrl-card">
   <% if @approvals.empty? && rows.empty? %>
     <p class="hrl-muted">Nothing is waiting on you.</p>
@@ -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/_month_grid.html.erb

@@ -4,6 +4,15 @@
    link_builder = local_assigns[:link_builder]
    pending_dates = local_assigns[:pending_dates]
    states = HrLite::ApplicationHelper::DAY_STATES %>
+<div class="hrl-legend hrl-small">
+  <% 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>
 <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>
@@ -25,12 +34,3 @@
     </div>
   <% end %>
 </div>
-<div class="hrl-legend hrl-small">
-  <% 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/_penalties.html.erb

@@ -3,8 +3,8 @@
    leave_type = HrLite::Setting.instance.penalty_leave_type %>
 <section class="hrl-card" id="penalties">
   <h2 class="hrl-card__title">Penalty hours</h2>
-  <p><strong><%= hrl_duration(held * 60) %></strong> held · <%= hrl_days(HrLite::AttendancePenalty.days_for(held)) %> days<%= " of #{leave_type.name}" if leave_type %></p>
-  <p class="hrl-hint">Penalties add up until HR removes them. Every 5 hours holds half a day of leave, which can't be applied for.</p>
+  <p><strong><%= hrl_duration(held * 60) %></strong> held · <%= pluralize(hrl_days(HrLite::AttendancePenalty.days_for(held)), "day") %><%= " of #{leave_type.name}" if leave_type %></p>
+  <p class="hrl-hint">Penalties add up until HR removes them.<% if leave_type %> Every 5 hours holds half a day of leave, which can't be applied for.<% end %></p>
   <% HrLite::PenaltyRemoval.where(user_id: user.id).includes(:removed_by).order(created_at: :desc).each do |removal| %>
     <div class="hrl-feed__item hrl-small"><div class="hrl-feed__body">Removed <%= hrl_duration(removal.minutes * 60) %> on <%= removal.created_at.strftime("%-d %b %Y") %> by <%= hr_display_name(removal.removed_by) %>: <%= removal.reason %></div></div>
   <% end %>

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

@@ -13,7 +13,7 @@
 
   <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>
+      <span class="hrl-badge hrl-badge--ok">In since <%= record.check_in_at.strftime("%H:%M") %> · <span data-hrl-since="<%= record.check_in_at.iso8601 %>"><%= hrl_duration(Time.current - record.check_in_at) %> so far</span></span>
     <% elsif record&.check_in_at %>
       <span class="hrl-badge hrl-badge--ok">In <%= record.check_in_at.strftime("%H:%M") %></span>
     <% end %>
@@ -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? %>
@@ -134,9 +142,7 @@
 
   <% if local_assigns.key?(:attention) %>
     <div class="hrl-row">
-      <a class="hrl-btn" href="<%= hr_lite.new_leave_request_path %>">Apply leave</a>
-      <% if HrLite.config.office_geofence %><a class="hrl-btn" href="<%= hr_lite.wfh_requests_path %>">Request WFH</a><% end %>
-      <a class="hrl-btn" href="<%= hr_lite.new_regularization_request_path %>">Fix a punch</a>
+      <a class="hrl-btn" href="<%= hr_lite.new_regularization_request_path %>">Fix a day</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>

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

@@ -12,7 +12,7 @@
 <% elsif due %>
   <% left = due - Time.current %>
   <p class="hrl-small">Checked in <%= record.check_in_at.strftime("%H:%M") %> · checkout at <strong><%= due.strftime("%H:%M") %></strong> ·
-    <%= left.positive? ? "#{hrl_duration(left)} left" : "you can check out" %></p>
+    <span data-hrl-countdown="<%= due.iso8601 %>" data-hrl-done="you can check out"><%= left.positive? ? "#{hrl_duration(left)} left" : "you can check out" %></span></p>
 <% end %>
 <% HrLite::AttendancePenalty.active.where(user_id: hr_current_user.id, date: Date.current).each do |penalty| %>
   <p class="hrl-small"><span class="hrl-badge hrl-badge--warn">+<%= penalty.minutes %> min</span> <%= penalty.label %></p>
@@ -23,11 +23,14 @@
       <label for="hrl-slot-start">Check-in slot</label>
       <%= select_tag :start_minute, options_for_select(HrLite::AttendanceSlot::START_MINUTES.map { |m| [ "#{HrLite::AttendanceSlot.label(m)} – out #{HrLite::AttendanceSlot.label(m + HrLite::EmployeeProfile.day_minutes_for(hr_current_user.id))}", m ] }, start), id: "hrl-slot-start" %>
     </div>
-    <div class="hrl-field">
-      <label for="hrl-slot-period">For</label>
-      <%= select_tag :period, options_for_select(HrLite::AttendanceSlot::PERIODS.invert), id: "hrl-slot-period" %>
-    </div>
-    <button type="submit" class="hrl-btn hrl-btn--block">Save and lock slot</button>
+    <fieldset class="hrl-field">
+      <legend>Lock this slot for</legend>
+      <div class="hrl-mode-switch">
+        <% HrLite::AttendanceSlot::PERIODS.each do |period, word| %>
+          <button type="submit" name="period" value="<%= period %>" class="hrl-btn" data-turbo-confirm="Lock this slot for <%= word.downcase %>? After that only HR can change it."><%= word %></button>
+        <% end %>
+      </div>
+    </fieldset>
     <p class="hrl-small hrl-muted">Once saved, only HR can change it for that period.</p>
   <% end %>
 <% end %>

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

@@ -8,7 +8,7 @@
     <% if home_m %> · <%= number_with_delimiter(home_m) %> m from home<% end %>
     <% if accuracy %> · ±<%= accuracy %> m<% end %></div>
 <% end %>
-<% if (punches = record.punches).size > 2 %>
+<% if (punches = local_assigns.fetch(:punches) { record.punches }).size > 2 %>
   <div class="hrl-punch-line">All punches: <%= punches.join(" · ") %></div>
 <% end %>
 <% if (route = record.route_url) %>

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

@@ -13,7 +13,7 @@
 </div>
 <%= render "hr_lite/attendance/custom_status", status: status %>
 <%= render "hr_lite/attendance/calendar_connection" %>
-<% if status.half_day_leave %><p class="hrl-small hrl-muted">Half-day leave today (<%= status.half_day_leave.half_day_part || "half day" %>).</p><% end %>
+<% if status.half_day_leave %><p class="hrl-small hrl-muted">Half-day leave today (<%= HrLite::DAY_PARTS.rassoc(status.half_day_leave.half_day_part)&.first&.downcase || "half day" %>).</p><% end %>
 
 <% if working %>
   <% if status.overlay %>

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

@@ -14,15 +14,17 @@
     <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>
   <%= 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 %>">Fix a day</a>
+    <a class="hrl-btn" href="<%= hr_lite.regularization_requests_path %>">Day fixes</a>
+  </div>
 </section>
 
 <% if HrLite.config.attendance_slots %>
@@ -46,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

@@ -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 %>
 
@@ -19,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 %>">
@@ -36,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,9 +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 (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/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/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/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

@@ -3,23 +3,23 @@
   <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">
     <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>
@@ -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

@@ -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>
@@ -32,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>