hr_lite 0.54.0 → 0.56.0

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

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

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

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

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

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

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

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

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

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

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

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

data/db/migrate/20261017161441_make_hr_lite_benefit_enrolments_unique_while_open.rb

@@ -0,0 +1,8 @@
+class MakeHrLiteBenefitEnrolmentsUniqueWhileOpen < ActiveRecord::Migration[8.1]
+  # One open enrolment per person per plan; ended ones stay as history.
+  def change
+    remove_index :hr_lite_benefit_enrolments, %i[benefit_id user_id], unique: true, if_exists: true
+    add_index :hr_lite_benefit_enrolments, %i[benefit_id user_id], unique: true, where: "ended_on IS NULL",
+              name: "index_hr_lite_benefit_enrolments_one_open", if_not_exists: true
+  end
+end

data/db/migrate/20261017161443_add_attendance_record_id_index_to_hr_lite_work_mode_events.rb

@@ -0,0 +1,5 @@
+class AddAttendanceRecordIdIndexToHrLiteWorkModeEvents < ActiveRecord::Migration[8.1]
+  def change
+    add_index :hr_lite_work_mode_events, :attendance_record_id, if_not_exists: true
+  end
+end

data/lib/hr_lite/notifications.rb

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

data/lib/hr_lite/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.56.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
@@ -504,6 +505,8 @@ files:
 - db/migrate/20261016090000_add_penalty_leave_type_to_hr_lite_settings.rb
 - db/migrate/20261016091000_create_hr_lite_penalty_removals.rb
 - db/migrate/20261016100000_add_hours_allowance_repeat_to_hr_lite_employee_profiles.rb
+- db/migrate/20261017161441_make_hr_lite_benefit_enrolments_unique_while_open.rb
+- db/migrate/20261017161443_add_attendance_record_id_index_to_hr_lite_work_mode_events.rb
 - lib/generators/hr_lite/install/install_generator.rb
 - lib/generators/hr_lite/install/templates/AFTER_INSTALL
 - lib/generators/hr_lite/install/templates/initializer.rb