hr_lite 0.21.3 → 0.22.1

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

@@ -1,45 +1,52 @@
 <% content_for(:page_title) { "Calendar" } %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Company calendar</h1>
+  <div class="hrl-page__actions">
+    <a class="hrl-btn" href="<%= hr_lite.holidays_path %>">Holiday list</a>
+  </div>
 </div>
 
 <section class="hrl-card">
-  <div class="hrl-row" style="margin-bottom:.6rem;">
-    <a class="hrl-btn" href="<%= hr_lite.calendar_path(month: (@month - 1.month).strftime("%Y-%m")) %>">&larr;</a>
+  <% prev_m, next_m = @month - 1.month, @month + 1.month %>
+  <div class="hrl-row hrl-row--mb">
+    <a class="hrl-btn" href="<%= hr_lite.calendar_path(month: prev_m.strftime("%Y-%m")) %>" aria-label="Previous month, <%= prev_m.strftime("%B %Y") %>"><span aria-hidden="true">&lsaquo;</span> <%= prev_m.strftime("%b") %></a>
     <strong><%= @month.strftime("%B %Y") %></strong>
-    <a class="hrl-btn" href="<%= hr_lite.calendar_path(month: (@month + 1.month).strftime("%Y-%m")) %>">&rarr;</a>
-    <a class="hrl-btn hrl-right" href="<%= hr_lite.holidays_path %>">Holiday list</a>
+    <a class="hrl-btn" href="<%= hr_lite.calendar_path(month: next_m.strftime("%Y-%m")) %>" aria-label="Next month, <%= next_m.strftime("%B %Y") %>"><%= next_m.strftime("%b") %> <span aria-hidden="true">&rsaquo;</span></a>
   </div>
 
   <% first = @month.beginning_of_month %>
-  <div class="hrl-mgrid">
+  <div class="hrl-mgrid hrl-mgrid--cal">
     <% %w[Mo Tu We Th Fr Sa Su].each do |d| %><div class="hrl-mgrid__head"><%= d %></div><% end %>
     <% (first.cwday - 1).times do %><div></div><% end %>
     <% (first..@month.end_of_month).each do |date| %>
