hr_lite 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d99d3408ecc4296bfb60310343f56df91495a48a6bc277881f6ebbd79a57de80
-  data.tar.gz: 9286e4b08358dbbe9f360967a57b134aa0ee6d74841daf80310ad79b372ae7b2
+  metadata.gz: 308cf87cc748758a71ff2bafc7cc301e7ff1fa3f0efc0e0b222e7e4e82e30161
+  data.tar.gz: 8541bec2dbd4b8c6c1b895065a9580f65de22ce01d128c86c4bc52455aa2bdc0
 SHA512:
-  metadata.gz: a96b511a5031812bf57b8b10314c1316eb29857f25f0e5dd4e454caea586bf88c3feff01180e3d5bdd8da693421c52524c9da93038740266c8bf9c079dca24ed
-  data.tar.gz: dc3d6659e50a6421935556bb13db5a0749198e119b6bc01fa5a84415a913d26e4a38397c71f2e529c379fdc14663eb9afb8825c1f402e9723e7c1fb2ba933ba8
+  metadata.gz: 7b6788e0da35e5695257ebf95e2a25b152a8c42d9659d449197995061b57220d34ae6503986f6aa80497cd55dc74e44d0ea2247126cf48924cead29d2c2f40f8
+  data.tar.gz: 06d8209caa183f2092611e9d7613b12a7d1cb45e3333a9ad0b0d1027e4f5ed48e6845e9b6766e6ed8f1352ca537c8921bf85e5e23af9b49876b75021273f645b

data/CHANGELOG.md

@@ -7,6 +7,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.20.0] - 2026-10-01
+
+Salary as CTC, and who is out today. No migration.
+
+### Added
+
+- **Fill from CTC.** The salary structure form takes an annual CTC, and
+  "Fill from CTC" splits it: Basic is half the monthly CTC, HRA is 40% of
+  Basic, the employer's PF and ESI are paid out of the CTC, and Special
+  allowance takes the rest, rounding included. Nothing is saved until Save,
+  which stores the lines shown; the CTC itself is never stored. A CTC too low
+  for the split is refused. The form shows the monthly gross and CTC a
+  structure works out to, and prefills the CTC on edit. Both use the rate
+  card of the month the structure takes effect, and the typed CTC never
+  reaches the audit log.
+- **`SalaryStructure#breakup`** gives one month of a structure: earnings, the
+  employee's PF, ESI and professional tax, the employer's PF and ESI, gross,
+  CTC and in-hand, from the existing statutory calculators. ESI is decided on
+  the salary that opened the ESIC period, as payroll does, and the yearly
+  professional tax is summed month by month so a February top-up counts once.
+- **My salary.** The salary slips page opens with the employee's current
+  structure as a Monthly | Yearly table, a structure HR has saved for a later
+  month ("New salary from …"), and earlier ones with their yearly CTC. Income
+  tax stays on the slips. Slip release day does not hide the card.
+- **Out today** on Home: everyone on approved leave today, by name, with the
+  leave's dates (`01 Oct – 05 Oct`, or `01 Oct (half day)`), and a link to the
+  Team board. The leave type is not shown, and staff who have left are not
+  listed.
+- **Team board** shows each leave's dates next to "On leave", and hovering a
+  name on the board or on Out today reads "On leave: 30 Sep – 03 Oct".
+
+### Fixed
+
+- Form action buttons wrap on a narrow phone, so a third button no longer
+  pushes the salary structure form sideways.
+
+### Upgrading
+
+No migration, no config.
+
 ## [0.19.0] - 2026-09-30
 
 Each night closes the day. A missed check-out becomes a half day, and

data/README.md

@@ -277,6 +277,9 @@ the audit row is the trail. Older days, off days, the third fix of a week, a cha
 to a real punch, a day HR already regularized or rejected, or a fix that cannot
 apply (no check-in that day) stay ordinary tickets for HR.
 
+Home has an "Out today" card: everyone on approved leave today, with the leave's
+dates, so the team knows who is away and until when. The leave type is not shown.
+
 ### Holidays and calendar
 
 `bin/rails hr_lite:seed` inserts the three fixed-date national holidays
