hr_lite 0.35.1 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b89cc7943db74414a4d788a6455c972cbc114f786a1f4f9441908dba5fe9a0a4
-  data.tar.gz: 7a80d0e103a2dab3720ba5b3f3abbc861e1b0133d85edd20035314667b325928
+  metadata.gz: 91b052360d5658195be8a557e080ddcaea5660de77265ff6cb4d030b879f23a8
+  data.tar.gz: 32a1e1624df566187143af64b995b0af4a2db0c44463ff7600d0f6d7ed0f2e32
 SHA512:
-  metadata.gz: 5b0d4fa99d60e1c3b4d15275ab7309032922c384d64aaa9af950980427ade931dc91c369f78b8870708f04b1284cedbe89c990a9705a4b28c22fd74a0ffa7ca9
-  data.tar.gz: 17f0cacac2684fd53c56d2faffb8846531529e3e97f723cd4d9845eb78ed1bc5d687dfd1116b2aeda08dc3c30faf36cfdd1e5a42b976fd3593595817330c15b6
+  metadata.gz: 0caced16fcf281925ba4ec901631dcffcd20e07aad5124781c67751298f1dfde737eb9ca60eaf4f3c100d47129a76a83bfb2ff93bd72d21db6de2834319dbc57
+  data.tar.gz: 8002305bba4b795098b2499a6765809a2a1aebf3c281fe715e7fc72f349ef3630cc653f2abbda98c32d03df4f5c223cbd4bf17e4ddb8b8404085aaa080a80f40

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.36.0] - 2026-10-13
+
+- Pick how long a mode lasts: Busy, Meeting and Out of office offer 15 min, 30 min, 1 h, 2 h, 4 h or 1 day (30 min preselected); Travelling and Client meeting also offer "Until I change it" (the default). Lunch and short break offer only lengths within their company limit — lunch 15 or 30 min by default — and one tap still takes the full limit; a longer break is refused. Every mode ends on its own at the picked time; the longest is a day. The choices are real radio buttons shown as 44px chips with 8px gaps.
+
 ## [0.35.1] - 2026-10-13
 
 - Spacing: forms, buttons and expandable sections stacked in a card no longer touch (only form fields carried spacing, so "Set a status" sat on "Change my mode", "Save status" on "Check in", "Out of office" on "Check out"). One card-level rule gives them a 12px gap. The emoji grid, lead picker, check-in badges, punch-card links (now wrapping as whole items, no dangling dots) and the admin month's In/Out map links all keep at least the 8px gap between touch targets. Measured at 360 px and 1280 px across Home, Attendance, WFH, WFH locations, My work time, Team and the HR work-mode, WFH, locations, work-time, attendance, holidays and employee screens: no stacked targets closer than 8px, no horizontal scroll.

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

@@ -43,7 +43,7 @@ module HrLite
         raise ActiveRecord::RecordNotFound if employee.id == hr_current_user.id
 
         result = WorkModeSwitch.call(user: employee, mode: params[:mode], source: "hr", actor: hr_current_user,
-                                     params: params.permit(:title, :client, :destination, :reason, :minutes, :until, :category, :crm_ref))
+                                     params: params.permit(:title, :client, :destination, :reason, :minutes, :until, :category, :crm_ref, :duration))
         flash_for = result.ok? ? { notice: "#{hr_display_name(employee)} is now: #{result.event.label}." } : { alert: result.error }
         redirect_back fallback_location: admin_attendance_path(employee.id), **flash_for
       end

data/app/controllers/hr_lite/work_modes_controller.rb

@@ -5,7 +5,7 @@ module HrLite
 
     def create
       result = WorkModeSwitch.call(user: hr_current_user, mode: params[:mode], source: "employee", actor: hr_current_user,
-                                   params: params.permit(:title, :client, :destination, :reason, :minutes, :until, :category, :crm_ref))
+                                   params: params.permit(:title, :client, :destination, :reason, :minutes, :until, :category, :crm_ref, :duration))
       if result.ok?
         redirect_to attendance_path, notice: "You are now: #{result.event.label}."
       else