-      <% cell_class =
-           if @holidays[date] then "hrl-mgrid__day--holiday"
+      <% cell_class, code =
+           if @holidays[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"
+           elsif @leaves[date].any? then [ "hrl-mgrid__day--leave", "#{@leaves[date].size} off" ]
            end %>
-      <div class="hrl-mgrid__day <%= cell_class %>">
+      <div class="<%= class_names("hrl-mgrid__day", cell_class, "hrl-mgrid__day--today": date == Date.current) %>">
         <span class="hrl-mgrid__num"><%= date.day %></span>
-        <% Array(@holidays[date]).each do |holiday| %>
-          <span class="hrl-mgrid__tag" title="<%= holiday.name %>"><%= holiday.name %></span>
-        <% end %>
-        <% @leaves[date].first(2).each do |request| %>
-          <span class="hrl-mgrid__tag" style="color: <%= request.leave_type.color %>;"
-                title="<%= hr_display_name(request.user) %> — <%= request.leave_type.name %>">
-            <%= hr_display_name(request.user).split.first %> · <%= request.leave_type.code %>
-          </span>
-        <% end %>
-        <% if @leaves[date].size > 2 %><span class="hrl-mgrid__tag">+<%= @leaves[date].size - 2 %> more</span><% end %>
+        <% if code %><span class="hrl-mgrid__tag"><%= code %></span><% end %>
       </div>
     <% end %>
   </div>
 
   <div class="hrl-legend hrl-small">
-    <span class="hrl-badge hrl-badge--warn">Holiday</span>
-    <span class="hrl-badge">On leave</span>
-    <span class="hrl-badge hrl-badge--muted">Weekend</span>
+    <span class="hrl-badge hrl-badge--warn">H Holiday</span>
+    <span class="hrl-badge">N off On leave</span>
+    <span class="hrl-badge hrl-badge--muted">Weekly off</span>
+    <span class="hrl-badge hrl-mgrid__key hrl-mgrid__day--today">Today</span>
   </div>
+
+  <%# 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)" ] } +
+              @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">
+      <% agenda.sort_by(&:first).each do |_, line| %><li class="hrl-feed__item"><%= line %></li><% end %>
+    </ul>
+  <% else %>
+    <p class="hrl-muted hrl-small hrl-mt">No holidays or leave this month.</p>
+  <% end %>
 </section>

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

@@ -1,14 +1,14 @@
 <% content_for(:page_title) { "Comp-off" } %>
+<% content_for(:back, "Leaves") %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">My comp-off</h1>
   <div class="hrl-page__actions">
-    <a class="hrl-btn" href="<%= hr_lite.leave_requests_path %>">My leaves</a>
     <a class="hrl-btn hrl-btn--primary" href="<%= hr_lite.new_comp_off_request_path %>">Request comp-off</a>
   </div>
 </div>
 
 <section class="hrl-card">
-  <p class="hrl-small hrl-muted" style="margin-top:0;">
+  <p class="hrl-small hrl-muted">
     Worked on a weekend or holiday? Request a comp-off — once an admin approves,
     <%= @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.
@@ -21,7 +21,7 @@
           <% @requests.each do |request| %>
             <tr>
               <td data-label="Day worked"><%= request.date_worked.strftime("%a, %d %b %Y") %></td>
-              <td data-label="Credit" class="hrl-num"><%= request.credit_days.to_f %></td>
+              <td data-label="Credit" class="hrl-num"><%= hrl_days(request.credit_days) %></td>
               <td data-label="Status"><%= hrl_request_status_badge(request.status) %></td>
               <td data-label="Note" class="hrl-small hrl-muted"><%= request.decision_note.presence || "—" %></td>
               <td data-label="" class="<%= 'hrl-cell--void' unless request.pending? %>">

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

@@ -1,4 +1,5 @@
 <% content_for(:page_title) { "Request comp-off" } %>
+<% content_for(:back, "Leaves") %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Request comp-off</h1>
 </div>
@@ -8,7 +9,7 @@
     <%= render "hr_lite/shared/form_errors", record: @request %>
     <div class="hrl-field">
       <%= f.label :date_worked, "Which day did you work?" %>
-      <%= f.date_field :date_worked, max: Date.current %>
+      <%= f.date_field :date_worked, max: Date.current, required: true %>
       <p class="hrl-hint">Must be a weekend or holiday you actually worked — extra hours on a
         normal working day are not comp-off under the policy.</p>
     </div>
@@ -18,7 +19,7 @@
     </div>
     <div class="hrl-field">
       <%= f.label :reason, "What did you work on? (required)" %>
-      <%= f.text_area :reason %>
+      <%= f.text_area :reason, required: true %>
     </div>
     <div class="hrl-form-actions">
       <%= f.submit "Send for approval", class: "hrl-btn hrl-btn--primary" %>

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

@@ -13,34 +13,6 @@
   </section>
 <% end %>
 
-<section class="hrl-card">
-  <h2 class="hrl-card__title">Upload a document</h2>
-  <%= form_with model: @document, url: hr_lite.documents_path, method: :post, local: true do |f| %>
-    <%= render "hr_lite/shared/form_errors", record: @document %>
-    <div class="hrl-field">
-      <%= f.label :category %>
-      <%= f.select :category,
-            options_for_select(HrLite::Document::SENSITIVE_CATEGORIES.map { |c| [ c.humanize, c ] } +
-                               [ [ "Offer letter", "offer_letter" ], [ "Certificate", "certificate" ],
-                                 [ "Other", "other" ] ], @document.category) %>
-    </div>
-    <div class="hrl-field"><%= f.label :title %><%= f.text_field :title %></div>
-    <div class="hrl-field">
-      <%= f.label :reference_number, "Document number (optional)" %>
-      <%= f.text_field :reference_number %>
-    </div>
-    <div class="hrl-field">
-      <%= f.label :expires_on, "Expires on (optional — we will remind you)" %>
-      <%= f.date_field :expires_on %>
-    </div>
-    <div class="hrl-field">
-      <%= f.label :file, "File (PDF or image, up to 10 MB)" %>
-      <%= f.file_field :file %>
-    </div>
-    <div class="hrl-form-actions"><%= f.submit "Upload", class: "hrl-btn hrl-btn--primary" %></div>
-  <% end %>
-</section>
-
 <section class="hrl-card">
   <h2 class="hrl-card__title">On file</h2>
   <% if @documents.empty? %>
@@ -54,7 +26,7 @@
             <tr>
               <td data-label="Document">
                 <strong><%= doc.title %></strong>
-                <div class="hrl-small hrl-muted"><%= doc.category.humanize %></div>
+                <div class="hrl-small hrl-muted"><%= doc.category.humanize.sub(/\APan\z/, "PAN") %></div>
               </td>
               <td data-label="Expires">
                 <%= doc.expires_on ? doc.expires_on.strftime("%d %b %Y") : "—" %>
@@ -67,7 +39,7 @@
               </td>
               <td data-label="">
                 <% if doc.file.attached? %>
-                  <a class="hrl-small" href="<%= hr_lite.download_document_path(doc) %>">Open</a>
+                  <a class="hrl-btn" href="<%= hr_lite.download_document_path(doc) %>">Open</a>
                 <% end %>
                 <% unless doc.verified? %>
                   <%= button_to "Remove", hr_lite.document_path(doc), method: :delete,
@@ -82,3 +54,33 @@
     </div>
   <% end %>
 </section>
+
+<details class="hrl-card" <%= "open" if @documents.empty? || @document.errors.any? %>>
+  <summary class="hrl-btn hrl-btn--primary">Upload a document</summary>
+  <%= form_with model: @document, url: hr_lite.documents_path, method: :post, local: true, class: "hrl-mt" do |f| %>
+    <%= render "hr_lite/shared/form_errors", record: @document %>
+    <div class="hrl-field">
+      <%= f.label :category, id: "hrl-doc-category", for: nil %>
+      <div class="hrl-chiprow" role="radiogroup" aria-labelledby="hrl-doc-category">
+        <% (HrLite::Document::SENSITIVE_CATEGORIES.map { |c| [ c.humanize.sub(/\APan\z/, "PAN"), c ] } +
+            [ [ "Offer letter", "offer_letter" ], [ "Certificate", "certificate" ], [ "Other", "other" ] ]).each do |label, value| %>
+          <label><%= f.radio_button :category, value, required: true %><span><%= label %></span></label>
+        <% end %>
+      </div>
+    </div>
+    <div class="hrl-field"><%= f.label :title %><%= f.text_field :title, required: true %></div>
+    <div class="hrl-field">
+      <%= f.label :reference_number, "Document number (optional)" %>
+      <%= f.text_field :reference_number %>
+    </div>
+    <div class="hrl-field">
+      <%= f.label :expires_on, "Expires on (optional — we will remind you)" %>
+      <%= f.date_field :expires_on %>
+    </div>
+    <div class="hrl-field">
+      <%= f.label :file, "File (PDF or image, up to 10 MB)" %>
+      <%= f.file_field :file, required: true, accept: "application/pdf,image/*" %>
+    </div>
+    <div class="hrl-form-actions"><%= f.submit "Upload", class: "hrl-btn hrl-btn--primary" %></div>
+  <% end %>
+</details>

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

@@ -9,8 +9,7 @@
       <dt>Employee code</dt><dd><%= @profile.employee_code %></dd>
       <dt>Designation</dt><dd><%= @profile.designation.presence || "—" %></dd>
       <dt>Reports to</dt>
-      <dd><%= (boss = @profile.active_manager) ? "#{hr_display_name(boss)} (your L1)" : "—" %>
-        · <a href="<%= hr_lite.org_path %>">Org chart</a></dd>
+      <dd><%= (boss = @profile.active_manager) ? "#{hr_display_name(boss)} (your L1)" : "—" %></dd>
       <dt>Department</dt><dd><%= @profile.department.presence || "—" %></dd>
       <dt>Joined</dt><dd><%= @profile.date_of_joining.strftime("%d %B %Y") %>
         <% if @profile.on_probation? %><span class="hrl-badge hrl-badge--warn">Probation</span><% end %></dd>
@@ -19,6 +18,7 @@
       <dt>PF UAN</dt><dd><%= @profile.masked_uan || "—" %></dd>
       <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>
   </section>

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

@@ -28,41 +28,23 @@
   <% if @expenses.empty? %>
     <p class="hrl-muted">No claims yet.</p>
   <% else %>
-    <div class="hrl-table-wrap">
-      <table class="hrl-table hrl-table--stack">
-        <thead><tr><th>Spent</th><th>Category</th><th>Amount</th><th>Status</th><th></th></tr></thead>
-        <tbody>
-          <% @expenses.each do |expense| %>
-            <tr>
-              <td data-label="Spent"><%= expense.spent_on.strftime("%d %b %Y") %></td>
-              <td data-label="Category">
-                <%= expense.category.name %>
-                <div class="hrl-small hrl-muted"><%= expense.description %></div>
-              </td>
-              <td data-label="Amount" class="hrl-num"><%= hrl_money(expense.amount) %></td>
-              <td data-label="Status">
-                <%= hrl_request_status_badge(expense.status) %>
-                <% if expense.reimbursed_in %>
-                  <div class="hrl-small hrl-muted">
-                    with <%= expense.reimbursed_in.strftime("%B %Y") %> payroll
-                  </div>
-                <% end %>
-                <% if expense.decision_note.present? %>
-                  <div class="hrl-small hrl-muted"><%= expense.decision_note %></div>
-                <% end %>
-              </td>
-              <td data-label="">
-                <% if expense.draft? || expense.submitted? %>
-                  <%= button_to "Withdraw", hr_lite.cancel_expense_path(expense),
-                        class: "hrl-btn",
-                        form: { data: { turbo_confirm: "Withdraw this claim?" } } %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
+    <% @expenses.each do |expense| %>
+      <div class="hrl-listrow">
+        <span><%= expense.description %></span>
+        <span><%= hrl_money(expense.amount) %></span>
+        <span class="hrl-small hrl-muted">
+          <%= expense.spent_on.strftime("%d %b %Y") %> · <%= expense.category.name %>
+          <%= hrl_request_status_badge(expense.status) %>
+          <%= "· with #{expense.reimbursed_in.strftime('%B %Y')} payroll" if expense.reimbursed_in %>
+          <%= "· #{expense.decision_note}" if expense.decision_note.present? %>
+        </span>
+        <% if expense.draft? || expense.submitted? %>
+          <%= button_to "Withdraw", hr_lite.cancel_expense_path(expense),
+                class: "hrl-btn",
+                form: { data: { turbo_confirm: "Withdraw this claim?" } } %>
+        <% end %>
+      </div>
+    <% end %>
     <%= hrl_pagination %>
   <% end %>
 </section>

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

@@ -7,26 +7,31 @@
 
     <div class="hrl-field">
       <%= f.label :category_id, "What kind of expense" %>
-      <%= f.select :category_id, @categories.map { |c| [ c.name, c.id ] },
-                   { include_blank: "Choose one" } %>
+      <% options = @categories.map do |c|
+           remaining = c.remaining_for(hr_current_user)
+           notes = [ ("receipt needed" if c.receipt_required),
+                     ("#{hrl_money(remaining)} left this month" if remaining) ].compact
+           [ notes.any? ? "#{c.name} (#{notes.join(', ')})" : c.name, c.id ]
+         end %>
+      <%= f.select :category_id, options, { include_blank: "Choose one" }, { required: true } %>
     </div>
     <div class="hrl-field">
       <%= f.label :amount, "Amount (₹)" %>
-      <%= f.text_field :amount, inputmode: "decimal" %>
+      <%= f.text_field :amount, inputmode: "decimal", required: true %>
     </div>
     <div class="hrl-field">
       <%= f.label :spent_on, "When you spent it" %>
-      <%= f.date_field :spent_on, max: Date.current.to_s %>
+      <%= f.date_field :spent_on, max: Date.current.to_s, required: true %>
     </div>
     <div class="hrl-field">
       <%= f.label :description, "What it was for" %>
-      <%= f.text_field :description %>
+      <%= f.text_field :description, required: true %>
     </div>
     <div class="hrl-field">
       <%= f.label :receipt, "Receipt (PDF or photo)" %>
       <%= f.file_field :receipt, accept: "application/pdf,image/*" %>
       <span class="hrl-small hrl-muted">
-        Some categories need one — the form will say so if yours does.
+        Needed when the category says "receipt needed".
       </span>
     </div>
 

data/app/views/hr_lite/holidays/_next_holiday.html.erb

@@ -1,12 +1,15 @@
 <section class="hrl-card">
-  <h2 class="hrl-card__title">Next holiday</h2>
-  <% holiday = HrLite::Holiday.company_wide.upcoming.first %>
-  <% if holiday %>
-    <p><strong><%= holiday.name %></strong><br>
-      <span class="hrl-muted hrl-small"><%= holiday.date.strftime("%A, %d %B %Y") %>
-        (<%= (holiday.date - Date.current).to_i %> days away)</span></p>
+  <h2 class="hrl-card__title">Upcoming holidays</h2>
+  <% holidays = HrLite::Holiday.company_wide.upcoming.where(date: ..Date.current + 60).limit(3).to_a %>
+  <% if holidays.any? %>
+    <div class="hrl-feed">
+      <% holidays.each do |holiday| %>
+        <% days = (holiday.date - Date.current).to_i %>
+        <div class="hrl-feed__item"><div class="hrl-feed__body"><%= holiday.date.strftime("%a %-d %b") %> · <%= holiday.name %> · <%= days.zero? ? "today" : "in #{pluralize(days, "day")}" %></div></div>
+      <% end %>
+    </div>
   <% else %>
-    <p class="hrl-muted hrl-small">No upcoming holidays on the calendar.</p>
+    <p class="hrl-muted hrl-small">No holidays in the next 2 months.</p>
   <% end %>
-  <a class="hrl-small" href="<%= hr_lite.calendar_path %>">Company calendar</a>
+  <a class="hrl-card__link" href="<%= hr_lite.holidays_path %>">All holidays</a>
 </section>

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

@@ -1,10 +1,10 @@
 <% content_for(:page_title) { "Holidays" } %>
+<% content_for(:back, "Calendar") %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Holidays <%= @year %></h1>
   <div class="hrl-page__actions">
     <a class="hrl-btn" href="<%= hr_lite.holidays_path(year: @year - 1) %>"><%= @year - 1 %></a>
     <a class="hrl-btn" href="<%= hr_lite.holidays_path(year: @year + 1) %>"><%= @year + 1 %></a>
-    <a class="hrl-btn" href="<%= hr_lite.calendar_path %>">Calendar</a>
   </div>
 </div>
 
@@ -12,14 +12,14 @@
   <% if @holidays.any? %>
     <div class="hrl-table-wrap">
       <table class="hrl-table hrl-table--stack">
-        <thead><tr><th>Date</th><th>Holiday</th><th></th></tr></thead>
+        <thead><tr><th>Date</th><th>Holiday</th></tr></thead>
         <tbody>
           <% @holidays.each do |holiday| %>
-            <tr>
+            <% next_up = holiday.id == @next_holiday_id %>
+            <%= tag.tr class: ("hrl-muted" if holiday.date < Date.current) do %>
               <td data-label="Date"><%= holiday.date.strftime("%a, %d %b") %></td>
-              <td data-label="Holiday"><%= holiday.name %></td>
-              <td data-label=""><% if holiday.optional %><span class="hrl-badge hrl-badge--muted">Optional</span><% end %></td>
-            </tr>
+              <td data-label="Holiday"><span class="hrl-row"><%= holiday.name %><% if next_up %> <span class="hrl-badge">Next</span><% end %><% if holiday.optional %> <span class="hrl-badge hrl-badge--muted">Optional</span><% end %></span></td>
+            <% end %>
           <% end %>
         </tbody>
       </table>

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

@@ -2,30 +2,40 @@
   <h1 class="hrl-page__title">Hello, <%= hr_display_name(hr_current_user) %></h1>
 </div>
 
+<% if (@waiting + @queue).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>
+  </section>
+<% end %>
+
 <div class="hrl-grid hrl-grid--2">
-  <%= render "hr_lite/attendance/punch_card" %>
+  <%= render "hr_lite/attendance/punch_card", attention: @attention %>
   <%= render "hr_lite/leave_requests/balance_chips" %>
+
+  <% if @mine_pending.any? %>
+    <section class="hrl-card">
+      <h2 class="hrl-card__title">My requests</h2>
+      <% @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 ]
+             else [ "Comp-off", "Worked #{req.date_worked.strftime('%a %-d %b')}", hr_lite.comp_off_requests_path ]
+             end %>
+        <a class="hrl-listrow" href="<%= href %>">
+          <span><%= title %></span>
+          <%= hrl_request_status_badge(req.status) %>
+          <span class="hrl-small hrl-muted"><%= detail %></span>
+        </a>
+      <% end %>
+    </section>
+  <% end %>
   <%= render "hr_lite/holidays/next_holiday" %>
 
   <section class="hrl-card">
