hr_lite 0.50.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01cbb25a2be4121524133e4ae3cc27c20e703edbe2ad51c41830f89a6223b5d6
-  data.tar.gz: ba0ed1ceeda7d1c25eec0a9607e773b260cd255eadee1f68b4d35667ab0de9d1
+  metadata.gz: 29f3f6694be039bef5c21d9548eaf1aaf8ff7c60191b0e92e2903c9fac7769fe
+  data.tar.gz: 361260627747e8ca8280401e985ef777cc8b267864fc6ccc0229ddf84670e939
 SHA512:
-  metadata.gz: a50669d8acec885fcaa6304e071785a34432c1bd8314edf57faac5f5436651b186e17c226e3413f50bb872f38fc52859dd61c0f248bd2ab09f03215c9a9d962f
-  data.tar.gz: 92b42d0e6301c22de05a6eed335f84065ad81eb5fd8ae3d3887dae0f38c66b485bcec3f9b13b7ea957ebf3dda4b16a38d891d69e351356bd91b50bb69d9a1877
+  metadata.gz: fbe31ca225879b95e882ee76b5cca183ef535c124c75616ebde7cd350bc03bff252febf09d6e7375f0dcf395ab19593548140667e6aa358b707be8f405c0f6f3
+  data.tar.gz: 39472b4fffa414eaafcbb2a7fb366354608d79f91f1cabe3e41d1e5a32380a2f7b42460fe3539e726850e163cea5680b5531aa4edf5ab7e79449d16e425e4091

data/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.51.0] - 2026-10-16
+
+- Shorter day on a repeat: HR or admin give a person 30, 60 or 90 minutes off the working day (so 7h at the least) on a pattern set like a calendar's custom repeat: every N days, every N weeks on chosen weekdays, or every N months on the start's date, from a start date, ending never, on a date, or after N times. No repeat means every day, as before.
+- Set it on the person's This week screen (Shorter day card) or on their employee profile; both edit the same fields. The card shows the pattern to anyone who can open the screen. The form and the reason show only to those who manage profiles company-wide, and never on your own record.
+- The day's required hours, the short-day check and the "Your day" badge follow the pattern, and This week marks each day it covers with "Day 7h 00m".
+- Migration: `hr_lite_employee_profiles.hours_allowance_repeat` (string). Hosts rebuild their schema on the bump.
+
 ## [0.50.0] - 2026-10-16
 
 - Global search: one box for screens and people. It opens with ⌘K or Ctrl+K anywhere, from **Search** at the top of the sidebar, or from **Search** in the phone's More sheet. Typing (2 letters or more) lists matching screens and people; arrows move, Enter opens, and Escape closes. With JavaScript off, Search opens the `/search` page.

data/app/controllers/hr_lite/admin/attendances_controller.rb

@@ -136,6 +136,21 @@ module HrLite
         @penalties = AttendancePenalty.active.where(user_id: @employee.id, date: range).group(:date).sum(:minutes)
         @balances = LeaveType.active.where(paid: true).map { |type| LeaveBalance.for(@employee, type, LeaveYear.current_key) }
         @requests = summary_requests(@employee, range)
+        @profile = EmployeeProfile.find_by(user_id: @employee.id)
+      end
+
+      # The shorter day and its repeat, from This week: the employee form's own
+      # gate (profile.manage, company-wide) and never your own record.
+      def shorter_day
+        return hr_access_denied unless hr_can?("profile.manage", scope: :all)
+        @employee = find_visible_employee
+        raise ActiveRecord::RecordNotFound if @employee.id == hr_current_user.id
+
+        profile = EmployeeProfile.find_by!(user_id: @employee.id)
+        saved = profile.update(params.require(:employee_profile).permit(:hours_allowance_minutes, :hours_allowance_reason)
+                                     .merge(hours_allowance_repeat: RepeatRule.from_params(params.fetch(:repeat, {}))&.to_s))
+        redirect_to summary_admin_attendance_path(@employee.id, anchor: "shorter-day"),
+                    saved ? { notice: "Shorter day saved." } : { alert: profile.errors.full_messages.to_sentence }
       end
 
       # HR sets a locked slot from today for the period.

data/app/controllers/hr_lite/admin/employees_controller.rb

@@ -125,8 +125,11 @@ module HrLite
       # hands one person's PAN, bank details and pay history to another, so it
       # is a create-time field only.
       def update_profile_params
