Skip to content

Commit d03c922

Browse files
nicolas-eoxianicolas-eoxia
committed
#2842 [InformationsSharing] add: deficiency report info in view/ODT
1 parent 561ad53 commit d03c922

File tree

4 files changed

+38
-29
lines changed

4 files changed

+38
-29
lines changed

‎class/digiriskdocuments/informationssharing.class.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ public function InformationsSharingFillJSON($object)
176176
}
177177

178178
// CSE
179+
$json['InformationsSharing']['deficiency_report_date'] = (dol_strlen($conf->global->DIGIRISKDOLIBARR_CSE_SUBMISSION_ELECTION_DATE) > 0 && $conf->global->DIGIRISKDOLIBARR_CSE_SUBMISSION_ELECTION_DATE != '--' && dol_now() > dol_time_plus_duree(dol_stringtotime($conf->global->DIGIRISKDOLIBARR_CSE_SUBMISSION_ELECTION_DATE), '30', 'd') ? dol_time_plus_duree(dol_stringtotime($conf->global->DIGIRISKDOLIBARR_CSE_SUBMISSION_ELECTION_DATE), '30', 'd') : '');
179180
$json['InformationsSharing']['membres_du_comite_entreprise_date'] = (dol_strlen($conf->global->DIGIRISKDOLIBARR_CSE_ELECTION_DATE) > 0 && $conf->global->DIGIRISKDOLIBARR_CSE_ELECTION_DATE != '--' ? $conf->global->DIGIRISKDOLIBARR_CSE_ELECTION_DATE : '');
180181
$json['InformationsSharing']['membres_du_comite_entreprise_titulaires'] = '';
181182
if (!empty ($digirisk_resources['TitularsCSE']->id )) {

‎core/substitutions/functions_digiriskdolibarr.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ function digiriskdolibarr_completesubstitutionarray(&$substitutionarray, $langs,
107107
$substitutionarray['referant_harcelement_nom'] = $informationssharing->harassment_officer_cse->name;
108108
$substitutionarray['referant_harcelement_telephone'] = $informationssharing->harassment_officer_cse->phone;
109109

110+
$substitutionarray['deficiency_report_date'] = dol_print_date($informationssharing->deficiency_report_date, 'day');
110111
$substitutionarray['membres_du_comite_entreprise_date'] = dol_print_date($informationssharing->membres_du_comite_entreprise_date, 'day');
111112
$substitutionarray['membres_du_comite_entreprise_titulaires'] = dol_htmlentitiesbr_decode(strip_tags($informationssharing->membres_du_comite_entreprise_titulaires, '<br>'));
112113
$substitutionarray['membres_du_comite_entreprise_suppleants'] = dol_htmlentitiesbr_decode(strip_tags($informationssharing->membres_du_comite_entreprise_suppleants, '<br>'));

‎core/tpl/digiriskdocuments/digiriskdolibarr_informationssharingfields_view.tpl.php‎

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -68,39 +68,46 @@
6868
}
6969
print '</td></tr>';
7070

71-
// Harassment officer CSE
72-
print '<tr>';
73-
print '<td class="titlefield"><i class="fas fa-user"></i> ' . $form->textwithpicto($langs->trans("HarassmentOfficerCSE"), $langs->trans('HowToSetDataInformationsSharing')) . '</td>';
74-
print '<td>';
75-
if ($informationssharing->harassment_officer_cse->id > 0) {
76-
$user->fetch($informationssharing->harassment_officer_cse->id);
77-
print $user->getNomUrl(1) . ' ';
78-
print '<i class="fas fa-phone"></i> ' . $informationssharing->harassment_officer_cse->phone;
79-
}
80-
print '</td></tr>';
71+
if (dol_now() > dol_time_plus_duree(dol_stringtotime($conf->global->DIGIRISKDOLIBARR_CSE_SUBMISSION_ELECTION_DATE), '30', 'd')) {
72+
// Deficiency report date
73+
print '<tr><td class="titlefield"><i class="fas fa-calendar-alt"></i> ' . $form->textwithpicto($langs->trans('DeficiencyReportDate'), $langs->trans('HowToSetDataInformationsSharing')) . '</td><td>';
74+
print img_picto('', 'calendar', 'class="pictofixedwidth"') . dol_print_date($informationssharing->deficiency_report_date, 'day');
75+
print '</td></tr>';
76+
} else {
77+
// Harassment officer CSE
78+
print '<tr>';
79+
print '<td class="titlefield"><i class="fas fa-user"></i> ' . $form->textwithpicto($langs->trans("HarassmentOfficerCSE"), $langs->trans('HowToSetDataInformationsSharing')) . '</td>';
80+
print '<td>';
81+
if ($informationssharing->harassment_officer_cse->id > 0) {
82+
$user->fetch($informationssharing->harassment_officer_cse->id);
83+
print $user->getNomUrl(1) . ' ';
84+
print '<i class="fas fa-phone"></i> ' . $informationssharing->harassment_officer_cse->phone;
85+
}
86+
print '</td></tr>';
8187

82-
// CSE
88+
// CSE
8389

84-
// Date
85-
print '<tr>';
86-
print '<td class="titlefield"><i class="fas fa-calendar-alt"></i> ' . $form->textwithpicto($langs->trans("ElectionDateCSE"), $langs->trans('HowToSetDataInformationsSharing')) . '</td>';
87-
print '<td>';
88-
print '<i class="fas fa-calendar-alt"></i> ' . dol_print_date($informationssharing->membres_du_comite_entreprise_date, 'day');
89-
print '</td></tr>';
90+
// Date
91+
print '<tr>';
92+
print '<td class="titlefield"><i class="fas fa-calendar-alt"></i> ' . $form->textwithpicto($langs->trans("ElectionDate"), $langs->trans('HowToSetDataInformationsSharing')) . '</td>';
93+
print '<td>';
94+
print '<i class="fas fa-calendar-alt"></i> ' . dol_print_date($informationssharing->membres_du_comite_entreprise_date, 'day');
95+
print '</td></tr>';
9096

91-
// Titulars
92-
print '<tr>';
93-
print '<td class="titlefield"><i class="fas fa-user"></i> ' . $form->textwithpicto($langs->trans("Titulars"), $langs->trans('HowToSetDataInformationsSharing')) . '</td>';
94-
print '<td>';
95-
print $informationssharing->membres_du_comite_entreprise_titulairesFullName;
96-
print '</td></tr>';
97+
// Titulars
98+
print '<tr>';
99+
print '<td class="titlefield"><i class="fas fa-user"></i> ' . $form->textwithpicto($langs->trans("Titulars"), $langs->trans('HowToSetDataInformationsSharing')) . '</td>';
100+
print '<td>';
101+
print $informationssharing->membres_du_comite_entreprise_titulairesFullName;
102+
print '</td></tr>';
97103

98-
// Alternates
99-
print '<tr>';
100-
print '<td class="titlefield"><i class="fas fa-user"></i> ' . $form->textwithpicto($langs->trans("Alternates"), $langs->trans('HowToSetDataInformationsSharing')) . '</td>';
101-
print '<td>';
102-
print $informationssharing->membres_du_comite_entreprise_suppleantsFullName;
103-
print '</td></tr>';
104+
// Alternates
105+
print '<tr>';
106+
print '<td class="titlefield"><i class="fas fa-user"></i> ' . $form->textwithpicto($langs->trans("Alternates"), $langs->trans('HowToSetDataInformationsSharing')) . '</td>';
107+
print '<td>';
108+
print $informationssharing->membres_du_comite_entreprise_suppleantsFullName;
109+
print '</td></tr>';
110+
}
104111

105112
// DP
106113
//Date

‎documents/doctemplates/informationssharing/template_informationssharing.odt‎

26.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)