Compare commits
4 Commits
707e18c625
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
06a7e65340 | ||
|
|
c220956146 | ||
|
|
e2da33bc44 | ||
|
|
575164d8a1 |
Binary file not shown.
@@ -38,7 +38,7 @@ TEMPLATE_NAMES = [
|
||||
'Vörös Pavel',
|
||||
'Janouš Petr',
|
||||
'Dvořák Václav',
|
||||
'Kópáček Ondřej',
|
||||
'Kopáček Ondřej',
|
||||
'Toman Milan',
|
||||
'Hanzlík Marek',
|
||||
'Vondrák Pavel',
|
||||
@@ -52,7 +52,7 @@ PERSON_DATA = {
|
||||
'Žemlička Miroslav': {'auto': 'AUS', 'km_tkb': 40, 'km_sat': 0},
|
||||
'Franek Lukáš': {'auto': 'AUS', 'km_tkb': 40, 'km_sat': 0},
|
||||
'Dvořák Václav': {'auto': 'AUS', 'km_tkb': 0, 'km_sat': 0},
|
||||
'Kópáček Ondřej': {'auto': 'AUS', 'km_tkb': 0, 'km_sat': 0}, # TODO confirm auto/km
|
||||
'Kopáček Ondřej': {'auto': 'AUS', 'km_tkb': 0, 'km_sat': 0}, # TODO confirm auto/km
|
||||
'Toman Milan': {'auto': 'AUS', 'km_tkb': 0, 'km_sat': 0},
|
||||
'Kohl David': {'auto': 'AUS', 'km_tkb': 0, 'km_sat': 0},
|
||||
'Milisavljevič Jovica':{'auto': 'AUS', 'km_tkb': 0, 'km_sat': 0},
|
||||
|
||||
@@ -36,7 +36,7 @@ CZECH_DAYS = ['Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota',
|
||||
TKB_ROWS = {
|
||||
'Pauzer Libor': 7, 'Vörös Pavel': 8, 'Janouš Petr': 9,
|
||||
'Franek Lukáš': 10, 'Svoboda Daniel': 11, 'Dvořák Václav': 12,
|
||||
'Kópáček Ondřej': 13,
|
||||
'Kopáček Ondřej': 13,
|
||||
'Vondrák Pavel': 14, 'Čeleda Olda': 15, 'Hanzlík Marek': 16,
|
||||
'Kohl David': 17, 'Dittrich Vladimír': 18, 'Toman Milan': 19,
|
||||
'Zábranský Petr': 20, 'Žemlička Miroslav': 21, 'Teslík Hynek': 22,
|
||||
@@ -87,6 +87,17 @@ def czech_holidays(year):
|
||||
return out
|
||||
|
||||
|
||||
def pms_hours(value):
|
||||
"""PMS (práce mimo směnu) hours — like hours_for, but negative values keep
|
||||
their sign (hours taken off). Matches getPmsHours in FpdCheck.tsx."""
|
||||
if value in ('A', 'B'):
|
||||
return 12
|
||||
try:
|
||||
return float(value)
|
||||
except (ValueError, TypeError):
|
||||
return 0
|
||||
|
||||
|
||||
def hours_for(value):
|
||||
"""Match webapp's getHoursForValue (FpdCheck.tsx):
|
||||
A and B count as 12 hours; numeric values as themselves;
|
||||
@@ -463,6 +474,10 @@ def main():
|
||||
collect(cd.get('nightValue'), is_workday)
|
||||
else:
|
||||
collect(cd.get('v'), is_workday)
|
||||
# PMS (práce mimo směnu) counts as worked hours, positive or negative (as in FpdCheck.tsx)
|
||||
pms_v = (person['data'].get(str(-month)) or {}).get('v')
|
||||
if pms_v:
|
||||
worked += pms_hours(pms_v)
|
||||
person_fpd = month_fpd - vacation
|
||||
diff = worked - person_fpd
|
||||
dst = ws.cell(row, 72)
|
||||
|
||||
@@ -42,8 +42,8 @@ HALF_TIME_NAMES = {'Dittrich Vladimír'}
|
||||
|
||||
ROSTER = [
|
||||
('Dvořák Václav (VN)', 'TKB', 1247, 'Dvořák Václav'),
|
||||
# Kópáček Ondřej — part-time student, not in CIS (no personal number); add here
|
||||
# if he joins full time: ('Kópáček Ondřej', 'TKB', <osobní číslo>, 'Kópáček Ondřej'),
|
||||
# Kopáček Ondřej — part-time student, not in CIS (no personal number); add here
|
||||
# if he joins full time: ('Kopáček Ondřej', 'TKB', <osobní číslo>, 'Kopáček Ondřej'),
|
||||
('Vondrák Pavel (NN)', 'TKB', 454, 'Vondrák Pavel'),
|
||||
('Čeleda Olda (NN)', 'TKB', 463, 'Čeleda Olda'),
|
||||
('Hanzlík Marek (VN)', 'TKB', 1366, 'Hanzlík Marek'),
|
||||
|
||||
Binary file not shown.
@@ -96,7 +96,7 @@ function fileMeta(file) {
|
||||
|
||||
// People renamed after data already existed: fix the name wherever it is stored
|
||||
// (files on disk at startup, and every incoming save from a client that still has the old name)
|
||||
const PERSON_RENAMES = { 'Kropáček Ondřej': 'Kópáček Ondřej' }
|
||||
const PERSON_RENAMES = { 'Kropáček Ondřej': 'Kopáček Ondřej', 'Kópáček Ondřej': 'Kopáček Ondřej' }
|
||||
|
||||
function normalizePeople(data) {
|
||||
let changed = false
|
||||
|
||||
@@ -23,6 +23,12 @@ interface FpdResult {
|
||||
infoOnly: boolean // contractor — never warn on shortfall
|
||||
}
|
||||
|
||||
function getPmsHours(v: string): number {
|
||||
if (v === 'A' || v === 'B') return 12
|
||||
const num = parseFloat(v)
|
||||
return isNaN(num) ? 0 : num
|
||||
}
|
||||
|
||||
function getHoursForValue(v: string): number {
|
||||
if (v === 'A' || v === 'B') return 12
|
||||
const num = parseFloat(v)
|
||||
@@ -81,8 +87,9 @@ export function computeFpd(
|
||||
}
|
||||
}
|
||||
// PMS (práce mimo směnu) is stored at day-index -month; counts as worked hours.
|
||||
// Unlike day cells it may be negative (hours taken off), so keep the sign.
|
||||
const pms = person.data[String(-month)]?.v
|
||||
if (pms) workedHours += getHoursForValue(pms)
|
||||
if (pms) workedHours += getPmsHours(pms)
|
||||
const personFpd = workDays * dailyHours - vacationHours
|
||||
const diff = workedHours - personFpd
|
||||
results.push({
|
||||
|
||||
@@ -2965,7 +2965,7 @@
|
||||
},
|
||||
{
|
||||
"id": "tkb-kropacek",
|
||||
"name": "Kópáček Ondřej",
|
||||
"name": "Kopáček Ondřej",
|
||||
"group": "TKB",
|
||||
"data": {}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user