-        profile_params.except(:user_id)
+        profile_params.except(:user_id).merge(repeat_param)
       end
+
+      # The shorter day's repeat (RepeatRule); absent when the form has no repeat fields.
+      def repeat_param = params.key?(:repeat) ? { hours_allowance_repeat: RepeatRule.from_params(params[:repeat])&.to_s } : {}
     end
   end
 end

data/app/models/hr_lite/attendance_record.rb

@@ -54,7 +54,7 @@ module HrLite
     # The working day HR sets in Settings, less the person's allowance. Nil when
     # the host turns hours rules off (config.work_hours), and on Saturdays.
     def required_minutes
-      EmployeeProfile.day_minutes_for(user_id) unless HrLite.config.work_hours.nil? || date.saturday?
+      EmployeeProfile.day_minutes_for(user_id, on: date) unless HrLite.config.work_hours.nil? || date.saturday?
     end
 
     # Hours worked, not the clock: an early start counts.
@@ -71,7 +71,7 @@ module HrLite
       return unless HrLite.config.attendance_slots && check_in_at
 
       extra = AttendancePenalty.active.where(user_id: user_id, date: date).sum(:minutes)
-      check_in_at + (EmployeeProfile.day_minutes_for(user_id) + extra).minutes
+      check_in_at + (EmployeeProfile.day_minutes_for(user_id, on: date) + extra).minutes
     end
 
     def worked_under?(minutes) = !!(minutes && worked_duration && worked_duration < minutes.minutes)

data/app/models/hr_lite/employee_profile.rb

@@ -41,8 +41,13 @@ module HrLite
     validates :hours_allowance_minutes, inclusion: { in: HOURS_ALLOWANCE_MINUTES }, allow_nil: true
     validates :hours_allowance_reason, presence: true, if: :hours_allowance_minutes
 
-    # One person's working day: HR's day in Settings less their allowance.
-    def self.day_minutes_for(user_id) = Setting.instance.day_minutes - where(user_id: user_id).pick(:hours_allowance_minutes).to_i
+    # One person's working day on a date: HR's day in Settings less their
+    # allowance, on the days its repeat covers (no repeat = every day).
+    def self.day_minutes_for(user_id, on: Date.current)
+      minutes, repeat = where(user_id: user_id).pick(:hours_allowance_minutes, :hours_allowance_repeat)
+      applies = minutes && (repeat.blank? || RepeatRule.parse(repeat).occurs_on?(on))
+      Setting.instance.day_minutes - (applies ? minutes : 0)
+    end
 
     TAX_REGIMES = %w[new old].freeze
     BLOOD_GROUPS = %w[A+ A- B+ B- AB+ AB- O+ O-].freeze

data/app/models/hr_lite/repeat_rule.rb