-    <h2 class="hrl-card__title">Out today</h2>
-    <% if @out_today.any? %>
-      <%# Name and dates only — the leave type (sick leave) is the employee's own business. %>
-      <div class="hrl-feed">
-        <% @out_today.first(10).each do |leave| %>
-          <div class="hrl-feed__item">
-            <div class="hrl-feed__body"><%= tag.strong hr_display_name(leave.user), title: "On leave: #{leave.date_range_label}" %>
-              <div class="hrl-feed__meta"><%= leave.date_range_label %></div></div>
-          </div>
-        <% end %>
-      </div>
-      <% if @out_today.size > 10 %>
-        <p class="hrl-muted hrl-small">+<%= @out_today.size - 10 %> more</p>
-      <% end %>
-    <% else %>
-      <p class="hrl-muted hrl-small">Everyone's in today.</p>
-    <% end %>
-    <a class="hrl-small" href="<%= hr_lite.team_path %>">Team board</a>
+    <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>
 
   <section class="hrl-card">

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

@@ -10,30 +10,13 @@
   <% if @requests.empty? %>
     <p class="hrl-muted">Nothing raised yet.</p>
   <% else %>
-    <div class="hrl-table-wrap">
-      <table class="hrl-table hrl-table--stack">
-        <thead><tr><th>Request</th><th>Raised</th><th>Status</th><th></th></tr></thead>
-        <tbody>
-          <% @requests.each do |request| %>
-            <tr>
-              <td data-label="Request">
-                <a href="<%= hr_lite.hr_request_path(request) %>"><%= request.subject %></a>
-                <div class="hrl-small hrl-muted"><%= request.category_label %></div>
-              </td>
-              <td data-label="Raised"><%= request.created_at.to_date.strftime("%d %b %Y") %></td>
-              <td data-label="Status"><%= hrl_request_status_badge(request.status) %></td>
-              <td data-label="">
-                <% if request.open? || request.in_progress? %>
-                  <%= button_to "Withdraw", hr_lite.cancel_hr_request_path(request),
-                        class: "hrl-btn",
-                        form: { data: { turbo_confirm: "Withdraw this request?" } } %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
+    <% @requests.each do |request| %>
+      <a class="hrl-listrow" href="<%= hr_lite.hr_request_path(request) %>">
+        <span><%= request.subject %></span>
+        <%= hrl_request_status_badge(request.status) %>
+        <span class="hrl-small hrl-muted"><%= request.category_label %> · <%= request.created_at.to_date.strftime("%d %b %Y") %></span>
+      </a>
+    <% end %>
     <%= hrl_pagination %>
   <% end %>
 </section>

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

