krisf/time_tracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: krisf:222339e6c559ff1788cbb5b5c6b1f888bcc45dec
Branches Tags
krisf:main
...
compare: krisf:main
Branches Tags
krisf:main

2 Commits
222339e6c5 ... main

Author SHA1 Message Date
Kris Forbes
89e5e8a303 feat: add reporting pay type and logic
All checks were successful
Docker Build and Publish / build-and-push (push) Successful in 41s
Details
2026-01-12 08:34:18 -05:00
Kris Forbes
9a939f0182 chore(frontend): update HTML title to Time Tracking Application 2026-01-12 08:34:18 -05:00
5 changed files with 35 additions and 1 deletions
Expand all files Collapse all files

19
backend/pb_migrations/1736619000_update_time_entries_reporting_pay.js Normal file
View File

@@ -0,0 +1,19 @@
migrate((db) => {
const dao = new Dao(db)
const collection = dao.findCollectionByNameOrId("time_entries")
const typeField = collection.schema.getFieldByName("type")
// Add reporting_pay to the existing values
typeField.options.values = ["regular", "overtime", "standby", "callback", "non_contiguous", "reporting_pay"]
return dao.saveCollection(collection)
}, (db) => {
const dao = new Dao(db)
const collection = dao.findCollectionByNameOrId("time_entries")
const typeField = collection.schema.getFieldByName("type")
// Revert back to previous list
typeField.options.values = ["regular", "overtime", "standby", "callback", "non_contiguous"]
return dao.saveCollection(collection)
})

2
frontend/index.html
View File

@@ -4,7 +4,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> <link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>frontend</title> <title>Time Tracking Application</title>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>

2
frontend/src/components/TimeEntry/EntryForm.jsx
View File

@@ -152,7 +152,9 @@ const EntryForm = ({ onEntryAdded }) => {
<option value="regular">{t('type.regular')}</option> <option value="regular">{t('type.regular')}</option>
<option value="standby">{t('type.standby')}</option> <option value="standby">{t('type.standby')}</option>
<option value="callback">{t('type.callback')}</option> <option value="callback">{t('type.callback')}</option>
<option value="callback">{t('type.callback')}</option>
<option value="non_contiguous">{t('type.non_contiguous')}</option> <option value="non_contiguous">{t('type.non_contiguous')}</option>
<option value="reporting_pay">{t('type.reporting_pay')}</option>
</select> </select>
</div> </div>

9
frontend/src/lib/time-rules.js
View File

@@ -60,6 +60,15 @@ export const calculateBankedHours = (duration, type, dayType) => {
return Math.max(minPay, workedValue); return Math.max(minPay, workedValue);
} }
// --- REPORTING PAY ---
if (type === 'reporting_pay') {
// Article 9.03 (a): Minimum 4 hours pay at straight time rates
// OR time worked at applicable overtime rate, whichever is greater.
let workedValue = calculateOvertimeValue(hours, dayType);
const minPay = 4.0;
return Math.max(minPay, workedValue);
}
// --- REGULAR / OVERTIME --- // --- REGULAR / OVERTIME ---
if (type === 'overtime' || type === 'regular') { if (type === 'overtime' || type === 'regular') {
// "Regular" on a Time Tracker for Overtime usually implies "Regular Overtime" unless it is standard hours? // "Regular" on a Time Tracker for Overtime usually implies "Regular Overtime" unless it is standard hours?

4
frontend/src/locales/translations.js
View File

@@ -37,7 +37,9 @@ export const translations = {
'type.regular': 'Regular', 'type.regular': 'Regular',
'type.standby': 'Standby', 'type.standby': 'Standby',
'type.callback': 'Call-back', 'type.callback': 'Call-back',
'type.callback': 'Call-back',
'type.non_contiguous': 'Non-Contiguous Hours', 'type.non_contiguous': 'Non-Contiguous Hours',
'type.reporting_pay': 'Reporting Pay',
// Day Types // Day Types
'day.workday': 'Normal Workday', 'day.workday': 'Normal Workday',
@@ -123,7 +125,9 @@ export const translations = {
'type.regular': 'Régulier', 'type.regular': 'Régulier',
'type.standby': 'Disponibilité', 'type.standby': 'Disponibilité',
'type.callback': 'Rappel au travail', 'type.callback': 'Rappel au travail',
'type.callback': 'Rappel au travail',
'type.non_contiguous': 'Heures non contiguës', 'type.non_contiguous': 'Heures non contiguës',
'type.reporting_pay': 'Indemnité de rentrée',
// Day Types // Day Types
'day.workday': 'Jour normal', 'day.workday': 'Jour normal',