@@ -0,0 +1,74 @@
+module HrLite
+  # A calendar repeat, like Google Calendar's custom repeat (an RRULE subset):
+  # every N days, weeks (on chosen weekdays) or months (on the start's date),
+  # from a start date, ending never, on a date, or after N times. Stored as
+  # text, e.g. "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE,FR;DTSTART=2026-10-20;COUNT=12".
+  class RepeatRule
+    FREQS = { "DAILY" => "day", "WEEKLY" => "week", "MONTHLY" => "month" }.freeze
+    DAYS = %w[SU MO TU WE TH FR SA].freeze # index = Date#wday
+
+    attr_reader :freq, :interval, :days, :from, :until_date, :count
+
+    def self.parse(text)
+      return if text.blank?
+
+      parts = text.split(";").to_h { |part| part.split("=", 2) }
+      new(freq: parts["FREQ"], interval: parts["INTERVAL"], days: parts["BYDAY"].to_s.split(","),
+          from: parts["DTSTART"], until_date: parts["UNTIL"], count: parts["COUNT"])
+    end
+
+    # The form's repeat[...] fields; a blank frequency means every day (no rule).
+    def self.from_params(params)
+      return if params[:freq].blank?
+
+      new(freq: params[:freq], interval: params[:interval], days: Array(params[:days]).compact_blank, from: params[:from],
+          until_date: (params[:until] if params[:ends] == "on"), count: (params[:count] if params[:ends] == "after"))
+    end
+
+    def initialize(freq:, interval: 1, days: [], from: nil, until_date: nil, count: nil)
+      @freq = FREQS.key?(freq.to_s.upcase) ? freq.to_s.upcase : "DAILY"
+      @interval = [ interval.to_i, 1 ].max
+      @days = days.map(&:upcase) & DAYS
+      @from = to_date(from) || Date.current
+      @until_date = to_date(until_date)
+      @count = count.to_i.positive? ? count.to_i : nil
+    end
+
+    def to_s
+      [ "FREQ=#{freq}", "INTERVAL=#{interval}", ("BYDAY=#{days.join(',')}" if days.any?), "DTSTART=#{from.iso8601}",
+        ("UNTIL=#{until_date.iso8601}" if until_date), ("COUNT=#{count}" if count) ].compact.join(";")
+    end
+
+    def occurs_on?(date)
+      return false if date < from || (until_date && date > until_date) || !matches?(date)
+
+      count.nil? || (from..date).count { |day| matches?(day) } <= count
+    end
+
+    # "Every 2 weeks on Mon, Wed, Fri from 20 Oct 2026, 12 times"
+    def describe
+      every = interval == 1 ? "Every #{FREQS[freq]}" : "Every #{interval} #{FREQS[freq]}s"
+      on = (" on #{days.map { |d| Date::ABBR_DAYNAMES[DAYS.index(d)] }.join(', ')}" if freq == "WEEKLY" && days.any?)
+      ends = until_date ? ", until #{until_date.strftime('%-d %b %Y')}" : (", #{count} times" if count)
+      "#{every}#{on} from #{from.strftime('%-d %b %Y')}#{ends}"
+    end
+
+    private
+
+    def matches?(date)
+      case freq
+      when "DAILY" then ((date - from).to_i % interval).zero?
+      when "WEEKLY"
+        (days.any? ? days.include?(DAYS[date.wday]) : date.wday == from.wday) &&
+          (((date.beginning_of_week - from.beginning_of_week).to_i / 7) % interval).zero?
+      else date.day == from.day && (((date.year * 12) + date.month - (from.year * 12) - from.month) % interval).zero?
+      end
+    end
+
+    def to_date(value)
+      value.is_a?(Date) ? value : Date.iso8601(value.to_s)
+    rescue Date::Error
+      nil
+    end
+  end
+end

data/app/views/hr_lite/admin/attendances/summary.html.erb

@@ -33,6 +33,9 @@
       <div class="hrl-feed__body hrl-small">
         <strong><%= date.strftime("%a %-d %b") %></strong>
         <span class="hrl-badge <%= tones[day.kind] %>"><%= HrLite::ApplicationHelper::DAY_STATES[day.kind][1] %></span>
+        <% if @profile&.hours_allowance_minutes && (length = HrLite::EmployeeProfile.day_minutes_for(@employee.id, on: date)) < HrLite::Setting.instance.day_minutes %>
+          <span class="hrl-badge hrl-badge--muted">Day <%= hrl_duration(length * 60) %></span>
+        <% end %>
         <% if rec&.check_in_at %>
           <div>In <%= rec.check_in_at.strftime("%H:%M") %><% if rec.check_out_at %> · Out <%= rec.check_out_at.strftime("%H:%M") %> · <%= hrl_duration(rec.worked_duration) %> worked<% end %></div>
         <% end %>
@@ -47,6 +50,23 @@
   <% end %>
 </section>
 
+<% if @profile %>
+  <section class="hrl-card" id="shorter-day">
+    <h2 class="hrl-card__title">Shorter day</h2>
+    <p class="hrl-small"><% if @profile.hours_allowance_minutes %><strong><%= @profile.hours_allowance_minutes %> min less</strong> · <%= HrLite::RepeatRule.parse(@profile.hours_allowance_repeat)&.describe || "Every day" %><% else %>None<% end %></p>
+    <% if @employee.id != hr_current_user.id && hr_can?("profile.manage", scope: :all) %>
+      <% if @profile.hours_allowance_reason.present? %><p class="hrl-small hrl-muted">Reason: <%= @profile.hours_allowance_reason %></p><% end %>
+      <details>
+        <summary class="hrl-btn hrl-btn--block"><%= @profile.hours_allowance_minutes ? "Change shorter day" : "Set a shorter day" %></summary>
+        <%= form_with model: @profile, scope: :employee_profile, url: hr_lite.shorter_day_admin_attendance_path(@employee.id), method: :patch, local: true do |f| %>
+          <%= render "hr_lite/admin/employees/shorter_day_fields", f: f, profile: @profile %>
+          <button type="submit" class="hrl-btn hrl-btn--primary">Save shorter day</button>
+        <% end %>
+      </details>
+    <% end %>
+  </section>
+<% end %>
+
 <section class="hrl-card">
   <h2 class="hrl-card__title">Requests</h2>
   <% if @requests.empty? %><p class="hrl-card--empty">No requests in this <%= @period.kind %>.</p><% end %>

