|
|
@@ -9,11 +9,7 @@ if masseuse['jobtype'] < 1:
|
|
|
masseuse['<<week>>_shift_3'] = 0
|
|
|
end
|
|
|
|
|
|
-if masseuse['jobtype'] > 0 and week = 5 and masseuse['weeks_pay'] > 0:
|
|
|
- masseuse['payday'] = 1
|
|
|
-end
|
|
|
-
|
|
|
-if masseuse['<<week>>_shift_1'] ! 0 or masseuse['<<week>>_shift_2'] ! 0 or masseuse['<<week>>_shift_3'] ! 0:
|
|
|
+if (masseuse['<<week>>_shift_1'] ! 0 or masseuse['<<week>>_shift_2'] ! 0 or masseuse['<<week>>_shift_3'] ! 0) and masseuse['last_worked_day'] ! daystart:
|
|
|
masseuse['missed_shift2'] = 1
|
|
|
end
|
|
|
|
|
|
@@ -88,6 +84,12 @@ end
|
|
|
!! masseuse paycheck
|
|
|
if masseuse['weeks_pay'] > 0 and week = 5:masseuse['paycheck'] = 1
|
|
|
|
|
|
+if masseuse['jobtype'] > 0 and week = 5 and masseuse['weeks_pay'] > 0:
|
|
|
+ masseuse['payday'] = 1
|
|
|
+end
|
|
|
+
|
|
|
+if week = 7 and masseuse['schedule_update'] ! daystart: gs 'masseuse_schedule','schedule_reset'
|
|
|
+
|
|
|
!!modelling check
|
|
|
if model_week ! (daystart - week) / 7:model_job_week = 0
|
|
|
|