data/app/services/hr_lite/work_mode_switch.rb

@@ -13,6 +13,17 @@ module HrLite
 
     def self.call(...) = new(...).call
 
+    # How long a mode lasts, picked per use (owner, 2026-10-13): 15 min up to a day.
+    DURATIONS = { "15" => 15.minutes, "30" => 30.minutes, "60" => 1.hour, "120" => 2.hours,
+                  "240" => 4.hours, "day" => 1.day }.freeze
+    DURATION_LABELS = { "15" => "15 min", "30" => "30 min", "60" => "1 h", "120" => "2 h", "240" => "4 h", "day" => "1 day" }.freeze
+
+    # The lengths offered for a mode: breaks never past their company limit.
+    def self.duration_choices(mode)
+      cap = { "lunch" => Setting.instance.lunch_break_minutes, "short_break" => Setting.instance.short_break_minutes }[mode.to_s]
+      cap ? DURATIONS.keys.select { |k| DURATIONS[k] <= cap.minutes } : DURATIONS.keys
+    end
+
     CLEAR_AFTER = { "30" => 30.minutes, "60" => 1.hour, "240" => 4.hours, "today" => :today, "never" => nil }.freeze
 
     # A person's own status, Slack-style: works with or without a check-in
@@ -120,10 +131,18 @@ module HrLite
       day = @now.in_time_zone(HrLite.config.time_zone).all_day
       return "You have already taken lunch today." if WorkModeEvent.where(user_id: @user.id, mode: "lunch", started_at: day).exists?
 
-      base.merge(ends_at: @now + Setting.instance.lunch_break_minutes.minutes)
+      capped_break(Setting.instance.lunch_break_minutes)
     end
 
-    def short_break_attrs = base.merge(ends_at: @now + Setting.instance.short_break_minutes.minutes)
+    def short_break_attrs = capped_break(Setting.instance.short_break_minutes)
+
+    # A break runs the picked length (never past the limit), or the full limit.
+    def capped_break(limit)
+      return base.merge(ends_at: @now + limit.minutes) unless @p[:duration]
+      return "That break length is over the #{limit}-minute limit." unless self.class.duration_choices(@mode).include?(@p[:duration])
+
+      base.merge(ends_at: @now + DURATIONS[@p[:duration]])
+    end
 
     def parse_until
       Time.zone.parse("#{@now.to_date} #{@p[:until]}") if @p[:until]
@@ -131,12 +150,18 @@ module HrLite
       nil
     end
 
-    # minutes (30/60/…) or until "HH:MM" today; must be in the future, today.
+    # A picked length (15 min … 1 day), or minutes / an "HH:MM" end time;
+    # always in the future and at most a day away.
     def timed(attrs, required: true)
-      ends_at = @p[:minutes] ? @now + @p[:minutes].to_i.minutes : parse_until
+      return "Pick how long from the choices." if @p[:duration] && !DURATIONS.key?(@p[:duration])
+
+      ends_at = if @p[:duration] then @now + DURATIONS[@p[:duration]]
+      elsif @p[:minutes] then @now + @p[:minutes].to_i.minutes
+      else parse_until
+      end
       return attrs unless ends_at || required
-      return "Pick when it ends." unless ends_at
-      return "The end time must be later today." unless ends_at > @now && ends_at <= @now.end_of_day
+      return "Pick how long." unless ends_at
+      return "The end time must be later than now, and at most a day away." unless ends_at > @now && ends_at <= @now + 1.day
 
       attrs.merge(ends_at: ends_at)
     end

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

@@ -0,0 +1,16 @@
+<%# How long a mode lasts: real radios styled as chips (selected state exposed).
+    locals: mode, id, optional (adds "Until I change it", the default) %>
+<% choices = HrLite::WorkModeSwitch.duration_choices(mode)
+   optional = local_assigns[:optional]
+   default = optional ? "" : (choices.include?("30") ? "30" : choices.last) %>
+<fieldset class="hrl-field">
+  <legend class="hrl-small"><strong>How long</strong></legend>
+  <div class="hrl-chiprow" role="radiogroup" aria-label="How long">
+    <% if optional %>
+      <label><input type="radio" name="duration" value="" <%= "checked" if default == "" %>><span>Until I change it</span></label>
+    <% end %>
+    <% choices.each do |key| %>
+      <label><input type="radio" name="duration" id="<%= id %>-<%= key %>" value="<%= key %>" <%= "checked" if key == default %>><span><%= HrLite::WorkModeSwitch::DURATION_LABELS[key] %></span></label>
+    <% end %>
+  </div>
+</fieldset>

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

