diff --git a/appointments_training_reports.py b/appointments_training_reports.py index 6cbc0c0..3102aff 100644 --- a/appointments_training_reports.py +++ b/appointments_training_reports.py @@ -552,21 +552,21 @@ def training_report(): if safety_due_status != True and safeguarding_due_status == True and firstaid_due_status != True and role_training == True: #write only with the safeguarding status due_mandatory.writerow([input_data[line_num][0], input_data[line_num][3], input_data[line_num][2], input_data[line_num][4], input_data[line_num][5], input_data[line_num][8], input_data[line_num][13], input_data[line_num][21], input_data[line_num][19], '', input_data[line_num][39], ""]) - if safety_due_status != True and safeguarding_due_status != True and firstaid_due_status == True and role_training == True: + if safety_due_status != True and safeguarding_due_status != True and firstaid_due_status == True and role_training == True and firstaid_required == True: #write only with the first aid status due_mandatory.writerow([input_data[line_num][0], input_data[line_num][3], input_data[line_num][2], input_data[line_num][4], input_data[line_num][5], input_data[line_num][8], input_data[line_num][13], input_data[line_num][21], input_data[line_num][19], '', '', input_data[line_num][41]]) # x2 combo only if safety_due_status == True and safeguarding_due_status == True and firstaid_due_status != True and role_training == True: #write safety and safeguarding status due_mandatory.writerow([input_data[line_num][0], input_data[line_num][3], input_data[line_num][2], input_data[line_num][4], input_data[line_num][5], input_data[line_num][8], input_data[line_num][13], input_data[line_num][21], input_data[line_num][19], input_data[line_num][37], input_data[line_num][39], ""]) - if safety_due_status == True and safeguarding_due_status != True and firstaid_due_status == True and role_training == True: + if safety_due_status == True and safeguarding_due_status != True and firstaid_due_status == True and role_training == True and firstaid_required == True: #write safety and first aid status due_mandatory.writerow([input_data[line_num][0], input_data[line_num][3], input_data[line_num][2], input_data[line_num][4], input_data[line_num][5], input_data[line_num][8], input_data[line_num][13], input_data[line_num][21], input_data[line_num][19], input_data[line_num][37] , '', input_data[line_num][41]]) - if safety_due_status != True and safeguarding_due_status == True and firstaid_due_status == True and role_training == True: + if safety_due_status != True and safeguarding_due_status == True and firstaid_due_status == True and role_training == True and firstaid_required == True: #write safeguarding and first aid status due_mandatory.writerow([input_data[line_num][0], input_data[line_num][3], input_data[line_num][2], input_data[line_num][4], input_data[line_num][5], input_data[line_num][8], input_data[line_num][13], input_data[line_num][21], input_data[line_num][19], '', input_data[line_num][39], input_data[line_num][41]]) # all 3 - if safety_due_status == True and safeguarding_due_status == True and firstaid_due_status == True and role_training == True: + if safety_due_status == True and safeguarding_due_status == True and firstaid_due_status == True and role_training == True and firstaid_required == True: #write safety, safeguarding and first aid status due_mandatory.writerow([input_data[line_num][0], input_data[line_num][3], input_data[line_num][2], input_data[line_num][4], input_data[line_num][5], input_data[line_num][8], input_data[line_num][13], input_data[line_num][21], input_data[line_num][19], input_data[line_num][37], input_data[line_num][39], input_data[line_num][41]])