hr_lite 0.52.0 → 0.54.0

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

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

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

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

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

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

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

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

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

@@ -20,9 +20,11 @@
   </div>
   <%= render "hr_lite/attendance/month_grid", month: @month, day_status: @day_status, pending_dates: @pending_dates,
              link_builder: ->(d) { hr_lite.attendance_path(month: @month.strftime("%Y-%m"), day: d.iso8601, anchor: "day") if d <= Date.current } %>
-  <p class="hrl-small hrl-muted hrl-mt">Forgot to check in or out on some day?
-    <a href="<%= hr_lite.new_regularization_request_path %>">Raise a regularization ticket</a>
-    · <a href="<%= hr_lite.regularization_requests_path %>">My tickets</a></p>
+  <p class="hrl-small hrl-muted hrl-mt">Forgot to check in or out on some day?</p>
+  <div class="hrl-row">
+    <a class="hrl-btn" href="<%= hr_lite.new_regularization_request_path %>">Raise a regularization ticket</a>
+    <a class="hrl-btn" href="<%= hr_lite.regularization_requests_path %>">My tickets</a>
+  </div>
 </section>
 
 <% if HrLite.config.attendance_slots %>

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

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

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

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

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

@@ -21,7 +21,7 @@
       <dl class="hrl-deflist">
         <dt>Monthly instalment</dt><dd><%= hrl_money(loan.monthly_instalment) %></dd>
         <dt>Repaid so far</dt><dd><%= hrl_money(loan.repaid) %></dd>
-        <dt>Outstanding</dt><dd><strong><%= hrl_money(loan.outstanding) %></strong></dd>
+        <dt>Outstanding</dt><dd><strong><%= loan.active? ? hrl_money(loan.outstanding) : "—" %></strong></dd>
         <dt>Next deduction</dt>
         <dd>
           <% amount = loan.instalment_for(@next_month) %>

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

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

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

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

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

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

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

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

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

@@ -7,6 +7,13 @@
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
   <%= yield :head %>
+  <% if HrLite.config.native_app.call(request) %>
+    <%# The host's iOS/Android shells drive pages through Turbo. "reload" makes
+        every visit a full page load, so the plain scripts below run exactly
+        as they do in a browser. Browsers never load Turbo here. %>
+    <meta name="turbo-visit-control" content="reload">
+    <%= javascript_include_tag "hr_lite/vendor/turbo.min", type: "module" %>
+  <% end %>
   <%= stylesheet_link_tag "hr_lite/hr_lite", media: "all" %>
   <% HrLite.config.extra_stylesheets.each do |sheet| %>
     <%= stylesheet_link_tag sheet, media: "all" %>

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

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

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

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

data/config/routes.rb

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

data/lib/hr_lite/amount_in_words.rb

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

data/lib/hr_lite/configuration.rb

@@ -13,6 +13,9 @@ module HrLite
                   # ->(user) { { url:, unread: } } — shows a notifications link in
                   # the HR shell; nil (default) shows nothing.
                   :notifications,
+                  # ->(request) { bool } — is this request from the host's native app?
+                  # Native pages load Turbo (see the layout); browsers never do.
+                  :native_app,
                   # e.g. 6 — default probation for new hires (admin edits per employee)
                   :probation_months,
                   # true = a punch without GPS is refused (default: recorded and flagged)
@@ -114,6 +117,7 @@ module HrLite
       @public_url_base       = nil # e.g. "https://hr.example.com" — enables email links + HrLite.public_url
       @notification_matrix   = nil # resolved lazily to Notifications::DEFAULT_MATRIX
       @back_link             = nil # optional {label:, url:} for the shell nav
+      @native_app            = ->(request) { request.user_agent.to_s.match?(/Hotwire Native|Turbo Native/) }
       @leave_year_start_month = 1  # 1 = calendar year; 7 = July–June leave year
       @slip_release_day       = nil # e.g. 10 = slips open on the 10th of the next month
       @self_regularization    = nil # e.g. { within_days: 2, per_week: 2 } — employees fix their own missed punch

data/lib/hr_lite/statutory_seeds.rb

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

data/lib/hr_lite/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.52.0
+  version: 0.54.0
 platform: ruby
 authors:
 - kshitiz sinha
@@ -79,6 +79,7 @@ files:
 - app/assets/javascripts/hr_lite/share.js
 - app/assets/javascripts/hr_lite/tax_preview.js
 - app/assets/javascripts/hr_lite/vendor/html_to_image.js
+- app/assets/javascripts/hr_lite/vendor/turbo.min.js
 - app/assets/stylesheets/hr_lite/application.css
 - app/assets/stylesheets/hr_lite/hr_lite.css
 - app/controllers/hr_lite/admin/appraisals_controller.rb