@@ -22,22 +22,37 @@
   <details>
     <summary class="hrl-btn hrl-btn--block">Change my mode</summary>
     <div class="hrl-mode-switch">
-      <% %w[lunch short_break office].each do |mode| %>
-        <%= button_to hr_lite.work_mode_path, params: { mode: mode }, method: :post, class: "hrl-btn hrl-btn--block" do %>
-          <%= hrl_mode_icon(HrLite::WorkStatus::Entry.new(mode: mode, label: HrLite::WorkModeEvent.label(mode))) %>
-          <%= HrLite::WorkModeEvent.label(mode) %>
-        <% end %>
+      <%= button_to hr_lite.work_mode_path, params: { mode: "office" }, method: :post, class: "hrl-btn hrl-btn--block" do %>
+        <%= hrl_mode_icon(HrLite::WorkStatus::Entry.new(mode: "office", label: HrLite::WorkModeEvent.label("office"))) %>
+        <%= HrLite::WorkModeEvent.label("office") %>
       <% end %>
       <% if HrLite::WfhRequest.approved_for(hr_current_user.id, Date.current) || HrLite::EmployeeProfile.where(user_id: hr_current_user.id).pick(:permanent_wfh) %>
         <%= button_to "Work from home", hr_lite.work_mode_path, params: { mode: "wfh" }, method: :post, class: "hrl-btn hrl-btn--block" %>
       <% end %>
+      <%# Breaks: one tap for the full limit, or pick a shorter length when the limit allows a choice. %>
+      <% %w[lunch short_break].each do |mode| %>
+        <% if HrLite::WorkModeSwitch.duration_choices(mode).size > 1 %>
+          <details>
+            <summary class="hrl-btn hrl-btn--block"><%= HrLite::WorkModeEvent.label(mode) %></summary>
+            <%= form_with url: hr_lite.work_mode_path, method: :post, local: true do %>
+              <input type="hidden" name="mode" value="<%= mode %>">
+              <%= render "hr_lite/attendance/duration_chips", mode: mode, id: "dur-#{mode}" %>
+              <button type="submit" class="hrl-btn hrl-btn--primary">Start <%= HrLite::WorkModeEvent.label(mode).downcase %></button>
+            <% end %>
+          </details>
+        <% else %>
+          <%= button_to hr_lite.work_mode_path, params: { mode: mode }, method: :post, class: "hrl-btn hrl-btn--block" do %>
+            <%= hrl_mode_icon(HrLite::WorkStatus::Entry.new(mode: mode, label: HrLite::WorkModeEvent.label(mode))) %>
+            <%= HrLite::WorkModeEvent.label(mode) %>
+          <% end %>
+        <% end %>
+      <% end %>
 
       <details>
         <summary class="hrl-btn hrl-btn--block">Busy / focus</summary>
         <%= form_with url: hr_lite.work_mode_path, method: :post, local: true do %>
           <input type="hidden" name="mode" value="busy">
-          <div class="hrl-field"><label for="busy-minutes">For</label>
-            <%= select_tag :minutes, options_for_select([ [ "30 minutes", 30 ], [ "1 hour", 60 ], [ "2 hours", 120 ] ]), id: "busy-minutes" %></div>
+          <%= render "hr_lite/attendance/duration_chips", mode: "busy", id: "dur-busy" %>
           <button type="submit" class="hrl-btn hrl-btn--primary">Set busy</button>
         <% end %>
       </details>