@@ -306,6 +309,12 @@ WickedPdf path if `wicked_pdf` is in the bundle. The exact math, rounding rules
 and what is deliberately not modelled are in `docs/PAYROLL.md` — read it with
 your accountant before the first run.
 
+HR can enter a structure as an annual CTC: "Fill from CTC" sets Basic to half the
+monthly CTC and HRA to 40% of Basic, pays the employer's PF and ESI out of the CTC,
+and puts the rest in Special allowance. Employees see their own breakup, monthly
+and yearly, at the top of `/salary_slips`, along with any revision HR has saved
+for a later month.
+
 ### Kudos and @mentions
 
 The kudos wall (`/kudos`) lets staff thank each other with @mentions. The picker

data/app/assets/stylesheets/hr_lite/hr_lite.css

@@ -195,6 +195,7 @@
 .hrl-table th, .hrl-table td { text-align: left; padding: .6rem .7rem; border-bottom: 1px solid var(--hrl-line); vertical-align: top; }
 .hrl-table th { color: var(--hrl-muted); font-size: .76rem; text-transform: uppercase; letter-spacing: .03em; }
 .hrl-table td.hrl-num, .hrl-table th.hrl-num { text-align: right; font-variant-numeric: tabular-nums; }
+.hrl-table--tight th, .hrl-table--tight td { padding: .5rem .35rem; }
 @media (max-width: 640px) {
   .hrl-table--stack thead { display: none; }
   .hrl-table--stack tr { display: block; border-bottom: 6px solid var(--hrl-bg); }
@@ -227,7 +228,7 @@
 .hrl-field--check label { margin-bottom: 0; font-weight: 600; }
 .hrl-errors { background: var(--hrl-bad-bg); color: var(--hrl-bad); border-radius: var(--hrl-radius-sm); padding: .7rem .9rem; margin-bottom: .85rem; font-size: .86rem; }
 .hrl-errors ul { margin: .3rem 0 0; padding-left: 1.1rem; }
-.hrl-form-actions { display: flex; gap: .6rem; margin-top: 1rem; }
+.hrl-form-actions { display: flex; flex-wrap: wrap; gap: .6rem; margin-top: 1rem; }
 .hrl-form-actions .hrl-btn { flex: 1; }
 @media (min-width: 700px) { .hrl-form-actions .hrl-btn { flex: 0 0 auto; min-width: 9rem; } }
 

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

@@ -12,6 +12,8 @@ module HrLite
         @structure = SalaryStructure.new(structure_params.merge(
           user_id: @profile.user_id, created_by_id: hr_current_user.id
         ))
+        return fill_from_ctc(:new) if params[:fill_from_ctc]
+
         if @structure.save
           redirect_to admin_employee_path(@profile), notice: "Salary structure saved."
         else
@@ -25,7 +27,10 @@ module HrLite
 
       def update
         @structure = SalaryStructure.where(user_id: @profile.user_id).find(params[:id])
-        if @structure.update(structure_params)
+        @structure.assign_attributes(structure_params)
+        return fill_from_ctc(:edit) if params[:fill_from_ctc]
+
+        if @structure.save
           redirect_to admin_employee_path(@profile), notice: "Salary structure updated."
         else
           render :edit, status: :unprocessable_entity
@@ -34,13 +39,22 @@ module HrLite
 
       private
 
+      # Shows the split for a check; only the Save button writes it.
+      def fill_from_ctc(view)
+        @structure.fill_from_ctc
+        return render(view, status: :unprocessable_entity) unless @structure.valid?
+
+        flash.now[:notice] = "Filled from CTC — check the lines, then Save."
+        render view
+      end
+
       def set_profile
         @profile = EmployeeProfile.find(params[:employee_id])
       end
 
       def structure_params
         params.require(:salary_structure).permit(
-          :effective_from, :basic, :hra, :special_allowance, :other_earnings,
+          :annual_ctc, :effective_from, :basic, :hra, :special_allowance, :other_earnings,
           :pf_applicable, :pf_on_full_basic, :esi_applicable, :pt_state, :notes
         )
       end

data/app/controllers/hr_lite/home_controller.rb

@@ -2,6 +2,9 @@ module HrLite
   class HomeController < ApplicationController
     def index
       @latest_kudos = Kudo.recent.includes(:giver, kudo_mentions: :user).limit(3)
+      @out_today = LeaveRequest.active_on(Date.current).includes(:user)
+                               .where(user_id: HrLite.active_employees.map(&:id))
+                               .sort_by { |leave| hr_display_name(leave.user).downcase }
     end
   end
 end

data/app/controllers/hr_lite/salary_slips_controller.rb

@@ -4,6 +4,11 @@ module HrLite
   class SalarySlipsController < ApplicationController
     def index
       @slips = paginate(own_released.recent_first)
+      # Structures show as soon as HR saves them; slip_release_day gates slips only.
+      @upcoming, started = SalaryStructure.where(user_id: hr_current_user.id).order(:effective_from)
+                                          .partition { |s| s.effective_from > Date.current }
+      @structure = started.pop
+      @past = started.reverse
     end
 
     def show

data/app/helpers/hr_lite/application_helper.rb

@@ -131,6 +131,9 @@ module HrLite
       HrLite::Money.format(amount)
     end
 
+    # Whole rupees, for salary figures that are planned rather than paid.
+    def hrl_rupees(amount) = hrl_money(amount.round).delete_suffix(".00")
+
     # Indian-system amount in words for the slip footer. Delegates to the
     # PORO so host-rendered templates (config.render_pdf) work too.
     def hrl_amount_in_words(amount)
@@ -149,7 +152,7 @@ module HrLite
       case row.kind
       when :holiday then hrl_status_badge("Holiday", "hrl-badge--muted", worked_hint(row))
       when :weekend then hrl_status_badge("Weekend", "hrl-badge--muted", worked_hint(row))
-      when :leave then hrl_status_badge("On leave (#{row.leave.leave_type.code})", "hrl-badge--warn")
+      when :leave then hrl_status_badge("On leave (#{row.leave.leave_type.code})", "hrl-badge--warn", row.leave.date_range_label)
       when :half_day_leave then hrl_status_badge("Half-day leave (#{row.leave.leave_type.code})", "hrl-badge--warn", worked_hint(row))
       when :upcoming then hrl_status_badge("\u2014", "hrl-badge--muted")
       when :absent

data/app/models/concerns/hr_lite/audited.rb

@@ -46,7 +46,8 @@ module HrLite
       when "destroy"
         { "_destroyed" => hr_lite_audit_label }
       else
-        saved_changes.except(*SKIPPED_ATTRIBUTES).to_h do |attr, (from, to)|
+        # Columns only: a virtual attribute (a typed annual CTC) is form input, not a stored change.
+        saved_changes.slice(*self.class.column_names).except(*SKIPPED_ATTRIBUTES).to_h do |attr, (from, to)|
           if encrypted.include?(attr)
             [ attr, REDACTED ]
           else

data/app/models/hr_lite/salary_structure.rb

@@ -11,12 +11,15 @@ module HrLite
     belongs_to :created_by, class_name: HrLite.config.user_class, optional: true
 
     encrypted_money :basic, :hra, :special_allowance, :other_earnings
+    # Typed on the form to fill the lines; CTC is always derived, never stored.
+    attribute :annual_ctc, :decimal
 
     validates :effective_from, presence: true, uniqueness: { scope: :user_id }
     validates :basic, presence: true
     validate :basic_positive
     validate :effective_from_is_first_of_month
     validates :pt_state, presence: true
+    validate { errors.add(:base, "CTC is too low for this split") if special_allowance&.negative? }
 
     def self.effective_for(user, period_month)
       where(user_id: user.id)
@@ -33,6 +36,60 @@ module HrLite
       monthly_gross * 12
     end
 
+    # A month of this structure: earnings, the employee's statutory
+    # deductions and the employer's contributions, via the payroll calculators.
+    def breakup(on: Date.current)
+      month = on.beginning_of_month
+      rates = StatutoryRateCard.for(month)
+      gross = monthly_gross
+      pf = Calculators::Pf.call(basic_earned: basic, on_full_basic: pf_on_full_basic, rates: rates[:pf]) if pf_applicable
+      esi = Calculators::Esi.call(monthly_gross: esi_reference_gross(month), gross_earned: gross, applicable: esi_applicable, rates: rates[:esi])
+      # Not flat: some states top up February, so the year is summed month by month.
+      pts = (0..11).map { |i| Calculators::ProfessionalTax.call(state: pt_state, gross_earned: gross, period_month: month >> i, rates: rates[:pt]) }
+      earnings, deductions, employer = [
+        { "Basic" => basic, "HRA" => hra, "Special allowance" => special_allowance, "Other" => other_earnings },
+        { "PF" => pf&.employee, "ESI" => esi.employee, "Professional tax" => pts.first },
+        { "PF" => pf && (pf.employer_eps + pf.employer_epf), "ESI" => esi.employer }
+      ].map { |rows| rows.select { |_, amount| Money.d(amount).positive? } }
+      monthly_ctc = gross + employer.values.sum(BigDecimal(0))
+      in_hand = gross - deductions.values.sum(BigDecimal(0))
+      { earnings: earnings, deductions: deductions, employer: employer,
+        monthly_gross: gross, monthly_ctc: monthly_ctc, annual_ctc: monthly_ctc * 12, in_hand: in_hand,
+        yearly: { "Professional tax" => pts.sum, "In-hand before tax" => (in_hand + pts.first) * 12 - pts.sum } }
+    end
+
+    # ESIC contribution periods run April–September and October–March.
+    # Eligibility is fixed for the whole period, so it is decided on the
+    # salary in force on its first day — re-deciding it every month dropped
+    # someone out of ESI the moment a mid-period raise crossed the ceiling.
+    def esi_reference_gross(month)
+      start = if month.month.between?(4, 9)
+        Date.new(month.year, 4, 1)
+      elsif month.month >= 10
+        Date.new(month.year, 10, 1)
+      else
+        Date.new(month.year - 1, 10, 1)
+      end
+
+      # Started mid-period: the structure in force when it opened decides (a mid-period joiner has none).
+      earlier = self.class.effective_for(user, start) if effective_from&.after?(start)
+      (earlier || self).monthly_gross
+    end
+
+    # Owner's split of annual_ctc: Basic 50% of the monthly CTC, HRA 40% of
+    # Basic, employer PF and ESI paid out of the CTC; Special takes the rest.
+    def fill_from_ctc(on: effective_from || Date.current)
+      monthly_ctc = Money.round_rupee(Money.d(annual_ctc) / 12)
+      self.basic = Money.round_rupee(monthly_ctc / 2)
+      self.hra = Money.round_rupee(basic * BigDecimal("0.4"))
+      self.special_allowance = 0
+      rest = monthly_ctc - Money.d(breakup(on: on).dig(:employer, "PF"))
+      # Employer ESI is a share of the gross beside it: gross + ESI = rest.
+      gross = (rest / (1 + StatutoryRateCard.for(on.beginning_of_month)[:esi][:employer_rate])).floor
+      self.special_allowance = gross - basic - hra - Money.d(other_earnings)
+      self.special_allowance += rest - gross unless breakup(on: on)[:employer].key?("ESI")
+    end
+
     private
 
     def basic_positive

data/app/services/hr_lite/slip_builder.rb

@@ -59,7 +59,7 @@ module HrLite
         )
       end
 