data/app/views/hr_lite/admin/employees/_form.html.erb

@@ -90,11 +90,7 @@
       </div>
       <div class="hrl-field"><%= f.label :buffer_note, "Buffer note (HR only; required for Other)" %><%= f.text_area :buffer_note, rows: 2 %></div>
     <% end %>
-    <div class="hrl-field">
-      <%= f.label :hours_allowance_minutes, "Shorter day (e.g. a long commute; lowers the hours they must work)" %>
-      <%= f.select :hours_allowance_minutes, HrLite::EmployeeProfile::HOURS_ALLOWANCE_MINUTES.map { |m| [ "#{m} min less", m ] }, include_blank: "None" %>
-    </div>
-    <div class="hrl-field"><%= f.label :hours_allowance_reason, "Shorter day reason (HR only; required)" %><%= f.text_area :hours_allowance_reason, rows: 2 %></div>
+    <%= render "hr_lite/admin/employees/shorter_day_fields", f: f, profile: f.object %>
     <% if HrLite.config.office_geofence %>
       <div class="hrl-field hrl-field--check"><%= f.check_box :permanent_wfh %><%= f.label :permanent_wfh, "Permanent work from home (every working day counts as approved WFH; check-in still within 500 m of their approved home location)" %></div>
       <div class="hrl-field hrl-field--check"><%= f.check_box :field_staff %><%= f.label :field_staff, "Field staff (e.g. sales: may check in from anywhere as Travelling or Client meeting, with purpose and place)" %></div>

data/app/views/hr_lite/admin/employees/_shorter_day_fields.html.erb

@@ -0,0 +1,30 @@
+<%# locals: f (employee_profile form), profile — the shorter day and the days it repeats on (repeat[...] → RepeatRule). %>
+<% rule = HrLite::RepeatRule.parse(profile.hours_allowance_repeat)
+   ends = rule&.until_date ? "on" : (rule&.count ? "after" : "never") %>
+<div class="hrl-field">
+  <%= f.label :hours_allowance_minutes, "Shorter day (e.g. a long commute; lowers the hours they must work)" %>
+  <%= f.select :hours_allowance_minutes, HrLite::EmployeeProfile::HOURS_ALLOWANCE_MINUTES.map { |m| [ "#{m} min less", m ] }, include_blank: "None" %>
+</div>
+<div class="hrl-field">
+  <label for="repeat-freq">Repeats</label>
+  <%= select_tag "repeat[freq]", options_for_select([ [ "Every day", "" ], [ "Every N days", "DAILY" ], [ "Every N weeks, on the days below", "WEEKLY" ], [ "Every N months, on the start's date", "MONTHLY" ] ], rule&.freq), id: "repeat-freq" %>
+</div>
+<div class="hrl-field"><label for="repeat-interval">N (every how many)</label><%= number_field_tag "repeat[interval]", rule&.interval || 1, min: 1, max: 12, id: "repeat-interval", class: "hrl-input" %></div>
+<fieldset class="hrl-field">
+  <legend>Days (weekly)</legend>
+  <div class="hrl-row">
+    <% HrLite::RepeatRule::DAYS.rotate(1).each do |day| %>
+      <label class="hrl-field--check"><%= check_box_tag "repeat[days][]", day, rule&.days&.include?(day), id: "repeat-#{day}" %> <%= Date::ABBR_DAYNAMES[HrLite::RepeatRule::DAYS.index(day)] %></label>
+    <% end %>
+  </div>
+</fieldset>
+<div class="hrl-field"><label for="repeat-from">Starts</label><%= date_field_tag "repeat[from]", rule&.from || Date.current, id: "repeat-from" %></div>
+<fieldset class="hrl-field">
+  <legend>Ends</legend>
+  <label class="hrl-field--check"><%= radio_button_tag "repeat[ends]", "never", ends == "never", id: "repeat-ends-never" %> Never</label>
+  <label class="hrl-field--check"><%= radio_button_tag "repeat[ends]", "on", ends == "on", id: "repeat-ends-on" %> On a date</label>
+  <label class="hrl-field--check"><%= radio_button_tag "repeat[ends]", "after", ends == "after", id: "repeat-ends-after" %> After a number of times</label>
+</fieldset>
+<div class="hrl-field"><label for="repeat-until">End date (for "On a date")</label><%= date_field_tag "repeat[until]", rule&.until_date, id: "repeat-until" %></div>
+<div class="hrl-field"><label for="repeat-count">Times (for "After a number of times")</label><%= number_field_tag "repeat[count]", rule&.count, min: 1, id: "repeat-count", class: "hrl-input" %></div>
+<div class="hrl-field"><%= f.label :hours_allowance_reason, "Shorter day reason (HR only; required)" %><%= f.text_area :hours_allowance_reason, rows: 2 %></div>

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