@@ -48,7 +63,7 @@
           <div class="hrl-field"><label for="mt-title">Meeting</label><input class="hrl-input" id="mt-title" name="title" maxlength="120" required></div>
           <div class="hrl-field"><label for="mt-client">Client (optional)</label><input class="hrl-input" id="mt-client" name="client" maxlength="120"></div>
           <%= render "hr_lite/attendance/crm_picker", id: "mt-crm" %>
-          <div class="hrl-field"><label for="mt-until">Ends at</label><input class="hrl-input" type="time" id="mt-until" name="until" required></div>
+          <%= render "hr_lite/attendance/duration_chips", mode: "meeting", id: "dur-meeting" %>
           <button type="submit" class="hrl-btn hrl-btn--primary">Start meeting</button>
         <% end %>
       </details>
@@ -60,7 +75,7 @@
           <div class="hrl-field"><label for="tr-why">Purpose</label><input class="hrl-input" id="tr-why" name="title" maxlength="120" required></div>
           <div class="hrl-field"><label for="tr-client">Client (optional)</label><input class="hrl-input" id="tr-client" name="client" maxlength="120"></div>
           <%= render "hr_lite/attendance/crm_picker", id: "tr-crm" %>
-          <div class="hrl-field"><label for="tr-until">Back by (optional)</label><input class="hrl-input" type="time" id="tr-until" name="until"></div>
+          <%= render "hr_lite/attendance/duration_chips", mode: "travelling", id: "dur-travelling", optional: true %>
           <button type="submit" class="hrl-btn hrl-btn--primary">Start travelling</button>
         <% end %>
       </details>
@@ -72,7 +87,7 @@
           <div class="hrl-field"><label for="om-client">Client or prospect<%= " (or link a lead above)" if HrLite.config.crm_search %></label><input class="hrl-input" id="om-client" name="client" maxlength="120"<%= " required" unless HrLite.config.crm_search %>></div>
           <div class="hrl-field"><label for="om-why">Purpose</label><input class="hrl-input" id="om-why" name="title" maxlength="120" required></div>
           <div class="hrl-field"><label for="om-where">Where (optional)</label><input class="hrl-input" id="om-where" name="destination" maxlength="120"></div>
-          <div class="hrl-field"><label for="om-until">Ends at (optional)</label><input class="hrl-input" type="time" id="om-until" name="until"></div>
+          <%= render "hr_lite/attendance/duration_chips", mode: "outside_meeting", id: "dur-om", optional: true %>
           <button type="submit" class="hrl-btn hrl-btn--primary">Start client meeting</button>
         <% end %>
       </details>
@@ -82,7 +97,7 @@
           <input type="hidden" name="mode" value="out_of_office">
           <div class="hrl-field"><label for="oo-why">Reason</label>
             <%= select_tag :category, options_for_select(HrLite::WorkModeSwitch::OUT_OF_OFFICE_REASONS.invert), id: "oo-why" %></div>
-          <div class="hrl-field"><label for="oo-until">Back by</label><input class="hrl-input" type="time" id="oo-until" name="until" required></div>
+          <%= render "hr_lite/attendance/duration_chips", mode: "out_of_office", id: "dur-oo" %>
           <p class="hrl-small hrl-muted">Away for a full day? <a href="<%= hr_lite.new_leave_request_path %>">Apply for leave</a> instead.</p>
           <button type="submit" class="hrl-btn hrl-btn--primary">Set out of office</button>
         <% end %>

data/lib/hr_lite/version.rb

@@ -1,3 +1,3 @@
 module HrLite
-  VERSION = "0.35.1"
+  VERSION = "0.36.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.36.0
 platform: ruby
 authors:
 - kshitiz sinha
@@ -350,6 +350,7 @@ files:
 - app/views/hr_lite/attendance/_calendar_connection.html.erb
 - app/views/hr_lite/attendance/_crm_picker.html.erb
 - app/views/hr_lite/attendance/_custom_status.html.erb
+- app/views/hr_lite/attendance/_duration_chips.html.erb
 - app/views/hr_lite/attendance/_month_grid.html.erb
 - app/views/hr_lite/attendance/_penalties.html.erb
 - app/views/hr_lite/attendance/_punch_card.html.erb