@@ -6,14 +6,16 @@
     <%= render "hr_lite/shared/form_errors", record: @request %>
 
     <div class="hrl-field">
-      <%= f.label :category, "What is this about" %>
-      <%= f.select :category,
-            HrLite::HrRequest::CATEGORIES.map { |c| [ c.humanize, c ] },
-            { include_blank: "Choose one" } %>
+      <%= f.label :category, "What is this about", id: "hrl-request-category", for: nil %>
+      <div class="hrl-chiprow" role="radiogroup" aria-labelledby="hrl-request-category">
+        <% HrLite::HrRequest::CATEGORIES.each do |c| %>
+          <label><%= f.radio_button :category, c, required: true %><span><%= HrLite::HrRequest.category_label(c) %></span></label>
+        <% end %>
+      </div>
     </div>
     <div class="hrl-field">
       <%= f.label :subject, "In one line" %>
-      <%= f.text_field :subject %>
+      <%= f.text_field :subject, required: true %>
     </div>
     <div class="hrl-field">
       <%= f.label :body, "Anything else HR should know" %>

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

@@ -12,6 +12,10 @@
   <% if @request.body.present? %>
     <div class="hrl-prose"><%= simple_format(@request.body) %></div>
   <% end %>
+  <% if @request.open? || @request.in_progress? %>
+    <%= button_to "Withdraw", hr_lite.cancel_hr_request_path(@request), class: "hrl-btn hrl-mt",
+                  form: { data: { turbo_confirm: "Withdraw this request?" } } %>
+  <% end %>
 </section>
 
 <% if @request.resolution.present? %>

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