-      esi = Calculators::Esi.call(monthly_gross: esi_reference_gross, gross_earned: esi_gross,
+      esi = Calculators::Esi.call(monthly_gross: @structure.esi_reference_gross(@run.period_month), gross_earned: esi_gross,
                                   applicable: @structure.esi_applicable, rates: @rates[:esi])
       if esi.applicable?
         deductions << { code: "esi_employee", label: "ESI", amount: esi.employee }
@@ -197,25 +197,6 @@ module HrLite
       (to.year * 12 + to.month) - (from.year * 12 + from.month) + 1
     end
 
-    # ESIC contribution periods run April–September and October–March.
-    # Eligibility is fixed for the whole period, so it is decided on the
-    # salary in force on its first day — re-deciding it every month dropped
-    # someone out of ESI the moment a mid-period raise crossed the ceiling.
-    def esi_reference_gross
-      month = @run.period_month
-      start = if month.month.between?(4, 9)
-        Date.new(month.year, 4, 1)
-      elsif month.month >= 10
-        Date.new(month.year, 10, 1)
-      else
-        Date.new(month.year - 1, 10, 1)
-      end
-
-      # No structure that far back (a mid-period joiner) — their own is the
-      # only salary this period has ever had.
-      (SalaryStructure.effective_for(@user, start) || @structure).monthly_gross
-    end
-
     def serialize_rows(rows)
       rows.map { |row|
         row.transform_values { |value| value.is_a?(BigDecimal) ? value.to_s("F") : value }

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

@@ -1,6 +1,8 @@
 <section class="hrl-card">
   <%= form_with model: structure, url: url, method: method, scope: :salary_structure, local: true do |f| %>
     <%= render "hr_lite/shared/form_errors", record: structure %>
+    <% breakup = structure.breakup(on: structure.effective_from || Date.current) if structure.basic %>
+    <div class="hrl-field"><%= f.label :annual_ctc, "Annual CTC (₹ a year)" %><%= f.number_field :annual_ctc, step: 1, value: (structure.annual_ctc || breakup&.dig(:annual_ctc))&.round %></div>
     <div class="hrl-field">
       <%= f.label :effective_from, "Effective from (1st of month)" %>
       <%= f.date_field :effective_from %>
@@ -21,8 +23,10 @@
       <%= f.select :pt_state, pt_states.map { |s| [ s.humanize, s ] } %>
     </div>
     <div class="hrl-field"><%= f.label :notes %><%= f.text_area :notes %></div>
+    <% if breakup %><p class="hrl-muted hrl-small">Monthly gross <%= hrl_money(breakup[:monthly_gross]) %> · CTC <%= hrl_money(breakup[:monthly_ctc]) %> a month</p><% end %>
     <div class="hrl-form-actions">
       <%= f.submit "Save structure", class: "hrl-btn hrl-btn--primary" %>
+      <%= f.submit "Fill from CTC", name: "fill_from_ctc", class: "hrl-btn" %>
       <a class="hrl-btn" href="<%= hr_lite.admin_employee_path(@profile) %>">Cancel</a>
     </div>
   <% end %>

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

@@ -7,6 +7,27 @@
   <%= render "hr_lite/leave_requests/balance_chips" %>
   <%= render "hr_lite/holidays/next_holiday" %>
 
+  <section class="hrl-card">
+    <h2 class="hrl-card__title">Out today</h2>
+    <% if @out_today.any? %>
+      <%# Name and dates only — the leave type (sick leave) is the employee's own business. %>
+      <div class="hrl-feed">
+        <% @out_today.first(10).each do |leave| %>
+          <div class="hrl-feed__item">
+            <div class="hrl-feed__body"><%= tag.strong hr_display_name(leave.user), title: "On leave: #{leave.date_range_label}" %>
+              <div class="hrl-feed__meta"><%= leave.date_range_label %></div></div>
+          </div>
+        <% end %>
+      </div>
+      <% if @out_today.size > 10 %>
+        <p class="hrl-muted hrl-small">+<%= @out_today.size - 10 %> more</p>
+      <% end %>
+    <% else %>
+      <p class="hrl-muted hrl-small">Everyone's in today.</p>
+    <% end %>
+    <a class="hrl-small" href="<%= hr_lite.team_path %>">Team board</a>
+  </section>
+
   <section class="hrl-card">
     <h2 class="hrl-card__title">Latest kudos</h2>
     <% if @latest_kudos.any? %>

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

@@ -3,6 +3,53 @@
   <h1 class="hrl-page__title">My salary slips</h1>
 </div>
 
+<section class="hrl-card">
+  <h2 class="hrl-card__title">My salary</h2>
+  <% if (breakup = @structure&.breakup) %>
+    <p class="hrl-small hrl-muted">Current salary from <%= @structure.effective_from.strftime("%d %b %Y") %></p>
+    <div class="hrl-table-wrap">
+      <%# Three narrow columns fit a 320px phone; stacking repeated the headings on every line. %>
+      <table class="hrl-table hrl-table--tight hrl-small">
+        <thead><tr><th>Component</th><th class="hrl-num">Monthly</th><th class="hrl-num">Yearly</th></tr></thead>
+        <tbody>
+          <% { "Earnings" => breakup[:earnings].merge("Gross" => breakup[:monthly_gross]),
+               "Deductions" => breakup[:deductions].merge("In-hand before tax" => breakup[:in_hand]),
+               "Employer contributions" => breakup[:employer].merge("CTC" => breakup[:monthly_ctc]) }.each do |section, lines| %>
+            <tr><th colspan="3"><%= section %></th></tr>
+            <% lines.each do |label, amount| %>
+              <% weight = label == lines.keys.last ? :strong : :span %>
+              <tr>
+                <td data-label="Component"><%= content_tag(weight, label) %></td>
+                <td data-label="Monthly" class="hrl-num"><%= content_tag(weight, hrl_rupees(amount)) %></td>
+                <td data-label="Yearly" class="hrl-num"><%= content_tag(weight, hrl_rupees(breakup[:yearly].fetch(label, amount * 12))) %></td>
+              </tr>
+            <% end %>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+    <p class="hrl-small hrl-muted">Income tax (TDS) depends on your declarations and is shown on each slip.</p>
+  <% end %>
+  <% @upcoming.each do |structure| %>
+    <% upcoming = structure.breakup(on: structure.effective_from) %>
+    <h3 class="hrl-card__title">New salary from <%= structure.effective_from.strftime("%d %b %Y") %></h3>
+    <dl class="hrl-deflist">
+      <dt>CTC</dt><dd><%= hrl_rupees(upcoming[:annual_ctc]) %> a year</dd>
+      <dt>Gross</dt><dd><%= hrl_rupees(upcoming[:monthly_gross]) %> a month</dd>
+      <dt>In-hand before tax</dt><dd><%= hrl_rupees(upcoming[:in_hand]) %> a month</dd>
+    </dl>
+  <% end %>
+  <% if @structure.nil? && @upcoming.empty? %>
+    <p class="hrl-card--empty">Your salary structure hasn't been set up yet.</p>
+  <% end %>
+  <% if @past.any? %>
+    <h3 class="hrl-card__title">Earlier revisions</h3>
+    <% @past.each do |structure| %>
+      <p class="hrl-small">From <%= structure.effective_from.strftime("%d %b %Y") %> — <%= hrl_rupees(structure.breakup(on: structure.effective_from)[:annual_ctc]) %> a year CTC</p>
+    <% end %>
+  <% end %>
+</section>
+
 <section class="hrl-card">
   <% if @slips.any? %>
     <div class="hrl-table-wrap">

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

@@ -29,7 +29,7 @@
           <% @board.rows.each do |row| %>
             <tr>
               <td data-label="Name">
-                <span><strong><%= hr_display_name(row.user) %></strong><% if row.profile&.designation.present? %>
+                <span><%= tag.strong hr_display_name(row.user), title: ("On leave: #{row.leave.date_range_label}" if row.leave) %><% if row.profile&.designation.present? %>
                   <span class="hrl-small hrl-muted"> · <%= row.profile.designation %></span><% end %></span>
               </td>
               <td data-label="Status"><%= hrl_team_status(row) %></td>

data/lib/hr_lite/version.rb

@@ -1,3 +1,3 @@
 module HrLite
-  VERSION = "0.19.0"
+  VERSION = "0.20.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hr_lite
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - kshitiz sinha