@@ -23,8 +23,8 @@
     <% if record&.work_mode_label %>
       <span class="hrl-badge hrl-badge--ok"><%= record.work_mode_label %></span>
     <% end %>
-    <% if HrLite::EmployeeProfile.where(user_id: hr_current_user.id).pick(:hours_allowance_minutes) %>
-      <span class="hrl-badge hrl-badge--muted">Your day <%= hrl_duration(HrLite::EmployeeProfile.day_minutes_for(hr_current_user.id) * 60) %></span>
+    <% if (my_day = HrLite::EmployeeProfile.day_minutes_for(hr_current_user.id)) < HrLite::Setting.instance.day_minutes %>
+      <span class="hrl-badge hrl-badge--muted">Your day <%= hrl_duration(my_day * 60) %></span>
     <% end %>
     <% if record&.check_in_place == "home" && record.work_location %>
       <span class="hrl-badge hrl-badge--muted"><%= record.work_location.name %> · <%= HrLite::WorkLocation::FENCE_M %> m</span>

data/config/routes.rb

@@ -74,7 +74,7 @@ HrLite::Engine.routes.draw do
     get "overview", to: "overview#index"
     resources :attendances, only: %i[index show update], param: :user_id do
       collection { get :week }
-      member { get :summary; post :slot; post :unlock_slot; post :remove_penalty; post :remove_penalty_hours }
+      member { get :summary; patch :shorter_day; post :slot; post :unlock_slot; post :remove_penalty; post :remove_penalty_hours }
     end
     resources :leave_requests, only: %i[index show new create edit update] do
       member { post :approve; post :reject; post :cancel }

data/db/migrate/20261016100000_add_hours_allowance_repeat_to_hr_lite_employee_profiles.rb

@@ -0,0 +1,5 @@
+class AddHoursAllowanceRepeatToHrLiteEmployeeProfiles < ActiveRecord::Migration[8.1]
+  def change
+    add_column :hr_lite_employee_profiles, :hours_allowance_repeat, :string
+  end
+end

data/lib/hr_lite/version.rb

@@ -1,3 +1,3 @@
 module HrLite
-  VERSION = "0.50.0"
+  VERSION = "0.51.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.51.0
 platform: ruby
 authors:
 - kshitiz sinha
@@ -220,6 +220,7 @@ files:
 - app/models/hr_lite/policy_acknowledgement.rb
 - app/models/hr_lite/professional_tax_slab.rb
 - app/models/hr_lite/regularization_request.rb
+- app/models/hr_lite/repeat_rule.rb
 - app/models/hr_lite/resignation.rb
 - app/models/hr_lite/role.rb
 - app/models/hr_lite/role_assignment.rb
@@ -282,6 +283,7 @@ files:
 - app/views/hr_lite/admin/documents/index.html.erb
 - app/views/hr_lite/admin/documents/show.html.erb
 - app/views/hr_lite/admin/employees/_form.html.erb
+- app/views/hr_lite/admin/employees/_shorter_day_fields.html.erb
 - app/views/hr_lite/admin/employees/edit.html.erb
 - app/views/hr_lite/admin/employees/index.html.erb
 - app/views/hr_lite/admin/employees/new.html.erb
@@ -499,6 +501,7 @@ files:
 - db/migrate/20261015100000_create_hr_lite_attendance_punches.rb
 - 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
 - lib/generators/hr_lite/install/install_generator.rb
 - lib/generators/hr_lite/install/templates/AFTER_INSTALL
 - lib/generators/hr_lite/install/templates/initializer.rb