hr_lite 0.53.0 → 0.55.0

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,16 +2,17 @@
 <% 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>
   <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/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/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/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/statutory_seeds.rb

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

data/lib/hr_lite/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.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