@@ -3,8 +3,9 @@
   <p class="hrl-page__sub">Appreciate teammates publicly. Mention people with @ — they get notified.</p>
 </div>
 
-<section class="hrl-card">
-  <%= form_with model: @kudo, url: hr_lite.kudos_path, local: true do |f| %>
+<details class="hrl-card" <%= "open" if @kudo.errors.any? %>>
+  <summary class="hrl-btn hrl-btn--primary hrl-btn--block">Give kudos</summary>
+  <%= form_with model: @kudo, url: hr_lite.kudos_path, local: true, class: "hrl-mt" do |f| %>
     <%= render "hr_lite/shared/form_errors", record: @kudo %>
     <div class="hrl-field">
       <%= f.label :message, "Say something nice" %>
@@ -24,7 +25,7 @@
       <%= f.submit "Post kudos", class: "hrl-btn hrl-btn--primary" %>
     </div>
   <% end %>
-</section>
+</details>
 
 <section class="hrl-card">
   <% if @kudos.any? %>

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

@@ -1,19 +1,28 @@
 <% content_for(:page_title) { "Leave balances" } %>
+<% content_for(:back, "Leaves") %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Leave balances <%= HrLite::LeaveYear.label(@year) %></h1>
+  <div class="hrl-page__actions">
+    <a class="hrl-btn hrl-btn--primary" href="<%= hr_lite.new_leave_request_path %>">Apply</a>
+  </div>
 </div>
 
+<% if @balances.any? %>
 <div class="hrl-grid hrl-grid--2">
   <% @balances.each do |balance| %>
     <section class="hrl-card">
       <h2 class="hrl-card__title"><%= balance.leave_type.name %></h2>
       <dl class="hrl-deflist">
-        <dt>Entitled</dt><dd><%= balance.entitled.to_f %></dd>
-        <dt>Used</dt><dd><%= balance.used.to_f %></dd>
-        <dt>Available</dt><dd><strong><%= balance.available.to_f %></strong></dd>
-        <% if balance.carried_forward.positive? %><dt>Carried forward</dt><dd><%= balance.carried_forward.to_f %></dd><% end %>
-        <% if balance.adjustment.nonzero? %><dt>Adjustments</dt><dd><%= balance.adjustment.to_f %> <span class="hrl-muted hrl-small"><%= balance.adjustment_note %></span></dd><% end %>
+        <dt><%= balance.leave_type.comp_off ? "Credited" : "Entitled" %></dt><dd><%= hrl_days(balance.entitled) %></dd>
+        <dt>Used</dt><dd><%= hrl_days(balance.used) %></dd>
+        <dt>Available</dt><dd><strong><%= hrl_days(balance.available) %></strong></dd>
+        <% if balance.carried_forward.positive? %><dt>Carried forward</dt><dd><%= hrl_days(balance.carried_forward) %></dd><% end %>
+        <% if balance.adjustment.nonzero? %><dt>Adjustments</dt><dd><%= hrl_days(balance.adjustment) %> <span class="hrl-muted hrl-small"><%= balance.adjustment_note %></span></dd><% end %>
       </dl>
+      <a class="hrl-card__link" href="<%= hr_lite.new_leave_request_path(leave_type_id: balance.leave_type_id) %>">Apply</a>
     </section>
   <% end %>
 </div>
+<% else %>
+<p class="hrl-card hrl-card--empty">No leave types set up yet. Ask HR.</p>
+<% end %>

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

@@ -5,12 +5,14 @@
     <div class="hrl-row">
       <% types.each do |type| %>
         <% balance = HrLite::LeaveBalance.for(hr_current_user, type, HrLite::LeaveYear.current_key) %>
-        <span class="hrl-badge" style="background: <%= type.color %>1f; color: <%= type.color %>;">
-          <%= type.code %> <%= balance.available.to_f %>/<%= balance.entitled.to_f %>
+        <span class="hrl-badge hrl-badge--type" style="--hrl-type: <%= type.color %>">
+          <%= type.name %> · <%= hrl_days(balance.available) %> of <%= hrl_days(balance.entitled) %> left
         </span>
       <% end %>
     </div>
-    <a class="hrl-btn hrl-mt" href="<%= hr_lite.new_leave_request_path %>">Apply for leave</a>
+    <% unless local_assigns[:compact] %>
+      <a class="hrl-btn hrl-mt" href="<%= hr_lite.new_leave_request_path %>">Apply for leave</a>
+    <% end %>
   <% else %>
     <p class="hrl-muted hrl-small">No leave types configured yet.</p>
   <% end %>

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

@@ -0,0 +1,16 @@
+<%# Name and dates only — the leave type (sick leave) is the employee's own business. %>
+<% if leaves.any? %>
+  <div class="hrl-feed">
+    <% leaves.first(10).each do |leave| %>
+      <div class="hrl-feed__item">
+        <div class="hrl-feed__body"><%= tag.strong hr_display_name(leave.user), title: "On leave: #{leave.date_range_label}" %>
+          <div class="hrl-feed__meta"><%= leave.date_range_label %></div></div>
+      </div>
+    <% end %>
+  </div>
+  <% if leaves.size > 10 %>
+    <p class="hrl-muted hrl-small">+<%= leaves.size - 10 %> more</p>
+  <% end %>
+<% else %>
+  <p class="hrl-muted hrl-small"><%= empty %></p>
+<% end %>