diff --git a/README.md b/README.md index 56fd94d28..1fe2595b7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Informations - Numéro du module : 436302 -- Dernière mise à jour : 24/06/2024 +- Dernière mise à jour : 12/12/2024 - Éditeur : [Evarisk](https://evarisk.com) - Thème : Eldy Menu - Licence : GPLv3 @@ -11,10 +11,10 @@ ### Version -- Version : 10.2.1 +- Version : 20.0.0 - PHP : 7.4.33 -- Compatibilité : Dolibarr 16.0.0 - 20.0.0 -- Saturne Framework : 1.5.1 +- Compatibilité : Dolibarr 20.0.0 - 20.0.2 +- Saturne Framework : 1.7.0 ## Liens diff --git a/admin/config/riskassessmentdocument.php b/admin/config/riskassessmentdocument.php index a18387bb3..1623f1731 100644 --- a/admin/config/riskassessmentdocument.php +++ b/admin/config/riskassessmentdocument.php @@ -162,7 +162,7 @@ // Configuration header $head = digiriskdolibarr_admin_prepare_head(); -print dol_get_fiche_head($head, 'riskassessmentdocument', $title, -1, "digiriskdolibarr_color@digiriskdolibarr"); +print dol_get_fiche_head($head, 'riskassessmentdocument', $title, -1, 'digiriskdolibarr_color@digiriskdolibarr'); // Risks @@ -449,7 +449,7 @@ ], 'ShowSharedRiskSigns' => [ 'name' => 'ShowSharedRiskSigns', - 'description' => $langs->trans('ShowSharedRiskSignsDescription') . (!$areRisksSharable ? '
' . img_picto('danger', 'fa-exclamation-triangle') . $langs->trans('DisabledSharedElement') : ''), + 'description' => $langs->trans('ShowSharedRiskSignsDescription') . (!$areRisksSignsSharable ? '
' . img_picto('danger', 'fa-exclamation-triangle') . $langs->trans('DisabledSharedElement') : ''), 'code' => 'DIGIRISKDOLIBARR_SHOW_SHARED_RISKSIGNS', 'disabled' => !$areRisksSignsSharable diff --git a/admin/event.php b/admin/event.php index 37bf9941b..3a39a560e 100644 --- a/admin/event.php +++ b/admin/event.php @@ -108,10 +108,9 @@ // Configuration header $head = digiriskdolibarr_admin_prepare_head(); -print dol_get_fiche_head($head, 'event', '', -1, $module->picto); +print dol_get_fiche_head($head, 'event', '', -1, "digiriskdolibarr_color@digiriskdolibarr"); print load_fiche_titre(' ' . $langs->trans('ConfTrigger'), '', ''); -print '
'; print ''; print ''; diff --git a/admin/securityconf.php b/admin/securityconf.php index 2645ec078..8aca506ba 100644 --- a/admin/securityconf.php +++ b/admin/securityconf.php @@ -435,14 +435,15 @@ print ''; print ''; print ''; // * Phone number - Numéro de téléphone * - print ''; print ''; + // Use signatory + print ''; + print ''; + print ''; + + // Show category description + print ''; + print ''; + print ''; + if (isModEnabled('multicompany')) { //Page de sélection de l'entité print ''; @@ -445,7 +471,7 @@ print ''; // GP/UT Visible and Required - print ''; + print ''; print ''; @@ -453,7 +479,7 @@ print ajax_constantonoff('DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_REQUIRED'); print ''; print ''; print ''; @@ -471,7 +497,7 @@ print ''; // Firstname Visible and Required - print ''; + print ''; print ''; @@ -479,12 +505,12 @@ print ajax_constantonoff('DIGIRISKDOLIBARR_TICKET_FIRSTNAME_REQUIRED'); print ''; print ''; print ''; // Lastname Visible and Required - print ''; + print ''; print ''; @@ -492,7 +518,7 @@ print ajax_constantonoff('DIGIRISKDOLIBARR_TICKET_LASTNAME_REQUIRED'); print ''; print ''; print ''; diff --git a/class/accident.class.php b/class/accident.class.php index ba59e243e..62c1ed6d9 100644 --- a/class/accident.class.php +++ b/class/accident.class.php @@ -412,28 +412,49 @@ public function LibStatut(int $status, int $mode = 0): string */ public function load_dashboard(): array { - global $conf, $langs; + global $langs, $conf; + + $confName = dol_strtoupper($this->module) . '_DASHBOARD_CONFIG'; + $dashboardConfig = json_decode(getDolUserString($confName)); + $array = ['graphs' => [], 'disabledGraphs' => []]; + + $join = ' LEFT JOIN ' . MAIN_DB_PREFIX . $this->table_element . ' as a ON a.rowid = t.fk_accident'; + $accidentsWithWorkStops = saturne_fetch_all_object_type('AccidentWorkStop', 'DESC', 't.rowid', 0, 0, [], 'AND', false, true, false, $join); + $accidents = $this->fetchAll('', '', 0, 0, ['customsql' => ' t.status > ' . self::STATUS_DRAFT]); + + if (empty($accidents) && !is_array($accidents)) { + $accidents = []; + } + if (empty($accidentsWithWorkStops) && !is_array($accidentsWithWorkStops)) { + $accidentsWithWorkStops = []; + } + + $arrayNbDaysWithoutAccident = $this->getNbDaysWithoutAccident($accidents); + $arrayNbWorkstopDays = $this->getNbWorkstopDays($accidentsWithWorkStops); - $arrayNbDaysWithoutAccident = $this->getNbDaysWithoutAccident(); - $arrayNbAccidents = $this->getNbAccidents(); - $arrayNbAccidentsLast3Years = $this->getNbAccidentsLast3years(); - $arrayNbWorkstopDays = $this->getNbWorkstopDays(); - $arrayNbAccidentsByEmployees = $this->getNbAccidentsByEmployees(); $arrayNbPresquAccidents = $this->getNbPresquAccidents(); $arrayNbAccidentInvestigations = $this->getNbAccidentInvestigations(); - $arrayFrequencyIndex = $this->getFrequencyIndex(); - $arrayFrequencyRate = $this->getFrequencyRate(); - //$arrayGravityIndex = $this->getGravityIndex(); - $arrayGravityRate = $this->getGravityRate(); + + $evaluator = new Evaluator($this->db); + $employees = $evaluator->getNbEmployees(); + $arrayNbAccidentsByEmployees = $this->getNbAccidentsByEmployees($accidents, $accidentsWithWorkStops, $employees); + $arrayFrequencyIndex = $this->getFrequencyIndex($accidentsWithWorkStops, $employees); + $arrayFrequencyRate = $this->getFrequencyRate($accidentsWithWorkStops); + $arrayGravityRate = $this->getGravityRate($accidentsWithWorkStops); $array['widgets'] = [ 'accident' => [ + 'title' => $langs->transnoentities('Accidents'), + 'picto' => 'fas fa-user-injured', + 'pictoColor' => '#F39B1F', 'label' => [$langs->transnoentities('DayWithoutAccident') ?? '', $langs->transnoentities('WorkStopDays') ?? '', $langs->transnoentities('NbAccidentsByEmployees') ?? '', $langs->transnoentities('NbPresquAccidents') ?? '', $langs->transnoentities('NbAccidentInvestigations') ?? ''], 'content' => [$arrayNbDaysWithoutAccident['daywithoutaccident'] ?? 0, $arrayNbWorkstopDays['nbworkstopdays'] ?? 0, $arrayNbAccidentsByEmployees['nbaccidentsbyemployees'] ?? 0, $arrayNbPresquAccidents['nbpresquaccidents'] ?? 0, $arrayNbAccidentInvestigations['nbaccidentinvestigations'] ?? 0], - 'picto' => 'fas fa-user-injured', 'widgetName' => $langs->transnoentities('Accident') ], 'accidentrateindicator' => [ + 'title' => $langs->transnoentities('Frequency'), + 'picto' => 'fas fa-chart-bar', + 'pictoColor' => '#9735FF', 'label' => [$langs->transnoentities('FrequencyIndex') ?? '', $langs->transnoentities('FrequencyRate') ?? '', $langs->transnoentities('GravityRate') ?? ''], 'content' => [$arrayFrequencyIndex['frequencyindex'] ?? 0, $arrayFrequencyRate['frequencyrate'] ?? 0, $arrayGravityRate['gravityrate'] ?? 0], 'tooltip' => [ @@ -441,46 +462,56 @@ public function load_dashboard(): array (($conf->global->DIGIRISKDOLIBARR_NB_WORKED_HOURS > 0 && $conf->global->DIGIRISKDOLIBARR_MANUAL_INPUT_NB_WORKED_HOURS) ? $langs->transnoentities('FrequencyRateTooltip') . '
' . $langs->transnoentities('NbWorkedHoursTooltip') : $langs->transnoentities('FrequencyRateTooltip')), (($conf->global->DIGIRISKDOLIBARR_NB_WORKED_HOURS > 0 && $conf->global->DIGIRISKDOLIBARR_MANUAL_INPUT_NB_WORKED_HOURS) ? $langs->transnoentities('GravityRateTooltip') . '
' . $langs->transnoentities('NbWorkedHoursTooltip') : $langs->transnoentities('GravityRateTooltip')) ], - 'picto' => 'fas fa-chart-bar', 'widgetName' => $langs->transnoentities('AccidentRateIndicator') ] ]; - $array['graphs'] = [$arrayNbAccidents, $arrayNbAccidentsLast3Years]; + if (empty($dashboardConfig->graphs->AccidentRepartition->hide)) { + $array['graphs'][] = $this->getNbAccidents($accidents, $accidentsWithWorkStops); + } else { + $array['disabledGraphs']['AccidentRepartition'] = $langs->transnoentities('AccidentRepartition'); + } + if (empty($dashboardConfig->graphs->AccidentByYear->hide)) { + $array['graphs'][] = $this->getNbAccidentsLast3years($accidents); + } else { + $array['disabledGraphs']['AccidentByYear'] = $langs->transnoentities('AccidentByYear'); + } return $array; } - /** - * Get number days without accident. - * - * @return array - * @throws Exception - */ - public function getNbDaysWithoutAccident() { - // Number days without accident - $lastAccident = $this->fetchAll('DESC', 'accident_date', 1, 0 ); - if (is_array($lastAccident) && !empty($lastAccident)) { - $lastTimeAccident = dol_now() - reset($lastAccident)->accident_date; - $array['daywithoutaccident'] = abs(round($lastTimeAccident / 86400)); - } else { - $array['daywithoutaccident'] = 'N/A'; - } - return $array; - } + /** + * Get number days without accident + * + * @param array $accidents Array of accidents + * @return array + */ + public function getNbDaysWithoutAccident(array $accidents = []): array + { + $lastAccident = end($accidents); + if ($lastAccident != null) { + $lastTimeAccident = dol_now() - $lastAccident->accident_date; + $array['daywithoutaccident'] = abs(round($lastTimeAccident / 86400)); + } else { + $array['daywithoutaccident'] = 'N/A'; + } + return $array; + } /** * Get number accidents * + * @param array $accidents Array of accidents + * @param array $accidentsWithWorkStops Array of accidents with work stops * @return array - * @throws Exception */ - public function getNbAccidents(): array + public function getNbAccidents(array $accidents = [], array $accidentsWithWorkStops = []): array { global $conf, $langs; // Graph Title parameters $array['title'] = $langs->transnoentities('AccidentRepartition'); + $array['name'] = 'AccidentRepartition'; $array['picto'] = $this->picto; // Graph parameters @@ -501,25 +532,8 @@ public function getNbAccidents(): array ], ]; - $nbAccidents = 0; - $nbAccidentsWithoutDIAT = 0; - $accidents = $this->fetchAll('','',0,0,['customsql' => ' t.status > 0 ']); - if (is_array($accidents) && !empty($accidents)) { - $accidentWorkStop = new AccidentWorkStop($this->db); - foreach ($accidents as $accident) { - $accidentWorkStops = $accidentWorkStop->fetchFromParent($accident->id); - if (is_array($accidentWorkStops) && !empty($accidentWorkStops)) { - $nbAccidents += 1; - } else { - $nbAccidentsWithoutDIAT += 1; - } - } - $array['data']['accidents'] = $nbAccidents; - $array['data']['accidentswithoutDIAT'] = $nbAccidentsWithoutDIAT; - } else { - $array['data']['accidents'] = 0; - $array['data']['accidentswithoutDIAT'] = 0; - } + $array['data']['accidents'] = count($accidentsWithWorkStops); + $array['data']['accidentswithoutDIAT'] = count($accidents) - $array['data']['accidents']; return $array; } @@ -527,15 +541,16 @@ public function getNbAccidents(): array /** * Get number accidents for last 3 years * + * @param array $accidents Array of accidents * @return array - * @throws Exception */ - public function getNbAccidentsLast3years(): array + public function getNbAccidentsLast3years(array $accidents = []): array { global $langs; // Graph Title parameters $array['title'] = $langs->transnoentities('AccidentByYear'); + $array['name'] = 'AccidentByYear'; $array['picto'] = $this->picto; // Graph parameters @@ -562,12 +577,14 @@ public function getNbAccidentsLast3years(): array $accidentsByYear = []; $accidentsArray = []; - $accidents = $this->fetchAll('', '', 0, 0, ['customsql' => 't.status > 0']); if (is_array($accidents) && !empty($accidents)) { foreach($accidents as $accident) { $accidentDate = dol_getdate($accident->accident_date); $yearKey = $accidentDate['year']; $monthKey = $accidentDate['mon']; + if (!isset($accidentsByYear[$yearKey][$monthKey - 1])) { + $accidentsByYear[$yearKey][$monthKey - 1] = 0; + } $accidentsByYear[$yearKey][$monthKey - 1] += 1; } @@ -593,181 +610,157 @@ public function getNbAccidentsLast3years(): array return $array; } - /** - * Get number workstop days. - * - * @return array - * @throws Exception - */ - public function getNbWorkstopDays() { - // Number workstop days - $allaccidents = $this->fetchAll(); - if (is_array($allaccidents) && !empty($allaccidents)) { - $accidentworkstop = new AccidentWorkStop($this->db); - foreach ($allaccidents as $accident) { - $allaccidentworkstop = $accidentworkstop->fetchFromParent($accident->id); - if (is_array($allaccidentworkstop) && !empty($allaccidentworkstop)) { - foreach ($allaccidentworkstop as $accidentworkstop) { - if ($accidentworkstop->id > 0) { - $nbworkstopdays += $accidentworkstop->workstop_days; - } - } - } - } - $array['nbworkstopdays'] = $nbworkstopdays ?: 0; - } else { - $array['nbworkstopdays'] = 0; - } - return $array; - } + /** + * Get number workstop days + * + * @param array $accidentsWithWorkStops Array of accidents with work stops + * @return array + */ + public function getNbWorkstopDays(array $accidentsWithWorkStops = []): array + { + $nbWorkStopDays = 0; + if (!empty($accidentsWithWorkStops)) { + foreach ($accidentsWithWorkStops as $accidentsWithWorkStop) { + $nbWorkStopDays += $accidentsWithWorkStop->workstop_days; + } + } + $array['nbworkstopdays'] = $nbWorkStopDays; - /** - * Get number accidents by employees. - * - * @return array - * @throws Exception - */ - public function getNbAccidentsByEmployees() { - $evaluator = new Evaluator($this->db); - - // Number accidents by employees - $arrayNbAccidents = $this->getNbAccidents(); - $arrayNbEmployees = $evaluator->getNbEmployees(); - if ($arrayNbEmployees['nbemployees'] > 0) { - $nbaccidentsbyemployees = ($arrayNbAccidents['data']['accidents'] + $arrayNbAccidents['data']['accidentswithoutDIAT']) / $arrayNbEmployees['nbemployees']; - if ($nbaccidentsbyemployees > 0) { - $array['nbaccidentsbyemployees'] = price2Num($nbaccidentsbyemployees, 2); - } else { - $array['nbaccidentsbyemployees'] = 'N/A'; - } - } else { - $array['nbaccidentsbyemployees'] = 'N/A'; - } - return $array; - } + return $array; + } - /** - * Get number presqu'accidents. - * - * @return array - * @throws Exception - */ - public function getNbPresquAccidents() { - global $langs; + /** + * Get number accidents by employees + * + * @param array $accidents Array of accidents + * @param array $accidentsWithWorkStops Array of accidents with work stops + * @param array $employees Array of employees + * @return array + */ + public function getNbAccidentsByEmployees(array $accidents = [], array $accidentsWithWorkStops = [], array $employees = []): array + { + $arrayNbAccidents = $this->getNbAccidents($accidents, $accidentsWithWorkStops); + if ($employees['nbemployees'] > 0 && ($arrayNbAccidents['data']['accidents'] + $arrayNbAccidents['data']['accidentswithoutDIAT']) > 0) { + $nbAccidentsByEmployees = ($arrayNbAccidents['data']['accidents'] + $arrayNbAccidents['data']['accidentswithoutDIAT']) / $employees['nbemployees']; + $array['nbaccidentsbyemployees'] = price2Num($nbAccidentsByEmployees, 2); + } else { + $array['nbaccidentsbyemployees'] = 'N/A'; + } + return $array; + } - $category = new Categorie($this->db); + /** + * Get number presqu'accidents + * + * @return array + * @throws Exception + */ + public function getNbPresquAccidents(): array + { + global $langs; - // Number accidents presqu'accidents - $category->fetch(0, $langs->transnoentities('PresquAccident')); - $alltickets = $category->getObjectsInCateg(Categorie::TYPE_TICKET); - if (is_array($alltickets) && !empty($alltickets)) { - $array['nbpresquaccidents'] = count($alltickets); - } else { - $array['nbpresquaccidents'] = 'N/A'; - } - return $array; - } + $category = new Categorie($this->db); - /** - * Get number accident investigations. - * - * @return array - * @throws Exception - */ - public function getNbAccidentInvestigations() { - // Number accident investigations - $allaccidents = $this->fetchAll(); - if (is_array($allaccidents) && !empty($allaccidents)) { - $accidentmetadata = new AccidentMetaData($this->db); - foreach ($allaccidents as $accident) { - $filter = ' AND t.fk_accident = ' . $accident->id . ' AND t.status = 1 AND t.accident_investigation = 1'; - $result = $accidentmetadata->fetch(0, '', $filter); - if ($result > 0) { - $nbaccidentinvestigations += 1; - } - } - if ($nbaccidentinvestigations > 0) { - $array['nbaccidentinvestigations'] = $nbaccidentinvestigations; - } else { - $array['nbaccidentinvestigations'] = 'N/A'; - } - } else { - $array['nbaccidentinvestigations'] = 'N/A'; - } - return $array; - } + $category->fetch(0, $langs->transnoentities('PresquAccident')); + $tickets = $category->getObjectsInCateg(Categorie::TYPE_TICKET); + if (!empty($tickets) && is_array($tickets)) { + $array['nbpresquaccidents'] = count($tickets); + } else { + $array['nbpresquaccidents'] = 'N/A'; + } + return $array; + } - /** - * Get frequency index (number accidents with DIAT by employees) x 1000. - * - * @return array - * @throws Exception - */ - public function getFrequencyIndex() { - $evaluator = new Evaluator($this->db); - - // (Number accidents with DIAT by employees) x 1 000 - $arrayNbAccidents = $this->getNbAccidents(); - $arrayNbEmployees = $evaluator->getNbEmployees(); - if ($arrayNbEmployees['nbemployees'] > 0) { - $frequencyindex = ($arrayNbAccidents['data']['accidents']/$arrayNbEmployees['nbemployees']) * 1000; - if ($frequencyindex > 0) { - $array['frequencyindex'] = price2Num($frequencyindex, 2); - } else { - $array['frequencyindex'] = 'N/A'; - } - } else { - $array['frequencyindex'] = 'N/A'; - } - return $array; - } + /** + * Get number accident investigations + * + * @param array $moreParam More param (Object/user/etc) + * @return array + * @throws Exception + */ + public function getNbAccidentInvestigations(array $moreParam = []): array + { + require_once __DIR__ . '/accidentinvestigation.class.php'; - /** - * Get frequency rate (number accidents with DIAT by working hours) x 1 000 000. - * - * @return array - * @throws Exception - */ - public function getFrequencyRate() { - // (Number accidents with DIAT by working hours) x 1 000 000 - $arrayNbAccidents = $this->getNbAccidents(); - $total_workhours = getWorkedHours(); - - if ($total_workhours > 0) { - $frequencyrate = ($arrayNbAccidents['data']['accidents']/$total_workhours) * 1000000; - if ($frequencyrate > 0) { - $array['frequencyrate'] = price2Num($frequencyrate, 5); - } else { - $array['frequencyrate'] = 'N/A'; - } - } else { - $array['frequencyrate'] = 'N/A'; - } - return $array; - } + $accidentInvestigation = new AccidentInvestigation($this->db); + if (isset($moreParam['filter']) && strpos($moreParam['filter'], 't.entity') !== false) { + $accidentInvestigation->ismultientitymanaged = 0; + } + $accidentInvestigations = $accidentInvestigation->fetchAll('', '', 0, 0, ['customsql' => ' t.status > ' . AccidentInvestigation::STATUS_DRAFT . ($moreParam['filter'] ?? '')]); + if (!empty($accidentInvestigations) && is_array($accidentInvestigations)) { + $array['nbaccidentinvestigations'] = count($accidentInvestigations); + } else { + $array['nbaccidentinvestigations'] = 'N/A'; + } + return $array; + } - /** - * Get gravity rate (number workstop days by working hours) x 1 000. - * - * @return array - * @throws Exception - */ - public function getGravityRate() { - // (Number workstop days by working hours) x 1 000 - $arrayNbWorkstopDays = $this->getNbWorkstopDays(); - $total_workhours = getWorkedHours(); - if ($total_workhours > 0) { - $gravityrate = ($arrayNbWorkstopDays['nbworkstopdays']/$total_workhours) * 1000; - if ($gravityrate > 0) { - $array['gravityrate'] = price2Num($gravityrate, 5); - } else { - $array['gravityrate'] = 'N/A'; - } - } else { - $array['gravityrate'] = 'N/A'; - } - return $array; - } + /** + * Get frequency index (number accidents with DIAT by employees) x 1000 + * + * @param array $accidentsWithWorkStops Array of accidents with work stops + * @param array $employees Array of employees + * @return array + */ + public function getFrequencyIndex(array $accidentsWithWorkStops = [], array $employees = []): array + { + if ($employees['nbemployees'] > 0) { + $frequencyIndex = (count($accidentsWithWorkStops) / $employees['nbemployees']) * 1000; + if ($frequencyIndex > 0) { + $array['frequencyindex'] = price2Num($frequencyIndex, 2); + } else { + $array['frequencyindex'] = 'N/A'; + } + } else { + $array['frequencyindex'] = 'N/A'; + } + return $array; + } + + /** + * Get frequency rate (number accidents with DIAT by working hours) x 1 000 000 + * + * @param array $accidentsWithWorkStops Array of accidents with work stops + * @return array + */ + public function getFrequencyRate(array $accidentsWithWorkStops = []): array + { + $workHours = getWorkedHours(); + if ($workHours > 0) { + $frequencyRate = (count($accidentsWithWorkStops) / $workHours) * 1000000; + if ($frequencyRate > 0) { + $array['frequencyrate'] = price2Num($frequencyRate, 2); + } else { + $array['frequencyrate'] = 'N/A'; + } + } else { + $array['frequencyrate'] = 'N/A'; + } + return $array; + } + + /** + * Get gravity rate (number workstop days by working hours) x 1 000 + * + * @param array $accidentsWithWorkStops Array of accidents with work stops + * @return array + */ + public function getGravityRate(array $accidentsWithWorkStops = []): array + { + $arrayNbWorkstopDays = $this->getNbWorkstopDays($accidentsWithWorkStops); + $workHours = getWorkedHours(); + if ($workHours > 0) { + $gravityRate = ($arrayNbWorkstopDays['nbworkstopdays'] / $workHours) * 1000; + if ($gravityRate > 0) { + $array['gravityrate'] = price2Num($gravityRate, 5); + } else { + $array['gravityrate'] = 'N/A'; + } + } else { + $array['gravityrate'] = 'N/A'; + } + return $array; + } /** * Get user victim object. @@ -830,7 +823,7 @@ public function getTriggerDescription(SaturneObject $object): string } $ret = parent::getTriggerDescription($object); - $ret .= $langs->trans('UserVictim') . ' : ' . $userVictim->firstname . $userVictim->lastname . '
'; + $ret .= $userVictim->id > 0 ? $langs->trans('UserVictim') . ' : ' . $userVictim->firstname . $userVictim->lastname . '
' : ''; $ret .= $langs->trans('UserEmployer') . ' : ' . $userEmployer->firstname . $userEmployer->lastname . '
'; $ret .= $langs->trans('AccidentLocation') . ' : ' . $accidentLocation . '
'; $ret .= $langs->trans('AccidentType') . ' : ' . ($object->accident_type ? $langs->trans('CommutingAccident') : $langs->trans('WorkAccidentStatement')) . '
'; diff --git a/class/actions_digiriskdolibarr.class.php b/class/actions_digiriskdolibarr.class.php index 2861266b8..6d7c1a7e8 100644 --- a/class/actions_digiriskdolibarr.class.php +++ b/class/actions_digiriskdolibarr.class.php @@ -200,7 +200,7 @@ public function printCommonFooter($parameters) array_options['options_digiriskdolibarr_ticket_service']) && $object->array_options['options_digiriskdolibarr_ticket_service'] > 0) { require_once __DIR__ . '/digiriskelement.class.php'; @@ -208,12 +208,15 @@ public function printCommonFooter($parameters) $digiriskElement = new DigiriskElement($db); $digiriskElement->fetch($object->array_options['options_digiriskdolibarr_ticket_service']); - $selectDictionnary = $digiriskElement->getNomUrl(1, 'blank', 0, '', -1, 1); ?> + $selectDictionnary = $digiriskElement->getNomUrl(1, 'blank', 0, '', -1, 1); - - + + fetch(GETPOST('id')); - $task->fetch_optionals(); - - $risk_id = $task->array_options['options_fk_risk']; - $preventionplan_id = $task->array_options['options_fk_preventionplan']; - $firepermit_id = $task->array_options['options_fk_firepermit']; - $accident_id = $task->array_options['options_fk_accident']; - $accidentinvestigation_id = $task->array_options['options_fk_accidentinvestigation']; - - $risk->fetch($risk_id); - $preventionplan->fetch($preventionplan_id); - $firepermit->fetch($firepermit_id); - $accident->fetch($accident_id); - $accidentinvestigation->fetch($accidentinvestigation_id); - - $pictoDigirisk = img_picto('', 'digiriskdolibarr_color@digiriskdolibarr', 'class="pictofixedwidth"'); + $signatory = new SaturneSignature($db, 'digiriskdolibarr', $object->element); + $signatories = $signatory->fetchSignatory('Attendant', $object->id, $object->element); + if (is_array($signatories) && !empty($signatories)) { + $signatory = array_shift($signatories); + if (dol_strlen( $signatory->signature_url ) > 0) { + $picto = img_picto('', 'digiriskdolibarr_color@digiriskdolibarr', 'class="pictoModule"'); + $signatureUrl = dol_buildpath('custom/saturne/public/signature/add_signature.php?track_id=' . $signatory->signature_url . '&entity=' . $conf->entity . '&module_name=digiriskdolibarr&object_type=' . $object->element . '&document_type=TicketDocument', 3); + + $out = ''; + $out .= ''; + $out .= ''; ?> + 0) { ?> - - 0) { ?> - - 0) { ?> - - 0) { ?> - - 0) { ?> - - fetch_name_optionals_label($task->table_element); - $alltasks = $task->getTasksArray(null, null, 0, 0, 0, '', '-1', '', 0, 0, $extrafields); - - if (is_array($alltasks) && !empty($alltasks)) { - foreach ($alltasks as $tasksingle) { - $risk_id = $tasksingle->options_fk_risk; - $preventionplan_id = $tasksingle->options_fk_preventionplan; - $firepermit_id = $tasksingle->options_fk_firepermit; - $accident_id = $tasksingle->options_fk_accident; - $accidentinvestigation_id = $tasksingle->options_fk_accidentinvestigation; - - $risk->fetch($risk_id); - $preventionplan->fetch($preventionplan_id); - $firepermit->fetch($firepermit_id); - $accident->fetch($accident_id); - $accidentinvestigation->fetch($accidentinvestigation_id); - if (strpos($parameters['context'], 'projecttaskcard') !== false) { - if (!empty($risk_id) && $risk_id > 0) { ?> - - 0) { ?> - - 0) { ?> - - 0) { ?> - - 0) { ?> - - 0) { ?> - - 0) { ?> - - 0) { ?> - - 0) { ?> - - 0) { ?> - - fetch( GETPOST('projectid'), GETPOST('project_ref')); - $projectId = $project->id; - } else if (preg_match('/projectcard|projectcontactcard|projecttaskscard/', $parameters['context'])) { + if (preg_match('/projectcard|projectcontactcard|projecttaskscard/', $parameters['context'])) { $projectId = GETPOST('id'); + } else if (GETPOSTISSET('projectid') || GETPOSTISSET('ref')) { + $project->fetch( GETPOST('projectid'), GETPOST('ref')); + $projectId = $project->id; } else { $task->fetch(GETPOST('id')); $projectId = $task->fk_project; @@ -512,14 +395,7 @@ public function printCommonFooter($parameters) print ''; } - if (true) { - $this->results = array('myreturn' => 999); - $this->resprints = 'A text to show'; - return 0; // or return 1 to replace standard code - } else { - $this->errors[] = 'Error message'; - return -1; - } + return 0; // or return 1 to replace standard code } /** @@ -549,7 +425,7 @@ public function doActions($parameters, $object, $action) } } } else if (strpos($parameters['context'], 'ticketcard') !== false) { - if ($action == 'builddoc' && preg_match('/\bticketdocument_odt\b/', GETPOST('model'))) { + if ($action == 'builddoc' && preg_match('/\/(ticketdocument)\/|\/(digiriskdolibarr)\//', GETPOST('model'))) { require_once __DIR__ . '/digiriskdolibarrdocuments/ticketdocument.class.php'; $document = new TicketDocument($this->db); @@ -558,7 +434,7 @@ public function doActions($parameters, $object, $action) $permissiontoadd = $user->rights->ticket->write; } - if ($action == 'remove_file' && preg_match('/\bticketdocument\b/', GETPOST('file'))) { + if ($action == 'remove_file' && preg_match('/\/(ticketdocument)\/|\/(digiriskdolibarr)\//', GETPOST('file'))) { $upload_dir = $conf->digiriskdolibarr->multidir_output[$conf->entity ?? 1]; $permissiontodelete = $user->rights->ticket->delete; } @@ -693,6 +569,7 @@ public function printFieldListFrom($parameters, $object) { global $conf, $user, $langs; + $sql = ''; /* print_r($parameters); print_r($object); echo "action: " . $action; */ if (preg_match('/ticketlist|thirdpartyticket|projectticket/', $parameters['context'])) { // do something only for the context 'somecontext1' or 'somecontext2' $searchCategoryTicketList = GETPOST('search_category_ticket_list'); @@ -701,13 +578,8 @@ public function printFieldListFrom($parameters, $object) } } - if (true) { - $this->resprints = $sql; - return 0; // or return 1 to replace standard code - } else { - $this->errors[] = 'Error message'; - return -1; - } + $this->resprints = $sql; + return 0; // or return 1 to replace standard code } @@ -720,12 +592,10 @@ public function printFieldListFrom($parameters, $object) */ public function printFieldListWhere($parameters, $object) { - global $conf, $user, $langs; - - /* print_r($parameters); print_r($object); echo "action: " . $action; */ - if (preg_match('/ticketlist|thirdpartyticket|projectticket/', $parameters['context'])) { // do something only for the context 'somecontext1' or 'somecontext2' + if (preg_match('/ticketlist|thirdpartyticket|projectticket/', $parameters['context'])) { $searchCategoryTicketSqlList = array(); $searchCategoryTicketList = GETPOST('search_category_ticket_list'); + $sql = ''; if (is_array($searchCategoryTicketList) && !empty($searchCategoryTicketList)) { foreach ($searchCategoryTicketList as $searchCategoryTicket) { if (intval($searchCategoryTicket) == -2) { @@ -748,24 +618,11 @@ public function printFieldListWhere($parameters, $object) if (!empty($searchCategoryTicketList)) { $sql .= " GROUP BY t.rowid"; } - } - if (strpos($parameters['context'], 'userlist') !== false) { - $user->fetchAll('','','','',['login' => 'USERAPI']); - - if (is_array($user->users) && !empty($user->users)) { - $userIds = implode(',', array_keys($user->users)); - $sql .= ' AND u.rowid NOT IN (' . $userIds . ')'; - } + $this->resprints = $sql; } - if (true) { - $this->resprints = $sql; - return 0; // or return 1 to replace standard code - } else { - $this->errors[] = 'Error message'; - return -1; - } + return 0; // or return 1 to replace standard code } @@ -804,13 +661,8 @@ public function printFieldPreListTitle($parameters, $object) } } - if (true) { - $this->resprints = $moreforfilter; - return 0; // or return 1 to replace standard code - } else { - $this->errors[] = 'Error message'; - return -1; - } + $this->resprints = $moreforfilter ?? ''; + return 0; // or return 1 to replace standard code } /** @@ -824,6 +676,7 @@ public function printFieldListSearchParam($parameters, $object) { global $conf, $db, $user, $langs; + $param = ''; /* print_r($parameters); print_r($object); echo "action: " . $action; */ if (preg_match('/ticketlist|thirdpartyticket|projectticket/', $parameters['context'])) { // do something only for the context 'somecontext1' or 'somecontext2' $searchCategoryTicketList = GETPOST('search_category_ticket_list'); @@ -845,6 +698,60 @@ public function printFieldListSearchParam($parameters, $object) } } + /** + * Overloading the formObjectOptions function : replacing the parent's function with the one below + * + * @param array $parameters Hook metadata (context, etc...) + * @return int 0 < on error, 0 on success, 1 to replace standard code + * @throws Exception + */ + public function formObjectOptions(array $parameters, $object, $action): int + { + global $extrafields, $langs; + + if (strpos($parameters['context'], 'projecttaskcard') !== false) { + $picto = img_picto('', 'digiriskdolibarr_color@digiriskdolibarr', 'class="pictoModule"'); + $extraFieldsNames = ['fk_risk', 'fk_preventionplan', 'fk_firepermit', 'fk_accident', 'fk_accidentinvestigation']; + foreach ($extraFieldsNames as $extraFieldsName) { + $extrafields->attributes['projet_task']['label'][$extraFieldsName] = $picto . $langs->transnoentities($extrafields->attributes['projet_task']['label'][$extraFieldsName]); + } + } + + if (strpos($parameters['context'], 'ticketcard') !== false) { + $picto = img_picto('', 'digiriskdolibarr_color@digiriskdolibarr', 'class="pictoModule"'); + foreach ($extrafields->attributes['ticket']['label'] as $key => $value) { + if (strpos($key, 'digiriskdolibarr_ticket') === false) { + continue; // Goes to the next element if ‘digiriskdolibarr_ticket’ is not found + } + $extrafields->attributes['ticket']['label'][$key] = $picto . $langs->transnoentities($value); + } + } + + return 0; // or return 1 to replace standard code + } + + /** + * Overloading the printFieldListOption function : replacing the parent's function with the one below + * + * @param array $parameters Hook metadata (context, etc...) + * @param CommonObject $object Current object + * @return int 0 < on error, 0 on success, 1 to replace standard code + */ + public function printFieldListOption(array $parameters, $object): int + { + global $extrafields, $langs; + + if (preg_match('/tasklist|projecttaskscard/', $parameters['context'])) { + $picto = img_picto('', 'digiriskdolibarr_color@digiriskdolibarr', 'class="pictoModule"'); + $extraFieldsNames = ['fk_risk', 'fk_preventionplan', 'fk_firepermit', 'fk_accident', 'fk_accidentinvestigation']; + foreach ($extraFieldsNames as $extraFieldsName) { + $extrafields->attributes['projet_task']['label'][$extraFieldsName] = $picto . $langs->transnoentities($extrafields->attributes['projet_task']['label'][$extraFieldsName]); + } + } + + return 0; // or return 1 to replace standard code + } + /** * Overloading the saturneBannerTab function : replacing the parent's function with the one below * @@ -1072,7 +979,7 @@ public function saturneBannerTabCustomSubdir(array $parameters, object $object): if (preg_match('/digiriskelementview|digiriskstandardview|digiriskstandardagenda|digiriskelementagenda|digiriskelementdocument/', $parameters['context'])) { require_once __DIR__ . '/../lib/digiriskdolibarr_function.lib.php'; if ($object->element == 'digiriskelement') { - $this->results = ['subdir' => $object->element_type . '/'. $object->ref]; + $this->results = ['subdir' => $object->element_type . '/'. $object->ref, 'photoLimit' => 1]; } elseif ($object->element == 'digiriskstandard') { $this->results = ['modulepart' => 'mycompany', 'dir' => $conf->mycompany->dir_output, 'subdir' => 'logos', 'photoLimit' => 1]; } diff --git a/class/digiriskdocuments.class.php b/class/digiriskdocuments.class.php index 8189a397b..9a7be0334 100644 --- a/class/digiriskdocuments.class.php +++ b/class/digiriskdocuments.class.php @@ -210,21 +210,21 @@ public function fillRiskData(Odf $odfHandler, $object, Translate $outputLangs, $ array_pop($digiriskElementIds); foreach ($digiriskElementIds as $key => $digiriskElementId) { - $nomElement .= str_repeat(' - ', count($digiriskElementIds) + 1 - $key) . $activeDigiriskElements[$digiriskElementId]->ref . ' - ' . $activeDigiriskElements[$digiriskElementId]->label . chr(0x0A) . chr(0x0A); + $nomElement .= '
' . str_repeat(' - ', count($digiriskElementIds) + 1 - $key) . $activeDigiriskElements[$digiriskElementId]->ref . ' - ' . $activeDigiriskElements[$digiriskElementId]->label . chr(0x0A) . chr(0x0A); } } } if ($conf->global->DIGIRISKDOLIBARR_SHOW_RISK_ORIGIN) { - $nomElement .= (!empty($conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS) ? 'S' . $element->entity : '') . ' - ' . $element->ref . ' - ' . $element->label; + $nomElement .= '
' . (!empty($conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS) ? 'S' . $element->entity : '') . ' - ' . $element->ref . ' - ' . $element->label; if ($line->fk_element != $line->appliedOn) { - $nomElement .= ($dash > 0 ? ' - ' : '') . $langs->trans('AppliedOn') . ' ' . $linked_element->ref . ' - ' . $linked_element->label; + $nomElement .= '
' . $langs->trans('AppliedOn') . ' ' . $linked_element->ref . ' - ' . $linked_element->label; } } else { if ($linked_element->id > 0) { - $nomElement .= ($dash > 0 ? ' - ' : '') . $linked_element->ref . ' - ' . $linked_element->label; + $nomElement .= '
' . ($dash > 0 ? ' - ' : '') . $linked_element->ref . ' - ' . $linked_element->label; } else { - $nomElement .= ($dash > 0 ? ' - ' : '') . $element->ref . ' - ' . $element->label; + $nomElement .= '
' . ($dash > 0 ? ' - ' : '') . $element->ref . ' - ' . $element->label; } } @@ -290,6 +290,7 @@ public function fillRiskData(Odf $odfHandler, $object, Translate $outputLangs, $ if ($task_progress == 100) { if ($conf->global->DIGIRISKDOLIBARR_WORKUNITDOCUMENT_SHOW_TASK_DONE > 0) { + (($related_task->label) ? $tmparray['actionPreventionCompleted'] .= $langs->trans('Label') . ' : ' . $related_task->label . "\n" : ''); if (!getDolGlobalInt('DIGIRISKDOLIBARR_TASK_HIDE_REF_IN_DOCUMENT')) { (($related_task->ref) ? $tmparray['actionPreventionCompleted'] .= $langs->trans('Ref') . ' : ' . $related_task->ref . "\n" : ''); } @@ -313,13 +314,13 @@ public function fillRiskData(Odf $odfHandler, $object, Translate $outputLangs, $ $tmparray['actionPreventionCompleted'] .= $langs->trans('Budget') . ' : ' . price($related_task->budget_amount, 0, $langs, 1, 0, 0, $conf->currency) . "\n"; } (($AllInitiales) ? $tmparray['actionPreventionCompleted'] .= $langs->trans('ContactsAction') . ' : ' . $AllInitiales . "\n" : ''); - (($related_task->label) ? $tmparray['actionPreventionCompleted'] .= $langs->trans('Label') . ' : ' . $related_task->label . "\n" : ''); (($related_task->description) ? $tmparray['actionPreventionCompleted'] .= $langs->trans('Description') . ' : ' . $related_task->description . "\n" : ''); $tmparray['actionPreventionCompleted'] .= "\n"; } else { $tmparray['actionPreventionCompleted'] = $langs->transnoentities('ActionPreventionCompletedTaskDone'); } } else { + (($related_task->label) ? $tmparray['actionPreventionUncompleted'] .= $langs->trans('Label') . ' : ' . $related_task->label . "\n" : ''); if (!getDolGlobalInt('DIGIRISKDOLIBARR_TASK_HIDE_REF_IN_DOCUMENT')) { (($related_task->ref) ? $tmparray['actionPreventionUncompleted'] .= $langs->trans('Ref') . ' : ' . $related_task->ref . "\n" : ''); } @@ -345,7 +346,6 @@ public function fillRiskData(Odf $odfHandler, $object, Translate $outputLangs, $ } $tmparray['actionPreventionUncompleted'] .= $langs->trans('DigiriskProgress') . ' : ' . ($task_progress ?: 0) . ' %' . "\n"; (($AllInitiales) ? $tmparray['actionPreventionUncompleted'] .= $langs->trans('ContactsAction') . ' : ' . $AllInitiales . "\n" : ''); - (($related_task->label) ? $tmparray['actionPreventionUncompleted'] .= $langs->trans('Label') . ' : ' . $related_task->label . "\n" : ''); (($related_task->description) ? $tmparray['actionPreventionUncompleted'] .= $langs->trans('Description') . ' : ' . $related_task->description . "\n" : ''); $tmparray['actionPreventionUncompleted'] .= "\n"; } diff --git a/class/digiriskdolibarrdashboard.class.php b/class/digiriskdolibarrdashboard.class.php index f399880b9..69002b83c 100644 --- a/class/digiriskdolibarrdashboard.class.php +++ b/class/digiriskdolibarrdashboard.class.php @@ -52,25 +52,26 @@ public function load_dashboard(array $moreParams = []): array { $dashboardDatas = [ ['type' => 'RiskAssessmentDocument', 'classPath' => '/digiriskdolibarrdocuments/riskassessmentdocument.class.php'], + ['type' => 'Risk', 'classPath' => '/riskanalysis/risk.class.php'], ['type' => 'Accident', 'classPath' => '/accident.class.php'], ['type' => 'Evaluator', 'classPath' => '/evaluator.class.php'], ['type' => 'DigiriskResources', 'classPath' => '/digiriskresources.class.php'], ['type' => 'DigiriskElement', 'classPath' => '/digiriskelement.class.php'], ['type' => 'SaturneTask', 'classPath' => '/../../saturne/class/task/saturnetask.class.php'], - ['type' => 'Risk', 'classPath' => '/riskanalysis/risk.class.php'], - ['type' => 'TicketDashboard', 'classPath' => '/ticketdashboard.class.php'] + ['type' => 'TicketDashboard', 'classPath' => '/ticketdashboard.class.php'], + ['type' => 'TicketStatsDashboard', 'classPath' => '/ticketstatsdashboard.class.php'] ]; foreach ($dashboardDatas as $dashboardData) { require_once __DIR__ . $dashboardData['classPath']; if ($dashboardData['type'] != 'TicketDashboard') { $className = new $dashboardData['type']($this->db); } else { - $className = new TicketDashboard($this->db, $moreParams['join'], $moreParams['where']); + $className = new TicketDashboard($this->db, $moreParams['join'] ?? '', $moreParams['where'] ?? ''); } if ($dashboardData['type'] != 'SaturneTask') { - $array[$dashboardData['type']] = array_key_exists('Load' . $dashboardData['type'], $moreParams) ? $className->load_dashboard() : []; + $array[$dashboardData['type']] = array_key_exists('Load' . $dashboardData['type'], $moreParams) && $moreParams['Load' . $dashboardData['type']] ? $className->load_dashboard() : []; } else { - $array[$dashboardData['type']] = array_key_exists('Load' . $dashboardData['type'], $moreParams) ? $className->load_dashboard(getDolGlobalInt('DIGIRISKDOLIBARR_DU_PROJECT')) : []; + $array[$dashboardData['type']] = array_key_exists('Load' . $dashboardData['type'], $moreParams) && $moreParams['Load' . $dashboardData['type']] ? $className->load_dashboard(getDolGlobalInt('DIGIRISKDOLIBARR_DU_PROJECT')) : []; } } @@ -137,7 +138,7 @@ protected function _getAllByYear(string $sql): array $result[$i]['year'] = $row->year; $result[$i]['nb'] = $row->nb; if ($i > 0 && $row->nb > 0) { - $result[$i - 1]['avg'] = ($result[$i - 1]['nb']) / $row->nb * 100; + $result[$i - 1]['avg'] = -($row->nb - ($result[$i - 1]['nb'])) / $row->nb * 100; } $i++; } diff --git a/class/digiriskdolibarrdocuments/informationssharing.class.php b/class/digiriskdolibarrdocuments/informationssharing.class.php index bfcdb6574..94a122e02 100644 --- a/class/digiriskdolibarrdocuments/informationssharing.class.php +++ b/class/digiriskdolibarrdocuments/informationssharing.class.php @@ -57,7 +57,7 @@ public function __construct(DoliDB $db) */ public function InformationsSharingFillJSON() { - global $conf; + global $conf, $langs; $resources = new DigiriskResources($this->db); $digirisk_resources = $resources->fetchDigiriskResources(); @@ -87,6 +87,7 @@ public function InformationsSharingFillJSON() if ($result > 0) { $json['InformationsSharing']['harassment_officer']['id'] = $harassment_officer->id; + $json['InformationsSharing']['harassment_officer']['name'] = $harassment_officer->getFullName($langs); $json['InformationsSharing']['harassment_officer']['phone'] = $harassment_officer->office_phone; } @@ -102,6 +103,7 @@ public function InformationsSharingFillJSON() $json['InformationsSharing']['delegues_du_personnels_date'] = (dol_strlen($conf->global->DIGIRISKDOLIBARR_DP_ELECTION_DATE) > 0 && $conf->global->DIGIRISKDOLIBARR_DP_ELECTION_DATE != '--' ? $conf->global->DIGIRISKDOLIBARR_DP_ELECTION_DATE : ''); $json['InformationsSharing']['delegues_du_personnels_titulaires'] = ''; + $json['InformationsSharing']['delegues_du_personnels_titulairesFullName'] = ''; if (!empty ($digirisk_resources['TitularsDP']->id )) { foreach ($digirisk_resources['TitularsDP']->id as $dp_titular) { @@ -115,6 +117,7 @@ public function InformationsSharingFillJSON() } $json['InformationsSharing']['delegues_du_personnels_suppleants'] = ''; + $json['InformationsSharing']['delegues_du_personnels_suppleantsFullName'] = ''; if (!empty ($digirisk_resources['AlternatesDP']->id )) { foreach ($digirisk_resources['AlternatesDP']->id as $dp_alternate) { @@ -130,6 +133,7 @@ public function InformationsSharingFillJSON() // CSE $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 : ''); $json['InformationsSharing']['membres_du_comite_entreprise_titulaires'] = ''; + $json['InformationsSharing']['membres_du_comite_entreprise_titulairesFullName'] = ''; if (!empty ($digirisk_resources['TitularsCSE']->id )) { foreach ($digirisk_resources['TitularsCSE']->id as $cse_titular) { $cse_titulars = new User($this->db); @@ -142,6 +146,7 @@ public function InformationsSharingFillJSON() } $json['InformationsSharing']['membres_du_comite_entreprise_suppleants'] = ''; + $json['InformationsSharing']['membres_du_comite_entreprise_suppleantsFullName'] = ''; if (!empty ($digirisk_resources['AlternatesCSE']->id )) { foreach ($digirisk_resources['AlternatesCSE']->id as $cse_alternate) { $cse_alternates = new User($this->db); diff --git a/class/digiriskdolibarrdocuments/legaldisplay.class.php b/class/digiriskdolibarrdocuments/legaldisplay.class.php index cc7e56aab..663404e69 100644 --- a/class/digiriskdolibarrdocuments/legaldisplay.class.php +++ b/class/digiriskdolibarrdocuments/legaldisplay.class.php @@ -236,7 +236,10 @@ public function LegalDisplayFillJSON() { $json['LegalDisplay']['derogation_schedule']['permanent'] = $conf->global->DIGIRISKDOLIBARR_DEROGATION_SCHEDULE_PERMANENT; $json['LegalDisplay']['derogation_schedule']['occasional'] = $conf->global->DIGIRISKDOLIBARR_DEROGATION_SCHEDULE_OCCASIONAL; $json['LegalDisplay']['collective_agreement']['title_of_the_applicable_collective_agreement'] = $conf->global->DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE; - $json['LegalDisplay']['collective_agreement']['title_of_the_applicable_collective_agreement'] = $conf->global->DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE . ' - ' . $this->getIDCCByCode($conf->global->DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE)->libelle; + $idcc = $this->getIDCCByCode($conf->global->DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE); + if (!empty($idcc)) { + $json['LegalDisplay']['collective_agreement']['title_of_the_applicable_collective_agreement'] .= ' - ' . $idcc->libelle; + } $json['LegalDisplay']['collective_agreement']['location_and_access_terms_of_the_agreement'] = $conf->global->DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_LOCATION; $json['LegalDisplay']['DUER']['how_access_to_duer'] = $conf->global->DIGIRISKDOLIBARR_DUER_LOCATION; $json['LegalDisplay']['rules']['location'] = $conf->global->DIGIRISKDOLIBARR_RULES_LOCATION; diff --git a/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php b/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php index c1215b33e..830706ee0 100644 --- a/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php +++ b/class/digiriskdolibarrdocuments/riskassessmentdocument.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2021-2024 EVARISK * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,12 +31,12 @@ class RiskAssessmentDocument extends DigiriskDocuments { /** - * @var string Module name. + * @var string Module name */ public $module = 'digiriskdolibarr'; /** - * @var string Element type of object. + * @var string Element type of object */ public $element = 'riskassessmentdocument'; @@ -46,9 +46,9 @@ class RiskAssessmentDocument extends DigiriskDocuments public string $picto = 'fontawesome_fa-file-alt_fas_#d35968'; /** - * Constructor. + * Constructor * - * @param DoliDb $db Database handler. + * @param DoliDb $db Database handler */ public function __construct(DoliDB $db) { @@ -115,102 +115,59 @@ public function load_dashboard(): array { global $langs; - $arrayLastGenerateDate = $this->getLastGenerateDate(); - $arrayNextGenerateDate = $this->getNextGenerateDate(); - $arrayNbDaysBeforeNextGenerateDate = $this->getNbDaysBeforeNextGenerateDate(); - - if (empty($arrayNbDaysBeforeNextGenerateDate['nbdaysbeforenextgeneratedate'])) { - $arrayNbDaysAfterNextGenerateDate = $this->getNbDaysAfterNextGenerateDate(); - $arrayNbDaysBeforeNextGenerateDate = ['nbdaysbeforenextgeneratedate' => 'N/A']; - } else { - $arrayNbDaysAfterNextGenerateDate = ['nbdaysafternextgeneratedate' => 'N/A']; - } + $arrayGetGenerationDateInfos = $this->getGenerationDateInfos(); $array['widgets'] = [ 'riskassessmentdocument' => [ - 'label' => [$langs->transnoentities('LastGenerateDate') ?? '', $langs->transnoentities('NextGenerateDate') ?? '', $langs->transnoentities('NbDaysBeforeNextGenerateDate') ?? '', $langs->transnoentities('NbDaysAfterNextGenerateDate') ?? ''], - 'content' => [$arrayLastGenerateDate['lastgeneratedate'] ?? 0, $arrayNextGenerateDate['nextgeneratedate'] ?? 0, $arrayNbDaysBeforeNextGenerateDate['nbdaysbeforenextgeneratedate'] ?? 0, $arrayNbDaysAfterNextGenerateDate['nbdaysafternextgeneratedate'] ?? 0], - 'picto' => 'fas fa-info-circle', - 'widgetName' => $langs->transnoentities('RiskAssessmentDocument') + 'title' => $langs->transnoentities('RiskAssessmentDocument'), + 'picto' => 'fas fa-book', + 'pictoColor' => '#0D8AFF', + 'label' => [$langs->transnoentities('NextGenerateDate') ?? '', $langs->transnoentities('LastGenerateDate') ?? '', $langs->transnoentities('DelayGenerateDate') ?? ''], + 'content' => [$arrayGetGenerationDateInfos['nextgeneratedate'], $arrayGetGenerationDateInfos['lastgeneratedate'], $arrayGetGenerationDateInfos['delaygeneratedate']], + 'picto' => 'fas fa-info-circle', + 'moreContent' => ['', $arrayGetGenerationDateInfos['moreContent'] ?? ''], + 'widgetName' => $langs->transnoentities('RiskAssessmentDocument') ] ]; return $array; } - /** - * Get last riskassessmentdocument generate date. - * - * @return array - * @throws Exception - */ - public function getLastGenerateDate() - { - // Last riskassessmentdocument generate date - $filter = array('customsql' => "t.type='riskassessmentdocument'"); - $riskassessmentdocumentarray = $this->fetchAll('desc', 't.rowid', 1, 0, $filter, 'AND'); - if ( ! empty($riskassessmentdocumentarray) && $riskassessmentdocumentarray > 0 && is_array($riskassessmentdocumentarray)) { - $riskassessmentdocument = array_shift($riskassessmentdocumentarray); - $array['lastgeneratedate'] = dol_print_date($riskassessmentdocument->date_creation, 'day'); - } else { - $array['lastgeneratedate'] = 'N/A'; - } - return $array; - } - - /** - * Get next riskassessmentdocument generate date. - * - * @return array - * @throws Exception - */ - public function getNextGenerateDate() - { - // Next riskassessmentdocument generate date - $filter = array('customsql' => "t.type='riskassessmentdocument'"); - $riskassessmentdocumentarray = $this->fetchAll('desc', 't.rowid', 1, 0, $filter, 'AND'); - if ( ! empty($riskassessmentdocumentarray) && $riskassessmentdocumentarray > 0 && is_array($riskassessmentdocumentarray)) { - $riskassessmentdocument = array_shift($riskassessmentdocumentarray); - $array['nextgeneratedate'] = dol_print_date(dol_time_plus_duree($riskassessmentdocument->date_creation, '1', 'y'), 'day'); - } else { - $array['nextgeneratedate'] = 'N/A'; - } - return $array; - } + /** + * Get generation date infos + * + * @param array $moreParam More param (Object/user/etc) + * + * @return array + * @throws Exception + */ + public function getGenerationDateInfos(array $moreParam = []): array + { + global $langs; - /** - * Get number days before next riskassessmentdocument generate date. - * - * @return array - * @throws Exception - */ - public function getNbDaysBeforeNextGenerateDate() - { - // Number days before next riskassessmentdocument generate date - $arrayNextGenerateDate = $this->getNextGenerateDate(); - if ($arrayNextGenerateDate['nextgeneratedate'] > 0) { - $array['nbdaysbeforenextgeneratedate'] = num_between_day(dol_now(), dol_stringtotime($arrayNextGenerateDate['nextgeneratedate']), 1); - } else { - $array['nbdaysbeforenextgeneratedate'] = 'N/A'; - } - return $array; - } + $filter = ['customsql' => 't.type = "' . $this->element . '"' . ($moreParam['filter'] ?? '')]; + $riskAssessmentDocuments = $this->fetchAll('desc', 't.rowid', 1, 0, $filter); + if (!empty($riskAssessmentDocuments) && is_array($riskAssessmentDocuments)) { + $riskAssessmentDocument = array_shift($riskAssessmentDocuments); + $now = dol_now(); + $nextGenerateTimeStamp = dol_time_plus_duree($riskAssessmentDocument->date_creation, '1', 'y'); + $nextGenerateDate = dol_print_date($nextGenerateTimeStamp, 'day'); + $lastGenerateDate = dol_print_date($riskAssessmentDocument->date_creation, 'day'); + $nbDaysAfterNextGenerateDate = num_between_day($now, $nextGenerateTimeStamp, 1); + $nbDaysBeforeNextGenerateDate = num_between_day($nextGenerateTimeStamp, $now, 1); + + $array['nextgeneratedate'] = img_picto('', 'fontawesome_fa-calendar_far_#263C5C80', 'class="pictofixedwidth"') . $nextGenerateDate; + $array['nextgeneratedate'] .= ' ' . (!empty($nbDaysAfterNextGenerateDate) ? $nbDaysAfterNextGenerateDate . ' ' . $langs->transnoentities('Days') : ''); + $array['lastgeneratedate'] = img_picto('', 'fontawesome_fa-calendar_far_#263C5C80', 'class="pictofixedwidth"') . $lastGenerateDate; + $array['delaygeneratedate'] = !empty($nbDaysBeforeNextGenerateDate) ? $nbDaysBeforeNextGenerateDate . ' ' . $langs->transnoentities('Days') : $langs->transnoentities('NoDelay'); + } else { + $array['nextgeneratedate'] = 'N/A'; + $array['lastgeneratedate'] = 'N/A'; + $array['delaygeneratedate'] = 'N/A'; + } - /** - * Get number days after next riskassessmentdocument generate date. - * - * @return array - * @throws Exception - */ - public function getNbDaysAfterNextGenerateDate() - { - // Number days after next riskassessmentdocument generate date - $arrayNextGenerateDate = $this->getNextGenerateDate(); - if ($arrayNextGenerateDate['nextgeneratedate'] > 0) { - $array['nbdaysafternextgeneratedate'] = num_between_day(dol_stringtotime($arrayNextGenerateDate['nextgeneratedate']), dol_now(), 1); - } else { - $array['nbdaysafternextgeneratedate'] = 'N/A'; - } - return $array; - } + $array['moreContent'] = $this->showUrlOfLastGeneratedDocument($this->module, $this->element, 'odt', 'fontawesome_fa-file-word_far_#0D8AFF', $moreParam['entity'] ?? 1); + $array['moreContent'] .= $this->showUrlOfLastGeneratedDocument($this->module, $this->element, 'pdf', 'fontawesome_fa-file-pdf_far_#FB4B54', $moreParam['entity'] ?? 1); + return $array; + } } diff --git a/class/digiriskelement.class.php b/class/digiriskelement.class.php index b1bfa04bd..633a0503a 100644 --- a/class/digiriskelement.class.php +++ b/class/digiriskelement.class.php @@ -136,7 +136,7 @@ public function create(User $user, bool $notrigger = false): int { global $conf; if (empty($this->ref)) { - $type = 'DIGIRISKDOLIBARR_' . strtoupper($this->element_type) . '_ADDON'; + $type = 'DIGIRISKDOLIBARR_' . dol_strtoupper($this->element_type) . '_ADDON'; $objectMod = $conf->global->$type; $numberingModules = [ 'digiriskelement/' . $this->element_type => $objectMod @@ -367,6 +367,30 @@ public function getMultiEntityTrashList() } } + /** + * Return SQL filter for trash exclusion + * + * @return string + * @throws Exception + */ + public function getTrashExclusionSqlFilter(): string + { + $filter = ''; + $digiriskElementTrashs = $this->getMultiEntityTrashList(); + if (!empty($digiriskElementTrashs) && is_array($digiriskElementTrashs)) { + $filter = '('; + foreach (array_keys($digiriskElementTrashs) as $digiriskElementTrash) { + $filter .= $digiriskElementTrash . ', '; + } + if (preg_match('/, /', $filter)) { + $filter = rtrim($filter, ', '); + } + $filter .= ')'; + } + + return $filter; + } + /** * Return list of parent ids for an element * @@ -400,7 +424,7 @@ public function getActiveDigiriskElements(int $multiEntityManagement = 0, array $this->ismultientitymanaged = 0; } - $digiriskElements = $this->fetchAll('', '', 0, 0, ['customsql' => 'status = ' . self::STATUS_VALIDATED . $moreParams['filter']]); + $digiriskElements = $this->fetchAll('', '', 0, 0, ['customsql' => 'status = ' . self::STATUS_VALIDATED . ($moreParams['filter'] ?? '')]); $trashList = $this->getMultiEntityTrashList(); if (is_array($trashList) && !empty($trashList)) { foreach($trashList as $trashElementID) { @@ -539,10 +563,22 @@ public function getTriggerDescription(SaturneObject $object): string */ public function load_dashboard(): array { - $getDigiriskElementListsByDepth = $this->getDigiriskElementListsByDepth(); - $getRisksByDigiriskElement = $this->getRisksByDigiriskElement(); + global $langs; + + $confName = strtoupper($this->module) . '_DASHBOARD_CONFIG'; + $dashboardConfig = json_decode(getDolUserString($confName)); + $array = ['graphs' => [], 'disabledGraphs' => []]; - $array['graphs'] = [$getDigiriskElementListsByDepth, $getRisksByDigiriskElement]; + if (empty($dashboardConfig->graphs->DigiriskElementsRepartitionByDepth->hide)) { + $array['graphs'][] = $this->getDigiriskElementListsByDepth(); + } else { + $array['disabledGraphs']['DigiriskElementsRepartitionByDepth'] = $langs->transnoentities('DigiriskElementsRepartitionByDepth'); + } + if (empty($dashboardConfig->graphs->RisksRepartitionByDigiriskElement->hide)) { + $array['graphs'][] = $this->getRisksByDigiriskElement(); + } else { + $array['disabledGraphs']['RisksRepartitionByDigiriskElement'] = $langs->transnoentities('RisksRepartitionByDigiriskElement'); + } return $array; } @@ -561,6 +597,7 @@ public function getRisksByDigiriskElement(string $riskType = 'risk'): array // Graph Title parameters $array['title'] = $langs->transnoentities('RisksRepartitionByDigiriskElement'); + $array['name'] = 'RisksRepartitionByDigiriskElement'; $array['picto'] = $this->picto; // Graph parameters @@ -613,6 +650,7 @@ public function getDigiriskElementListsByDepth(): array // Graph Title parameters $array['title'] = $langs->transnoentities('DigiriskElementsRepartitionByDepth', getDolGlobalInt('DIGIRISKDOLIBARR_DIGIRISKELEMENT_DEPTH_GRAPH')); + $array['name'] = 'DigiriskElementsRepartitionByDepth'; $array['picto'] = $this->picto; // Graph parameters diff --git a/class/digiriskresources.class.php b/class/digiriskresources.class.php index e71f9c868..8cc3ea958 100644 --- a/class/digiriskresources.class.php +++ b/class/digiriskresources.class.php @@ -301,7 +301,7 @@ public function fetchDigiriskResources() $allLinks = array(); if (!empty ($links) && $links > 0) { foreach ($links as $link) { - if ($allLinks[$link->ref]->ref == $link->ref) { + if (isset($allLinks[$link->ref]) && $allLinks[$link->ref]->ref == $link->ref) { array_push($allLinks[$link->ref]->id, $link->element_id); } else { $allLinks[$link->ref] = new stdClass(); @@ -329,9 +329,11 @@ public function load_dashboard(): array $array['widgets'] = [ 'society' => [ + 'title' => $langs->transnoentities('Society'), + 'picto' => 'fas fa-building', + 'pictoColor' => '#FB4B54', 'label' => [$langs->transnoentities('SiretNumber') ?? ''], 'content' => [$arraySiretNumber['siretnumber'] ?? 0], - 'picto' => 'fas fa-building', 'widgetName' => $langs->transnoentities('Society') ] ]; diff --git a/class/evaluator.class.php b/class/evaluator.class.php index 1ce18b023..2bb75a0a5 100644 --- a/class/evaluator.class.php +++ b/class/evaluator.class.php @@ -142,10 +142,12 @@ public function load_dashboard(): array $array['widgets'] = [ 'evaluator' => [ + 'title' => $langs->transnoentities('Employees'), + 'picto' => 'fas fa-user', + 'pictoColor' => '#32E592', 'label' => [$langs->transnoentities('NbEmployeesInvolved') ?? '', $langs->transnoentities('NbEmployees') ?? ''], 'content' => [$arrayNbEmployeesInvolved['nbemployeesinvolved'] ?? 0, $arrayNbEmployees['nbemployees'] ?? 0], 'tooltip' => [$langs->transnoentities('NbEmployeesInvolvedTooltip'), (($conf->global->DIGIRISKDOLIBARR_NB_EMPLOYEES > 0 && $conf->global->DIGIRISKDOLIBARR_MANUAL_INPUT_NB_EMPLOYEES) ? $langs->transnoentities('NbEmployeesConfTooltip') : $langs->transnoentities('NbEmployeesTooltip'))], - 'picto' => 'fas fa-user-check', 'widgetName' => $langs->transnoentities('Evaluator') ] ]; @@ -156,12 +158,13 @@ public function load_dashboard(): array /** * Get number employees involved. * - * @return array + * @param array $moreParam More param (Object/user/etc) + * @return array * @throws Exception */ - public function getNbEmployeesInvolved() { + public function getNbEmployeesInvolved(array $moreParam = []) { // Number employees involved - $allevaluators = $this->fetchAll('','', 0, 0, array(), 'AND', 'fk_user'); + $allevaluators = $this->fetchAll('','', 0, 0, ['customsql' => ($moreParam['filter'] ?? '')], 'AND', 'fk_user'); if (is_array($allevaluators) && !empty($allevaluators)) { $array['nbemployeesinvolved'] = count($allevaluators); } else { @@ -170,29 +173,29 @@ public function getNbEmployeesInvolved() { return $array; } - /** - * Get number employees. - * - * @return array - * @throws Exception - */ - public function getNbEmployees() { - global $conf; - - // Number employees - if ($conf->global->DIGIRISKDOLIBARR_NB_EMPLOYEES > 0 && $conf->global->DIGIRISKDOLIBARR_MANUAL_INPUT_NB_EMPLOYEES) { - $array['nbemployees'] = $conf->global->DIGIRISKDOLIBARR_NB_EMPLOYEES; - } else { - $user = new User($this->db); - $allusers = $user->get_full_tree(0, 'u.employee = 1'); - if (!empty($allusers) && is_array($allusers)) { - $array['nbemployees'] = count($allusers); - } else { - $array['nbemployees'] = 'N/A'; - } - } - return $array; - } + /** + * Get number employees + * + * @param array $moreParam More param (Object/user/etc) + * @return array + * @throws Exception + */ + public function getNbEmployees(array $moreParam = []): array + { + global $user; + + if (getDolGlobalInt('DIGIRISKDOLIBARR_NB_EMPLOYEES') > 0 && getDolGlobalInt('DIGIRISKDOLIBARR_MANUAL_INPUT_NB_EMPLOYEES')) { + $array['nbemployees'] = getDolGlobalInt('DIGIRISKDOLIBARR_NB_EMPLOYEES'); + } else { + $users = $user->get_full_tree(0, 'u.employee = 1' . ($moreParam['filter'] ?? '')); + if (!empty($users) && is_array($users)) { + $array['nbemployees'] = count($users); + } else { + $array['nbemployees'] = 0; + } + } + return $array; + } /** * Write information of trigger description diff --git a/class/firepermit.class.php b/class/firepermit.class.php index da31e6473..ed78e83e5 100644 --- a/class/firepermit.class.php +++ b/class/firepermit.class.php @@ -306,6 +306,12 @@ public function LibStatut($status, $mode = 0): string $this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ValidatePendingSignature'); $this->labelStatus[self::STATUS_LOCKED] = $langs->trans('Locked'); $this->labelStatus[self::STATUS_ARCHIVED] = $langs->trans('Archived'); + + $this->labelStatusShort[self::STATUS_DELETED] = $langs->transnoentitiesnoconv('Deleted'); + $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('InProgress'); + $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ValidatePendingSignature'); + $this->labelStatusShort[self::STATUS_LOCKED] = $langs->transnoentitiesnoconv('Locked'); + $this->labelStatusShort[self::STATUS_ARCHIVED] = $langs->transnoentitiesnoconv('Archived'); } $statusType = 'status' . $status; diff --git a/class/preventionplan.class.php b/class/preventionplan.class.php index e300c48cf..f0c6d9d5d 100644 --- a/class/preventionplan.class.php +++ b/class/preventionplan.class.php @@ -307,6 +307,12 @@ public function LibStatut($status, $mode = 0): string $this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ValidatePendingSignature'); $this->labelStatus[self::STATUS_LOCKED] = $langs->trans('Locked'); $this->labelStatus[self::STATUS_ARCHIVED] = $langs->trans('Archived'); + + $this->labelStatusShort[self::STATUS_DELETED] = $langs->transnoentitiesnoconv('Deleted'); + $this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft'); + $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled'); + $this->labelStatusShort[self::STATUS_LOCKED] = $langs->transnoentitiesnoconv('Locked'); + $this->labelStatusShort[self::STATUS_ARCHIVED] = $langs->transnoentitiesnoconv('Archived'); } $statusType = 'status' . $status; diff --git a/class/riskanalysis/risk.class.php b/class/riskanalysis/risk.class.php index 33b8d4b17..f054e7812 100644 --- a/class/riskanalysis/risk.class.php +++ b/class/riskanalysis/risk.class.php @@ -87,7 +87,7 @@ class Risk extends SaturneObject 'import_key' => ['type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 70, 'notnull' => -1, 'visible' => 0], 'status' => ['type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => 0], 'category' => ['type' => 'varchar(255)', 'label' => 'RiskCategory', 'enabled' => '1', 'position' => 21, 'notnull' => 0, 'visible' => 1], - 'description' => ['type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 23, 'notnull' => 0, 'visible' => -1], + 'description' => ['type' => 'text', 'label' => 'Description', 'enabled' => '$conf->global->DIGIRISKDOLIBARR_RISK_DESCRIPTION', 'position' => 23, 'notnull' => 0, 'visible' => -1], 'type' => ['type' => 'varchar(255)', 'label' => 'Type', 'enabled' => '1', 'position' => 24, 'notnull' => 1, 'visible' => 0, 'default' => '(PROV)'], 'fk_user_creat' => ['type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 110, 'notnull' => 1, 'visible' => 0, 'foreignkey' => 'user.rowid'], 'fk_user_modif' => ['type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 120, 'notnull' => -1, 'visible' => 0], @@ -140,12 +140,12 @@ public function __construct(DoliDB $db) 'label' => $langs->transnoentities('RedRisk'), 'color' => '#e05353', 'start' => 51, - 'end' => 80 + 'end' => 79 ], 4 => [ 'label' => $langs->transnoentities('BlackRisk'), 'color' => '#2b2b2b', - 'start' => 81, + 'start' => 80, 'end' => 100 ] ]; @@ -192,7 +192,8 @@ public function fetchRisksOrderedByCotation($parent_id, $get_children_data = fal $objects = $object->getActiveDigiriskElements(); if ($get_shared_data) { - $risk->ismultientitymanaged = 0; + $activeDigiriskElements = $object->getActiveDigiriskElements($get_shared_data); + $risk->ismultientitymanaged = 0; $riskAssessment->ismultientitymanaged = 0; } $riskList = $risk->fetchAll('', '', 0, 0, ['customsql' => 'status = ' . self::STATUS_VALIDATED . $moreParams['filterRisk']]); @@ -305,11 +306,13 @@ public function fetchRisksOrderedByCotation($parent_id, $get_children_data = fal $digiriskElementOfEntity->fetchObjectLinked(null, '', $digiriskElementOfEntity->id, 'digiriskdolibarr_digiriskelement', 'AND', 1, 'sourcetype', 0); if (!empty($digiriskElementOfEntity->linkedObjectsIds['digiriskdolibarr_risk'])) { foreach ($digiriskElementOfEntity->linkedObjectsIds['digiriskdolibarr_risk'] as $sharedRiskId) { - $sharedRisk = $riskList[$sharedRiskId]; - if (is_object($sharedRisk)) { - $sharedRisk->appliedOn = $digiriskElementOfEntity->id; - $risks[] = $sharedRisk; - } + $sharedRisk = $riskList[$sharedRiskId]; + $sharedParentActive = array_search($sharedRisk->fk_element, array_column($activeDigiriskElements, 'id')); + if (is_object($sharedRisk) && $sharedParentActive > 0) { + $clonedRisk = clone $sharedRisk; + $clonedRisk->appliedOn = $digiriskElementOfEntity->id; + $risks[] = $clonedRisk; + } } } } @@ -320,10 +323,12 @@ public function fetchRisksOrderedByCotation($parent_id, $get_children_data = fal $parentElement->fetchObjectLinked(null, '', $parent_id, 'digiriskdolibarr_digiriskelement', 'AND', 1, 'sourcetype', 0); if (!empty($parentElement->linkedObjectsIds['digiriskdolibarr_risk'])) { foreach ($parentElement->linkedObjectsIds['digiriskdolibarr_risk'] as $sharedRiskId) { - $sharedRisk = $riskList[$sharedRiskId]; - if (is_object($sharedRisk)) { - $sharedRisk->appliedOn = $parent_id; - $risks[] = $sharedRisk; + $sharedRisk = $riskList[$sharedRiskId]; + $sharedParentActive = array_search($sharedRisk->fk_element, array_column($activeDigiriskElements, 'id')); + if (is_object($sharedRisk) && $sharedParentActive > 0) { + $clonedRisk = clone $sharedRisk; + $clonedRisk->appliedOn = $parent_id; + $risks[] = $clonedRisk; } } } @@ -490,6 +495,100 @@ public function getFirePermitDangerCategoryName($object) return -1; } + /** + * check if risk not exists for a digirisk element + * + * @param int $limit Limit + * @return array|int Int <0 if KO, array of pages if OK + * @throws Exception + */ + public function checkNotExistsDigiriskElementForRisk(int $limit = 0) + { + dol_syslog(__METHOD__, LOG_DEBUG); + + $digiriskElement = new DigiriskElement($this->db); + + $sql = 'SELECT '; + $sql .= $this->getFieldList('t'); + $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t'; + $sql .= ' WHERE !EXISTS'; + $sql .= ' ( SELECT '; + $sql .= $digiriskElement->getFieldList('d'); + $sql .= ' FROM ' . MAIN_DB_PREFIX . $digiriskElement->table_element . ' as d'; + $sql .= ' WHERE d.rowid = t.fk_element )'; + + $records = []; + $resql = $this->db->query($sql); + if ($resql) { + $num = $this->db->num_rows($resql); + $i = 0; + while ($i < ($limit ? min($limit, $num) : $num)) { + $obj = $this->db->fetch_object($resql); + + $record = new $this($this->db); + $record->setVarsFromFetchObj($obj); + + $records[$record->id] = $record; + + $i++; + } + $this->db->free($resql); + + return $records; + } else { + $this->errors[] = 'Error ' . $this->db->lasterror(); + dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR); + return -1; + } + } + + /** + * check if risk assessment not exists for a risk + * + * @param int $limit Limit + * @return array|int Int <0 if KO, array of pages if OK + * @throws Exception + */ + public function checkNotExistsRiskAssessmentForRisk(int $limit = 0) + { + dol_syslog(__METHOD__, LOG_DEBUG); + + $riskAssessment = new RiskAssessment($this->db); + + $sql = 'SELECT '; + $sql .= $this->getFieldList('t'); + $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t'; + $sql .= ' WHERE !EXISTS'; + $sql .= ' (SELECT '; + $sql .= $riskAssessment->getFieldList('ra'); + $sql .= ' FROM ' . MAIN_DB_PREFIX . $riskAssessment->table_element . ' as ra'; + $sql .= ' WHERE ra.fk_risk = t.rowid)'; + + $records = []; + $resql = $this->db->query($sql); + if ($resql) { + $num = $this->db->num_rows($resql); + $i = 0; + while ($i < ($limit ? min($limit, $num) : $num)) { + $obj = $this->db->fetch_object($resql); + + $record = new $this($this->db); + $record->setVarsFromFetchObj($obj); + + $records[$record->id] = $record; + + $i++; + } + $this->db->free($resql); + + return $records; + } else { + $this->errors[] = 'Error ' . $this->db->lasterror(); + dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR); + return -1; + } + } + /** * Get children tasks * @@ -534,7 +633,7 @@ public function getRelatedTasks($risk) */ public function getTasksWithFkRisk() { - $sql = "SELECT * FROM " . MAIN_DB_PREFIX . 'projet_task_extrafields' . ' WHERE fk_risk > 0'; + $sql = "SELECT * FROM " . MAIN_DB_PREFIX . 'projet_task_extrafields' . ' WHERE fk_risk > 0 ORDER BY fk_object ASC'; $tasksList = saturne_fetch_all_object_type('SaturneTask', '', '', 0, 0, [], 'AND', false, false); $resql = $this->db->query($sql); @@ -545,7 +644,7 @@ public function getTasksWithFkRisk() $records = array(); while ($i < $num) { $obj = $this->db->fetch_object($resql); - $records[$obj->fk_risk][$obj->rowid] = $tasksList[$obj->fk_object]; + $records[$obj->fk_risk][$obj->rowid] = $tasksList[$obj->fk_object] ?? null; $i++; } $this->db->free($resql); @@ -567,15 +666,51 @@ public function getTasksWithFkRisk() */ public function load_dashboard(): array { - $dangerCategories = $this->getDangerCategories(); + global $langs; + + $confName = dol_strtoupper($this->module) . '_DASHBOARD_CONFIG'; + $dashboardConfig = json_decode(getDolUserString($confName)); + $array = ['graphs' => [], 'lists' => [], 'disabledGraphs' => []]; + + $riskType = !empty($dashboardConfig->filters->riskType) ? $dashboardConfig->filters->riskType : 'risk'; - $getRisksByCotation = $this->getRisksByCotation(); - $getRisksByDangerCategoriesAndCriticality = $this->getRisksByDangerCategoriesAndCriticality($dangerCategories); - $getRisksByDangerCategories = $this->getRisksByDangerCategories($dangerCategories); - $getRiskListsByDangerCategories = $this->getRiskListsByDangerCategories($dangerCategories); + $digiriskElement = new DigiriskElement($this->db); - $array['graphs'] = [$getRisksByCotation, $getRisksByDangerCategoriesAndCriticality, $getRisksByDangerCategories]; - $array['lists'] = [$getRiskListsByDangerCategories]; + $filter = 'AND t.fk_element NOT IN ' . $digiriskElement->getTrashExclusionSqlFilter(); + + $dangerCategories = $this->getDangerCategories(); + $riskByDangerCategoriesAndRiskAssessments = $this->getRiskByDangerCategoriesAndRiskAssessments($dangerCategories, $filter, $riskType); + $moreParam['filter'] = $filter; + + $array['graphsFilters'] = [ + 'riskType' => [ + 'title' => $langs->transnoentities('DisplayRiskOfType'), + 'type' => 'selectarray', + 'filter' => 'riskType', + 'values' => ['risk' => $langs->transnoentities('Risk'), 'riskenvironmental' => $langs->transnoentities('Riskenvironmental')], + 'currentValue' => $riskType + ]]; + + if (empty($dashboardConfig->graphs->RisksRepartitionByDangerCategoriesAndCriticality->hide)) { + $array['graphs'][] = $this->getRisksByDangerCategoriesAndCriticality($dangerCategories, $riskByDangerCategoriesAndRiskAssessments); + } else { + $array['disabledGraphs']['RisksRepartitionByDangerCategoriesAndCriticality'] = $langs->transnoentities('RisksRepartitionByDangerCategoriesAndCriticality'); + } + if (empty($dashboardConfig->graphs->RisksRepartitionByDangerCategories->hide)) { + $array['graphs'][] = $this->getRisksByDangerCategories($dangerCategories, $riskByDangerCategoriesAndRiskAssessments); + } else { + $array['disabledGraphs']['RisksRepartitionByDangerCategories'] = $langs->transnoentities('RisksRepartitionByDangerCategories'); + } + if (empty($dashboardConfig->graphs->RisksRepartitionByCotation->hide)) { + $array['graphs'][] = $this->getRisksByCotation($moreParam); + } else { + $array['disabledGraphs']['RisksRepartitionByCotation'] = $langs->transnoentities('RisksRepartitionByCotation'); + } + if (empty($dashboardConfig->graphs->RiskListsByDangerCategories->hide)) { + $array['lists'][] = $this->getRiskListsByDangerCategories($dangerCategories, $riskByDangerCategoriesAndRiskAssessments, $filter, $riskType); + } else { + $array['disabledGraphs']['RiskListsByDangerCategories'] = $langs->transnoentities('RiskListsByDangerCategories'); + } return $array; } @@ -583,17 +718,20 @@ public function load_dashboard(): array /** * Get risks by cotation * + * @param array $moreParam More param (Object/user/etc) * @return array * @throws Exception */ - public function getRisksByCotation(): array + public function getRisksByCotation(array $moreParam = []): array { global $conf, $langs; - $riskAssessment = new RiskAssessment($this->db); + $riskAssessment = new RiskAssessment($this->db); + $digiriskElement = new DigiriskElement($this->db); // Graph Title parameters $array['title'] = $langs->transnoentities('RisksRepartition'); + $array['name'] = 'RisksRepartition'; $array['picto'] = $this->picto; // Graph parameters @@ -604,8 +742,11 @@ public function getRisksByCotation(): array $array['dataset'] = 1; $array['labels'] = $this->cotations; - $riskAssessmentList = $riskAssessment->fetchAll('', '', 0, 0, ['customsql' => 'status = 1']); - $array['data'] = $riskAssessment->getRiskAssessmentCategoriesNumber($riskAssessmentList); + $join = ' LEFT JOIN ' . MAIN_DB_PREFIX . $this->table_element . ' as r ON r.rowid = t.fk_risk'; + $join .= ' LEFT JOIN ' . MAIN_DB_PREFIX . $digiriskElement->table_element . ' as d ON d.rowid = r.fk_element'; + + $riskAssessments = saturne_fetch_all_object_type('RiskAssessment', '', '', 0, 0, ['customsql' => 't.status = ' . RiskAssessment::STATUS_VALIDATED . str_replace('t.fk_element NOT IN', 'r.fk_element NOT IN', $moreParam['filter'])], 'AND', false, $moreParam['multiEntityManagement'] ?? true, false, $join); + $array['data'] = $riskAssessment->getRiskAssessmentCategoriesNumber($riskAssessments); return $array; } @@ -613,18 +754,17 @@ public function getRisksByCotation(): array /** * Get risks by danger categories and criticality * - * @param array $dangerCategories Danger categories datas - * @param string $type Risk type (risk, riskenvironmental or ...) - * + * @param array $dangerCategories Danger categories datas + * @param array $riskByDangerCategoriesAndRiskAssessments Risk by danger categories and risk assessments * @return array - * @throws Exception */ - public function getRisksByDangerCategoriesAndCriticality(array $dangerCategories, string $type = 'risk'): array + public function getRisksByDangerCategoriesAndCriticality(array $dangerCategories, array $riskByDangerCategoriesAndRiskAssessments): array { - global $conf, $langs; + global $langs; // Graph Title parameters $array['title'] = $langs->transnoentities('RisksRepartitionByDangerCategoriesAndCriticality'); + $array['name'] = 'RisksRepartitionByDangerCategoriesAndCriticality'; $array['picto'] = $this->picto; // Graph parameters @@ -636,14 +776,10 @@ public function getRisksByDangerCategoriesAndCriticality(array $dangerCategories $array['moreCSS'] = 'grid-2'; $array['labels'] = $this->cotations; - $join = ' LEFT JOIN ' . MAIN_DB_PREFIX . $this->table_element . ' as r ON r.rowid = t.fk_risk'; foreach ($dangerCategories as $dangerCategory) { $array['data'][$dangerCategory['position']][0] = $dangerCategory['name']; - - $risks = $this->fetchAll('', '', 0, 0, ['customsql' => 't.status = ' . self::STATUS_VALIDATED . ' AND t.entity = ' . $conf->entity . (GETPOSTISSET('id') ? ' AND t.fk_element = ' . GETPOST('id') : '') . ' AND t.type = "' . $type . '" AND t.category = ' . $dangerCategory['position']]); for ($i = 1; $i <= 4; $i++) { - $riskAssessments = saturne_fetch_all_object_type('RiskAssessment', '', '', 0, 0, ['customsql' => 't.status = ' . RiskAssessment::STATUS_VALIDATED . ' AND r.entity = ' . $conf->entity . (GETPOSTISSET('id') ? ' AND r.fk_element = ' . GETPOST('id') : '') . ' AND r.type = "' . $type . '" AND r.category = ' . $dangerCategory['position'] . ' AND t.cotation >= ' . $this->cotations[$i]['start'] . ' AND t.cotation <= ' . $this->cotations[$i]['end']], 'AND', false, true, false, $join); - $array['data'][$dangerCategory['position']]['y_combined_' . $array['labels'][$i]['label']] = ((is_array($risks) && !empty($risks) && is_array($riskAssessments) && !empty($riskAssessments)) ? count($riskAssessments) / count($risks) : 0); + $array['data'][$dangerCategory['position']]['y_combined_' . $array['labels'][$i]['label']] = !empty($riskByDangerCategoriesAndRiskAssessments[$dangerCategory['name']]['risk']) ? $riskByDangerCategoriesAndRiskAssessments[$dangerCategory['name']]['riskAssessments'][$i] / $riskByDangerCategoriesAndRiskAssessments[$dangerCategory['name']]['risk'] : 0; } } @@ -653,18 +789,19 @@ public function getRisksByDangerCategoriesAndCriticality(array $dangerCategories /** * Get risks by danger categories * - * @param array $dangerCategories Danger categories datas - * @param string $type Risk type (risk, riskenvironmental or ...) - * + * @param array $dangerCategories Danger categories datas + * @param array $riskByDangerCategoriesAndRiskAssessments Risk by danger categories and risk assessments + * * @return array * @throws Exception */ - public function getRisksByDangerCategories(array $dangerCategories, string $type = 'risk'): array + public function getRisksByDangerCategories(array $dangerCategories, array $riskByDangerCategoriesAndRiskAssessments): array { - global $conf, $langs; + global $langs; // Graph Title parameters $array['title'] = $langs->transnoentities('RisksRepartitionByDangerCategories'); + $array['name'] = 'RisksRepartitionByDangerCategories'; $array['picto'] = $this->picto; // Graph parameters @@ -683,10 +820,8 @@ public function getRisksByDangerCategories(array $dangerCategories, string $type ]; foreach ($dangerCategories as $dangerCategory) { - $risks = $this->fetchAll('', '', 0, 0, ['customsql' => 't.status = ' . self::STATUS_VALIDATED . ' AND t.entity = ' . $conf->entity . (GETPOSTISSET('id') ? ' AND t.fk_element = ' . GETPOST('id') : '') . ' AND t.type = "' . $type . '" AND t.category = ' . $dangerCategory['position']]); - $array['data'][$dangerCategory['position']][] = $dangerCategory['name']; - $array['data'][$dangerCategory['position']][] = (is_array($risks) && !empty($risks) ? count($risks) : 0); + $array['data'][$dangerCategory['position']][] = $riskByDangerCategoriesAndRiskAssessments[$dangerCategory['name']]['risk']; } return $array; @@ -695,49 +830,50 @@ public function getRisksByDangerCategories(array $dangerCategories, string $type /** * Get list of risks by danger categories * - * @param array $dangerCategories Danger categories datas - * @param string $type Risk type (risk, riskenvironmental or ...) + * @param array $dangerCategories Danger categories datas + * @param array $riskByDangerCategoriesAndRiskAssessments Risk by danger categories and risk assessments + * @param string $filter SQL Filter + * @param string $type Risk type (risk, riskenvironmental or ...) * * @return array * @throws Exception */ - public function getRiskListsByDangerCategories(array $dangerCategories, string $type = 'risk') : array + public function getRiskListsByDangerCategories(array $dangerCategories, array $riskByDangerCategoriesAndRiskAssessments, string $filter = '', string $type = 'risk') : array { + //$riskByDangerCategoriesAndRiskAssessments global $conf, $langs; + $digiriskElement = new DigiriskElement($this->db); + // Graph Title parameters $array['title'] = $langs->transnoentities('RiskListsByDangerCategories'); + $array['name'] = 'RiskListsByDangerCategories'; $array['picto'] = $this->picto; // Graph parameters $array['width'] = '100%'; $array['type'] = 'list'; - $totalRisks = $this->fetchAll('', '', 0, 0, ['customsql' => 't.status = ' . self::STATUS_VALIDATED . ' AND t.entity = ' . $conf->entity . (GETPOSTISSET('id') ? ' AND t.fk_element = ' . GETPOST('id') : '') . ' AND t.type = "' . $type . '"']); + $totalRisks = saturne_fetch_all_object_type('Risk', '', '', 0, 0, ['customsql' => 't.status = ' . self::STATUS_VALIDATED . ' AND t.entity = ' . $conf->entity . (GETPOSTISSET('id') ? ' AND t.fk_element = ' . GETPOST('id') : '') . ' AND t.type = "' . $type . '"' . (!empty($filter) ? ' AND ' . $filter : '')], 'AND', false, true, false, ' LEFT JOIN ' . MAIN_DB_PREFIX . $digiriskElement->table_element . ' as d ON d.rowid = t.fk_element'); $array['labels']['Ref'] = $langs->transnoentities('DangerCategories'); $array['labels']['numberOfRisks'] = $langs->transnoentities('NumberOfRisks') . ' : ' . '' . (is_array($totalRisks) && !empty($totalRisks) ? count($totalRisks) : 0) . ''; $array['labels']['percentage'] = $langs->transnoentities('Percentage'); $arrayRiskLists = []; - $join = ' LEFT JOIN ' . MAIN_DB_PREFIX . $this->table_element . ' as r ON r.rowid = t.fk_risk'; if (is_array($totalRisks) && !empty($totalRisks)) { foreach ($dangerCategories as $dangerCategory) { $arrayRiskLists[$dangerCategory['position']]['Ref']['value'] = $dangerCategory['name']; - $risks = $this->fetchAll('', '', 0, 0, ['customsql' => 't.status = ' . self::STATUS_VALIDATED . ' AND t.entity = ' . $conf->entity . (GETPOSTISSET('id') ? ' AND t.fk_element = ' . GETPOST('id') : '') . ' AND t.type = "' . $type . '" AND t.category = ' . $dangerCategory['position']]); - $arrayRiskLists[$dangerCategory['position']]['numberOfRisks']['value'] = is_array($risks) && !empty($risks) ? count($risks) : 0; + $arrayRiskLists[$dangerCategory['position']]['numberOfRisks']['value'] = $riskByDangerCategoriesAndRiskAssessments[$dangerCategory['name']]['risk']; $arrayRiskLists[$dangerCategory['position']]['numberOfRisks']['morecss'] = 'risk-evaluation-cotation'; $arrayRiskLists[$dangerCategory['position']]['numberOfRisks']['moreAttr'] = 'style="line-height: 0; border-radius: 0; background-color: #A1467EAA; color: #FFF;"'; - $arrayRiskLists[$dangerCategory['position']]['percentage']['value'] = is_array($risks) && !empty($risks) ? price2num((count($risks) / count($totalRisks)) * 100, 2) . ' %' : 0; + $arrayRiskLists[$dangerCategory['position']]['percentage']['value'] = price2num(($riskByDangerCategoriesAndRiskAssessments[$dangerCategory['name']]['risk'] / count($totalRisks)) * 100, 2) . ' %'; for ($i = 1; $i <= 4; $i++) { $array['labels'][$i] = $this->cotations[$i]['label']; - - $riskAssessments = saturne_fetch_all_object_type('RiskAssessment', '', '', 0, 0, ['customsql' => 't.status = ' . RiskAssessment::STATUS_VALIDATED . ' AND r.entity = ' . $conf->entity . (GETPOSTISSET('id') ? ' AND r.fk_element = ' . GETPOST('id') : '') . ' AND r.type = "' . $type . '" AND r.category = ' . $dangerCategory['position'] . ' AND t.cotation >= ' . $this->cotations[$i]['start'] . ' AND t.cotation <= ' . $this->cotations[$i]['end']], 'AND', false, true, false, $join); - - $arrayRiskLists[$dangerCategory['position']][$i]['value'] = is_array($riskAssessments) && !empty($riskAssessments) ? count($riskAssessments) : 0; + $arrayRiskLists[$dangerCategory['position']][$i]['value'] = $riskByDangerCategoriesAndRiskAssessments[$dangerCategory['name']]['riskAssessments'][$i]; $arrayRiskLists[$dangerCategory['position']][$i]['morecss'] = 'risk-evaluation-cotation'; $arrayRiskLists[$dangerCategory['position']][$i]['moreAttr'] = 'data-scale = ' . $i . ' style="line-height: 0; border-radius: 0;"'; } @@ -749,6 +885,36 @@ public function getRiskListsByDangerCategories(array $dangerCategories, string $ return $array; } + /** + * Get risk by danger categories and risk assessments + * + * @param array $dangerCategories Danger categories datas + * @param string $filter SQL Filter + * @param string $type Risk type (risk, riskenvironmental or ...) + * + * @return array + * @throws Exception + */ + public function getRiskByDangerCategoriesAndRiskAssessments(array $dangerCategories, string $filter = '', string $type = 'risk') : array + { + global $conf; + + $array = []; + $digiriskElement = new DigiriskElement($this->db); + + foreach ($dangerCategories as $dangerCategory) { + $risks = saturne_fetch_all_object_type('Risk', '', '', 0, 0, ['customsql' => 't.status = ' . self::STATUS_VALIDATED . ' AND t.entity = ' . $conf->entity . (GETPOSTISSET('id') ? ' AND t.fk_element = ' . GETPOST('id') : '') . ' AND t.type = "' . $type . '" AND t.category = ' . $dangerCategory['position'] . $filter], 'AND', false, true, false, ' LEFT JOIN ' . MAIN_DB_PREFIX . $digiriskElement->table_element . ' as d ON d.rowid = t.fk_element'); + $array[$dangerCategory['name']]['risk'] = !empty($risks) && is_array($risks) ? count($risks) : 0; + for ($i = 1; $i <= 4; $i++) { + $join = ' LEFT JOIN ' . MAIN_DB_PREFIX . $this->table_element . ' as r ON r.rowid = t.fk_risk'; + $join .= ' LEFT JOIN ' . MAIN_DB_PREFIX . $digiriskElement->table_element . ' as d ON d.rowid = r.fk_element'; + $riskAssessments = saturne_fetch_all_object_type('RiskAssessment', '', '', 0, 0, ['customsql' => 't.status = ' . RiskAssessment::STATUS_VALIDATED . ' AND r.entity = ' . $conf->entity . (GETPOSTISSET('id') ? ' AND r.fk_element = ' . GETPOST('id') : '') . ' AND r.type = "' . $type . '" AND r.category = ' . $dangerCategory['position'] . ' AND t.cotation >= ' . $this->cotations[$i]['start'] . ' AND t.cotation <= ' . $this->cotations[$i]['end'] . str_replace('t.fk_element NOT IN', 'r.fk_element NOT IN', $filter)], 'AND', false, true, false, $join); + $array[$dangerCategory['name']]['riskAssessments'][$i] = !empty($riskAssessments) && is_array($riskAssessments) ? count($riskAssessments) : 0; + } + } + return $array; + } + /** * Write information of trigger description * diff --git a/class/riskanalysis/riskassessment.class.php b/class/riskanalysis/riskassessment.class.php index ba8a091bc..d05ce61c1 100644 --- a/class/riskanalysis/riskassessment.class.php +++ b/class/riskanalysis/riskassessment.class.php @@ -92,7 +92,7 @@ class RiskAssessment extends SaturneObject 'date_riskassessment' => array('type' => 'datetime', 'label' => 'RiskAssessmentDate', 'enabled' => '1', 'position' => 141, 'notnull' => -1, 'visible' => 0,), 'comment' => array('type' => 'text', 'label' => 'Comment', 'enabled' => '1', 'position' => 150, 'notnull' => 0, 'visible' => 0,), 'photo' => array('type' => 'varchar(255)', 'label' => 'Photo', 'enabled' => '1', 'position' => 160, 'notnull' => 0, 'visible' => 0,), - 'has_tasks' => array('type' => 'integer', 'label' => 'Tasks', 'enabled' => '1', 'position' => 170, 'notnull' => 0, 'visible' => -1,), + 'has_tasks' => array('type' => 'integer', 'label' => 'Tasks', 'enabled' => '$conf->global->DIGIRISKDOLIBARR_TASK_MANAGEMENT', 'position' => 170, 'notnull' => 0, 'visible' => -1,), 'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 180, 'notnull' => 1, 'visible' => 0, 'foreignkey' => 'user.rowid',), 'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 190, 'notnull' => -1, 'visible' => 0,), 'fk_risk' => array('type' => 'integer', 'label' => 'ParentRisk', 'enabled' => '1', 'position' => 200, 'notnull' => 1, 'visible' => 0,), @@ -192,6 +192,53 @@ public function updatePreviousRiskAssessmentStatus(User $user, int $riskID) } } + /** + * check if risk assessment not exists for a risk + * + * @param int $limit Limit + * @return array|int Int <0 if KO, array of pages if OK + * @throws Exception + */ + public function checkNotExistsRiskForRiskAssessment(int $limit = 0) + { + dol_syslog(__METHOD__, LOG_DEBUG); + + $risk = new Risk($this->db); + + $sql = 'SELECT '; + $sql .= $this->getFieldList('t'); + $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t'; + $sql .= ' WHERE !EXISTS'; + $sql .= ' ( SELECT '; + $sql .= $risk->getFieldList('r'); + $sql .= ' FROM ' . MAIN_DB_PREFIX . $risk->table_element . ' as r'; + $sql .= ' WHERE r.rowid = t.fk_risk )'; + + $records = []; + $resql = $this->db->query($sql); + if ($resql) { + $num = $this->db->num_rows($resql); + $i = 0; + while ($i < ($limit ? min($limit, $num) : $num)) { + $obj = $this->db->fetch_object($resql); + + $record = new $this($this->db); + $record->setVarsFromFetchObj($obj); + + $records[$record->id] = $record; + + $i++; + } + $this->db->free($resql); + + return $records; + } else { + $this->errors[] = 'Error ' . $this->db->lasterror(); + dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR); + return -1; + } + } + /** * Return scale level for risk assessment * diff --git a/class/ticketdashboard.class.php b/class/ticketdashboard.class.php index e16723195..5c250c6ad 100644 --- a/class/ticketdashboard.class.php +++ b/class/ticketdashboard.class.php @@ -40,6 +40,11 @@ class TicketDashboard extends DigiriskDolibarrDashboard */ public DoliDB $db; + /** + * @var string Module name + */ + public $module = 'digiriskdolibarr'; + /** * @var string SQL FROM */ @@ -70,7 +75,7 @@ public function __construct(DoliDB $db, ?string $moreJoin = '', ?string $moreWhe if (dol_strlen($moreJoin) > 0) { $this->join .= $moreJoin; } - $this->where = 't.fk_statut >= 0'; + $this->where = 't.fk_statut > 0'; $this->where .= ' AND t.entity IN (' . getEntity('ticket') . ')'; if (dol_strlen($moreWhere) > 0) { $this->where .= $moreWhere; @@ -267,19 +272,36 @@ public function getNbTicketByDigiriskElementAndTicketTags(int $dateStart, int $d */ public function load_dashboard(array $moreParams = []): array { - $getTicketsByMonth = $this->getTicketsByMonth(); + global $langs; + + $confName = dol_strtoupper($this->module) . '_DASHBOARD_CONFIG'; + $dashboardConfig = json_decode(getDolUserString($confName)); + $array = ['graphs' => [], 'lists' => [], 'disabledGraphs' => []]; $category = new Categorie($this->db); $category->fetch(getDolGlobalInt('DIGIRISKDOLIBARR_TICKET_MAIN_CATEGORY')); $mainCategories = $category->get_filles(); - $getTicketsByMainTagAndByDigiriskElement = $this->getTicketsByMainTagAndByDigiriskElement($mainCategories); - $getTicketsByMainSubTagAndByDigiriskElement = $this->getTicketsByMainSubTagAndByDigiriskElement($mainCategories); - - $getTicketsByYear = $this->getTicketsByYear(); - - $array['graphs'] = [$getTicketsByMonth, $getTicketsByMainTagAndByDigiriskElement, $getTicketsByMainSubTagAndByDigiriskElement]; - $array['lists'] = [$getTicketsByYear]; + if (empty($dashboardConfig->graphs->NumberOfTicketsByMonth->hide)) { + $array['graphs'][] = $this->getTicketsByMonth(); + } else { + $array['disabledGraphs']['NumberOfTicketsByMonth'] = $langs->transnoentities('NumberOfTicketsByMonth'); + } + if (empty($dashboardConfig->graphs->NumberOfTicketsByMainTagAndByDigiriskElement->hide)) { + $array['graphs'][] = $this->getTicketsByMainTagAndByDigiriskElement($mainCategories); + } else { + $array['disabledGraphs']['NumberOfTicketsByMainTagAndByDigiriskElement'] = $langs->transnoentities('NumberOfTicketsByMainTagAndByDigiriskElement'); + } + if (empty($dashboardConfig->graphs->NumberOfTicketsByMainSubTagAndByDigiriskElement->hide)) { + $array['graphs'][] = $this->getTicketsByMainSubTagAndByDigiriskElement($mainCategories); + } else { + $array['disabledGraphs']['NumberOfTicketsByMainSubTagAndByDigiriskElement'] = $langs->transnoentities('NumberOfTicketsByMainSubTagAndByDigiriskElement'); + } + if (empty($dashboardConfig->graphs->NumberOfTicketsByYear->hide)) { + $array['lists'][] = $this->getTicketsByYear(); + } else { + $array['disabledGraphs']['NumberOfTicketsByYear'] = $langs->transnoentities('NumberOfTicketsByYear'); + } return $array; } @@ -295,6 +317,7 @@ public function getTicketsByMonth(): array // Graph Title parameters $array['title'] = $langs->transnoentities('NumberOfTicketsByMonth'); + $array['name'] = 'NumberOfTicketsByMonth'; $array['picto'] = 'fontawesome_fa-ticket-alt_fas_#3bbfa8'; // Graph parameters @@ -352,6 +375,7 @@ public function getTicketsByMainTagAndByDigiriskElement($mainCategories): array // Graph Title parameters $array['title'] = $langs->transnoentities('NumberOfTicketsByMainTagAndByDigiriskElement'); + $array['name'] = 'NumberOfTicketsByMainTagAndByDigiriskElement'; $array['picto'] = 'fontawesome_fa-ticket-alt_fas_#3bbfa8'; // Graph parameters @@ -398,6 +422,7 @@ public function getTicketsByMainSubTagAndByDigiriskElement($mainCategories): arr // Graph Title parameters $array['title'] = $langs->transnoentities('NumberOfTicketsByMainSubTagAndByDigiriskElement'); + $array['name'] = 'NumberOfTicketsByMainSubTagAndByDigiriskElement'; $array['picto'] = 'fontawesome_fa-ticket-alt_fas_#3bbfa8'; // Graph parameters @@ -449,6 +474,7 @@ public function getTicketsByYear(): array // Graph Title parameters $array['title'] = $langs->transnoentities('NumberOfTicketsByYear'); + $array['name'] = 'NumberOfTicketsByYear'; $array['picto'] = 'fontawesome_fa-ticket-alt_fas_#3bbfa8'; // Graph parameters @@ -461,7 +487,7 @@ public function getTicketsByYear(): array foreach ($tickets as $key => $ticket) { $arrayTicketByYear[$key]['Ref']['value'] = $ticket['year']; $arrayTicketByYear[$key]['Tickets']['value'] = $ticket['nb']; - $arrayTicketByYear[$key]['Percentage']['value'] = price2num($ticket['avg'] ?: 0, 2) . ' %'; + $arrayTicketByYear[$key]['Percentage']['value'] = price2num($ticket['avg'] ?? 0, 2) . ' %'; } } diff --git a/class/ticketstatsdashboard.class.php b/class/ticketstatsdashboard.class.php new file mode 100644 index 000000000..bd5401729 --- /dev/null +++ b/class/ticketstatsdashboard.class.php @@ -0,0 +1,350 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file class/ticketstatsdashboard.class.php + * \ingroup digiriskdolibarr + * \brief Class file for manage TicketDashboard + */ + +// load Dolibarr librairies +require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php'; + +/** + * Class to manage stats for tickets + */ +class TicketStatsDashboard extends DigiriskDolibarrDashboard +{ + /** + * @var DoliDB Database handler + */ + public DoliDB $db; + + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + public function __construct(DoliDB $db) + { + parent::__construct($db); + } + + /** + * Load dashboard info ticket + * + * @param array $moreParams Parameters for load dashboard info + * @return array + * @throws Exception + */ + public function load_dashboard(array $moreParams = []): array + { + $tickets = $this->getAllTickets(); + + $runningTickets = $this->getRunningTickets($tickets); + $ticketStats = $this->getTicketStats($tickets); + + $getTicketRepartitionPerUserAndMeanAnswerTime = $this->getTicketRepartitionPerUserAndMeanAnswerTime($tickets); + $getTopSocietyWithMostTickets = $this->getTopSocietyWithMostTickets($tickets); + + $array['widgets'] = array_merge($runningTickets, $ticketStats); + $array['graphs'] = [$getTicketRepartitionPerUserAndMeanAnswerTime, $getTopSocietyWithMostTickets]; + + return $array; + } + + /** + * Get all tickets from database for current entity order by datec DESC + * fetch all comments for each ticket if exists + * add them to ticket object as comms property (array of comments) + * + * @return array $tickets All tickets with comments if exists or empty array + * @throws Exception If an error occurs while fetching tickets + */ + public function getAllTickets(): array + { + try { + $actionComm = new ActionComm($this->db); + $tickets = saturne_fetch_all_object_type('Ticket', 'DESC', 't.datec'); + if (!empty($tickets) && is_array($tickets)) { + foreach ($tickets as $ticketID => $ticket) { + $ticket->comms = []; + $actionComms = $actionComm->getActions(0, $ticketID, 'ticket', 'AND a.code LIKE "TICKET_MSG%"', 'a.datec'); + if (!empty($actionComms) && is_array($actionComms)) { + $ticket->comms = $actionComms; + } elseif (is_string($actionComms)) { + dol_syslog(__METHOD__ . 'Error while fetching comments for ticket ID {$ticketID}: ' . $actionComms, LOG_ERR); + } + } + } + } catch (Exception $e) { + dol_syslog(__METHOD__ . 'Error while fetching tickets: ' . $e->getMessage(), LOG_ERR); + throw $e; + } + + return $tickets; + } + + /** + * Get running tickets + * + * @param array $tickets All tickets from database for current entity order by datec DESC with comments if exists or empty array + * @return array Widget of running tickets with the oldest ticket and oldest message ticket + */ + public function getRunningTickets(array $tickets): array + { + global $form, $langs; + + // Widget title parameters + $array['title'] = $langs->transnoentities('RunningTicket'); + $array['widgetName'] = 'RunningTicket'; + $array['picto'] = 'fas fa-ticket-alt'; + $array['pictoColor'] = '#0D8AFF'; + + // Widget labels parameters + $array['label'] = [ + $langs->transnoentities('NbOfOpenedTicket'), + $form->textwithpicto($langs->transnoentities('OldestTicket'), $langs->transnoentities('OldestTicketDescription')), + $form->textwithpicto($langs->transnoentities('OldestMessageTicket'), $langs->transnoentities('OldestMessageTicketDescription')) + ]; + + // Initialize variables + $openTickets = 0; + $oldestTicket = null; + $oldestMessageTicket = null; + $now = dol_now(); + + // Get number of open tickets, oldest ticket and oldest message ticket + if (!empty($tickets)) { + foreach ($tickets as $ticket) { + if (!in_array($ticket->fk_statut, [Ticket::STATUS_CANCELED, Ticket::STATUS_CLOSED])) { + $openTickets++; + + if (empty($oldestTicket) || $ticket->datec < $oldestTicket->datec) { + $oldestTicket = $ticket; + } + + $lastComm = !empty($ticket->comms) ? current($ticket->comms) : null; + if (!empty($lastComm) && (empty($oldestMessageTicket) || $lastComm->datec < $oldestMessageTicket->datec)) { + $oldestMessageTicket = $lastComm; + } + } + } + } + + // Widget content parameters + $array['content'] = [ + $openTickets, + !empty($oldestTicket) ? dol_print_date($oldestTicket->datec, 'day') : $langs->transnoentities('NoData'), + !empty($oldestMessageTicket) ? dol_print_date($oldestMessageTicket->datec, 'day') : $langs->transnoentities('NoData') + ]; + + $array['moreContent'] = [ + '', + !empty($oldestTicket) ? ' (' . convertSecondToTime(roundUpToNextMultiple($now - $oldestTicket->datec, 60)) . ')' . $oldestTicket->getNomUrl(2, '', 0, 'paddingleft') : '', + !empty($oldestMessageTicket) ? ' (' . convertSecondToTime(roundUpToNextMultiple($now - $oldestMessageTicket->datec, 60)) . ')' . $tickets[$oldestMessageTicket->fk_element]->getNomUrl(2, '', 0, 'paddingleft') : '' + ]; + + return ['runningTickets' => $array]; + } + + /** + * Get ticket stats + * + * @param array $tickets All tickets from database for current entity order by datec DESC with comments if exists or empty array + * @return array Widget of ticket stats with number of ticket per user, mean answer time and number of exchange per ticket + */ + function getTicketStats(array $tickets): array + { + global $langs; + + // Widget title parameters + $array['title'] = $langs->transnoentities('TicketStatistics'); + $array['widgetName'] = 'TicketStatistics'; + $array['picto'] = 'fas fa-chart-pie'; + $array['pictoColor'] = '#32E592'; + + // Widget labels parameters + $array['label'] = [ + $langs->transnoentities('MeanAnswerTime'), + $langs->transnoentities('NbTicketPerUser'), + $langs->transnoentities('NbExchangePerTicket') + ]; + + // Initialize variables + $timePerTicket = []; + $users = []; + $nbTicketAssigned = 0; + $nbExchanges = 0; + + if (!empty($tickets)) { + foreach ($tickets as $ticket) { + if (!empty($ticket->date_close)) { + $timePerTicket[] = $ticket->date_close - $ticket->datec; + } + if (!empty($ticket->fk_user_assign)) { + $nbTicketAssigned++; + if (!in_array($ticket->fk_user_assign, $users)) { + $users[] = $ticket->fk_user_assign; + } + } + $nbExchanges += count($ticket->comms); + } + } + + // Widget content parameters + $array['content'] = [ + count($timePerTicket) ? convertSecondToTime(array_sum($timePerTicket) / count($timePerTicket)) : $langs->transnoentities('NoData'), + count($users) ? intdiv($nbTicketAssigned, count($users)) : 0, + $tickets ? ceil($nbExchanges / count($tickets)) : 0 + ]; + + return ['ticketStats' => $array]; + } + + /** + * Get ticket repartition per user with number of ticket and mean answer time + * + * @param array $tickets All tickets from database for current entity order by datec DESC with comments if exists or empty array + * @return array Graph of ticket repartition per user with number of ticket and mean answer time + */ + function getTicketRepartitionPerUserAndMeanAnswerTime(array $tickets): array + { + global $langs; + + // Graph title parameters + $array['title'] = $langs->transnoentities('TicketRepartitionPerUserAndMeanAnswerTime'); + $array['picto'] = 'fontawesome_fa-ticket-alt_fas_#3bbfa8'; + + // Graph parameters + $array['width'] = '100%'; + $array['height'] = 300; + $array['type'] = 'bar'; + $array['showlegend'] = 1; + $array['dataset'] = 3; + $array['moreCSS'] = 'grid-2'; + + $array['labels'] = [ + ['label' => $langs->transnoentities('NbOfTickets')], + ['label' => $langs->transnoentities('MeanAnswerTime')] + ]; + + // Initialize technical objects + $userTmp = new User($this->db); + + // Initialize variables + $nbTicketPerUser = []; + + if (!empty($tickets)) { + foreach ($tickets as $ticket) { + if ($ticket->fk_user_assign == null) { + continue; + } + + $userTmp->fetch($ticket->fk_user_assign); + $userFullName = $userTmp->getFullName($langs); + if (!isset($nbTicketPerUser[$userFullName])) { + $nbTicketPerUser[$userFullName]['nbTicket'] = 0; + } + $nbTicketPerUser[$userFullName]['nbTicket']++; + if (!empty($ticket->date_close)) { + $nbTicketPerUser[$userFullName]['meanAnswerTime'][$ticket->id] = $ticket->date_close - $ticket->datec; + } + } + + if (!empty($nbTicketPerUser)) { + uasort($nbTicketPerUser, function($a, $b) { + return $b['nbTicket'] - $a['nbTicket']; + }); + + foreach ($nbTicketPerUser as $userName => $ticketData) { + $meanAnswerTimePerUser = 0; + if (isset($ticketData['meanAnswerTime'])) { + $meanAnswerTimePerUser = array_sum($ticketData['meanAnswerTime']) / count($ticketData['meanAnswerTime']); + $meanAnswerTimePerUser = round($meanAnswerTimePerUser / 86400); + } + $array['data'][] = [$userName, $ticketData['nbTicket'], $meanAnswerTimePerUser]; + } + } + } + + return $array; + } + + /** + * Get top society with most tickets + * + * @param array $tickets All tickets from database for current entity order by datec DESC with comments if exists or empty array + * @return array Graph of top society with most tickets + */ + function getTopSocietyWithMostTickets(array $tickets): array + { + global $langs; + + // Graph title parameters + $array['title'] = $langs->transnoentities('TopSocietyWithMostTickets', getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5)); + $array['picto'] = 'fontawesome_fa-ticket-alt_fas_#3bbfa8'; + + // Graph parameters + $array['width'] = '100%'; + $array['height'] = 300; + $array['type'] = 'bar'; + $array['showlegend'] = 1; + $array['dataset'] = 2; + $array['moreCSS'] = 'grid-2'; + + $array['labels'] = [ + [ + 'label' => $langs->transnoentities('NbOfTickets'), + 'color' => '#A1467E' + ] + ]; + + // Initialize technical objects + $society = new Societe($this->db); + + // Initialize variables + $nbTicketPerSociety = []; + + if (!empty($tickets)) { + foreach ($tickets as $ticket) { + if ($ticket->fk_soc == null) { + continue; + } + + $society->fetch($ticket->fk_soc); + if (!isset($nbTicketPerSociety[$society->name])) { + $nbTicketPerSociety[$society->name]['nbTicket'] = 0; + } + $nbTicketPerSociety[$society->name]['nbTicket']++; + } + + if (!empty($nbTicketPerSociety)) { + uasort($nbTicketPerSociety, function($a, $b) { + return $b['nbTicket'] - $a['nbTicket']; + }); + + $nbTicketPerSociety = array_slice($nbTicketPerSociety, 0, getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5), true); + foreach ($nbTicketPerSociety as $socName => $ticketData) { + $array['data'][] = [$socName, $ticketData['nbTicket']]; + } + } + } + + return $array; + } +} diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/accidentinvestigationdocument/doc_accidentinvestigationdocument_odt.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/accidentinvestigationdocument/doc_accidentinvestigationdocument_odt.modules.php index 0677b21fb..82de373d5 100644 --- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/accidentinvestigationdocument/doc_accidentinvestigationdocument_odt.modules.php +++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/accidentinvestigationdocument/doc_accidentinvestigationdocument_odt.modules.php @@ -215,17 +215,24 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa $tmpArray['attendants_number'] = '0 '; } - $tmpArray['victim_lastname'] = dol_strtoupper($victim->lastname); - $tmpArray['victim_firstname'] = ucfirst($victim->firstname); $tmpArray['seniority_in_position'] = $object->seniority_in_position; - if ($victim->dateemployment > 0) { - $daysEmployee = dol_time_plus_duree($now, -$victim->dateemployment, 's'); - $daysEmployee = round($daysEmployee / 60 / 60 / 24); - $tmpArray['victim_date_employment'] = dol_print_date($victim->dateemployment, 'day', 'tzuser') . ' - ' . $daysEmployee . ' ' . ($daysEmployee <= 1 ? $outputLangs->trans('Day') : $outputLangs->trans('Days')); - } else { - $tmpArray['victim_date_employment'] = ''; - } + if ($victim->id > 0) { + $tmpArray['victim_lastname'] = dol_strtoupper($victim->lastname); + $tmpArray['victim_firstname'] = ucfirst($victim->firstname); + if ($victim->dateemployment > 0) { + $daysEmployee = dol_time_plus_duree($now, -$victim->dateemployment, 's'); + $daysEmployee = round($daysEmployee / 60 / 60 / 24); + $tmpArray['victim_date_employment'] = dol_print_date($victim->dateemployment, 'day', 'tzuser') . ' - ' . $daysEmployee . ' ' . ($daysEmployee <= 1 ? $outputLangs->trans('Day') : $outputLangs->trans('Days')); + } else { + $tmpArray['victim_date_employment'] = ''; + } + } else { + $tmpArray['victim_lastname'] = ''; + $tmpArray['victim_firstname'] = ''; + $tmpArray['victim_date_employment'] = ''; + } + $tmpArray['accident_date'] = dol_print_date($accident->accident_date, 'day'); $tmpArray['accident_hour'] = dol_print_date($accident->accident_date, 'hour'); $tmpArray['accident_day'] = dol_print_date($accident->accident_date, '%A'); diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/digiriskelementdocument/modules_digiriskelementdocument.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/digiriskelementdocument/modules_digiriskelementdocument.php index 5577f3650..f56fabef8 100644 --- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/digiriskelementdocument/modules_digiriskelementdocument.php +++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/digiriskelementdocument/modules_digiriskelementdocument.php @@ -32,8 +32,9 @@ require_once __DIR__ . '/../../../../../class/riskanalysis/risk.class.php'; require_once __DIR__ . '/../../../../../class/evaluator.class.php'; require_once __DIR__ . '/../../../../../class/accident.class.php'; +require_once __DIR__ . '/../../../../../class/digiriskresources.class.php'; -// Load saturne libraries +// Load Saturne libraries require_once __DIR__ . '/../../../../../../saturne/core/modules/saturne/modules_saturne.php'; /** @@ -306,6 +307,32 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa $tmpArray['photo'] = DOL_DOCUMENT_ROOT . $noPhoto; } + $resources = new DigiriskResources($this->db); + $userTmp = new User($this->db); + + // Get QRCode to public interface + if (isModEnabled('multicompany')) { + $qrCodePath = DOL_DATA_ROOT . '/digiriskdolibarr/multicompany/ticketqrcode/'; + } else { + $qrCodePath = $conf->digiriskdolibarr->multidir_output[$conf->entity ?: 1] . '/ticketqrcode/'; + } + $QRCodeList = dol_dir_list($qrCodePath); + if (is_array($QRCodeList) && !empty($QRCodeList)) { + $QRCode = array_shift($QRCodeList); + $QRCodeImagePath = $QRCode['fullname']; + } else { + $QRCodeImagePath = DOL_DOCUMENT_ROOT . '/public/theme/common/nophoto.png'; + } + + $allLinks = $resources->fetchDigiriskResources(); + $responsibleResources = $allLinks['Responsible']; + $userTmp->fetch($responsibleResources->id[0]); + + // @todo The keyword "signature" is needed because we want the image to be cropped to fit in the table + $tmpArray['helpUrl'] = DOL_MAIN_URL_ROOT . '/custom/digiriskdolibarr/public/ticket/create_ticket.php'; + $tmpArray['signatureQRCodeTicket'] = $QRCodeImagePath; + $tmpArray['securityResponsible'] = (!empty($userTmp) ? dol_strtoupper($userTmp->lastname) . ' ' . ucfirst($userTmp->firstname) : ''); + if (isset($moreParam['tmparray']) && is_array($moreParam['tmparray'])) { $moreParam['tmparray'] = array_merge($moreParam['tmparray'], $tmpArray); } else { diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/ticketdocument/doc_ticketdocument_odt.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/ticketdocument/doc_ticketdocument_odt.modules.php index 10a865cd2..559cd0a10 100644 --- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/ticketdocument/doc_ticketdocument_odt.modules.php +++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/ticketdocument/doc_ticketdocument_odt.modules.php @@ -108,7 +108,7 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo $tmpArray['type'] = $outputLangs->transnoentities('Action' . $actionComm->type_code); $tmpArray['title'] = $actionComm->label; $tmpArray['event_content'] = dol_htmlentitiesbr_decode($actionComm->note); - $tmpArray['date'] = dol_print_date($actionComm->datec, 'dayreduceformat'); + $tmpArray['date'] = dol_print_date($actionComm->datec, 'dayhourreduceformat'); $this->setTmpArrayVars($tmpArray, $listLines, $outputLangs); } diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/workunitdocument/doc_workunitdocument_odt.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/workunitdocument/doc_workunitdocument_odt.modules.php index 7b9adcc40..cb8da90f8 100644 --- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/workunitdocument/doc_workunitdocument_odt.modules.php +++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/workunitdocument/doc_workunitdocument_odt.modules.php @@ -28,7 +28,6 @@ // Load DigiriskDolibarr libraries require_once __DIR__ . '/../digiriskelementdocument/modules_digiriskelementdocument.php'; -require_once __DIR__ . '/../../../../../class/digiriskresources.class.php'; /** * Class to build documents using ODF templates generator @@ -65,52 +64,4 @@ public function info(Translate $langs): string { return parent::info($langs); } - - /** - * Function to build a document on disk - * - * @param SaturneDocuments $objectDocument Object source to build document - * @param Translate $outputLangs Lang object to use for output - * @param string $srcTemplatePath Full path of source filename for generator using a template file - * @param int $hideDetails Do not show line details - * @param int $hideDesc Do not show desc - * @param int $hideRef Do not show ref - * @param array $moreParam More param (Object/user/etc) - * @return int 1 if OK, <=0 if KO - * @throws Exception - */ - public function write_file(SaturneDocuments $objectDocument, Translate $outputLangs, string $srcTemplatePath, int $hideDetails = 0, int $hideDesc = 0, int $hideRef = 0, array $moreParam): int - { - global $conf; - - $resources = new DigiriskResources($this->db); - $userTmp = new User($this->db); - - // Get QRCode to public interface - if (isModEnabled('multicompany')) { - $qrCodePath = DOL_DATA_ROOT . '/digiriskdolibarr/multicompany/ticketqrcode/'; - } else { - $qrCodePath = $conf->digiriskdolibarr->multidir_output[$conf->entity ?: 1] . '/ticketqrcode/'; - } - $QRCodeList = dol_dir_list($qrCodePath); - if (is_array($QRCodeList) && !empty($QRCodeList)) { - $QRCode = array_shift($QRCodeList); - $QRCodeImagePath = $QRCode['fullname']; - } else { - $QRCodeImagePath = DOL_DOCUMENT_ROOT . '/public/theme/common/nophoto.png'; - } - - $allLinks = $resources->fetchDigiriskResources(); - $responsibleResources = $allLinks['Responsible']; - $userTmp->fetch($responsibleResources->id[0]); - - // @todo The keyword "signature" is needed because we want the image to be cropped to fit in the table - $tmpArray['helpUrl'] = DOL_MAIN_URL_ROOT . '/custom/digiriskdolibarr/public/ticket/create_ticket.php'; - $tmpArray['signatureQRCodeTicket'] = $QRCodeImagePath; - $tmpArray['securityResponsible'] = (!empty($userTmp) ? dol_strtoupper($userTmp->lastname) . ' ' . ucfirst($userTmp->firstname) : ''); - - $moreParam['tmparray'] = $tmpArray; - - return parent::write_file($objectDocument, $outputLangs, $srcTemplatePath, $hideDetails, $hideDesc, $hideRef, $moreParam); - } } diff --git a/core/modules/modDigiriskDolibarr.class.php b/core/modules/modDigiriskDolibarr.class.php index ede0ae826..367154523 100644 --- a/core/modules/modDigiriskDolibarr.class.php +++ b/core/modules/modDigiriskDolibarr.class.php @@ -364,7 +364,7 @@ public function __construct($db) $this->errors[] = $langs->trans('activateModuleDependNotSatisfied', 'Digirisk', 'Saturne'); } - $langs->load("digiriskdolibarr@digiriskdolibarr"); + $langs->loadLangs(['digiriskdolibarr@digiriskdolibarr', 'categories']); // Id for module (must be unique). // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id). @@ -380,7 +380,7 @@ public function __construct($db) $this->descriptionlong = "Digirisk"; $this->editor_name = 'Evarisk'; $this->editor_url = 'https://evarisk.com'; - $this->version = '10.2.1'; + $this->version = '20.0.0'; $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name); $this->picto = 'digiriskdolibarr_color@digiriskdolibarr'; @@ -478,7 +478,7 @@ public function __construct($db) $this->hidden = false; $this->depends = ['modSaturne', 'modECM', 'modProjet', 'modSociete', 'modTicket', 'modCategorie', 'modFckeditor', 'modApi', 'modExport', 'modImport']; - $this->requiredby = []; + $this->requiredby = ['modDigiBoard']; $this->conflictwith = []; $this->langfiles = ["digiriskdolibarr@digiriskdolibarr"]; $this->phpmin = [7, 4]; // Minimum version of PHP required by module @@ -755,7 +755,7 @@ public function __construct($db) $i++ => ['DIGIRISKDOLIBARR_TICKET_PARENT_CATEGORY', 'integer', 0, '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_TICKET_MAIN_CATEGORY', 'integer', 0, '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_TICKET_PARENT_CATEGORY_LABEL', 'chaine', $langs->trans('Registre'), '', 0, 'current'], - $i++ => ['DIGIRISKDOLIBARR_TICKET_CHILD_CATEGORY_LABEL', 'chaine', $langs->trans('Pertinence'), '', 0, 'current'], + $i++ => ['DIGIRISKDOLIBARR_TICKET_CHILD_CATEGORY_LABEL', 'chaine', $langs->trans('Rubriques'), '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_TICKET_PROJECT', 'integer', 0, '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_TICKET_SUCCESS_MESSAGE', 'chaine', $langs->trans('YouMustNotifyYourHierarchy'), '', 0, 'current'], $i++ => ['DIGIRISKDOLIBARR_SHOW_MULTI_ENTITY_SELECTOR_ON_TICKET_PUBLIC_INTERFACE', 'integer', 0, '', 0, 'current'], @@ -901,6 +901,7 @@ public function __construct($db) $this->tabs[] = ['data' => 'thirdparty:+schedules:'. $pictoDigirisk .$langs->trans('Schedules').':digiriskdolibarr@digiriskdolibarr:1:/custom/saturne/view/saturne_schedules.php?id=__ID__&element_type=societe&module_name=societe']; // To add a new tab identified by code tabname1 $this->tabs[] = ['data' => 'user:+participation:'. $pictoDigirisk .$langs->trans('GP/UTParticipation').':digiriskdolibarr@digiriskdolibarr:1:/custom/digiriskdolibarr/view/digiriskelement/digiriskelement_evaluator.php?fromid=__ID__']; // To add a new tab identified by code tabname1 $this->tabs[] = ['data' => 'user:+accidents:'. $pictoDigirisk .$langs->trans('Accidents').':digiriskdolibarr@digiriskdolibarr:1:/custom/digiriskdolibarr/view/accident/accident_list.php?fromiduser=__ID__']; // To add a new tab identified by code tabname1 + $this->tabs[] = ['data' => 'categories_ticket:+config:' . $pictoDigirisk .$langs->trans('WHSRegister') . ':digiriskdolibarr@digiriskdolibarr:1:/custom/digiriskdolibarr/view/ticket/category_config.php?id=__ID__&type=ticket']; // Dictionaries $this->dictionaries = [ @@ -1398,7 +1399,7 @@ public function __construct($db) 'prefix' => '', 'mainmenu' => 'digiriskdolibarr', 'leftmenu' => 'digiriskstandard', - 'url' => '/digiriskdolibarr/view/digiriskstandard/digiriskstandard_card.php', + 'url' => '/digiriskdolibarr/view/digiriskstandard/digiriskstandard_card.php?type=risk', 'langs' => 'digiriskdolibarr@digiriskdolibarr', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position' => 100 + $r, 'enabled' => '$conf->digiriskdolibarr->enabled', // Define condition to show or hide menu entry. Use '$conf->digiriskdolibarr->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. @@ -1459,7 +1460,7 @@ public function __construct($db) 'prefix' => '', 'mainmenu' => 'digiriskdolibarr', 'leftmenu' => 'digiriskstandard_riskenvironmental', - 'url' => '/digiriskdolibarr/view/digiriskstandard/digiriskstandard_card.php', + 'url' => '/digiriskdolibarr/view/digiriskstandard/digiriskstandard_card.php?type=riskenvironmental', 'langs' => 'digiriskdolibarr@digiriskdolibarr', 'position' => 100 + $r, 'enabled' => '$conf->digiriskdolibarr->enabled', @@ -1693,7 +1694,7 @@ public function __construct($db) 'prefix' => $pictoDigirisk, 'mainmenu' => 'ticket', 'leftmenu' => 'ticketstats', - 'url' => '/digiriskdolibarr/view/ticket/ticketstats.php', + 'url' => '/digiriskdolibarr/view/ticket/ticket_management_dashboard.php', 'langs' => 'digiriskdolibarr@digiriskdolibarr', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position' => 100 + $r, 'enabled' => '$conf->digiriskdolibarr->enabled && $conf->ticket->enabled', // Define condition to show or hide menu entry. Use '$conf->digiriskdolibarr->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. @@ -1803,7 +1804,7 @@ public function __construct($db) $this->export_entities_array[$r] = []; $keyforclass = ucfirst($key); - $keyforclassfile = '/' . $this->rights_class . '/class/' . $objectMetaData['classPath'] . '/' . $key . '.class.php'; + $keyforclassfile = '/' . $this->rights_class . '/class/' . (isset($objectMetaData['classPath']) ? $objectMetaData['classPath'] . '/' : '') . $key . '.class.php'; $keyforelement = $key; $keyforalias = 't'; @@ -2106,6 +2107,28 @@ public function init($options = '') dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_THIRDPARTY_SET', 3, 'integer', 0, '', $conf->entity); } + if (getDolGlobalInt('DIGIRISKDOLIBARR_THIRDPARTY_SET') == 3) { + $poisonCenters = [ + 'ANGERS' => ['phone' => '02 41 48 21 21'], + 'BORDEAUX' => ['phone' => '05 56 96 40 80'], + 'LILLE' => ['phone' => '08 00 59 59 59'], + 'LYON' => ['phone' => '04 72 11 69 11'], + 'MARSEILLE' => ['phone' => '04 91 75 25 25'], + 'NANCY' => ['phone' => '03 83 22 50 50'], + 'PARIS' => ['phone' => '01 40 05 48 48'], + 'TOULOUSE' => ['phone' => '05 61 77 74 47'] + ]; + + foreach ($poisonCenters as $city => $poisonCenter) { + $societe->name = $langs->trans('PoisonControlCenter') . ' ' . $city . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; + $societe->client = 0; + $societe->phone = $poisonCenter['phone']; + $societe->url = ''; + $poisonControlCenterID = $societe->create($user); + } + + dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_THIRDPARTY_SET', 4, 'integer', 0, '', $conf->entity); + } if (getDolGlobalInt('DIGIRISKDOLIBARR_CONTACTS_SET') == 0) { require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; @@ -2136,118 +2159,105 @@ public function init($options = '') dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_CONTACTS_SET', 1, 'integer', 0, '', $conf->entity); } - if ( $conf->global->DIGIRISKDOLIBARR_THIRDPARTY_UPDATED == 0 ) { - require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php'; - require_once __DIR__ . '/../../class/digiriskresources.class.php'; - - $societe = new Societe($this->db); - $resources = new DigiriskResources($this->db); - $labour_inspectorID = $resources->fetchDigiriskResource('LabourInspectorSociety'); - $societe->fetch($labour_inspectorID); - $societe->name = $langs->trans('LabourInspectorName') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; - $societe->update(0, $user); - - $policeID = $resources->fetchDigiriskResource('Police'); - $societe->fetch($policeID); - $societe->name = $langs->trans('Police') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; - $societe->update(0, $user); - - $samuID = $resources->fetchDigiriskResource('SAMU'); - $societe->fetch($samuID); - $societe->name = $langs->trans('SAMU') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; - $societe->update(0, $user); - - $pompiersID = $resources->fetchDigiriskResource('Pompiers'); - $societe->fetch($pompiersID); - $societe->name = $langs->trans('Pompiers') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; - $societe->update(0, $user); - - $emergencyID = $resources->fetchDigiriskResource('AllEmergencies'); - $societe->fetch($emergencyID); - $societe->name = $langs->trans('AllEmergencies') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; - $societe->update(0, $user); - - $rights_defenderID = $resources->fetchDigiriskResource('RightsDefender'); - $societe->fetch($rights_defenderID); - $societe->name = $langs->transnoentities('RightsDefender') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; - $societe->update(0, $user); - - $poison_control_centerID = $resources->fetchDigiriskResource('PoisonControlCenter'); - $societe->fetch($poison_control_centerID); - $societe->name = $langs->trans('PoisonControlCenter') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; - $societe->update(0, $user); - - dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_THIRDPARTY_UPDATED', 1, 'integer', 0, '', $conf->entity); - } + if (getDolGlobalInt('DIGIRISKDOLIBARR_THIRDPARTY_UPDATED') == 0) { + $labourInspectorID = $resources->fetchDigiriskResource('LabourInspectorSociety'); + $societe->fetch($labourInspectorID); + $societe->name = $langs->trans('LabourInspectorName') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; + $societe->update(0, $user); + + $policeID = $resources->fetchDigiriskResource('Police'); + $societe->fetch($policeID); + $societe->name = $langs->trans('Police') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; + $societe->update(0, $user); + + $samuID = $resources->fetchDigiriskResource('SAMU'); + $societe->fetch($samuID); + $societe->name = $langs->trans('SAMU') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; + $societe->update(0, $user); + + $pompiersID = $resources->fetchDigiriskResource('Pompiers'); + $societe->fetch($pompiersID); + $societe->name = $langs->trans('Pompiers') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; + $societe->update(0, $user); + + $emergencyID = $resources->fetchDigiriskResource('AllEmergencies'); + $societe->fetch($emergencyID); + $societe->name = $langs->trans('AllEmergencies') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; + $societe->update(0, $user); + + $rightsDefenderID = $resources->fetchDigiriskResource('RightsDefender'); + $societe->fetch($rightsDefenderID); + $societe->name = $langs->transnoentities('RightsDefender') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; + $societe->update(0, $user); + + $poisonControlCenterID = $resources->fetchDigiriskResource('PoisonControlCenter'); + $societe->fetch($poisonControlCenterID); + $societe->name = $langs->trans('PoisonControlCenter') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM; + $societe->update(0, $user); + + dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_THIRDPARTY_UPDATED', 1, 'integer', 0, '', $conf->entity); + } + if (getDolGlobalInt('DIGIRISKDOLIBARR_THIRDPARTY_UPDATED') == 1) { + $rightsDefenderID = $resources->fetchDigiriskResource('RightsDefender'); + $societe->fetch($rightsDefenderID); + $societe->phone = '09 69 39 00 00'; + $societe->url = 'https://www.defenseurdesdroits.fr/'; + $societe->update(0, $user); + + dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_THIRDPARTY_UPDATED', 2, 'integer', 0, '', $conf->entity); + } - // Create extrafields during init - include_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; - require_once __DIR__ . '/../../lib/digiriskdolibarr_function.lib.php'; - - $extra_fields = new ExtraFields($this->db); - - $extra_fields->update('fk_risk', $langs->transnoentities("RiskLinked"), 'sellist', '', 'projet_task', 0, 0, 1010, 'a:1:{s:7:"options";a:1:{s:50:"digiriskdolibarr_risk:ref:rowid::entity = $ENTITY$";N;}}', '', '', 1); - $extra_fields->addExtraField('fk_risk', $langs->transnoentities("RiskLinked"), 'sellist', 1010, '', 'projet_task', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:50:"digiriskdolibarr_risk:ref:rowid::entity = $ENTITY$";N;}}', '', '', 1); - $extra_fields->update('fk_preventionplan', $langs->transnoentities("PreventionPlanLinked"), 'sellist', '', 'projet_task', 0, 0, 1020, 'a:1:{s:7:"options";a:1:{s:60:"digiriskdolibarr_preventionplan:ref:rowid::entity = $ENTITY$";N;}}', '', '', '', 1); - $extra_fields->addExtraField('fk_preventionplan', $langs->transnoentities("PreventionPlanLinked"), 'sellist', 1020, '', 'projet_task', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:60:"digiriskdolibarr_preventionplan:ref:rowid::entity = $ENTITY$";N;}}', '', '', 1); - $extra_fields->update('fk_firepermit', $langs->transnoentities("FirePermitLinked"), 'sellist', '', 'projet_task', 0, 0, 1030, 'a:1:{s:7:"options";a:1:{s:56:"digiriskdolibarr_firepermit:ref:rowid::entity = $ENTITY$";N;}}', '', '', '', 1); - $extra_fields->addExtraField('fk_firepermit', $langs->transnoentities("FirePermitLinked"), 'sellist', 1030, '', 'projet_task', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:56:"digiriskdolibarr_firepermit:ref:rowid::entity = $ENTITY$";N;}}', '', '', 1); - $extra_fields->update('fk_accident', $langs->transnoentities("AccidentLinked"), 'sellist', '', 'projet_task', 0, 0, 1040, 'a:1:{s:7:"options";a:1:{s:54:"digiriskdolibarr_accident:ref:rowid::entity = $ENTITY$";N;}}', '', '', 1); - $extra_fields->addExtraField('fk_accident', $langs->transnoentities("AccidentLinked"), 'sellist', 1040, '', 'projet_task', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:54:"digiriskdolibarr_accident:ref:rowid::entity = $ENTITY$";N;}}', '', '', 1); - $extra_fields->update('fk_accidentinvestigation', $langs->transnoentities("AccidentInvestigationLinked"), 'sellist', '', 'projet_task', 0, 0, 1050, 'a:1:{s:7:"options";a:1:{s:68:"digiriskdolibarr_accident_investigation:ref:rowid::entity = $ENTITY$";N;}}', '', '', 1); - $extra_fields->addExtraField('fk_accidentinvestigation', $langs->transnoentities("AccidentInvestigationLinked"), 'sellist', 1050, '', 'projet_task', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:68:"digiriskdolibarr_accident_investigation:ref:rowid::entity = $ENTITY$";N;}}', '', '', 1); - - if (!$conf->global->DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS_BACKWARD_COMPATIBILITY && (dolibarr_get_const($this->db, 'DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS', 0) || dolibarr_get_const($this->db, 'DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS', $conf->entity))) { - if ($conf->multicompany->enabled) { - $current_entity = $conf->entity; - $object = new ActionsMulticompany($this->db); - - $entities = $object->getEntitiesList(false, false, true, true); - foreach ($entities as $sub_entity => $entity_name) { - $conf->setEntityValues($this->db, $sub_entity); - - extrafield_soft_delete('digiriskdolibarr_ticket_firstname', 'ticket', $extra_fields); - extrafield_soft_delete('digiriskdolibarr_ticket_lastname', 'ticket', $extra_fields); - extrafield_soft_delete('digiriskdolibarr_ticket_phone', 'ticket', $extra_fields); - extrafield_soft_delete('digiriskdolibarr_ticket_service', 'ticket', $extra_fields); - extrafield_soft_delete('digiriskdolibarr_ticket_location', 'ticket', $extra_fields); - extrafield_soft_delete('digiriskdolibarr_ticket_date', 'ticket', $extra_fields); - } - $conf->setEntityValues($this->db, $current_entity); - } else { - extrafield_soft_delete('digiriskdolibarr_ticket_firstname', 'ticket', $extra_fields); - extrafield_soft_delete('digiriskdolibarr_ticket_lastname', 'ticket', $extra_fields); - extrafield_soft_delete('digiriskdolibarr_ticket_phone', 'ticket', $extra_fields); - extrafield_soft_delete('digiriskdolibarr_ticket_service', 'ticket', $extra_fields); - extrafield_soft_delete('digiriskdolibarr_ticket_location', 'ticket', $extra_fields); - extrafield_soft_delete('digiriskdolibarr_ticket_date', 'ticket', $extra_fields); - } + // Create extrafields during init + require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; - $extra_fields->addExtraField('digiriskdolibarr_ticket_lastname', $langs->transnoentities("LastName"), 'varchar', 2000, 255, 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0); - $extra_fields->addExtraField('digiriskdolibarr_ticket_firstname', $langs->transnoentities("FirstName"), 'varchar', 2100, 255, 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0); - $extra_fields->addExtraField('digiriskdolibarr_ticket_phone', $langs->transnoentities("Phone"), 'phone', 2200, '', 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0); - $extra_fields->addExtraField('digiriskdolibarr_ticket_service', $langs->transnoentities("GP/UT"), 'sellist', 2300, '255', 'ticket', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:61:"digiriskdolibarr_digiriskelement:ref:rowid::entity = $ENTITY$";N;}}', 1, '', 4, '','',0); - $extra_fields->addExtraField('digiriskdolibarr_ticket_location', $langs->transnoentities("Location"), 'varchar', 2400, 255, 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0); - $extra_fields->addExtraField('digiriskdolibarr_ticket_date', $langs->transnoentities("Date"), 'datetime', 2500, '', 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0); - dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS', 1, 'integer', 0, '', 0); - dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS_BACKWARD_COMPATIBILITY', 1, 'integer', 0, '', 0); - } + $extraFields = new ExtraFields($this->db); - //Used for data import from Digirisk Wordpress - $extra_fields->update('wp_digi_id', $langs->trans("WPDigiID"), 'int', 100, 'digiriskdolibarr_digiriskelement', 0, 0, 1020, '', '', '', 0); - $extra_fields->addExtraField('wp_digi_id', $langs->trans("WPDigiID"), 'int', 100, '', 'digiriskdolibarr_digiriskelement', 0, 0, '', '', '', '', 0); - $extra_fields->addExtraField('entity', $langs->trans("Entity"), 'int', 100, '', 'digiriskdolibarr_digiriskelement', 0, 0, '', '', '', '', 0); + $commonExtraFieldsValue = [ + 'alwayseditable' => 1, 'list' => 1, 'help' => '', 'entity' => 0, 'langfile' => 'digiriskdolibarr@digiriskdolibarr', 'enabled' => "isModEnabled('digiriskdolibarr') && isModEnabled('project')", 'moreparams' => ['css' => 'minwidth100 maxwidth300'] + ]; - $extra_fields->addExtraField('professional_qualification', $langs->trans("ProfessionalQualification"), 'varchar', 990, 255, 'user', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:0:"";N;}}', 1, '', 1, '', '', 0, 'digiriskdolibarr'); - $extra_fields->addExtraField('contract_type', $langs->trans("ContractType"), 'select', 1000, '', 'user', 0, 0, '', 'a:1:{s:7:"options";a:5:{i:1;s:3:"CDI";i:2;s:3:"CDD";i:3;s:18:"Apprentice/Student";i:4;s:7:"Interim";i:5;s:5:"Other";}}', 1, '', 1, '', '', 0, 'digiriskdolibarr'); + $extraFieldsArrays = [ + 'fk_risk' => ['Label' => 'Risk', 'type' => 'link', 'elementtype' => ['projet_task'], 'position' => $this->numero . 10, 'params' => ['Risk:digiriskdolibarr/class/riskanalysis/risk.class.php:1:(entity:IN:__SHARED_ENTITIES__)' => NULL], ], + 'fk_preventionplan' => ['Label' => 'PreventionPlan', 'type' => 'link', 'elementtype' => ['projet_task'], 'position' => $this->numero . 20, 'params' => ['PreventionPlan:digiriskdolibarr/class/preventionplan.class.php:1:(entity:IN:__SHARED_ENTITIES__)' => NULL], ], + 'fk_firepermit' => ['Label' => 'FirePermit', 'type' => 'link', 'elementtype' => ['projet_task'], 'position' => $this->numero . 30, 'params' => ['FirePermit:digiriskdolibarr/class/firepermit.class.php:1:(entity:IN:__SHARED_ENTITIES__)' => NULL], ], + 'fk_accident' => ['Label' => 'Accident', 'type' => 'link', 'elementtype' => ['projet_task'], 'position' => $this->numero . 40, 'params' => ['Accident:digiriskdolibarr/class/accident.class.php:1:(entity:IN:__SHARED_ENTITIES__)' => NULL], ], + 'fk_accidentinvestigation' => ['Label' => 'AccidentInvestigation', 'type' => 'link', 'elementtype' => ['projet_task'], 'position' => $this->numero . 50, 'params' => ['AccidentInvestigation:digiriskdolibarr/class/accidentinvestigation.class.php:1:(entity:IN:__SHARED_ENTITIES__)' => NULL]], - if ($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2 == 0) { - dolibarr_set_const($this->db, 'MAIN_EXTRAFIELDS_USE_SELECT2', 1, 'integer', 0, '', $conf->entity); - } + 'wp_digi_id' => ['Label' => 'WPDigiID', 'type' => 'int', 'length' => 100, 'elementtype' => ['digiriskdolibarr_digiriskelement'], 'position' => $this->numero . 10, 'list' => 0, 'enabled' => "isModEnabled('digiriskdolibarr')"], + 'entity' => ['Label' => 'Entity', 'type' => 'int', 'length' => 100, 'elementtype' => ['digiriskdolibarr_digiriskelement'], 'position' => $this->numero . 20, 'list' => 0, 'enabled' => "isModEnabled('digiriskdolibarr')"], - if ($conf->global->CATEGORIE_RECURSIV_ADD == 0) { - dolibarr_set_const($this->db, 'CATEGORIE_RECURSIV_ADD', 1, 'integer', 0, '', $conf->entity); - } + 'professional_qualification' => ['Label' => 'ProfessionalQualification', 'type' => 'varchar', 'length' => 255, 'elementtype' => ['user'], 'position' => $this->numero . 10, 'enabled' => "isModEnabled('digiriskdolibarr') && isModEnabled('user')"], + 'contract_type' => ['Label' => 'ContractType', 'type' => 'select', 'elementtype' => ['user'], 'position' => $this->numero . 20, 'params' => [1 => 'CDI', 2 => 'CDD', 3 => 'Apprentice/Student', 4 => 'Interim', 5 => 'Other'], 'enabled' => "isModEnabled('digiriskdolibarr') && isModEnabled('user')"] + ]; + + if (getDolGlobalInt('DIGIRISKDOLIBARR_EXTRAFIELDS_BACKWARD_COMPATIBILITY') == 0) { + if (isModEnabled('multicompany')) { + require_once __DIR__ . '/../../../multicompany/class/actions_multicompany.class.php'; + + $currentEntity = $conf->entity; + $actionsMulticompany = new ActionsMulticompany($this->db); + $entities = $actionsMulticompany->getEntitiesList(false, false, true, true); + foreach ($entities as $subEntity => $entity_name) { + $conf->setEntityValues($this->db, $subEntity); + foreach ($extraFieldsArrays as $key => $extraField) { + foreach ($extraField['elementtype'] as $extraFieldElementType) { + $extraFields->delete($key, $extraFieldElementType); + } + } + $conf->setEntityValues($this->db, $currentEntity); + } + } else { + foreach ($extraFieldsArrays as $key => $extraField) { + foreach ($extraField['elementtype'] as $extraFieldElementType) { + $extraFields->delete($key, $extraFieldElementType); + } + } + } + + dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_EXTRAFIELDS_BACKWARD_COMPATIBILITY', 1, 'integer', 0, '', $conf->entity); + } + + saturne_manage_extrafields($extraFieldsArrays, $commonExtraFieldsValue); //DigiriskElement favorite medias backward compatibility if ($conf->global->DIGIRISKDOLIBARR_DIGIRISKELEMENT_MEDIAS_BACKWARD_COMPATIBILITY == 0) { diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_inheritedrisklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_inheritedrisklist_view.tpl.php index a4dc6c16d..92527c277 100644 --- a/core/tpl/riskanalysis/risk/digiriskdolibarr_inheritedrisklist_view.tpl.php +++ b/core/tpl/riskanalysis/risk/digiriskdolibarr_inheritedrisklist_view.tpl.php @@ -328,26 +328,6 @@ $arrayfields = dol_sort_array($arrayfields, 'position'); - $menuConf = 'MAIN_SELECTEDFIELDS_' . $varpage; - - if (dol_strlen($user->conf->$menuConf) < 1 || preg_match('/t./', $user->conf->$menuConf)) { - $user->conf->$menuConf = 'r.fk_element,r.ref,r.category,evaluation.cotation,'; - } - - if ( ! preg_match('/r.description/', $user->conf->$menuConf) && $conf->global->DIGIRISKDOLIBARR_RISK_DESCRIPTION) { - $user->conf->$menuConf = $user->conf->$menuConf . 'r.description,'; - } elseif ( ! $conf->global->DIGIRISKDOLIBARR_RISK_DESCRIPTION) { - $user->conf->$menuConf = preg_replace('/r.description,/', '', $user->conf->$menuConf); - $arrayfields['r.description']['enabled'] = 0; - } - - if ( ! preg_match('/evaluation.has_tasks/', $user->conf->$menuConf) && $conf->global->DIGIRISKDOLIBARR_TASK_MANAGEMENT) { - $user->conf->$menuConf .= $user->conf->$menuConf . 'evaluation.has_tasks,'; - } elseif ( ! $conf->global->DIGIRISKDOLIBARR_TASK_MANAGEMENT) { - $user->conf->$menuConf = preg_replace('/evaluation.has_tasks,/', '', $user->conf->$menuConf); - $arrayfields['evaluation.has_tasks']['enabled'] = 0; - } - $selectedfields = $form->multiSelectArrayWithCheckbox('inherited_risklist_selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_risk_actions.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_risk_actions.tpl.php index 99d1e91df..fb75ee434 100644 --- a/core/tpl/riskanalysis/risk/digiriskdolibarr_risk_actions.tpl.php +++ b/core/tpl/riskanalysis/risk/digiriskdolibarr_risk_actions.tpl.php @@ -92,12 +92,8 @@ if ($result2 > 0) { $tasktitle = $data['task']; - $dateStart = $data['dateStart']; - $hourStart = $data['hourStart']; - $minStart = $data['minStart']; - $dateEnd = $data['dateEnd']; - $hourEnd = $data['hourEnd']; - $minEnd = $data['minEnd']; + $dateStart = dol_stringtotime($data['dateStart']); + $dateEnd = dol_stringtotime($data['dateEnd']); $budget = $data['budget']; if ( ! empty($tasktitle) && $tasktitle !== 'undefined') { $extrafields->fetch_name_optionals_label($task->table_element); @@ -107,16 +103,12 @@ $task->fk_project = $riskType == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT; $task->date_c = dol_now(); if (!empty($dateStart)) { - $task->date_start = strtotime(preg_replace('/\//', '-', $dateStart)); - $task->date_start = dol_time_plus_duree($task->date_start, $hourStart, 'h'); - $task->date_start = dol_time_plus_duree($task->date_start, $minStart, 'i'); + $task->date_start = $dateStart; } else { $task->date_start = dol_now('tzuser'); } if (!empty($dateEnd)) { - $task->date_end = strtotime(preg_replace('/\//', '-', $dateEnd)); - $task->date_end = dol_time_plus_duree($task->date_end, $hourEnd, 'h'); - $task->date_end = dol_time_plus_duree($task->date_end, $minEnd, 'i'); + $task->date_end = $dateEnd; } $task->budget_amount = $budget; $task->array_options['options_fk_risk'] = $risk->id; @@ -355,18 +347,7 @@ } $entity = ($conf->entity > 1) ? '/' . $conf->entity : ''; - $result = $evaluation->update($user); - - if ($result > 0) { - // Update evaluation OK - $urltogo = str_replace('__ID__', $result, $backtopage); - $urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $id, $urltogo); // New method to autoselect project after a New on another form object creation - header("Location: " . $urltogo); - } else { - // Update evaluation KO - if ( ! empty($evaluation->errors)) setEventMessages(null, $evaluation->errors, 'errors'); - else setEventMessages($evaluation->error, null, 'errors'); - } + $evaluation->update($user); } if ( ! $error && $action == "deleteEvaluation" && $permissiontodelete) { @@ -400,12 +381,8 @@ $riskID = $data['riskToAssign']; $tasktitle = $data['tasktitle']; - $dateStart = $data['dateStart']; - $hourStart = $data['hourStart']; - $minStart = $data['minStart']; - $dateEnd = $data['dateEnd']; - $hourEnd = $data['hourEnd']; - $minEnd = $data['minEnd']; + $dateStart = dol_stringtotime($data['dateStart']); + $dateEnd = dol_stringtotime($data['dateEnd']); $budget = $data['budget']; $extrafields->fetch_name_optionals_label($task->table_element); @@ -415,16 +392,12 @@ $task->fk_project = $riskType == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT; $task->datec = dol_now(); if (!empty($dateStart)) { - $task->date_start = strtotime(preg_replace('/\//', '-', $dateStart)); - $task->date_start = dol_time_plus_duree($task->date_start, $hourStart, 'h'); - $task->date_start = dol_time_plus_duree($task->date_start, $minStart, 'i'); + $task->date_start = $dateStart; } else { $task->date_start = dol_now('tzuser'); } if (!empty($dateEnd)) { - $task->date_end = strtotime(preg_replace('/\//', '-', $dateEnd)); - $task->date_end = dol_time_plus_duree($task->date_end, $hourEnd, 'h'); - $task->date_end = dol_time_plus_duree($task->date_end, $minEnd, 'i'); + $task->date_end = $dateEnd; } $task->budget_amount = $budget; $task->fk_task_parent = 0; @@ -451,12 +424,8 @@ $riskAssessmentTaskID = $data['riskAssessmentTaskID']; $tasktitle = $data['tasktitle']; - $dateStart = $data['dateStart']; - $hourStart = $data['hourStart']; - $minStart = $data['minStart']; - $dateEnd = $data['dateEnd']; - $hourEnd = $data['hourEnd']; - $minEnd = $data['minEnd']; + $dateStart = dol_stringtotime($data['dateStart']); + $dateEnd = dol_stringtotime($data['dateEnd']); $budget = $data['budget']; $taskProgress = $data['taskProgress']; @@ -465,18 +434,14 @@ $task->label = $tasktitle; if (!empty($dateStart)) { - $task->date_start = strtotime(preg_replace('/\//', '-', $dateStart)); - $task->date_start = dol_time_plus_duree($task->date_start, $hourStart, 'h'); - $task->date_start = dol_time_plus_duree($task->date_start, $minStart, 'i'); + $task->date_start = $dateStart; } else { $task->date_start = dol_now('tzuser'); } if (!empty($dateEnd)) { - $task->date_end = strtotime(preg_replace('/\//', '-', $dateEnd)); - $task->date_end = dol_time_plus_duree($task->date_end, $hourEnd, 'h'); - $task->date_end = dol_time_plus_duree($task->date_end, $minEnd, 'i'); + $task->date_end = $dateEnd; } - $task->budget_amount = is_int($budget) ? $budget : ($task->budget ?? 0); + $task->budget_amount = is_numeric($budget) ? $budget : ($task->budget ?? 0); if ($taskProgress == 1) { $task->progress = 100; diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php index 11a22b516..da138fc58 100644 --- a/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php +++ b/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php @@ -459,9 +459,10 @@ $sql .= " FROM " . MAIN_DB_PREFIX . $evaluation->table_element . " as evaluation"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $risk->table_element . " as r on (evaluation.fk_risk = r.rowid)"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $digiriskelement->table_element . " as e on (r.fk_element = e.rowid)"; - if (is_array($extrafields->attributes[$evaluation->table_element]['label']) && count($extrafields->attributes[$evaluation->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $evaluation->table_element . "_extrafields as ef on (evaluation.rowid = ef.fk_object)"; + if (isset($extrafields->attributes[$evaluation->table_element]) && + is_array($extrafields->attributes[$evaluation->table_element]['label']) && count($extrafields->attributes[$evaluation->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $evaluation->table_element . "_extrafields as ef on (evaluation.rowid = ef.fk_object)"; if ($sortfield == 'evaluation.has_tasks') $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'projet_task_extrafields as taskextrafields ON (taskextrafields.fk_risk = r.rowid)'; - if (!empty($conf->categorie->enabled) && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) $sql .= Categorie::getFilterJoinQuery('risk', "r.rowid"); + if (!empty($conf->categorie->enabled) && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) $sql .= Categorie::getFilterJoinQuery('risk', "r.rowid"); if ($evaluation->ismultientitymanaged == 1) $sql .= " WHERE evaluation.entity IN (" . getEntity($evaluation->element) . ")"; else $sql .= " WHERE 1 = 1"; $sql .= " AND evaluation.status = 1"; @@ -593,441 +594,240 @@ } else { $newcardbutton = '
'; } ?> - - global->DIGIRISKDOLIBARR_TASK_MANAGEMENT == 0 && $conf->global->DIGIRISKDOLIBARR_RISK_DESCRIPTION == 0 && $conf->global->DIGIRISKDOLIBARR_MULTIPLE_RISKASSESSMENT_METHOD == 0 ) : ?> -
-
' . $form->editfieldkey('ResponsibleToNotify', 'Responsible_id', '', $object, 0) . ''; - print $form->selectarray('responsible_socid', $userlist, $usertmp->id, $langs->trans('SelectUser'), null, null, null, "40%", 0, 0, '', 'minwidth300', 1); + print img_picto('', 'user', 'class="pictofixedwidth"') . $form->selectarray('responsible_socid', $userlist, $usertmp->id, $langs->trans('SelectUser'), null, null, null, "40%", 0, 0, '', 'minwidth300', 1); print ' '; print '
'; + print '
'; + print img_picto('', 'object_phoning', 'class="pictofixedwidth"'); if ($usertmp->office_phone > 0) { print $usertmp->office_phone; } else { ?> diff --git a/admin/ticket/ticket.php b/admin/ticket/ticket.php index b848e8f2a..708947416 100644 --- a/admin/ticket/ticket.php +++ b/admin/ticket/ticket.php @@ -104,18 +104,22 @@ } if ($action == 'generateExtrafields') { - $ret1 = $extra_fields->addExtraField('digiriskdolibarr_ticket_lastname', $langs->transnoentities("LastName"), 'varchar', 2000, 255, 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0); - $ret2 = $extra_fields->addExtraField('digiriskdolibarr_ticket_firstname', $langs->transnoentities("FirstName"), 'varchar', 2100, 255, 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0); - $ret3 = $extra_fields->addExtraField('digiriskdolibarr_ticket_phone', $langs->transnoentities("Phone"), 'phone', 2200, '', 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0); - $ret4 = $extra_fields->addExtraField('digiriskdolibarr_ticket_service', $langs->transnoentities("Service"), 'sellist', 2300, '255', 'ticket', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:61:"digiriskdolibarr_digiriskelement:ref:rowid::entity = $ENTITY$";N;}}', 1, '', 4, '','',0); - $ret5 = $extra_fields->addExtraField('digiriskdolibarr_ticket_location', $langs->transnoentities("Location"), 'varchar', 2400, 255, 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0); - $ret6 = $extra_fields->addExtraField('digiriskdolibarr_ticket_date', $langs->transnoentities("Date"), 'datetime', 2500, '', 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0); - if ($ret1 > 0 && $ret2 > 0 && $ret3 > 0 && $ret4 > 0 && $ret5 > 0 && $ret6 > 0) { - setEventMessages($langs->transnoentities('ExtrafieldsCreated'), array()); - } else { - setEventMessages($extra_fields->error, array(), 'errors'); - } - dolibarr_set_const($db, 'DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS', 1, 'integer', 0, '', 0); + $commonExtraFieldsValue = [ + 'alwayseditable' => 1, 'list' => 1, 'help' => '', 'entity' => 0, 'langfile' => 'digiriskdolibarr@digiriskdolibarr', 'enabled' => "isModEnabled('digiriskdolibarr') && isModEnabled('ticket')", 'moreparams' => ['css' => 'minwidth100 maxwidth300'] + ]; + + $extraFieldsArrays = [ + 'digiriskdolibarr_ticket_lastname' => ['Label' => 'LastName', 'type' => 'varchar', 'length' => 255, 'elementtype' => ['ticket'], 'position' => 43630210, ], + 'digiriskdolibarr_ticket_firstname' => ['Label' => 'FirstName', 'type' => 'varchar', 'length' => 255, 'elementtype' => ['ticket'], 'position' => 43630220, ], + 'digiriskdolibarr_ticket_phone' => ['Label' => 'Phone', 'type' => 'varchar', 'length' => 255, 'elementtype' => ['ticket'], 'position' => 43630230, ], + 'digiriskdolibarr_ticket_service' => ['Label' => 'GP/UT', 'type' => 'link', 'elementtype' => ['ticket'], 'position' => 43630240, 'params' => ['DigiriskElement:digiriskdolibarr/class/digiriskelement.class.php:1' => NULL], 'list' => 4], + 'digiriskdolibarr_ticket_location' => ['Label' => 'Location', 'type' => 'varchar', 'length' => 255, 'elementtype' => ['ticket'], 'position' => 43630250, ], + 'digiriskdolibarr_ticket_date' => ['Label' => 'DeclarationDate', 'type' => 'datetime', 'elementtype' => ['ticket'], 'position' => 43630260, ] + ]; + + saturne_manage_extrafields($extraFieldsArrays, $commonExtraFieldsValue); + setEventMessages($langs->transnoentities('ExtrafieldsCreated'), []); + dolibarr_set_const($db, 'DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS', 1, 'integer', 0, '', 0); } if ($action == 'generateCategories') { @@ -370,6 +374,28 @@ print '
'; + print $langs->transnoentities('PublicInterfaceUseSignatoryDescription'); + print ''; + print ajax_constantonoff('DIGIRISKDOLIBARR_TICKET_PUBLIC_INTERFACE_USE_SIGNATORY'); + print ''; + print $form->textwithpicto('', $langs->transnoentities('TicketPublicInterfaceUseSignatoryDescription')); + print '
'; + print $langs->transnoentities('TicketPublicInterfaceShowCategoryDescription'); + print ''; + print ajax_constantonoff('DIGIRISKDOLIBARR_TICKET_PUBLIC_INTERFACE_SHOW_CATEGORY_DESCRIPTION'); + print ''; + print $form->textwithpicto('', $langs->transnoentities('TicketPublicInterfaceShowCategoryDescriptionHelp')); + print '
' . $langs->transnoentities("ShowSelectorOnTicketPublicInterface") . '
' . $langs->transnoentities("TicketDigiriskElementVisible") . '
' . $langs->transnoentities("TicketDigiriskelementVisible") . ''; print ajax_constantonoff('DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_VISIBLE'); print ''; - print $form->textwithpicto('', $langs->transnoentities("TicketDigiriskElementVisibleHelp")); + print $form->textwithpicto('', $langs->transnoentities("TicketDigiriskelementVisibleHelp")); print '
' . $langs->transnoentities("TicketFirstNameVisible") . '
' . $langs->transnoentities("TicketFirstnameVisible") . ''; print ajax_constantonoff('DIGIRISKDOLIBARR_TICKET_FIRSTNAME_VISIBLE'); print ''; - print $form->textwithpicto('', $langs->transnoentities("TicketFirstNameVisibleHelp")); + print $form->textwithpicto('', $langs->transnoentities("TicketFirstnameVisibleHelp")); print '
' . $langs->transnoentities("TicketLastNameVisible") . '
' . $langs->transnoentities("TicketLastnameVisible") . ''; print ajax_constantonoff('DIGIRISKDOLIBARR_TICKET_LASTNAME_VISIBLE'); print ''; - print $form->textwithpicto('', $langs->transnoentities("TicketLastNameVisibleHelp")); + print $form->textwithpicto('', $langs->transnoentities("TicketLastnameVisibleHelp")); print '
' . $picto . $langs->trans('Signature') . ''; + $out .= '
'; + $out .= ' '; + $out .= ''; + $out .= '
- - - - - -
- - - -
- - + +
+ + +
+
+ +
+ +
+
- 		- digiriskdolibarr->multidir_output[$conf->entity] . '/riskassessment/tmp/RA0', 'small', 0, 0, 0, 0, $onPhone ? 40 : 50, $onPhone ? 40 : 50, 1, 0, 0, '/riskassessment/tmp/RA0'); - ?> -
+ + + - - - - -
- -
- trans('AddRiskButton'); ?> -
- -
- trans('AddRiskButton'); ?> -
- -
- - - - -
- - -
- -
- trans('AddRiskButton'); ?> -
- -
- trans('AddRiskButton'); ?> -
- -
-
- - - + global->DIGIRISKDOLIBARR_TASK_MANAGEMENT) : ?> +
+
+ trans('Task'); ?> + trans('Label'); ?> +
+
+ trans('DateStart'); ?> + '; ?> +
+
+ trans('Deadline'); ?> + '; ?> +
+
+ trans('Budget'); ?> + +
+ + + +
+ +
+ trans('AddRiskButton'); ?> +
+ +
+ trans('AddRiskButton'); ?> +
+ +
+ + + trans('DigiriskElement' . ucfirst($riskType) . 'sList'); print '
'; -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $risk->picto, 0, $newcardbutton, '', $limit, 0, 0, 1); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $risk->picto, 0, $newcardbutton ?? '', '', $limit, 0, 0, 1); $corruptedRisks = saturne_fetch_all_object_type('Risk', '', '', 0, 0, ['customsql' => 't.category NOT BETWEEN 0 AND ' . count($dangerCategories) . ' AND t.type = "' . $riskType . '"']); @@ -1066,26 +866,6 @@ class="risk-evaluation-cotation cotation">
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; -$menuConf = 'MAIN_SELECTEDFIELDS_' . $varpage; - -if (dol_strlen($user->conf->$menuConf) < 1 || preg_match('/t./', $user->conf->$menuConf)) { - $user->conf->$menuConf = ($contextpage == 'risklist' ? 'r.fk_element,' : '') . 'r.ref,r.category,evaluation.cotation,'; -} - -if ( ! preg_match('/r.description/', $user->conf->$menuConf) && $conf->global->DIGIRISKDOLIBARR_RISK_DESCRIPTION) { - $user->conf->$menuConf = $user->conf->$menuConf . 'r.description,'; -} elseif ( ! $conf->global->DIGIRISKDOLIBARR_RISK_DESCRIPTION) { - $user->conf->$menuConf = preg_replace('/r.description,/', '', $user->conf->$menuConf); - $arrayfields['r.description']['enabled'] = 0; -} - -if ( ! preg_match('/evaluation.has_tasks/', $user->conf->$menuConf) && $conf->global->DIGIRISKDOLIBARR_TASK_MANAGEMENT) { - $user->conf->$menuConf .= $user->conf->$menuConf . 'evaluation.has_tasks,'; -} elseif ( ! $conf->global->DIGIRISKDOLIBARR_TASK_MANAGEMENT) { - $user->conf->$menuConf = preg_replace('/evaluation.has_tasks,/', '', $user->conf->$menuConf); - $arrayfields['evaluation.has_tasks']['enabled'] = 0; -} - $selectedfields = $form->multiSelectArrayWithCheckbox('risklist_selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); @@ -1102,15 +882,15 @@ class="risk-evaluation-cotation cotation"> if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '') . 'center'; if ( ! empty($arrayfields['r.' . $key]['checked'])) { print ''; - if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_' . $key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); + if (isset($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_' . $key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); elseif (strpos($val['type'], 'integer:') === 0) { print $risk->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1); } elseif ($key == 'fk_element') { - print $digiriskelement->selectDigiriskElementList($search['fk_element'], 'search_fk_element', ['customsql' => 'rowid NOT IN (' . implode(',', $deletedElements) . ')'], 1, 0, [], 0, 0, 'minwidth100 maxwidth300', 0, false, 1); + print $digiriskelement->selectDigiriskElementList($search['fk_element'] ?? '', 'search_fk_element', ['customsql' => 'rowid NOT IN (' . implode(',', $deletedElements) . ')'], 1, 0, [], 0, 0, 'minwidth100 maxwidth300', 0, false, 1); } elseif ($key == 'category') { ?>
- - + +
@@ -1131,7 +911,7 @@ class="risk-evaluation-cotation cotation">
endif; ?>
- '; + '; print ''; } } @@ -1195,7 +975,7 @@ class="risk-evaluation-cotation cotation"> // contenu $i = 0; -$totalarray = array(); +$totalarray = array('nbfield' => 0); while ($i < ($limit ? min($num, $limit) : $num)) { $obj = $db->fetch_object($resql); diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php index e7925f20f..db5b01e3b 100644 --- a/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php +++ b/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php @@ -120,6 +120,7 @@ } $sql .= " AND el.sourcetype = 'digiriskdolibarr_risk'"; $sql .= ' AND r.type = "' . $riskType . '"'; + $sql .= ' AND e.rowid IN (' . implode(',', array_keys($alldigiriskelement)) . ')'; foreach ($search as $key => $val) { if ($key == 'status' && $search[$key] == -1) continue; @@ -211,7 +212,8 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $risk->table_element . " as r on (evaluation.fk_risk = r.rowid)"; $sql .= " INNER JOIN " . MAIN_DB_PREFIX . 'element_element' . " as el on (r.rowid = el.fk_source)"; $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $digiriskelement->table_element . " as e on (r.fk_element = e.rowid)"; - if (is_array($extrafields->attributes[$evaluation->table_element]['label']) && count($extrafields->attributes[$evaluation->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $evaluation->table_element . "_extrafields as ef on (evaluation.rowid = ef.fk_object)"; + if (isset($extrafields->attributes[$evaluation->table_element]) && + is_array($extrafields->attributes[$evaluation->table_element]['label']) && count($extrafields->attributes[$evaluation->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $evaluation->table_element . "_extrafields as ef on (evaluation.rowid = ef.fk_object)"; //if ($evaluation->ismultientitymanaged == 1) $sql .= " WHERE evaluation.entity IN (" . getEntity($evaluation->element) . ")"; else $sql .= " WHERE 1 = 1"; $sql .= " AND evaluation.status = 1"; @@ -234,6 +236,7 @@ } $sql .= " AND el.sourcetype = 'digiriskdolibarr_risk'"; $sql .= ' AND r.type = "' . $riskType . '"'; + $sql .= ' AND e.rowid IN (' . implode(',', array_keys($alldigiriskelement)) . ')'; foreach ($search as $key => $val) { if ($key == 'status' && $search[$key] == -1) continue; @@ -368,26 +371,6 @@ $arrayfields = dol_sort_array($arrayfields, 'position'); -$menuConf = 'MAIN_SELECTEDFIELDS_' . $varpage; - -if (dol_strlen($user->conf->$menuConf) < 1 || preg_match('/t./', $user->conf->$menuConf)) { - $user->conf->$menuConf = 'r.entity,r.fk_element,r.applied_on,r.ref,r.category,evaluation.cotation,'; -} - -if ( ! preg_match('/r.description/', $user->conf->$menuConf) && $conf->global->DIGIRISKDOLIBARR_RISK_DESCRIPTION) { - $user->conf->$menuConf = $user->conf->$menuConf . 'r.description,'; -} elseif ( ! $conf->global->DIGIRISKDOLIBARR_RISK_DESCRIPTION) { - $user->conf->$menuConf = preg_replace('/r.description,/', '', $user->conf->$menuConf); - $arrayfields['r.description']['enabled'] = 0; -} - -if ( ! preg_match('/evaluation.has_tasks/', $user->conf->$menuConf) && $conf->global->DIGIRISKDOLIBARR_TASK_MANAGEMENT) { - $user->conf->$menuConf .= $user->conf->$menuConf . 'evaluation.has_tasks,'; -} elseif ( ! $conf->global->DIGIRISKDOLIBARR_TASK_MANAGEMENT) { - $user->conf->$menuConf = preg_replace('/evaluation.has_tasks,/', '', $user->conf->$menuConf); - $arrayfields['evaluation.has_tasks']['enabled'] = 0; -} - $selectedfields = $form->multiSelectArrayWithCheckbox('shared_risklist_selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); @@ -408,19 +391,19 @@ if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '') . 'center'; if ( ! empty($arrayfields['r.' . $key]['checked'])) { print ''; - if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_' . $key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); - elseif (strpos($val['type'], 'integer:') === 0) { + if (isset($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_' . $key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); + elseif (strpos($val['type'] ?? '', 'integer:') === 0) { print $risk->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1); } elseif ($key == 'entity') { - print select_entity_list($search['entity'], 'search_entity', 'e.rowid NOT IN (' . $conf->entity . ')'); + print select_entity_list($search['entity'] ?? '', 'search_entity', 'e.rowid NOT IN (' . $conf->entity . ')'); } elseif ($key == 'fk_element') { - print $digiriskelement->selectDigiriskElementList($search['fk_element'], 'search_fk_element_sharedrisk', ['customsql' => 'entity NOT IN (' . $conf->entity . ') AND rowid NOT IN (' . implode(',', $deletedElements) . ')'], 1, 0, array(), 0, 0, 'minwidth100 maxwidth300', 0, false, 1, $contextpage, false); + print $digiriskelement->selectDigiriskElementList($search['fk_element'] ?? '', 'search_fk_element_sharedrisk', ['customsql' => 'entity NOT IN (' . $conf->entity . ') AND rowid NOT IN (' . implode(',', $deletedElements) . ')'], 1, 0, array(), 0, 0, 'minwidth100 maxwidth300', 0, false, 1, $contextpage, false); } elseif ($key == 'applied_on') { // print $digiriskelement->select_digiriskelement_list($search['search_applied_on_sharedrisk'], 'search_applied_on_sharedrisk', '', 1, 0, array(), 0, 0, 'minwidth100', 0, false, 1, $contextpage); } elseif ($key == 'category') { ?>
- - + +
@@ -442,7 +425,7 @@ endif; ?>
- '; + '; print ''; } } @@ -479,7 +462,7 @@ $cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']); if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '') . 'center'; if ( ! empty($arrayfields['r.' . $key]['checked'])) { - print getTitleFieldOfList($arrayfields['r.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 'r.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), $arrayfields['r.' . $key]['disablesort']) . "\n"; + print getTitleFieldOfList($arrayfields['r.' . $key]['label'] ?? '', 0, $_SERVER['PHP_SELF'], 'r.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), $arrayfields['r.' . $key]['disablesort'] ?? '') . "\n"; } } @@ -507,7 +490,7 @@ // contenu $i = 0; -$totalarray = array(); +$totalarray = ['nbfield' => 0]; unset($risk->fields['applied_on']); while ($i < ($limit ? min($num, $limit) : $num)) { diff --git a/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php b/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php index c0efb7a22..b89ff2593 100644 --- a/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php +++ b/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php @@ -213,28 +213,6 @@
-
-
-
-
-
- trans('NoRiskAssessment'); ?> -
-
- - -
- -
- -
- -
- - -
-
-
method = $lastRiskAssessment->method ?: "standard" ; ?> @@ -335,10 +313,10 @@ class="risk-evaluation-cotation cotation">
-
@@ -379,7 +357,7 @@ class="risk-evaluation-cotation cotation">
- +
diff --git a/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_edit_modal.tpl.php b/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_edit_modal.tpl.php index 41b7740c9..97aa5d2ed 100644 --- a/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_edit_modal.tpl.php +++ b/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_edit_modal.tpl.php @@ -149,7 +149,7 @@ class="risk-evaluation-cotation cotationcotation ==
- +
diff --git a/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_single_view.tpl.php b/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_single_view.tpl.php index cf39dbf04..3d0a3a350 100644 --- a/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_single_view.tpl.php +++ b/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_single_view.tpl.php @@ -13,7 +13,7 @@ global->DIGIRISKDOLIBARR_SHOW_TASK_START_DATE && ( ! empty($related_task->dateo))) ? $related_task->dateo : $related_task->datec)) . (($conf->global->DIGIRISKDOLIBARR_SHOW_TASK_END_DATE && ( ! empty($related_task->datee))) ? ' - ' . date('d/m/Y', $related_task->datee) : ''); ?> - id]; + id] ?? []; $allTimeSpent = 0; if (is_array($allTimeSpentArray) && !empty($allTimeSpentArray)) { foreach ($allTimeSpentArray as $timespent) { diff --git a/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_view.tpl.php b/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_view.tpl.php index 7116e3c32..3825e74ad 100644 --- a/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_view.tpl.php +++ b/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_view.tpl.php @@ -1,6 +1,6 @@ id]; -if (!empty($related_tasks) && $related_tasks > 0) { +$related_tasks = $riskAssessmentTaskList[$risk->id] ?? []; +if (!empty($related_tasks) && is_array($related_tasks)) { foreach ($related_tasks as $related_task_id => $related_task) { if (!is_object($related_task)) { unset($related_tasks[$related_task_id]); @@ -82,18 +82,6 @@
0 ? $langs->trans('NoTaskLinked') : $langs->trans('NoTaskShared'); ?> - - -
- - -
- -
- -
- -
@@ -121,18 +109,6 @@
0 ? $langs->trans('NoTaskLinked') : $langs->trans('NoTaskShared'); ?> - - -
- - -
- -
- -
- -
@@ -148,18 +124,6 @@
trans('NoTaskLinked'); ?> - - -
- - -
- -
- -
- -
@@ -194,11 +158,11 @@
trans('DateStart'); ?> - selectDate(dol_now('tzuser'), 'RiskassessmentTaskDateStart' . $risk->id, 1, 1, 0, '', 1, 1); ?> + id . '" name="RiskassessmentTaskDateStart' . $risk->id . '">'; ?>
trans('Deadline'); ?> - selectDate(-1,'RiskassessmentTaskDateEnd'. $risk->id, 1, 1, 0, '', 1, 1); ?> + id . '" name="RiskassessmentTaskDateEnd' . $risk->id . '">'; ?>
trans('Budget'); ?> @@ -323,9 +287,19 @@ - 0) : ?> - - id]; ?> + 0) : + foreach ($related_tasks as $related_task) : + if ($conf->global->DIGIRISKDOLIBARR_SHOW_TASK_CALCULATED_PROGRESS) { + $tmparray = $related_task->getSummaryOfTimeSpent(); + if ($tmparray['total_duration'] > 0 && !empty($related_task->planned_workload)) { + $task_progress = round($tmparray['total_duration'] / $related_task->planned_workload * 100, 2); + } else { + $task_progress = 0; + } + } else { + $task_progress = $related_task->progress; + } + $allTimeSpentArray = $timeSpentSortedByTasks[$related_task->id] ?? []; ?>
@@ -372,11 +346,11 @@
trans('DateStart'); ?> - selectDate($related_task->dateo ?: -1, 'RiskassessmentTaskDateStartEdit'.$related_task->id, 1, 1, 0, '', 1, 1); ?> + id . '" name="RiskassessmentTaskDateStartEdit' . $related_task->id . '" value="' . ($related_task->dateo ? dol_print_date($related_task->dateo, '%Y-%m-%dT%H:%M:%S') : '') . '">'; ?>
trans('Deadline'); ?> - selectDate($related_task->datee ?: -1,'RiskassessmentTaskDateEndEdit'.$related_task->id, 1, 1, 0, '', 1, 1); ?> + id . '" name="RiskassessmentTaskDateEndEdit' . $related_task->id . '" value="' . ($related_task->datee ? dol_print_date($related_task->datee, '%Y-%m-%dT%H:%M:%S') : '') . '">'; ?>
trans('Budget'); ?> diff --git a/core/triggers/interface_99_modDigiriskdolibarr_DigiriskdolibarrTriggers.class.php b/core/triggers/interface_99_modDigiriskdolibarr_DigiriskdolibarrTriggers.class.php index 12354a59e..d439ec759 100644 --- a/core/triggers/interface_99_modDigiriskdolibarr_DigiriskdolibarrTriggers.class.php +++ b/core/triggers/interface_99_modDigiriskdolibarr_DigiriskdolibarrTriggers.class.php @@ -72,7 +72,7 @@ public function __construct($db) $this->name = preg_replace('/^Interface/i', '', get_class($this)); $this->family = "demo"; $this->description = "Digiriskdolibarr triggers."; - $this->version = '10.2.1'; + $this->version = '20.0.0'; $this->picto = 'digiriskdolibarr@digiriskdolibarr'; } @@ -116,7 +116,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf // Allowed triggers are a list of trigger from other module that should activate this file if (!isModEnabled('digiriskdolibarr') || !$active) { - $allowedTriggers = ['COMPANY_DELETE', 'CONTACT_DELETE', 'TICKET_CREATE']; + $allowedTriggers = ['COMPANY_DELETE', 'CONTACT_DELETE', 'TICKET_CREATE', 'TICKET_PUBLIC_INTERFACE_CREATE']; if (!in_array($action, $allowedTriggers)) { return 0; // If module is not enabled or trigger is deactivated, we do nothing } @@ -440,6 +440,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf $langs->load('mails'); $listOfMails = $conf->global->DIGIRISKDOLIBARR_TICKET_SUBMITTED_SEND_MAIL_TO; + if ( ! preg_match('/;/', $listOfMails)) { $sendto = $listOfMails; @@ -544,6 +545,67 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf } break; + case 'TICKET_PUBLIC_INTERFACE_CREATE' : + $categories = $object->getCategoriesCommon('ticket'); + if (is_array($categories) && !empty($categories)) { + $category = new Categorie($this->db); + foreach ($categories as $categoryID) { + $category->fetch($categoryID); + $categoryConfigs = json_decode($category->array_options['options_ticket_category_config']); + if ($categoryConfigs->mail_template && $categoryConfigs->recipients) { + $modelMail = new ModelMail($this->db); + $modelMail->fetch($categoryConfigs->mail_template); + $recipients = explode(',', $categoryConfigs->recipients); + foreach ($recipients as $recipientID) { + $userTmp = new User($this->db); + $userTmp->fetch($recipientID); + $sendto = $userTmp->email; + if (dol_strlen($sendto) && (!empty($conf->global->MAIN_MAIL_EMAIL_FROM))) { + require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php'; + + $from = $conf->global->MAIN_MAIL_EMAIL_FROM; + $trackid = 'tic' . $object->id; + + // Create form object + // Send mail (substitutionarray must be done just before this) + $mailfile = new CMailFile($modelMail->topic, $sendto, $from, $modelMail->content, array(), array(), array(), "", "", 0, -1, '', '', $trackid, '', 'ticket'); + if ($mailfile->error) { + setEventMessages($mailfile->error, $mailfile->errors, 'errors'); + } else { + if (1) { + $result = $mailfile->sendfile(); + if ( ! $result) { + $langs->load("other"); + $mesg = '
'; + if ($mailfile->error) { + $mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto)); + $mesg .= '
' . $mailfile->error; + } else { + $mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto)); + } + $mesg .= '
'; + setEventMessages($mesg, null, 'warnings'); + } else { + $actioncomm->elementtype = 'ticket'; + $actioncomm->label = $langs->transnoentities('TicketCreationMailWellSent'); + $actioncomm->note_private = $langs->transnoentities('TicketCreationMailSent', $sendto) . '
'; + $actioncomm->note_private .= $modelMail->topic . '
'; + $actioncomm->note_private .= $modelMail->content; + $result = $actioncomm->create($user); + } + } + } + } else { + $langs->load("errors"); + setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("MailTo")), null, 'warnings'); + dol_syslog('Try to send email with no recipient defined', LOG_WARNING); + } + } + } + } + } + break; + case 'RISKSIGN_CREATE' : case 'RISK_CREATE' : $actioncomm->elementtype = 'digiriskelement@digiriskdolibarr'; diff --git a/css/digiriskdolibarr.min.css b/css/digiriskdolibarr.min.css index 8c3303203..03d9951f8 100644 --- a/css/digiriskdolibarr.min.css +++ b/css/digiriskdolibarr.min.css @@ -1 +1 @@ -.risk-evaluation-cotation{width:50px;min-width:50px;height:50px;line-height:50px;text-align:center;border-radius:6px;background:#ececec;color:rgba(0,0,0,.8);font-size:16px;font-weight:600;margin-right:.5em}.risk-evaluation-cotation[data-scale="1"]{background:#ececec}.risk-evaluation-cotation[data-scale="2"]{background:#e9ad4f;color:#fff}.risk-evaluation-cotation[data-scale="3"]{background:#e05353;color:#fff}.risk-evaluation-cotation[data-scale="4"]{background:#2b2b2b;color:#fff}.risk-evaluation-cotation.selected-cotation{box-shadow:0 0 0 2px #0d8aff}.can-select,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .risk-evaluation-cotation{transition:all .2s ease-out}.can-select:hover,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .risk-evaluation-cotation:hover{cursor:pointer;opacity:.8}.wpeo-modal .title{display:block;font-weight:600;font-size:13px;margin-bottom:.6em;color:rgba(0,0,0,.8)}.wpeo-modal input[type=text],.wpeo-modal input[type=email],.wpeo-modal input[type=url],.wpeo-modal input[type=password],.wpeo-modal input[type=search],.wpeo-modal input[type=number],.wpeo-modal input[type=tel],.wpeo-modal input[type=range],.wpeo-modal input[type=date],.wpeo-modal input[type=month],.wpeo-modal input[type=week],.wpeo-modal input[type=time],.wpeo-modal input[type=datetime],.wpeo-modal input[type=datetime-local],.wpeo-modal input[type=color],.wpeo-modal select,.wpeo-modal textarea{width:100%;border:1px solid rgba(0,0,0,.2);padding:1em;box-sizing:border-box}.wpeo-modal input[type=text]:focus,.wpeo-modal input[type=email]:focus,.wpeo-modal input[type=url]:focus,.wpeo-modal input[type=password]:focus,.wpeo-modal input[type=search]:focus,.wpeo-modal input[type=number]:focus,.wpeo-modal input[type=tel]:focus,.wpeo-modal input[type=range]:focus,.wpeo-modal input[type=date]:focus,.wpeo-modal input[type=month]:focus,.wpeo-modal input[type=week]:focus,.wpeo-modal input[type=time]:focus,.wpeo-modal input[type=datetime]:focus,.wpeo-modal input[type=datetime-local]:focus,.wpeo-modal input[type=color]:focus,.wpeo-modal select:focus,.wpeo-modal textarea:focus{border:1px solid rgba(0,0,0,.6)}.wpeo-modal select{padding:1em 0}.form-label-required::after{display:inline-block;content:"*";color:#e05353;font-size:22px;line-height:0;position:relative;top:4px;left:4px}.digirisk-page-container{max-width:1000px;background:#fff;box-shadow:0 0 40px 0 rgba(0,0,0,.1);margin:1.5em auto 0 auto;padding:2em;box-sizing:border-box}.digirisk-page-container *{box-sizing:border-box}.card{box-shadow:0 4px 8px 0 rgba(0,0,0,.2);transition:.3s}.card:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,.2)}.card-container{display:flex;padding:2px 16px;justify-content:center}.page-ut-gp-list{margin-left:-40px;box-sizing:border-box;display:block !important;width:100%}.page-ut-gp-list *{box-sizing:border-box}.page-ut-gp-list .fiche{margin-right:0 !important}.page-ut-gp-list #id-right{padding-left:300px;width:calc(100% + 40px);display:block}.page-ut-gp-list .side-nav{position:absolute;height:100%;top:0;padding-top:50px;box-sizing:border-box;box-shadow:none}.page-ut-gp-list .side-nav .side-nav-responsive{display:none}.page-ut-gp-list .side-nav #id-left{width:300px;padding-top:0}.page-ut-gp-list .side-nav .digirisk-wrap{padding:0 !important}.page-ut-gp-list .side-nav .navigation-container{max-height:1000px;overflow-y:auto;height:90vh}.page-ut-gp-list .side-nav .add-container{position:absolute;right:0;bottom:5px;opacity:0;pointer-events:none;transition:all .2s ease-out}.page-ut-gp-list .side-nav #id-left.active .add-container{opacity:1}.page-ut-gp-list .side-nav .society-header{padding-top:27px;position:relative;padding-left:10px;padding-right:10px}.page-ut-gp-list .side-nav .society-header .title{font-weight:700}.page-ut-gp-list .side-nav .society-header .linkElement{line-height:1;border-bottom:1px solid rgba(0,0,0,.2);padding-bottom:10px;display:flex;width:100%}.page-ut-gp-list .side-nav .society-header:hover .add-container{opacity:1;pointer-events:all}.page-ut-gp-list .side-nav .toolbar{padding-left:10px;padding-right:10px}.page-ut-gp-list .side-nav .toolbar .toggle-plus,.page-ut-gp-list .side-nav .toolbar .toggle-minus{display:inline-block;padding:3px;transition:all .2s ease-out;color:rgba(0,0,0,.6)}.page-ut-gp-list .side-nav .toolbar .toggle-plus:hover,.page-ut-gp-list .side-nav .toolbar .toggle-minus:hover{cursor:pointer;opacity:.6}.page-ut-gp-list .side-nav .workunit-list{padding-left:0}.page-ut-gp-list .side-nav .workunit-list ul,.page-ut-gp-list .side-nav .workunit-list li{list-style-type:none;margin:0}.page-ut-gp-list .side-nav .workunit-list>.unit:first-child>.unit-container:first-child>.title{border-top:1px solid rgba(0,0,0,.1)}.page-ut-gp-list .side-nav .workunit-list .unit-container{display:flex;position:relative}.page-ut-gp-list .side-nav .workunit-list .unit-container:hover .add-container{opacity:1;pointer-events:all}.page-ut-gp-list .side-nav .workunit-list .unit-container .toggle-unit{color:rgba(0,0,0,.6);line-height:40px;font-size:18px;min-width:30px;width:30px;text-align:center;transition:all .2s ease-out}.page-ut-gp-list .side-nav .workunit-list .unit-container .toggle-unit:hover{cursor:pointer}.page-ut-gp-list .side-nav .workunit-list .unit-container .toggle-unit .toggle-icon{line-height:40px}.page-ut-gp-list .side-nav .workunit-list .unit-container .spacer{position:relative;min-width:30px;width:30px}.page-ut-gp-list .side-nav .workunit-list .unit-container .spacer::before{display:block;position:absolute;content:"";height:1px;left:0;right:10px;top:20px;background:rgba(0,0,0,.3)}.page-ut-gp-list .side-nav .workunit-list .unit-container .photodigiriskdolibarr{display:block;width:40px;min-width:40px;height:40px;position:relative;background:#fff;text-align:center;transition:all .2s ease-out}.page-ut-gp-list .side-nav .workunit-list .unit-container .divphotoref{max-width:50px;position:relative}.page-ut-gp-list .side-nav .workunit-list .unit-container .divphotoref .photo{object-fit:cover;margin:0}.page-ut-gp-list .side-nav .workunit-list .unit-container .title{width:100%;padding-left:1em;display:flex;border-bottom:1px solid rgba(0,0,0,.1)}.page-ut-gp-list .side-nav .workunit-list .unit-container .title .linkElement{width:100%;padding-top:.5em;text-decoration:none}.page-ut-gp-list .side-nav .workunit-list .unit-container .title .linkElement:hover .name{color:#0d8aff}.page-ut-gp-list .side-nav .workunit-list .unit-container .title .title-container{margin:auto 0}.page-ut-gp-list .side-nav .workunit-list .unit-container .title .ref{font-size:10px;color:#fff;text-transform:uppercase;font-weight:600;display:inline-block;background:#263c5c;padding:.2em .4em}.page-ut-gp-list .side-nav .workunit-list .unit-container .title .name{font-size:14px;color:#000;display:block;transition:all .2s ease-out}.page-ut-gp-list .side-nav .workunit-list .unit>.sub-list{padding:0 0 0 7px;display:none}.page-ut-gp-list .side-nav .workunit-list .unit>.sub-list>.unit:last-child::before{height:24px}.page-ut-gp-list .side-nav .workunit-list .unit>.sub-list .toggle-unit{position:relative}.page-ut-gp-list .side-nav .workunit-list .unit>.sub-list .toggle-unit::before{right:20px;display:block;position:absolute;content:"";height:1px;left:0;top:20px;background:rgba(0,0,0,.3)}.page-ut-gp-list .side-nav .workunit-list .unit>.sub-list .unit{position:relative;margin-left:.6em}.page-ut-gp-list .side-nav .workunit-list .unit>.sub-list .unit::before{display:block;position:absolute;content:"";width:1px;height:100%;left:0;top:0;background:rgba(0,0,0,.3)}.page-ut-gp-list .side-nav .workunit-list .unit.active>.unit-container .title{background:rgba(0,0,0,.1)}.page-ut-gp-list .side-nav .workunit-list .unit.active>.unit-container .title .name{font-weight:600}.page-ut-gp-list .side-nav .workunit-list .unit.type-workunit .unit-container .ref{background:#0d8aff}.page-ut-gp-list .side-nav .workunit-list .unit.toggled>.sub-list{display:block}.digirisk-signature-container{max-width:800px;background:#fff;box-shadow:0 0 40px 0 rgba(0,0,0,.1);margin:1.5em auto 0 auto;padding:2em;box-sizing:border-box}.digirisk-signature-container *{box-sizing:border-box}.digirisk-signature-container .signature .signature-element .wpeo-button.modal-signature-open{display:none}.digirisk-signature-container .signature .signature-element img{width:100%;height:auto;border:1px solid rgba(0,0,0,.4) !important}.ticketpublicarea .ticket-parentCategory{width:100%;height:100%}.ticketpublicarea .ticket-parentCategory .wpeo-button{width:100%;height:100%;padding:12px 14px}.ticketpublicarea .ticket-parentCategory .wpeo-button:hover{box-shadow:inset 0 -4.6em rgba(255,255,255,.25)}.ticketpublicarea .ticket-parentCategory .wpeo-button.button-yellow{border-color:#e88740;background:#e88740}.ticketpublicarea .ticket-parentCategory .wpeo-button.button-blue{border-color:#009cc2;background:#009cc2}.ticketpublicarea .ticket-parentCategory .wpeo-button.button-red{border-color:#c44b2a;background:#c44b2a}.ticketpublicarea .ticket-parentCategory.active .wpeo-button{border-color:#000 !important}.ticketpublicarea .ticket-subCategory{border:1px solid rgba(0,0,0,.2);padding:1em;text-align:center;width:100%;transition:all .2s ease-out}.ticketpublicarea .ticket-subCategory:hover{cursor:pointer;background:rgba(0,0,0,.1)}.ticketpublicarea .ticket-subCategory.active{box-shadow:inset 0 0 0px 3px #0d8aff}.ticketpublicarea .ticket-subCategory .button-label{display:block;margin-top:.5em}.ticketpublicarea .form-registre .wpeo-button{display:flex;justify-content:center}.ticketpublicarea .form-registre .wpeo-button>*{margin-top:auto;margin-bottom:auto}.ticketpublicarea .form-registre .wpeo-button .button-label{margin-left:.5em}.ticketpublicarea .tableforinputfields{margin-top:1em}.ticketpublicarea .tableforinputfields input{display:block;clear:both;width:100%;max-width:none;margin-bottom:1em}@media(max-width: 480px){.ticketpublicarea .tableforinputfields .inline-block{display:block}}.ticketpublicarea .tableforinputfields .inline-block input{display:inline-block}.ticketpublicarea .tableforinputfields .inline-block #options_digiriskdolibarr_ticket_date{max-width:80px}.page-ut-gp-list .organization{position:absolute;height:100%;top:0;padding-top:50px;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-box-shadow:none;box-shadow:none}.page-ut-gp-list .organization .side-nav-responsive{display:none}.page-ut-gp-list .organization #id-left{width:300px;padding-top:0}.page-ut-gp-list .organization .digirisk-wrap{padding:0 !important}.page-ut-gp-list .organization .navigation-container{max-height:1000px;overflow-y:auto}.page-ut-gp-list .organization .add-container{position:absolute;right:0;bottom:5px;opacity:0;pointer-events:none;-webkit-transition:all .2s ease-out;transition:all .2s ease-out}.page-ut-gp-list .organization .society-header{padding-top:27px;position:relative;padding-left:10px;padding-right:10px}.page-ut-gp-list .organization .society-header .title{font-weight:700}.page-ut-gp-list .organization .society-header .linkElement{line-height:1;border-bottom:1px solid rgba(0,0,0,.2);padding-bottom:10px;display:-webkit-box;display:-ms-flexbox;display:flex;width:100%}.page-ut-gp-list .organization .society-header:hover .add-container{opacity:1;pointer-events:all}.page-ut-gp-list .organization .toolbar{padding-left:10px;padding-right:10px}.page-ut-gp-list .organization .toolbar .toggle-plus,.page-ut-gp-list .organization .toolbar .toggle-minus{display:inline-block;padding:3px;-webkit-transition:all .2s ease-out;transition:all .2s ease-out;color:rgba(0,0,0,.6)}.page-ut-gp-list .organization .toolbar .toggle-plus:hover,.page-ut-gp-list .organization .toolbar .toggle-minus:hover{cursor:pointer;opacity:.6}.page-ut-gp-list .organization .workunit-list{padding-left:0}.page-ut-gp-list .organization .workunit-list ul,.page-ut-gp-list .organization .workunit-list li{list-style-type:none;margin:0}.page-ut-gp-list .organization .workunit-list .unit-container{display:-webkit-box;display:-ms-flexbox;display:flex;position:relative}.page-ut-gp-list .organization .workunit-list .unit-container:hover .add-container{opacity:1;pointer-events:all}.page-ut-gp-list .organization .workunit-list .unit-container .toggle-unit{color:rgba(0,0,0,.6);line-height:40px;font-size:18px;min-width:30px;width:30px;text-align:center;-webkit-transition:all .2s ease-out;transition:all .2s ease-out}.page-ut-gp-list .organization .workunit-list .unit-container .toggle-unit:hover{cursor:pointer}.page-ut-gp-list .organization .workunit-list .unit-container .toggle-unit .toggle-icon{line-height:40px}.page-ut-gp-list .organization .workunit-list .unit-container .spacer{position:relative;min-width:30px;width:30px}.page-ut-gp-list .organization .workunit-list .unit-container .spacer::before{display:block;position:absolute;content:"";height:1px;left:0;right:10px;top:20px;background:rgba(0,0,0,.3)}.page-ut-gp-list .organization .workunit-list .unit-container .photodigiriskdolibarr{display:block;width:40px;min-width:40px;height:40px;position:relative;background:#fff;text-align:center;-webkit-transition:all .2s ease-out;transition:all .2s ease-out}.page-ut-gp-list .organization .workunit-list .unit-container .title{width:100%;padding-left:1em;display:-webkit-box;display:-ms-flexbox;display:flex}.page-ut-gp-list .organization .workunit-list .unit-container .title .title-container{margin:auto 0}.page-ut-gp-list .organization .workunit-list .unit-container .title .ref{font-size:10px;color:#fff;text-transform:uppercase;font-weight:600;display:inline-block;background:#263c5c;padding:.2em .4em}.page-ut-gp-list .organization .workunit-list .unit-container .title .name{font-size:14px;color:#000;display:block}.page-ut-gp-list .organization .workunit-list .unit>.unit-container{padding:4px 0 0 0;border:solid}.page-ut-gp-list .organization .workunit-list .unit>.sub-list{padding:0 0 0 7px;display:none}.page-ut-gp-list .organization .workunit-list .unit>.sub-list>.unit:last-child::before{height:24px}.page-ut-gp-list .organization .workunit-list .unit>.sub-list .toggle-unit{position:relative}.page-ut-gp-list .organization .workunit-list .unit>.sub-list .toggle-unit::before{right:20px;display:block;position:absolute;content:"";height:1px;left:0;top:20px;background:rgba(0,0,0,.3)}.page-ut-gp-list .organization .workunit-list .unit>.sub-list .unit{position:relative;margin-left:.6em}.page-ut-gp-list .organization .workunit-list .unit>.sub-list .unit::before{display:block;position:absolute;content:"";width:1px;height:100%;left:0;top:0;background:rgba(0,0,0,.3)}.page-ut-gp-list .organization .workunit-list .unit.active>.unit-container .title{background:rgba(0,0,0,.1)}.page-ut-gp-list .organization .workunit-list .unit.active>.unit-container .title .name{font-weight:600}.page-ut-gp-list .organization .workunit-list .unit.type-workunit .unit-container .ref{background:#0d8aff}.page-ut-gp-list .organization .workunit-list .unit.toggled>.sub-list{display:block}@media(max-width: 1200px){#id-container.page-ut-gp-list .organization{position:static;height:auto;padding:0 2em;background:none;border:0}#id-container.page-ut-gp-list .organization .side-nav-responsive{display:block;background:#263c5c;color:#fff;border-radius:6px;padding:.6em 1em;font-weight:600;font-size:14px;-webkit-transition:all .2s ease-out;transition:all .2s ease-out}#id-container.page-ut-gp-list .organization .side-nav-responsive:hover{cursor:pointer;background:#446ba4}#id-container.page-ut-gp-list .organization #id-left{opacity:0;pointer-events:none;position:absolute;z-index:999;background:#efefef;border:1px solid rgba(0,0,0,.1);-webkit-box-shadow:0 0 40px 0 rgba(0,0,0,.1);box-shadow:0 0 40px 0 rgba(0,0,0,.1);-webkit-transition:all .2s ease-out;transition:all .2s ease-out;-webkit-transform:translateY(-10px);transform:translateY(-10px);max-height:500px;overflow-y:auto}#id-container.page-ut-gp-list .organization #id-left.active{opacity:1;pointer-events:auto;-webkit-transform:translateY(0px);transform:translateY(0px)}#id-container.page-ut-gp-list #id-right{padding-left:0}}.container{position:relative;min-height:500px}.container h3{position:absolute;border:0;margin:0;padding:20px 0;width:400px;pointer-events:none;margin-left:0px;width:100%}.route{position:relative;list-style-type:none;border:0;margin:0;padding:0;top:0px;margin-top:0px;max-height:100% !important;width:100%;background:#bcf;border-radius:2px;z-index:-1}.route span{position:absolute;top:26px;left:20px;transform:scale(2);z-index:10;transition:all .2s ease-out}.route span:hover{cursor:pointer;opacity:.6}.route .title{font-size:16px}.route .title .ref{position:static;top:auto;left:auto;transform:none;font-size:12px;border-radius:4px;padding:4px 6px;margin-right:.8em}.route .title.workunit{position:absolute;border:0;margin:0;padding:20px 0;width:400px;text-indent:60px;background:#ebebeb;border:1px solid rgba(0,0,0,.2);pointer-events:none}.route .title.workunit>.ref{background:#0d8aff;color:#fff}.route .title.groupment{position:absolute;border:0;margin:0;width:400px;text-indent:60px;background:#ebebeb;border:1px solid rgba(0,0,0,.2);pointer-events:none}.route .title.groupment>.ref{background:#263c5c;color:#fff}.first-title{margin-left:10px}.space{position:relative;list-style-type:none;border:0;margin:0;padding:0;margin-left:40px;width:30px;top:68px;padding-bottom:68px;height:100%;z-index:1}.space.space-0{margin-left:0}.table-cell-header{display:flex;flex-wrap:wrap;justify-content:space-between;margin-bottom:.5em}.table-cell-header>*{margin:auto 0}.table-cell-header .wpeo-button{margin:0}.risk-container .risk-edit{color:#263c5c}.risk-container .risk-edit:hover{cursor:pointer;text-decoration:underline}.risk-container .risk-edit-no-perm{color:#333}.risk-container .risk-edit-no-perm:hover{cursor:auto;text-decoration:none}.risk-category{text-align:center}.risk-description{width:25% !important}.risksign-container .risksign-edit{color:#263c5c}.risksign-container .risksign-edit:hover{cursor:pointer;text-decoration:underline}.risksign-content{width:100%}.risksign-add{min-width:40px;margin-left:.5em}.riskassessment-tasks .riskassessment-task-container,.riskassessment-task-container{min-width:430px;border:1px solid rgba(0,0,0,.1);background:rgba(0,0,0,.05);padding:.5em}.riskassessment-tasks{display:flex;flex-wrap:nowrap;align-items:center}.riskassessment-tasks .riskassessment-task-container{flex-grow:1}.riskassessment-tasks .riskassessment-task-add-wrapper{min-width:calc(40px + .5em);margin:auto 0;text-align:center}.riskassessment-task-listing-wrapper .riskassessment-task-container{margin-bottom:.5em}.riskassessment-task-single{display:flex;box-sizing:border-box}.riskassessment-task-single *{box-sizing:border-box}.riskassessment-task-single .riskassessment-task-actions{margin-left:auto}.riskassessment-task-single>*{margin-top:auto;margin-bottom:auto}.riskassessment-task-content .riskassessment-task-author,.riskassessment-task-content .riskassessment-task-timespent-list li .riskassessment-task-timespent-author,.riskassessment-task-timespent-list li .riskassessment-task-content .riskassessment-task-timespent-author{display:inline-block;width:25px;min-width:25px;height:25px;line-height:25px;background:rgba(0,0,0,.5);overflow:hidden;text-transform:uppercase;font-size:14px;font-weight:600;border-radius:50%;vertical-align:sub;text-align:center}.riskassessment-task-content .riskassessment-task-author a,.riskassessment-task-content .riskassessment-task-timespent-list li .riskassessment-task-timespent-author a,.riskassessment-task-timespent-list li .riskassessment-task-content .riskassessment-task-timespent-author a{color:#fff !important}.riskassessment-task-content .riskassessment-task-author-label{word-break:break-all}.riskassessment-task-content .riskassessment-task-data{display:flex;flex-wrap:wrap;font-size:14px}.riskassessment-task-content .riskassessment-task-data>*{margin:auto .2em}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-reference{color:#263c5c;font-weight:600}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-reference:hover{text-decoration:underline;cursor:pointer}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-count{background:rgba(0,0,0,.2);font-size:12px;border-radius:4px;padding:.2em .4em}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-progress{background:rgba(0,0,0,.2);font-size:12px;border-radius:4px;padding:.2em .4em;font-weight:700;color:rgba(0,0,0,.6)}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-progress.progress-red{background:#e05353;color:#fff}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-progress.progress-yellow{background:#e9ad4f;color:#fff}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-progress.progress-green{background:#47e58e;color:#fff}.riskassessment-task-content .riskassessment-task-title{display:flex}.riskassessment-task-content .riskassessment-task-title .riskassessment-task-progress-checkbox{margin:auto 0}.riskassessment-task-content .riskassessment-task-title .riskassessment-task-progress-checkbox input{width:20px;height:20px}.riskassessment-task-content .riskassessment-task-add{min-width:40px;margin-left:.5em}.riskassessment-task-content .riskassessment-task-delete{margin-right:-0.5em}.riskassessment-task-listing-wrapper{width:100%}.riskassessment-task-add{margin:5px}.riskassessment-task-list{margin:5px}.riskassessment-task-timespent-add-container{display:flex;background:rgba(0,0,0,.1);padding:10px;margin-bottom:25px}.riskassessment-task-timespent-add-container>*{margin:auto 5px}.riskassessment-task-timespent-add-container .timespent-comment{flex-grow:1}.riskassessment-task-timespent-add-container .timespent-date{min-width:250px}.riskassessment-task-timespent-add-container .timespent-duration{max-width:100px}.riskassessment-task-timespent-add-container .timespent-add-button{min-width:30px}.riskassessment-task-timespent-add-container .timespent-add-button .wpeo-button{margin-top:20px}.riskassessment-task-timespent-container .riskassessment-task .riskassessment-task-container{background:#fff;border:0}.riskassessment-task-timespent-container .riskassessment-task-timespent-comment{display:block}.riskassessment-task-timespent-list li:nth-of-type(even) .table-row{background:rgba(0,0,0,.05) !important}.riskassessment-task-timespent-list li:nth-of-type(odd) .table-row{background:#fff !important}td>.risk-evaluation-list-content .risk-evaluation-container:not(.advanced,.standard){min-width:340px;border:1px solid rgba(0,0,0,.1);background:rgba(0,0,0,.05);padding:.5em;margin-bottom:.5em}.risk-evaluation-container .risk-evaluation-single{display:flex;box-sizing:border-box}.risk-evaluation-container .risk-evaluation-single *{box-sizing:border-box}.risk-evaluation-container .risk-evaluation-single>*{margin-top:auto;margin-bottom:auto}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo{width:40px;min-width:40px;height:40px;line-height:40px;text-align:center;background:#ececec;color:rgba(0,0,0,.3);margin-right:.5em}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo .photodigiriskdolibarr{width:100%;height:auto;background:#fff}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo a,.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo .divphotoref{width:40px;min-width:40px;height:40px;position:relative;display:block}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo a .photo,.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo .divphotoref .photo{position:absolute;top:0;left:0;width:100%;height:100%;object-fit:cover}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content{width:100%}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-author{display:inline-block;width:25px;min-width:25px;height:25px;line-height:25px;background:rgba(0,0,0,.5);overflow:hidden;text-transform:uppercase;font-size:14px;font-weight:600;border-radius:50%;vertical-align:sub;text-align:center}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-author a{color:#fff !important}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-data{display:flex;flex-wrap:wrap}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-data>*{margin:auto .2em}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-data .risk-evaluation-reference{color:#333;font-weight:600}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-data .risk-evaluation-count{background:rgba(0,0,0,.2);font-size:12px;border-radius:4px;padding:.2em .4em}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-button{margin-left:.5em}.wpeo-table.evaluation-method{background:none !important}@media(max-width: 480px){.wpeo-table.evaluation-method .table-row.table-header{display:none}}.wpeo-table.evaluation-method .table-cell{margin:0;text-align:center;border:1px solid rgba(0,0,0,.1);padding:.8em .4em;position:relative}@media(max-width: 480px){.wpeo-table.evaluation-method .table-cell{width:100% !important}}.wpeo-table.evaluation-method .table-cell.can-select::after,.wpeo-table.evaluation-method .wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .table-cell.risk-evaluation-cotation::after,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .wpeo-table.evaluation-method .table-cell.risk-evaluation-cotation::after{display:block;content:"";position:absolute;top:.4em;right:.4em;bottom:.4em;left:.4em;background:rgba(0,0,0,.1);transform:scale(0);opacity:0;transition:all .2s ease-out}.wpeo-table.evaluation-method .table-cell.can-select:hover,.wpeo-table.evaluation-method .wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .table-cell.risk-evaluation-cotation:hover,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .wpeo-table.evaluation-method .table-cell.risk-evaluation-cotation:hover{cursor:pointer}.wpeo-table.evaluation-method .table-cell.can-select:hover::after,.wpeo-table.evaluation-method .wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .table-cell.risk-evaluation-cotation:hover::after,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .wpeo-table.evaluation-method .table-cell.risk-evaluation-cotation:hover::after{transform:scale(1);opacity:1}.wpeo-table.evaluation-method .table-cell.can-select.active,.wpeo-table.evaluation-method .wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .table-cell.active.risk-evaluation-cotation,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .wpeo-table.evaluation-method .table-cell.active.risk-evaluation-cotation{color:#fff}.wpeo-table.evaluation-method .table-cell.can-select.active::after,.wpeo-table.evaluation-method .wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .table-cell.active.risk-evaluation-cotation::after,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .wpeo-table.evaluation-method .table-cell.active.risk-evaluation-cotation::after{transform:scale(1) !important;opacity:1 !important;background:#0d8aff;z-index:-1}.wpeo-table.evaluation-method .table-row>.table-cell:first-child{background:#263c5c;color:#fff}@media(max-width: 480px){.wpeo-table.evaluation-method .table-row>.table-cell:first-child{background:#263c5c}}.wpeo-table.evaluation-method .table-row:not(.header) .table-cell:nth-of-type(2).active::after{background:#0d8aff}.wpeo-table.evaluation-method .table-row:not(.header) .table-cell:nth-of-type(3).active::after{background:#0063c0}.wpeo-table.evaluation-method .table-row:not(.header) .table-cell:nth-of-type(4).active::after{background:#003b73}.wpeo-table.evaluation-method .table-row:not(.header) .table-cell:nth-of-type(5).active::after{background:#001427}.wpeo-table.evaluation-method .table-row:not(.header) .table-cell:nth-of-type(6).active::after{background:#000}.wpeo-modal[class*=modal-risk] .modal-container .title{display:block;font-weight:600;font-size:13px;margin-bottom:.6em;color:rgba(0,0,0,.8)}.wpeo-modal[class*=modal-risk] .modal-container .title required{font-size:18px;color:#0d8aff;vertical-align:text-top;line-height:.9}.wpeo-modal[class*=modal-risk] .modal-container .section-title{font-size:16px;color:rgba(0,0,0,.8);font-weight:600;margin-bottom:.6em;display:block}.wpeo-modal[class*=modal-risk] .modal-container .maxwidthdate{max-width:125px}.wpeo-modal[class*=modal-risk] .modal-container .risk-content{display:flex;padding-bottom:1em;margin-bottom:1em;border-bottom:1px solid rgba(0,0,0,.2)}.wpeo-modal[class*=modal-risk] .modal-container .risk-content .risk-category{margin-right:1.5em}.wpeo-modal[class*=modal-risk] .modal-container .risk-content .risk-category .dropdown-toggle::after{display:none}.wpeo-modal[class*=modal-risk] .modal-container .risk-content .risk-description{flex-grow:1}.wpeo-modal[class*=modal-risk] .modal-container .risk-content .risk-description textarea{width:100%}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container{padding-bottom:1em;margin-bottom:1em;border-bottom:1px solid rgba(0,0,0,.2)}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-header{margin-bottom:1em}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper{display:flex}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard{margin-right:1em}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .risk-evaluation-photo img{max-width:50px}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .risk-evaluation-comment{flex-grow:1;margin-left:1em}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .risk-evaluation-comment textarea{width:100%}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container.advanced .risk-evaluation-content-wrapper{flex-wrap:wrap}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container.advanced .risk-evaluation-content{width:100%;margin-bottom:1em}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container.advanced .risk-evaluation-photo{margin-right:1em}.wpeo-modal .modal-container .risk-evaluations-list .risk-evaluation>.risk-evaluation-container{display:flex}.wpeo-modal .modal-container .risk-evaluations-list .risk-evaluation>.risk-evaluation-container .risk-evaluation-single{width:100%}.wpeo-modal .modal-container .risk-evaluations-list .risk-evaluation>.risk-evaluation-container .risk-evaluation-single .risk-evaluation-reference{color:#333}.wpeo-modal .modal-container .risk-evaluations-list .risk-evaluation>.risk-evaluation-container .risk-evaluation-actions{margin-left:auto}.wpeo-modal[class*=modal-risksign] .modal-container .title{display:block;font-weight:600;font-size:13px;margin-bottom:.6em;color:rgba(0,0,0,.8)}.wpeo-modal[class*=modal-risksign] .modal-container .title required{font-size:18px;color:#0d8aff;vertical-align:text-top;line-height:.9}.wpeo-modal[class*=modal-risksign] .modal-container .section-title{font-size:16px;color:rgba(0,0,0,.8);font-weight:600;margin-bottom:.6em;display:block}.wpeo-modal[class*=modal-risksign] .modal-container .risksign-content{display:flex;padding-bottom:1em;margin-bottom:1em;border-bottom:1px solid rgba(0,0,0,.2)}.wpeo-modal[class*=modal-risksign] .modal-container .risksign-content .risksign-category{margin-right:1.5em}.wpeo-modal[class*=modal-risksign] .modal-container .risksign-content .risksign-category .dropdown-toggle::after{display:none}.wpeo-modal[class*=modal-risksign] .modal-container .risksign-content .risksign-description{flex-grow:1}.wpeo-modal[class*=modal-risksign] .modal-container .risksign-content .risksign-description textarea{width:100%}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .title{display:block;font-weight:600;font-size:13px;margin-bottom:.6em;color:rgba(0,0,0,.8)}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .title required{font-size:18px;color:#0d8aff;vertical-align:text-top;line-height:.9}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .section-title{font-size:16px;color:rgba(0,0,0,.8);font-weight:600;margin-bottom:.6em;display:block}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .riskassessment-task-single{display:block !important}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .riskassessment-task-container{display:flex;padding-bottom:1em;margin-bottom:1em;border-bottom:1px solid rgba(0,0,0,.2)}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .riskassessment-task-container .riskassessment-task{flex-grow:1}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .riskassessment-task-container .riskassessment-task input{width:100%}.wpeo-modal .modal-container .riskassessment-task-list .riskassessment-task>.riskassessment-task-container{display:flex}.wpeo-modal .modal-container .riskassessment-task-list .riskassessment-task>.riskassessment-task-container .riskassessment-task-single{width:100%}.wpeo-modal .modal-container .riskassessment-task-list .riskassessment-task>.riskassessment-task-container .riskassessment-task-actions{margin-left:auto}.riskassessment-task-edit-modal .wpeo-modal.modal-riskassessment-task.modal-active{z-index:1004}#dialog-confirm-actionButtonImportSharedRisks .confirmtext{text-align:center;padding:.2em 0 .4em 0}#dialog-confirm-actionButtonImportSharedRisks .tagtable{border-collapse:collapse}#dialog-confirm-actionButtonImportSharedRisks .tagtr{border-bottom:1px solid rgba(0,0,0,.2)}#dialog-confirm-actionButtonImportSharedRisks .tagtd{padding:.3em 0}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child{display:flex}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child .importsharedrisk:not(.imported):not(.risk-evaluation-cotation){width:30%}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child .importsharedrisk.imported{width:10%;text-align:center;font-size:12px}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child .importsharedrisk img{float:left;margin-right:.4em;max-width:35px}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child .importsharedrisk>span{display:block}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child .importsharedrisk .importsharedrisk-ref{font-weight:600}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:last-child{vertical-align:middle}#dialog-confirm-actionButtonImportSharedRiskSigns .confirmtext{text-align:center;padding:.2em 0 .4em 0}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtable{border-collapse:collapse}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr{border-bottom:1px solid rgba(0,0,0,.2)}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtd{padding:.3em 0}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child{display:flex}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child .importsharedrisksign:not(.imported){width:30%}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child .importsharedrisksign.imported{width:10%;text-align:center;font-size:12px}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child .importsharedrisksign img{float:left;margin-right:.4em;max-width:35px}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child .importsharedrisksign>span{display:block}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child .importsharedrisksign .importsharedrisksign-ref{font-weight:600}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:last-child{vertical-align:middle}.wpeo-modal.modal-photo.modal-active{z-index:2014}.wpeo-modal.modal-photo .clickable-photo{border:5px solid #fff;transition:all .2s ease-out;width:100%}.wpeo-modal.modal-photo .clickable-photo:hover{cursor:pointer}.wpeo-modal.modal-photo .clickable-photo:hover .photo-image .photo{opacity:.8}.wpeo-modal.modal-photo .clickable-photo .photo-image{position:relative;width:100%;max-width:120px;height:120px;margin:auto}.wpeo-modal.modal-photo .clickable-photo .photo-image .photo{position:absolute;top:0;left:0;width:100%;object-fit:cover;max-width:none !important;transition:all .2s ease-out}.wpeo-modal.modal-photo .clickable-photo .photo-image .clicked-photo-preview{position:absolute;display:inline-block;top:1em;right:1em;z-index:900;height:25px;line-height:25px;background:#fff;color:#0d8aff;transition:all .2s ease-out}.wpeo-modal.modal-photo .clickable-photo .photo-image .clicked-photo-preview:hover{transform:scale(1.1)}.wpeo-modal.modal-photo .clickable-photo .photo-image .clicked-photo-preview i{line-height:25px;font-size:14px}.wpeo-modal.modal-photo .clickable-photo .title{word-break:break-all}.wpeo-modal.modal-photo .formattachnewfile{padding-bottom:.5em}.wpeo-modal.modal-photo input[type=file]{border-bottom:0 !important}.evaluator-add-modal .time{display:flex;align-items:center}.risk-evaluation-add-modal .modal-container,.risk-evaluation-edit-modal .modal-container{max-height:750px}.risk-evaluation-edit-modal .wpeo-modal.modal-risk.modal-active{z-index:1004}.wpeo-modal .modal-container ul,.wpeo-modal .modal-container li{margin:0;list-style-type:none;padding:0}@media(max-width: 1200px){#id-container .side-nav .vmenu{width:30px;padding-right:0 !important;overflow:hidden}#id-container .side-nav .vmenu .menu_titre .vmenu i{margin-right:2em}#id-container .side-nav .vmenu #blockvmenusearch .select2-container--default .select2-selection--single .select2-selection__placeholder::before{display:inline-block;content:"";font-family:"Font Awesome 5 Free";font-weight:600;margin-right:2em}}@media(max-width: 1200px){#id-container.page-ut-gp-list .side-nav{display:inline-block;position:static;height:auto;padding:0 2em;background:none;border:0}#id-container.page-ut-gp-list .side-nav .side-nav-responsive{display:block;background:#263c5c;color:#fff;border-radius:6px;padding:.6em 1em;font-weight:600;font-size:14px;transition:all .2s ease-out}#id-container.page-ut-gp-list .side-nav .side-nav-responsive:hover{cursor:pointer;background:#446ba4}#id-container.page-ut-gp-list .side-nav #id-left{position:absolute;z-index:999;background:#efefef;border:1px solid rgba(0,0,0,.1);box-shadow:0 0 40px 0 rgba(0,0,0,.1);transition:all .2s ease-out;max-height:500px;overflow-y:auto}#id-container.page-ut-gp-list .side-nav #id-left:not(.active){opacity:0;pointer-events:none;transform:translateY(-10px)}#id-container.page-ut-gp-list .side-nav #id-left:not(.active) .wpeo-button{pointer-events:none}}@media(max-width: 695px){#id-container.page-ut-gp-list{margin-left:0}#id-container.page-ut-gp-list #id-right{padding-left:0;width:100%}}@media(max-width: 1200px){td>.riskassessment-task-container{min-width:0}}@media(max-width: 1200px){td>.risk-evaluation-container{min-width:0}}.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-draggable.ui-resizable.preview-photo{z-index:2100 !important}.imgTabTitle{max-height:32px !important}.dropdown-toggle::after{display:none}.favorite-photo{border:5px solid #0d8aff}.box-flex-item{width:auto !important}ul{list-style-type:none}tr.liste_titre th.liste_titre:not(.maxwidthsearch),tr.liste_titre td.liste_titre:not(.maxwidthsearch){opacity:1}@media only screen and (max-width: 1600px){div.fichecenter{width:100%;clear:both}div.fichecenterbis{margin-top:8px}div.fichethirdleft{float:none;width:auto;padding-bottom:6px}div.fichetwothirdright{float:none;width:auto;padding-bottom:6px}div.fichehalfleft{float:none;width:auto}div.fichehalfright{float:none;width:auto}div.fichehalfright{margin-top:10px}div.firstcolumn div.box{padding-right:0px}div.secondcolumn div.box{padding-left:0px}} \ No newline at end of file +.risk-evaluation-cotation{width:50px;min-width:50px;height:50px;line-height:50px;text-align:center;border-radius:6px;background:#ececec;color:rgba(0,0,0,.8);font-size:16px;font-weight:600;margin-right:.5em}.risk-evaluation-cotation[data-scale="1"]{background:#ececec}.risk-evaluation-cotation[data-scale="2"]{background:#e9ad4f;color:#fff}.risk-evaluation-cotation[data-scale="3"]{background:#e05353;color:#fff}.risk-evaluation-cotation[data-scale="4"]{background:#2b2b2b;color:#fff}.risk-evaluation-cotation.selected-cotation{box-shadow:0 0 0 2px #0d8aff}.can-select,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .risk-evaluation-cotation{transition:all .2s ease-out}.can-select:hover,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .risk-evaluation-cotation:hover{cursor:pointer;opacity:.8}.wpeo-modal .title{display:block;font-weight:600;font-size:13px;margin-bottom:.6em;color:rgba(0,0,0,.8)}.wpeo-modal input[type=text],.wpeo-modal input[type=email],.wpeo-modal input[type=url],.wpeo-modal input[type=password],.wpeo-modal input[type=search],.wpeo-modal input[type=number],.wpeo-modal input[type=tel],.wpeo-modal input[type=range],.wpeo-modal input[type=date],.wpeo-modal input[type=month],.wpeo-modal input[type=week],.wpeo-modal input[type=time],.wpeo-modal input[type=datetime],.wpeo-modal input[type=datetime-local],.wpeo-modal input[type=color],.wpeo-modal select,.wpeo-modal textarea{width:100%;border:1px solid rgba(0,0,0,.2);padding:1em;box-sizing:border-box}.wpeo-modal input[type=text]:focus,.wpeo-modal input[type=email]:focus,.wpeo-modal input[type=url]:focus,.wpeo-modal input[type=password]:focus,.wpeo-modal input[type=search]:focus,.wpeo-modal input[type=number]:focus,.wpeo-modal input[type=tel]:focus,.wpeo-modal input[type=range]:focus,.wpeo-modal input[type=date]:focus,.wpeo-modal input[type=month]:focus,.wpeo-modal input[type=week]:focus,.wpeo-modal input[type=time]:focus,.wpeo-modal input[type=datetime]:focus,.wpeo-modal input[type=datetime-local]:focus,.wpeo-modal input[type=color]:focus,.wpeo-modal select:focus,.wpeo-modal textarea:focus{border:1px solid rgba(0,0,0,.6)}.wpeo-modal select{padding:1em 0}.form-label-required::after{display:inline-block;content:"*";color:#e05353;font-size:22px;line-height:0;position:relative;top:4px;left:4px}.digirisk-page-container{max-width:1000px;background:#fff;box-shadow:0 0 40px 0 rgba(0,0,0,.1);margin:1.5em auto 0 auto;padding:2em;box-sizing:border-box}.digirisk-page-container *{box-sizing:border-box}.card{box-shadow:0 4px 8px 0 rgba(0,0,0,.2);transition:.3s}.card:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,.2)}.card-container{display:flex;padding:2px 16px;justify-content:center}.page-ut-gp-list{margin-left:-40px;box-sizing:border-box;display:block !important;width:100%}.page-ut-gp-list *{box-sizing:border-box}.page-ut-gp-list .fiche{margin-right:0 !important}.page-ut-gp-list #id-right{padding-left:300px;width:calc(100% + 40px);display:block}.page-ut-gp-list .side-nav{position:absolute;height:100%;top:0;padding-top:50px;box-sizing:border-box;box-shadow:none}.page-ut-gp-list .side-nav .side-nav-responsive{display:none}.page-ut-gp-list .side-nav #id-left{width:300px;padding-top:0}.page-ut-gp-list .side-nav .digirisk-wrap{padding:0 !important}.page-ut-gp-list .side-nav .navigation-container{max-height:1000px;overflow-y:auto;height:90vh}.page-ut-gp-list .side-nav .add-container{position:absolute;right:0;bottom:5px;opacity:0;pointer-events:none;transition:all .2s ease-out}.page-ut-gp-list .side-nav #id-left.active .add-container{opacity:1}.page-ut-gp-list .side-nav .society-header{padding-top:27px;position:relative;padding-left:10px;padding-right:10px}.page-ut-gp-list .side-nav .society-header .title{font-weight:700}.page-ut-gp-list .side-nav .society-header .linkElement{line-height:1;border-bottom:1px solid rgba(0,0,0,.2);padding-bottom:10px;display:flex;width:100%}.page-ut-gp-list .side-nav .society-header:hover .add-container{opacity:1;pointer-events:all}.page-ut-gp-list .side-nav .toolbar{padding-left:10px;padding-right:10px}.page-ut-gp-list .side-nav .toolbar .toggle-plus,.page-ut-gp-list .side-nav .toolbar .toggle-minus{display:inline-block;padding:3px;transition:all .2s ease-out;color:rgba(0,0,0,.6)}.page-ut-gp-list .side-nav .toolbar .toggle-plus:hover,.page-ut-gp-list .side-nav .toolbar .toggle-minus:hover{cursor:pointer;opacity:.6}.page-ut-gp-list .side-nav .workunit-list{padding-left:0}.page-ut-gp-list .side-nav .workunit-list ul,.page-ut-gp-list .side-nav .workunit-list li{list-style-type:none;margin:0}.page-ut-gp-list .side-nav .workunit-list>.unit:first-child>.unit-container:first-child>.title{border-top:1px solid rgba(0,0,0,.1)}.page-ut-gp-list .side-nav .workunit-list .unit-container{display:flex;position:relative}.page-ut-gp-list .side-nav .workunit-list .unit-container:hover .add-container{opacity:1;pointer-events:all}.page-ut-gp-list .side-nav .workunit-list .unit-container .toggle-unit{color:rgba(0,0,0,.6);line-height:40px;font-size:18px;min-width:30px;width:30px;text-align:center;transition:all .2s ease-out}.page-ut-gp-list .side-nav .workunit-list .unit-container .toggle-unit:hover{cursor:pointer}.page-ut-gp-list .side-nav .workunit-list .unit-container .toggle-unit .toggle-icon{line-height:40px}.page-ut-gp-list .side-nav .workunit-list .unit-container .spacer{position:relative;min-width:30px;width:30px}.page-ut-gp-list .side-nav .workunit-list .unit-container .photodigiriskdolibarr{display:block;width:40px;min-width:40px;height:40px;position:relative;background:#fff;text-align:center;transition:all .2s ease-out}.page-ut-gp-list .side-nav .workunit-list .unit-container .divphotoref{max-width:50px;position:relative}.page-ut-gp-list .side-nav .workunit-list .unit-container .divphotoref .photo{object-fit:cover;margin:0}.page-ut-gp-list .side-nav .workunit-list .unit-container .title{width:100%;padding-left:1em;display:flex;border-bottom:1px solid rgba(0,0,0,.1)}.page-ut-gp-list .side-nav .workunit-list .unit-container .title .linkElement{width:100%;padding-top:.5em;text-decoration:none}.page-ut-gp-list .side-nav .workunit-list .unit-container .title .linkElement:hover .name{color:#0d8aff}.page-ut-gp-list .side-nav .workunit-list .unit-container .title .title-container{margin:auto 0}.page-ut-gp-list .side-nav .workunit-list .unit-container .title .ref{font-size:10px;color:#fff;text-transform:uppercase;font-weight:600;display:inline-block;background:#263c5c;padding:.2em .4em}.page-ut-gp-list .side-nav .workunit-list .unit-container .title .name{font-size:14px;color:#000;display:block;transition:all .2s ease-out}.page-ut-gp-list .side-nav .workunit-list .unit>.sub-list{padding:0 0 0 7px;display:none}.page-ut-gp-list .side-nav .workunit-list .unit>.sub-list>.unit:last-child::before{height:24px}.page-ut-gp-list .side-nav .workunit-list .unit>.sub-list .toggle-unit{position:relative}.page-ut-gp-list .side-nav .workunit-list .unit>.sub-list .unit{position:relative;margin-left:.6em}.page-ut-gp-list .side-nav .workunit-list .unit.active>.unit-container .title{background:rgba(0,0,0,.1)}.page-ut-gp-list .side-nav .workunit-list .unit.active>.unit-container .title .name{font-weight:600}.page-ut-gp-list .side-nav .workunit-list .unit.type-workunit .unit-container .ref{background:#0d8aff}.page-ut-gp-list .side-nav .workunit-list .unit.toggled>.sub-list{display:block}.digirisk-signature-container{max-width:800px;background:#fff;box-shadow:0 0 40px 0 rgba(0,0,0,.1);margin:1.5em auto 0 auto;padding:2em;box-sizing:border-box}.digirisk-signature-container *{box-sizing:border-box}.digirisk-signature-container .signature .signature-element .wpeo-button.modal-signature-open{display:none}.digirisk-signature-container .signature .signature-element img{width:100%;height:auto;border:1px solid rgba(0,0,0,.4) !important}.ticketpublicarea .ticket-parentCategory{width:100%;height:100%}.ticketpublicarea .ticket-parentCategory .wpeo-button{width:100%;height:100%;padding:12px 14px}.ticketpublicarea .ticket-parentCategory .wpeo-button:hover{box-shadow:inset 0 -4.6em hsla(0,0%,100%,.25)}.ticketpublicarea .ticket-parentCategory .wpeo-button.button-yellow{border-color:#e88740;background:#e88740}.ticketpublicarea .ticket-parentCategory .wpeo-button.button-blue{border-color:#009cc2;background:#009cc2}.ticketpublicarea .ticket-parentCategory .wpeo-button.button-red{border-color:#c44b2a;background:#c44b2a}.ticketpublicarea .ticket-parentCategory.active .wpeo-button{border-color:#000 !important}.ticketpublicarea .ticket-subCategory{border:1px solid rgba(0,0,0,.2);padding:1em;text-align:center;width:100%;transition:all .2s ease-out}.ticketpublicarea .ticket-subCategory:hover{cursor:pointer;background:rgba(0,0,0,.1)}.ticketpublicarea .ticket-subCategory.active{box-shadow:inset 0 0 0px 3px #0d8aff}.ticketpublicarea .ticket-subCategory .button-label{display:block;margin-top:.5em}.ticketpublicarea .form-registre .wpeo-button{display:flex;justify-content:center}.ticketpublicarea .form-registre .wpeo-button>*{margin-top:auto;margin-bottom:auto}.ticketpublicarea .form-registre .wpeo-button .button-label{margin-left:.5em}.ticketpublicarea .tableforinputfields{margin-top:1em}.ticketpublicarea .tableforinputfields input{display:block;clear:both;width:100%;max-width:none;margin-bottom:1em}@media(max-width: 480px){.ticketpublicarea .tableforinputfields .inline-block{display:block}}.ticketpublicarea .tableforinputfields .inline-block input{display:inline-block}.ticketpublicarea .tableforinputfields .inline-block #options_digiriskdolibarr_ticket_date{max-width:80px}.page-ut-gp-list .organization{position:absolute;height:100%;top:0;padding-top:50px;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-box-shadow:none;box-shadow:none}.page-ut-gp-list .organization .side-nav-responsive{display:none}.page-ut-gp-list .organization #id-left{width:300px;padding-top:0}.page-ut-gp-list .organization .digirisk-wrap{padding:0 !important}.page-ut-gp-list .organization .navigation-container{max-height:1000px;overflow-y:auto}.page-ut-gp-list .organization .add-container{position:absolute;right:0;bottom:5px;opacity:0;pointer-events:none;-webkit-transition:all .2s ease-out;transition:all .2s ease-out}.page-ut-gp-list .organization .society-header{padding-top:27px;position:relative;padding-left:10px;padding-right:10px}.page-ut-gp-list .organization .society-header .title{font-weight:700}.page-ut-gp-list .organization .society-header .linkElement{line-height:1;border-bottom:1px solid rgba(0,0,0,.2);padding-bottom:10px;display:-webkit-box;display:-ms-flexbox;display:flex;width:100%}.page-ut-gp-list .organization .society-header:hover .add-container{opacity:1;pointer-events:all}.page-ut-gp-list .organization .toolbar{padding-left:10px;padding-right:10px}.page-ut-gp-list .organization .toolbar .toggle-plus,.page-ut-gp-list .organization .toolbar .toggle-minus{display:inline-block;padding:3px;-webkit-transition:all .2s ease-out;transition:all .2s ease-out;color:rgba(0,0,0,.6)}.page-ut-gp-list .organization .toolbar .toggle-plus:hover,.page-ut-gp-list .organization .toolbar .toggle-minus:hover{cursor:pointer;opacity:.6}.page-ut-gp-list .organization .workunit-list{padding-left:0}.page-ut-gp-list .organization .workunit-list ul,.page-ut-gp-list .organization .workunit-list li{list-style-type:none;margin:0}.page-ut-gp-list .organization .workunit-list .unit-container{display:-webkit-box;display:-ms-flexbox;display:flex;position:relative}.page-ut-gp-list .organization .workunit-list .unit-container:hover .add-container{opacity:1;pointer-events:all}.page-ut-gp-list .organization .workunit-list .unit-container .toggle-unit{color:rgba(0,0,0,.6);line-height:40px;font-size:18px;min-width:30px;width:30px;text-align:center;-webkit-transition:all .2s ease-out;transition:all .2s ease-out}.page-ut-gp-list .organization .workunit-list .unit-container .toggle-unit:hover{cursor:pointer}.page-ut-gp-list .organization .workunit-list .unit-container .toggle-unit .toggle-icon{line-height:40px}.page-ut-gp-list .organization .workunit-list .unit-container .spacer{position:relative;min-width:30px;width:30px}.page-ut-gp-list .organization .workunit-list .unit-container .spacer::before{display:block;position:absolute;content:"";height:1px;left:0;right:10px;top:20px;background:rgba(0,0,0,.3)}.page-ut-gp-list .organization .workunit-list .unit-container .photodigiriskdolibarr{display:block;width:40px;min-width:40px;height:40px;position:relative;background:#fff;text-align:center;-webkit-transition:all .2s ease-out;transition:all .2s ease-out}.page-ut-gp-list .organization .workunit-list .unit-container .title{width:100%;padding-left:1em;display:-webkit-box;display:-ms-flexbox;display:flex}.page-ut-gp-list .organization .workunit-list .unit-container .title .title-container{margin:auto 0}.page-ut-gp-list .organization .workunit-list .unit-container .title .ref{font-size:10px;color:#fff;text-transform:uppercase;font-weight:600;display:inline-block;background:#263c5c;padding:.2em .4em}.page-ut-gp-list .organization .workunit-list .unit-container .title .name{font-size:14px;color:#000;display:block}.page-ut-gp-list .organization .workunit-list .unit>.unit-container{padding:4px 0 0 0;border:solid}.page-ut-gp-list .organization .workunit-list .unit>.sub-list{padding:0 0 0 7px;display:none}.page-ut-gp-list .organization .workunit-list .unit>.sub-list>.unit:last-child::before{height:24px}.page-ut-gp-list .organization .workunit-list .unit>.sub-list .toggle-unit{position:relative}.page-ut-gp-list .organization .workunit-list .unit>.sub-list .toggle-unit::before{right:20px;display:block;position:absolute;content:"";height:1px;left:0;top:20px;background:rgba(0,0,0,.3)}.page-ut-gp-list .organization .workunit-list .unit>.sub-list .unit{position:relative;margin-left:.6em}.page-ut-gp-list .organization .workunit-list .unit>.sub-list .unit::before{display:block;position:absolute;content:"";width:1px;height:100%;left:0;top:0;background:rgba(0,0,0,.3)}.page-ut-gp-list .organization .workunit-list .unit.active>.unit-container .title{background:rgba(0,0,0,.1)}.page-ut-gp-list .organization .workunit-list .unit.active>.unit-container .title .name{font-weight:600}.page-ut-gp-list .organization .workunit-list .unit.type-workunit .unit-container .ref{background:#0d8aff}.page-ut-gp-list .organization .workunit-list .unit.toggled>.sub-list{display:block}@media(max-width: 1200px){#id-container.page-ut-gp-list .organization{position:static;height:auto;padding:0 2em;background:none;border:0}#id-container.page-ut-gp-list .organization .side-nav-responsive{display:block;background:#263c5c;color:#fff;border-radius:6px;padding:.6em 1em;font-weight:600;font-size:14px;-webkit-transition:all .2s ease-out;transition:all .2s ease-out}#id-container.page-ut-gp-list .organization .side-nav-responsive:hover{cursor:pointer;background:#446ba4}#id-container.page-ut-gp-list .organization #id-left{opacity:0;pointer-events:none;position:absolute;z-index:999;background:#efefef;border:1px solid rgba(0,0,0,.1);-webkit-box-shadow:0 0 40px 0 rgba(0,0,0,.1);box-shadow:0 0 40px 0 rgba(0,0,0,.1);-webkit-transition:all .2s ease-out;transition:all .2s ease-out;-webkit-transform:translateY(-10px);transform:translateY(-10px);max-height:500px;overflow-y:auto}#id-container.page-ut-gp-list .organization #id-left.active{opacity:1;pointer-events:auto;-webkit-transform:translateY(0px);transform:translateY(0px)}#id-container.page-ut-gp-list #id-right{padding-left:0}}.container{position:relative;min-height:500px}.container h3{position:absolute;border:0;margin:0;padding:20px 0;width:400px;pointer-events:none;margin-left:0px;width:100%}.route{position:relative;list-style-type:none;border:0;margin:0;padding:0;top:0px;margin-top:0px;max-height:100% !important;width:100%;background:#bcf;border-radius:2px;z-index:-1}.route span{position:absolute;top:26px;left:20px;transform:scale(2);z-index:10;transition:all .2s ease-out}.route span:hover{cursor:pointer;opacity:.6}.route .title{font-size:16px}.route .title .ref{position:static;top:auto;left:auto;transform:none;font-size:12px;border-radius:4px;padding:4px 6px;margin-right:.8em}.route .title.workunit{position:absolute;border:0;margin:0;padding:20px 0;width:400px;text-indent:60px;background:#ebebeb;border:1px solid rgba(0,0,0,.2);pointer-events:none}.route .title.workunit>.ref{background:#0d8aff;color:#fff}.route .title.groupment{position:absolute;border:0;margin:0;width:400px;text-indent:60px;background:#ebebeb;border:1px solid rgba(0,0,0,.2);pointer-events:none}.route .title.groupment>.ref{background:#263c5c;color:#fff}.first-title{margin-left:10px}.space{position:relative;list-style-type:none;border:0;margin:0;padding:0;margin-left:40px;width:30px;top:68px;padding-bottom:68px;height:100%;z-index:1}.space.space-0{margin-left:0}.table-cell-header{display:flex;flex-wrap:wrap;justify-content:space-between;margin-bottom:.5em}.table-cell-header>*{margin:auto 0}.table-cell-header .wpeo-button{margin:0}.risk-container .risk-edit{color:#263c5c}.risk-container .risk-edit:hover{cursor:pointer;text-decoration:underline}.risk-container .risk-edit-no-perm{color:#333}.risk-container .risk-edit-no-perm:hover{cursor:auto;text-decoration:none}.risk-category{text-align:center}.risk-description{width:25% !important}.risksign-container .risksign-edit{color:#263c5c}.risksign-container .risksign-edit:hover{cursor:pointer;text-decoration:underline}.risksign-content{width:100%}.risksign-add{min-width:40px;margin-left:.5em}.riskassessment-tasks .riskassessment-task-container,.riskassessment-task-container{min-width:430px;border:1px solid rgba(0,0,0,.1);background:rgba(0,0,0,.05);padding:.5em}.riskassessment-tasks{display:flex;flex-wrap:nowrap;align-items:center;flex-direction:column}.riskassessment-tasks .riskassessment-task-container{flex-grow:1}.riskassessment-tasks .riskassessment-task-add-wrapper{min-width:calc(40px + .5em);margin:auto 0;text-align:center}.riskassessment-task-listing-wrapper .riskassessment-task-container{margin-bottom:.5em}.riskassessment-task-single{display:flex;box-sizing:border-box}.riskassessment-task-single *{box-sizing:border-box}.riskassessment-task-single .riskassessment-task-actions{margin-left:auto}.riskassessment-task-single>*{margin-top:auto;margin-bottom:auto}.riskassessment-task-content .riskassessment-task-author,.riskassessment-task-content .riskassessment-task-timespent-list li .riskassessment-task-timespent-author,.riskassessment-task-timespent-list li .riskassessment-task-content .riskassessment-task-timespent-author{display:inline-block;width:25px;min-width:25px;height:25px;line-height:25px;background:rgba(0,0,0,.5);overflow:hidden;text-transform:uppercase;font-size:14px;font-weight:600;border-radius:50%;vertical-align:sub;text-align:center}.riskassessment-task-content .riskassessment-task-author a,.riskassessment-task-content .riskassessment-task-timespent-list li .riskassessment-task-timespent-author a,.riskassessment-task-timespent-list li .riskassessment-task-content .riskassessment-task-timespent-author a{color:#fff !important}.riskassessment-task-content .riskassessment-task-author-label{word-break:break-all}.riskassessment-task-content .riskassessment-task-data{display:flex;flex-wrap:wrap;font-size:14px}.riskassessment-task-content .riskassessment-task-data>*{margin:auto .2em}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-reference{color:#263c5c;font-weight:600}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-reference:hover{text-decoration:underline;cursor:pointer}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-count{background:rgba(0,0,0,.2);font-size:12px;border-radius:4px;padding:.2em .4em}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-progress{background:rgba(0,0,0,.2);font-size:12px;border-radius:4px;padding:.2em .4em;font-weight:700;color:rgba(0,0,0,.6)}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-progress.progress-red{background:#e05353;color:#fff}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-progress.progress-yellow{background:#e9ad4f;color:#fff}.riskassessment-task-content .riskassessment-task-data .riskassessment-task-progress.progress-green{background:#47e58e;color:#fff}.riskassessment-task-content .riskassessment-task-title{display:flex}.riskassessment-task-content .riskassessment-task-title .riskassessment-task-progress-checkbox{margin:auto 0}.riskassessment-task-content .riskassessment-task-title .riskassessment-task-progress-checkbox input{width:20px;height:20px}.riskassessment-task-content .riskassessment-task-add{min-width:40px;margin-left:.5em}.riskassessment-task-content .riskassessment-task-delete{margin-right:-0.5em}.riskassessment-task-listing-wrapper{width:100%}.riskassessment-task-add{margin:5px}.riskassessment-task-list{margin:5px}.riskassessment-task-timespent-add-container{display:flex;background:rgba(0,0,0,.1);padding:10px;margin-bottom:25px}.riskassessment-task-timespent-add-container>*{margin:auto 5px}.riskassessment-task-timespent-add-container .timespent-comment{flex-grow:1}.riskassessment-task-timespent-add-container .timespent-date{min-width:250px}.riskassessment-task-timespent-add-container .timespent-duration{max-width:100px}.riskassessment-task-timespent-add-container .timespent-add-button{min-width:30px}.riskassessment-task-timespent-add-container .timespent-add-button .wpeo-button{margin-top:20px}.riskassessment-task-timespent-container .riskassessment-task .riskassessment-task-container{background:#fff;border:0}.riskassessment-task-timespent-container .riskassessment-task-timespent-comment{display:block}.riskassessment-task-timespent-list li:nth-of-type(even) .table-row{background:rgba(0,0,0,.05) !important}.riskassessment-task-timespent-list li:nth-of-type(odd) .table-row{background:#fff !important}td>.risk-evaluation-list-content .risk-evaluation-container:not(.advanced,.standard){min-width:340px;border:1px solid rgba(0,0,0,.1);background:rgba(0,0,0,.05);padding:.5em;margin-bottom:.5em}.risk-evaluation-container .risk-evaluation-single{display:flex;box-sizing:border-box}.risk-evaluation-container .risk-evaluation-single *{box-sizing:border-box}.risk-evaluation-container .risk-evaluation-single>*{margin-top:auto;margin-bottom:auto}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo{width:40px;min-width:40px;height:40px;line-height:40px;text-align:center;background:#ececec;color:rgba(0,0,0,.3);margin-right:.5em}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo .photodigiriskdolibarr{width:100%;height:auto;background:#fff}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo a,.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo .divphotoref{width:40px;min-width:40px;height:40px;position:relative;display:block}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo a .photo,.risk-evaluation-container .risk-evaluation-single .risk-evaluation-photo .divphotoref .photo{position:absolute;top:0;left:0;width:100%;height:100%;object-fit:cover}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content{width:100%}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-author{display:inline-block;width:25px;min-width:25px;height:25px;line-height:25px;background:rgba(0,0,0,.5);overflow:hidden;text-transform:uppercase;font-size:14px;font-weight:600;border-radius:50%;vertical-align:sub;text-align:center}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-author a{color:#fff !important}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-data{display:flex;flex-wrap:wrap}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-data>*{margin:auto .2em}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-data .risk-evaluation-reference{color:#333;font-weight:600}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-content .risk-evaluation-data .risk-evaluation-count{background:rgba(0,0,0,.2);font-size:12px;border-radius:4px;padding:.2em .4em}.risk-evaluation-container .risk-evaluation-single .risk-evaluation-button{margin-left:.5em}.wpeo-table.evaluation-method{background:none}@media(max-width: 770px){.wpeo-table.evaluation-method .table-row.table-header{display:none}}.wpeo-table.evaluation-method.riskenvironmental .table-row.table-header{background:#22bf4e}.wpeo-table.evaluation-method.riskenvironmental .table-row>.table-cell:first-child{background:#22bf4e;color:#fff}.wpeo-table.evaluation-method.risk .table-row.table-header{background:#263c5c}.wpeo-table.evaluation-method.risk .table-row>.table-cell:first-child{background:#263c5c;color:#fff}.wpeo-table.evaluation-method .table-cell{margin:0;text-align:center;border:1px solid rgba(0,0,0,.1);padding:.8em .4em;position:relative}@media(max-width: 480px){.wpeo-table.evaluation-method .table-cell{width:100% !important}}.wpeo-table.evaluation-method .table-cell.can-select::after,.wpeo-table.evaluation-method .wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .table-cell.risk-evaluation-cotation::after,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .wpeo-table.evaluation-method .table-cell.risk-evaluation-cotation::after{display:block;content:"";position:absolute;top:.4em;right:.4em;bottom:.4em;left:.4em;background:rgba(0,0,0,.1);transform:scale(0);opacity:0;transition:transform .2s ease-out,opacity .2s ease-out}.wpeo-table.evaluation-method .table-cell.can-select:hover,.wpeo-table.evaluation-method .wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .table-cell.risk-evaluation-cotation:hover,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .wpeo-table.evaluation-method .table-cell.risk-evaluation-cotation:hover{cursor:pointer}.wpeo-table.evaluation-method .table-cell.can-select:hover::after,.wpeo-table.evaluation-method .wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .table-cell.risk-evaluation-cotation:hover::after,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .wpeo-table.evaluation-method .table-cell.risk-evaluation-cotation:hover::after{transform:scale(1);opacity:1}.wpeo-table.evaluation-method .table-cell.can-select.active,.wpeo-table.evaluation-method .wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .table-cell.active.risk-evaluation-cotation,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .wpeo-table.evaluation-method .table-cell.active.risk-evaluation-cotation{color:#fff}.wpeo-table.evaluation-method .table-cell.can-select.active::after,.wpeo-table.evaluation-method .wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .table-cell.active.risk-evaluation-cotation::after,.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard .wpeo-table.evaluation-method .table-cell.active.risk-evaluation-cotation::after{transform:scale(1);opacity:1;background:#0d8aff;z-index:-1}.wpeo-table.evaluation-method .table-row:not(.header) .table-cell:nth-of-type(2).active::after{background:#0d8aff}.wpeo-table.evaluation-method .table-row:not(.header) .table-cell:nth-of-type(3).active::after{background:rgb(0,98.9152892562,191.5)}.wpeo-table.evaluation-method .table-row:not(.header) .table-cell:nth-of-type(4).active::after{background:rgb(0,59.4008264463,115)}.wpeo-table.evaluation-method .table-row:not(.header) .table-cell:nth-of-type(5).active::after{background:rgb(0,19.8863636364,38.5)}.wpeo-table.evaluation-method .table-row:not(.header) .table-cell:nth-of-type(6).active::after{background:#000}.wpeo-modal[class*=modal-risk] .modal-container .title{display:block;font-weight:600;font-size:13px;margin-bottom:.6em;color:rgba(0,0,0,.8)}.wpeo-modal[class*=modal-risk] .modal-container .title required{font-size:18px;color:#0d8aff;vertical-align:text-top;line-height:.9}.wpeo-modal[class*=modal-risk] .modal-container .section-title{font-size:16px;color:rgba(0,0,0,.8);font-weight:600;margin-bottom:.6em;display:block}.wpeo-modal[class*=modal-risk] .modal-container .maxwidthdate{max-width:125px}.wpeo-modal[class*=modal-risk] .modal-container .risk-content{display:flex;padding-bottom:1em;margin-bottom:1em;border-bottom:1px solid rgba(0,0,0,.2)}.wpeo-modal[class*=modal-risk] .modal-container .risk-content .risk-category{margin-right:1.5em}.wpeo-modal[class*=modal-risk] .modal-container .risk-content .risk-category .dropdown-toggle::after{display:none}.wpeo-modal[class*=modal-risk] .modal-container .risk-content .risk-description{flex-grow:1}.wpeo-modal[class*=modal-risk] .modal-container .risk-content .risk-description textarea{width:100%}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container{padding-bottom:1em;margin-bottom:1em;border-bottom:1px solid rgba(0,0,0,.2)}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-header{margin-bottom:1em}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper{display:flex}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .cotation-standard{margin-right:1em}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .risk-evaluation-photo img{max-width:50px}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .risk-evaluation-comment{flex-grow:1;margin-left:1em}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container .risk-evaluation-content-wrapper .risk-evaluation-comment textarea{width:100%}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container.advanced .risk-evaluation-content-wrapper{flex-wrap:wrap}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container.advanced .risk-evaluation-content{width:100%;margin-bottom:1em}.wpeo-modal[class*=modal-risk] .modal-container .risk-evaluation-container.advanced .risk-evaluation-photo{margin-right:1em}.wpeo-modal .modal-container .risk-evaluations-list .risk-evaluation>.risk-evaluation-container{display:flex}.wpeo-modal .modal-container .risk-evaluations-list .risk-evaluation>.risk-evaluation-container .risk-evaluation-single{width:100%}.wpeo-modal .modal-container .risk-evaluations-list .risk-evaluation>.risk-evaluation-container .risk-evaluation-single .risk-evaluation-reference{color:#333}.wpeo-modal .modal-container .risk-evaluations-list .risk-evaluation>.risk-evaluation-container .risk-evaluation-actions{margin-left:auto}.wpeo-modal[class*=modal-risksign] .modal-container .title{display:block;font-weight:600;font-size:13px;margin-bottom:.6em;color:rgba(0,0,0,.8)}.wpeo-modal[class*=modal-risksign] .modal-container .title required{font-size:18px;color:#0d8aff;vertical-align:text-top;line-height:.9}.wpeo-modal[class*=modal-risksign] .modal-container .section-title{font-size:16px;color:rgba(0,0,0,.8);font-weight:600;margin-bottom:.6em;display:block}.wpeo-modal[class*=modal-risksign] .modal-container .risksign-content{display:flex;padding-bottom:1em;margin-bottom:1em;border-bottom:1px solid rgba(0,0,0,.2)}.wpeo-modal[class*=modal-risksign] .modal-container .risksign-content .risksign-category{margin-right:1.5em}.wpeo-modal[class*=modal-risksign] .modal-container .risksign-content .risksign-category .dropdown-toggle::after{display:none}.wpeo-modal[class*=modal-risksign] .modal-container .risksign-content .risksign-description{flex-grow:1}.wpeo-modal[class*=modal-risksign] .modal-container .risksign-content .risksign-description textarea{width:100%}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .title{display:block;font-weight:600;font-size:13px;margin-bottom:.6em;color:rgba(0,0,0,.8)}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .title required{font-size:18px;color:#0d8aff;vertical-align:text-top;line-height:.9}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .section-title{font-size:16px;color:rgba(0,0,0,.8);font-weight:600;margin-bottom:.6em;display:block}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .riskassessment-task-single{display:block !important}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .riskassessment-task-container{display:flex;padding-bottom:1em;margin-bottom:1em;border-bottom:1px solid rgba(0,0,0,.2)}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .riskassessment-task-container .riskassessment-task{flex-grow:1}.wpeo-modal[class*=modal-riskassessment-task] .modal-container .riskassessment-task-container .riskassessment-task input{width:100%}.wpeo-modal .modal-container .riskassessment-task-list .riskassessment-task>.riskassessment-task-container{display:flex}.wpeo-modal .modal-container .riskassessment-task-list .riskassessment-task>.riskassessment-task-container .riskassessment-task-single{width:100%}.wpeo-modal .modal-container .riskassessment-task-list .riskassessment-task>.riskassessment-task-container .riskassessment-task-actions{margin-left:auto}.riskassessment-task-edit-modal .wpeo-modal.modal-riskassessment-task.modal-active{z-index:1004}#dialog-confirm-actionButtonImportSharedRisks .confirmtext{text-align:center;padding:.2em 0 .4em 0}#dialog-confirm-actionButtonImportSharedRisks .tagtable{border-collapse:collapse}#dialog-confirm-actionButtonImportSharedRisks .tagtr{border-bottom:1px solid rgba(0,0,0,.2)}#dialog-confirm-actionButtonImportSharedRisks .tagtd{padding:.3em 0}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child{display:flex}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child .importsharedrisk:not(.imported):not(.risk-evaluation-cotation){width:30%}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child .importsharedrisk.imported{width:10%;text-align:center;font-size:12px}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child .importsharedrisk img{float:left;margin-right:.4em;max-width:35px}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child .importsharedrisk>span{display:block}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:first-child .importsharedrisk .importsharedrisk-ref{font-weight:600}#dialog-confirm-actionButtonImportSharedRisks .tagtr>.tagtd:last-child{vertical-align:middle}#dialog-confirm-actionButtonImportSharedRiskSigns .confirmtext{text-align:center;padding:.2em 0 .4em 0}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtable{border-collapse:collapse}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr{border-bottom:1px solid rgba(0,0,0,.2)}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtd{padding:.3em 0}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child{display:flex}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child .importsharedrisksign:not(.imported){width:30%}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child .importsharedrisksign.imported{width:10%;text-align:center;font-size:12px}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child .importsharedrisksign img{float:left;margin-right:.4em;max-width:35px}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child .importsharedrisksign>span{display:block}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:first-child .importsharedrisksign .importsharedrisksign-ref{font-weight:600}#dialog-confirm-actionButtonImportSharedRiskSigns .tagtr>.tagtd:last-child{vertical-align:middle}.wpeo-modal.modal-photo.modal-active{z-index:2014}.wpeo-modal.modal-photo .clickable-photo{border:5px solid #fff;transition:all .2s ease-out;width:100%}.wpeo-modal.modal-photo .clickable-photo:hover{cursor:pointer}.wpeo-modal.modal-photo .clickable-photo:hover .photo-image .photo{opacity:.8}.wpeo-modal.modal-photo .clickable-photo .photo-image{position:relative;width:100%;max-width:120px;height:120px;margin:auto}.wpeo-modal.modal-photo .clickable-photo .photo-image .photo{position:absolute;top:0;left:0;width:100%;object-fit:cover;max-width:none !important;transition:all .2s ease-out}.wpeo-modal.modal-photo .clickable-photo .photo-image .clicked-photo-preview{position:absolute;display:inline-block;top:1em;right:1em;z-index:900;height:25px;line-height:25px;background:#fff;color:#0d8aff;transition:all .2s ease-out}.wpeo-modal.modal-photo .clickable-photo .photo-image .clicked-photo-preview:hover{transform:scale(1.1)}.wpeo-modal.modal-photo .clickable-photo .photo-image .clicked-photo-preview i{line-height:25px;font-size:14px}.wpeo-modal.modal-photo .clickable-photo .title{word-break:break-all}.wpeo-modal.modal-photo .formattachnewfile{padding-bottom:.5em}.wpeo-modal.modal-photo input[type=file]{border-bottom:0 !important}.evaluator-add-modal .time{display:flex;align-items:center}.risk-evaluation-add-modal .modal-container,.risk-evaluation-edit-modal .modal-container{max-height:750px}.risk-evaluation-edit-modal .wpeo-modal.modal-risk.modal-active{z-index:1004}.wpeo-modal .modal-container ul,.wpeo-modal .modal-container li{margin:0;list-style-type:none;padding:0}@media(max-width: 1200px){#id-container .side-nav .vmenu{width:30px;padding-right:0 !important;overflow:hidden}#id-container .side-nav .vmenu .menu_titre .vmenu i{margin-right:2em}#id-container .side-nav .vmenu #blockvmenusearch .select2-container--default .select2-selection--single .select2-selection__placeholder::before{display:inline-block;content:"";font-family:"Font Awesome 5 Free";font-weight:600;margin-right:2em}}@media(max-width: 1200px){#id-container.page-ut-gp-list .side-nav{display:inline-block;position:static;height:auto;padding:0 2em;background:none;border:0}#id-container.page-ut-gp-list .side-nav .navigation-container{padding-right:.5em}#id-container.page-ut-gp-list .side-nav .side-nav-responsive{display:block;background:#263c5c;color:#fff;border-radius:6px;padding:.6em 1em;font-weight:600;font-size:14px;transition:all .2s ease-out}#id-container.page-ut-gp-list .side-nav .side-nav-responsive:hover{cursor:pointer;background:rgb(67.8153846154,107.0769230769,164.1846153846)}#id-container.page-ut-gp-list .side-nav #id-left{position:absolute;z-index:999;background:#efefef;border:1px solid rgba(0,0,0,.1);box-shadow:0 0 40px 0 rgba(0,0,0,.1);transition:all .2s ease-out;max-height:500px;overflow-y:auto;width:80%;max-width:350px}#id-container.page-ut-gp-list .side-nav #id-left:not(.active){opacity:0;pointer-events:none;transform:translateY(-10px)}#id-container.page-ut-gp-list .side-nav #id-left:not(.active) .wpeo-button{pointer-events:none}}@media(max-width: 695px){#id-container.page-ut-gp-list{margin-left:0}#id-container.page-ut-gp-list #id-right{padding-left:0;width:100%}}@media(max-width: 1200px){td>.riskassessment-task-container{min-width:0}}@media(max-width: 1200px){td>.risk-evaluation-container{min-width:0}}.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-draggable.ui-resizable.preview-photo{z-index:2100 !important}.dropdown-toggle::after{display:none}.favorite-photo{border:5px solid #0d8aff}.box-flex-item{width:auto !important}ul{list-style-type:none}tr.liste_titre th.liste_titre:not(.maxwidthsearch),tr.liste_titre td.liste_titre:not(.maxwidthsearch){opacity:1}@media only screen and (max-width: 1600px){div.fichecenter{width:100%;clear:both}div.fichecenterbis{margin-top:8px}div.fichethirdleft{float:none;width:auto;padding-bottom:6px}div.fichetwothirdright{float:none;width:auto;padding-bottom:6px}div.fichehalfleft{float:none;width:auto}div.fichehalfright{float:none;width:auto}div.fichehalfright{margin-top:10px}div.firstcolumn div.box{padding-right:0px}div.secondcolumn div.box{padding-left:0px}} \ No newline at end of file diff --git a/css/scss/page/_page-ut-gp-list.scss b/css/scss/page/_page-ut-gp-list.scss index b0c2d40d8..e8b5a3ad9 100644 --- a/css/scss/page/_page-ut-gp-list.scss +++ b/css/scss/page/_page-ut-gp-list.scss @@ -147,16 +147,16 @@ min-width: 30px; width: 30px; - &::before { - display: block; - position: absolute; - content: ''; - height: 1px; - left: 0; - right: 10px; - top: 20px; - background: rgba(0,0,0,0.3); - } + //&::before { + // display: block; + // position: absolute; + // content: ''; + // height: 1px; + // left: 0; + // right: 10px; + // top: 20px; + // background: rgba(0,0,0,0.3); + //} } .photodigiriskdolibarr { display: block; @@ -229,31 +229,31 @@ .toggle-unit { position: relative; - &::before { - right: 20px; - display: block; - position: absolute; - content: ''; - height: 1px; - left: 0; - top: 20px; - background: rgba(0,0,0,0.3); - } + //&::before { + // right: 20px; + // display: block; + // position: absolute; + // content: ''; + // height: 1px; + // left: 0; + // top: 20px; + // background: rgba(0,0,0,0.3); + //} } .unit { position: relative; margin-left: 0.6em; - &::before { - display: block; - position: absolute; - content: ''; - width: 1px; - height: 100%; - left: 0; - top: 0; - background: rgba(0,0,0,0.3); - } + //&::before { + // display: block; + // position: absolute; + // content: ''; + // width: 1px; + // height: 100%; + // left: 0; + // top: 0; + // background: rgba(0,0,0,0.3); + //} } } diff --git a/css/scss/page/_ticket.scss b/css/scss/page/_ticket.scss index 1a0a0e69d..cf6d9ec6b 100644 --- a/css/scss/page/_ticket.scss +++ b/css/scss/page/_ticket.scss @@ -53,9 +53,6 @@ } .form-registre .wpeo-button { - display: flex; - justify-content: center; - > * { margin-top: auto; margin-bottom: auto; diff --git a/css/scss/responsive/_page-ut-gp-list.scss b/css/scss/responsive/_page-ut-gp-list.scss index 5512cd7c1..557e69abd 100644 --- a/css/scss/responsive/_page-ut-gp-list.scss +++ b/css/scss/responsive/_page-ut-gp-list.scss @@ -7,6 +7,9 @@ background: none; border: 0; + .navigation-container { + padding-right: 0.5em; + } .side-nav-responsive { display: block; background: $color__secondary; @@ -31,6 +34,8 @@ transition: all 0.2s ease-out; max-height: 500px; overflow-y: auto; + width: 80%; + max-width: 350px; &:not(.active) { opacity: 0; diff --git a/css/scss/style.scss b/css/scss/style.scss index f2546b5be..d7493d4a6 100644 --- a/css/scss/style.scss +++ b/css/scss/style.scss @@ -12,10 +12,6 @@ z-index: 2100 !important; } -.imgTabTitle { - max-height: 32px !important; -} - .dropdown-toggle::after { display: none; } diff --git a/css/scss/table/_evaluation-method.scss b/css/scss/table/_evaluation-method.scss index 98d331ee2..496b822bc 100644 --- a/css/scss/table/_evaluation-method.scss +++ b/css/scss/table/_evaluation-method.scss @@ -7,14 +7,32 @@ * .level5 -> cotation 80 * .method -> cotation personnalisée */ +$background-colors: ( + riskenvironmental: $color__riskenvironmental, + risk: $color__secondary +); + .wpeo-table.evaluation-method { - background: none !important; + background: none; .table-row.table-header { - @media ( max-width: $media__small ) { + @media (max-width: $media__medium) { display: none; } } + + @each $class, $color in $background-colors { + &.#{$class} { + .table-row.table-header { + background: $color; + } + .table-row > .table-cell:first-child { + background: $color; + color: #fff; + } + } + } + .table-cell { margin: 0; text-align: center; @@ -22,7 +40,7 @@ padding: 0.8em 0.4em; position: relative; - @media ( max-width: $media__small ) { + @media (max-width: $media__small) { width: 100% !important; } @@ -38,7 +56,7 @@ background: rgba(0,0,0,0.1); transform: scale(0); opacity: 0; - transition: all 0.2s ease-out; + transition: transform 0.2s ease-out, opacity 0.2s ease-out; } &:hover { cursor: pointer; @@ -51,37 +69,18 @@ color: #fff; &::after { - transform: scale(1) !important; - opacity: 1 !important; + transform: scale(1); + opacity: 1; background: $color__primary; z-index: -1; } } } } - .table-row > .table-cell:first-child { - background: $color__secondary; - color: #fff; - @media ( max-width: $media__small ) { - background: $color__secondary; - } - } - .table-row:not(.header) { - .table-cell:nth-of-type(2).active::after { - background: darken($color__primary, 0); - } - .table-cell:nth-of-type(3).active::after { - background: darken($color__primary, 15%); - } - .table-cell:nth-of-type(4).active::after { - background: darken($color__primary, 30%); - } - .table-cell:nth-of-type(5).active::after { - background: darken($color__primary, 45%); - } - .table-cell:nth-of-type(6).active::after { - background: darken($color__primary, 60%); + @for $i from 2 through 6 { + .table-row:not(.header) .table-cell:nth-of-type(#{$i}).active::after { + background: darken($color__primary, (($i - 2) * 15%)); } } } diff --git a/css/scss/table/_riskassessment-task.scss b/css/scss/table/_riskassessment-task.scss index 921f44d1d..91dd7d317 100644 --- a/css/scss/table/_riskassessment-task.scss +++ b/css/scss/table/_riskassessment-task.scss @@ -9,6 +9,7 @@ display: flex; flex-wrap: nowrap; align-items: center; + flex-direction: column; .riskassessment-task-container { flex-grow: 1; diff --git a/css/scss/variable/_colors.scss b/css/scss/variable/_colors.scss index cffe7b893..263d995ca 100644 --- a/css/scss/variable/_colors.scss +++ b/css/scss/variable/_colors.scss @@ -12,3 +12,4 @@ $color__dark: #2b2b2b; $color__grey: #ececec; $color__blue: #0d8aff; $color__green: #47e58e; +$color__riskenvironmental: #22bf4e; diff --git a/digiriskdolibarrindex.php b/digiriskdolibarrindex.php index be21c0ef6..40fa22afe 100644 --- a/digiriskdolibarrindex.php +++ b/digiriskdolibarrindex.php @@ -32,8 +32,6 @@ require_once __DIR__ . '/core/tpl/digiriskdolibarr_projectcreation_action.tpl.php'; -$moreParams['specialModuleNameLowerCase'] = 'digirisk'; - $moreParams = [ 'LoadRiskAssessmentDocument' => 1, 'LoadAccident' => 1, @@ -42,7 +40,8 @@ 'LoadDigiriskElement' => 1, 'LoadSaturneTask' => 1, 'LoadRisk' => 1, - 'LoadTicketDashboard' => 1 + 'LoadTicketDashboard' => 1, + 'specialModuleNameLowerCase' => 'digirisk' ]; require_once __DIR__ . '/../saturne/core/tpl/index/index_view.tpl.php'; diff --git a/documents/doctemplates/groupmentdocument/template_groupmentdocument.odt b/documents/doctemplates/groupmentdocument/template_groupmentdocument.odt index 058715624..b8990837b 100644 Binary files a/documents/doctemplates/groupmentdocument/template_groupmentdocument.odt and b/documents/doctemplates/groupmentdocument/template_groupmentdocument.odt differ diff --git a/documents/doctemplates/riskassessmentdocument/template_riskassessmentdocument.odt b/documents/doctemplates/riskassessmentdocument/template_riskassessmentdocument.odt index 03449eefe..d9d824567 100644 Binary files a/documents/doctemplates/riskassessmentdocument/template_riskassessmentdocument.odt and b/documents/doctemplates/riskassessmentdocument/template_riskassessmentdocument.odt differ diff --git a/documents/doctemplates/workunitdocument/template_workunitdocument.odt b/documents/doctemplates/workunitdocument/template_workunitdocument.odt index 469955099..414a4c4ef 100644 Binary files a/documents/doctemplates/workunitdocument/template_workunitdocument.odt and b/documents/doctemplates/workunitdocument/template_workunitdocument.odt differ diff --git a/img/digiriskdolibarr.png b/img/digiriskdolibarr.png index 66e496b87..191c6b408 100644 Binary files a/img/digiriskdolibarr.png and b/img/digiriskdolibarr.png differ diff --git a/img/digiriskdolibarr_color.png b/img/digiriskdolibarr_color.png index 66e496b87..191c6b408 100644 Binary files a/img/digiriskdolibarr_color.png and b/img/digiriskdolibarr_color.png differ diff --git a/img/digiriskdolibarr_color.svg b/img/digiriskdolibarr_color.svg index fd1b217d8..0f279437e 100644 --- a/img/digiriskdolibarr_color.svg +++ b/img/digiriskdolibarr_color.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/img/digiriskdolibarr_color_192.png b/img/digiriskdolibarr_color_192.png index 143600fe5..1d4d1b6f7 100644 Binary files a/img/digiriskdolibarr_color_192.png and b/img/digiriskdolibarr_color_192.png differ diff --git a/img/digiriskdolibarr_color_512.png b/img/digiriskdolibarr_color_512.png index 5d05cf5a7..2ba218981 100644 Binary files a/img/digiriskdolibarr_color_512.png and b/img/digiriskdolibarr_color_512.png differ diff --git a/img/digiriskdolibarr_logo.png b/img/digiriskdolibarr_logo.png new file mode 100644 index 000000000..9ec614096 Binary files /dev/null and b/img/digiriskdolibarr_logo.png differ diff --git a/img/object_digiriskdolibarr_color.png b/img/object_digiriskdolibarr_color.png index 66e496b87..191c6b408 100644 Binary files a/img/object_digiriskdolibarr_color.png and b/img/object_digiriskdolibarr_color.png differ diff --git a/js/digiriskdolibarr.min.js b/js/digiriskdolibarr.min.js index bdd4f007f..61fda1de3 100644 --- a/js/digiriskdolibarr.min.js +++ b/js/digiriskdolibarr.min.js @@ -1 +1 @@ -"use strict";window.digiriskdolibarr||(window.digiriskdolibarr={},window.digiriskdolibarr.scriptsLoaded=!1),window.digiriskdolibarr.scriptsLoaded||(window.digiriskdolibarr.init=function(){window.digiriskdolibarr.load_list_script()},window.digiriskdolibarr.load_list_script=function(){if(!window.digiriskdolibarr.scriptsLoaded){var i=void 0,e=void 0;for(i in window.digiriskdolibarr)for(e in window.digiriskdolibarr[i].init&&window.digiriskdolibarr[i].init(),window.digiriskdolibarr[i])window.digiriskdolibarr[i]&&window.digiriskdolibarr[i][e]&&window.digiriskdolibarr[i][e].init&&window.digiriskdolibarr[i][e].init();window.digiriskdolibarr.scriptsLoaded=!0}},window.digiriskdolibarr.refresh=function(){var i=void 0,e=void 0;for(i in window.digiriskdolibarr)for(e in window.digiriskdolibarr[i].refresh&&window.digiriskdolibarr[i].refresh(),window.digiriskdolibarr[i])window.digiriskdolibarr[i]&&window.digiriskdolibarr[i][e]&&window.digiriskdolibarr[i][e].refresh&&window.digiriskdolibarr[i][e].refresh()},$(document).ready(window.digiriskdolibarr.init)),window.digiriskdolibarr.accident={},window.digiriskdolibarr.accident.init=function(){window.digiriskdolibarr.accident.event()},window.digiriskdolibarr.accident.event=function(){$(document).on("submit",".sendfile",window.digiriskdolibarr.accident.tmpStockFile),$(document).on("click",".linked-file-delete-workstop",window.digiriskdolibarr.accident.removeFile),$(document).on("change","#external_accident",window.digiriskdolibarr.accident.showExternalAccidentLocation)},window.digiriskdolibarr.accident.tmpStockFile=function(e,i=""){var s=$("#sendfile").prop("files"),t=new FormData;for(let i=0;ii.json()).then(i=>{i=i[0].option.matrix[e];t.find(".risk-evaluation-calculated-cotation").find(".risk-evaluation-cotation").attr("data-scale",window.digiriskdolibarr.evaluation.getDynamicScale(i)),t.find(".risk-evaluation-calculated-cotation").find(".risk-evaluation-cotation span").text(i),t.find(".risk-evaluation-content").find(".risk-evaluation-seuil").val(i),window.digiriskdolibarr.risk.haveDataInInput(t)})}},window.digiriskdolibarr.evaluator={},window.digiriskdolibarr.evaluator.init=function(){window.digiriskdolibarr.evaluator.event()},window.digiriskdolibarr.evaluator.event=function(){$(document).on("click",".evaluator-create",window.digiriskdolibarr.evaluator.createEvaluator),$(document).on("change","#fk_user_employer",window.digiriskdolibarr.evaluator.selectUser)},window.digiriskdolibarr.evaluator.selectUser=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".modal-container"),t=s.find("#fk_user_employer").val();window.saturne.loader.display(s.find('input[name="evaluatorJob"]')),$.ajax({url:document.URL+"&action=getEvaluatorJob&token="+e,type:"POST",processData:!1,data:JSON.stringify({userID:t}),contentType:!1,success:function(i){s.find('input[name="evaluatorJob"]').val($(i).find('input[name="evaluatorJob"]').val()),s.find('input[name="evaluatorJob"]').removeClass("wpeo-loader")},error:function(i){}}),window.digiriskdolibarr.evaluator.haveDataInInput(s)},window.digiriskdolibarr.evaluator.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("evaluator-add-modal")&&(0 div:nth-child(1)").text();var l=[];$(this).closest(".modal-container").find(".risk-categories").find(":selected").each(function(){l.push($(this).val())}),$.ajax({url:document.URL+"&action=saveRisk&token="+e,type:"POST",processData:!1,data:JSON.stringify({riskID:t,category:s,comment:r,newParent:o,categories:l}),contentType:!1,success:function(i){$(".wpeo-loader").removeClass("wpeo-loader");var e=$(".messageSuccessRiskEdit"),s=(o==a||n?($(".modal-active").removeClass("modal-active"),$(".risk-description-"+t).html($(i).find(".risk-description-"+t)),$(".risk-row-content-"+t).find(".risk-category .cell-risk").html($(i).find(".risk-row-content-"+t).find(".risk-category .cell-risk").children()),$(".risk-row-content-"+t).find(".risk-category").fadeOut(800),$(".risk-row-content-"+t).find(".risk-category").fadeIn(800),$(".risk-row-content-"+t).find(".risk-description-"+t).fadeOut(800),$(".risk-row-content-"+t).find(".risk-description-"+t).fadeIn(800)):$(".risk-row-content-"+t).fadeOut(800,function(){$(".fichecenter .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormListRisks .opacitymedium.colorblack.paddingleft"))}),""),s=(s=(s+=e.find(".valueForEditRisk1").val())+d)+e.find(".valueForEditRisk2").val();e.find("a").attr("href","#risk_row_"+t),e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskEdit"),s="",s=(s=(s+=e.find(".valueForEditRisk1").val())+d)+e.find(".valueForEditRisk2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.risk.unlinkSharedRisk=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value"),t=(window.saturne.loader.display($(this)),$(".risk_row_"+s).find(".risk-container > div:nth-child(1)").text());var a=document.URL.split(/#/);$.ajax({url:a[0]+"&action=unlinkSharedRisk&token="+e,type:"POST",processData:!1,data:JSON.stringify({riskID:s}),contentType:!1,success:function(i){$(".confirmquestions").html($(i).find(".confirmquestions").children()),$(".fichecenter.sharedrisklist .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormSharedListRisks .opacitymedium.colorblack.paddingleft"));var i=$(".messageSuccessRiskUnlinkShared"),e=($("#risk_row_"+s).fadeOut(800),""),e=(e=(e+=i.find(".valueForUnlinkSharedRisk1").val())+t)+i.find(".valueForUnlinkSharedRisk2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskUnlinkShared"),s="",s=(s=(s+=e.find(".valueForUnlinkSharedRisk1").val())+t)+e.find(".valueForUnlinkSharedRisk2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.risk.sharedRiskBoxLoader=function(i){"Oui"==$(this).text()&&window.saturne.loader.display($("#searchFormSharedListRisks"))},window.digiriskdolibarr.evaluation={},window.digiriskdolibarr.evaluation.init=function(){window.digiriskdolibarr.evaluation.event()},window.digiriskdolibarr.evaluation.event=function(){$(document).on("click",".select-evaluation-method",window.digiriskdolibarr.evaluation.selectEvaluationMethod),$(document).on("click",".cotation-container .risk-evaluation-cotation.cotation",window.digiriskdolibarr.evaluation.selectSeuil),$(document).on("click",".risk-evaluation-create",window.digiriskdolibarr.evaluation.createEvaluation),$(document).on("click",".risk-evaluation-save",window.digiriskdolibarr.evaluation.saveEvaluation),$(document).on("click",".risk-evaluation-delete",window.digiriskdolibarr.evaluation.deleteEvaluation)},window.digiriskdolibarr.evaluation.selectEvaluationMethod=function(i){var e=$(this).closest(".modal-container");0"+e.split(/\(/)[0]+"("+(+s-1)+")"),s-1<1&&$(".fichecenter.risklist").html($(i).find("#searchFormListRisks")),t.removeClass("wpeo-loader"),""),e=(e=(e+=r.find(".valueForDeleteEvaluation1").val())+n)+r.find(".valueForDeleteEvaluation2").val();r.find(".notice-subtitle .text").text(e),r.removeClass("hidden")},error:function(i){var e="",e=(e=(e+=o.find(".valueForDeleteEvaluation1").val())+n)+o.find(".valueForDeleteEvaluation2").val();o.find(".notice-subtitle .text").text(e),o.removeClass("hidden")}})}},window.digiriskdolibarr.evaluation.saveEvaluation=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).closest(".risk-evaluation-edit-modal"),t=s.attr("value");var a=s.find(".risk-evaluation-comment textarea").val();let n=$(this).closest(".risk-row").find(".risk-evaluations-list-content").attr("value"),r=$(".risk-evaluation-ref-"+t).attr("value"),o=$(".risk-evaluation-list-modal-"+n),d=$("#risk_evaluation_list"+n).hasClass("modal-active");var a=window.digiriskdolibarr.risk.sanitizeBeforeRequest(a),l=s.find(".risk-evaluation-method").val(),c=s.find(".risk-evaluation-seuil").val(),k=s.find("#RiskAssessmentDateEdit"+t).val(),u=s.find(".risk-evaluation-photo .filename").val();let m=[];Object.values($(".table-cell.active.cell-"+t)).forEach(function(i){-1<$(i).data("seuil")&&(m[$(i).data("type")]=$(i).data("seuil"))}),window.saturne.loader.display($(this)),$.ajax({url:document.URL+"&action=saveEvaluation&token="+e,type:"POST",processData:!1,data:JSON.stringify({cotation:c,comment:a,method:l,photo:u,date:k,evaluationID:t,criteres:{gravite:m.gravite||0,occurrence:m.occurrence||m.historique||0,protection:m.protection||m.milieu||0,formation:m.formation||m.maitrise||0,exposition:m.exposition||m.frequence||0}}),contentType:!1,success:function(i){$("#risk_evaluation_edit"+t).removeClass("modal-active"),0<$(i).find(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)").length?((d?($(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)")):($(".risk-evaluation-container-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-container-"+t+":not(.last-risk-assessment)"))).fadeIn(800),o.find(".risk-evaluation-ref-"+t).replaceWith($(i).find(".risk-evaluation-ref-"+t)),$(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)").replaceWith($(i).find(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)")),$("#risk_evaluation_add"+n).html($(i).find("#risk_evaluation_add"+n).children())):($(".div-table-responsive").html($(i).find(".div-table-responsive").children()),(d?($(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)")):($(".risk-evaluation-container-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-container-"+t+":not(.last-risk-assessment)"))).fadeIn(800)),$(".wpeo-loader").removeClass("wpeo-loader");var i=$(".messageSuccessEvaluationEdit"),e=(s.find("#risk_evaluation_edit"+t).removeClass("modal-active"),""),e=(e=(e+=i.find(".valueForEditEvaluation1").val())+r)+i.find(".valueForEditEvaluation2").val();i.find("a").attr("href","#risk_row_"+n),i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(){var i=$(".messageErrorEvaluationEdit"),e="",e=(e=(e+=i.find(".valueForEditEvaluation1").val())+r)+i.find(".valueForEditEvaluation2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")}})},window.digiriskdolibarr.risksign={},window.digiriskdolibarr.risksign.init=function(){window.digiriskdolibarr.risksign.event()},window.digiriskdolibarr.risksign.event=function(){$(document).on("click",".risksign-category-danger .item, .wpeo-table .risksign-category-danger .item",window.digiriskdolibarr.risksign.selectRiskSign),$(document).on("click",".risksign-create:not(.button-disable)",window.digiriskdolibarr.risksign.createRiskSign),$(document).on("click",".risksign-save",window.digiriskdolibarr.risksign.saveRiskSign),$(document).on("click",".risksign-unlink-shared",window.digiriskdolibarr.risksign.unlinkSharedRiskSign)},window.digiriskdolibarr.risksign.selectRiskSign=function(i){var e=$(this),e=(e.closest(".content").removeClass("active"),e.closest(".wpeo-dropdown").find(".dropdown-toggle span").hide(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").show(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("src",e.find("img").attr("src")),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("aria-label",e.closest(".wpeo-tooltip-event").attr("aria-label")),e.closest(".fichecenter").find(".input-hidden-danger").val(e.data("id")),$(this).closest(".modal-container"));window.digiriskdolibarr.risksign.haveDataInInput(e)},window.digiriskdolibarr.risksign.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("risksign-add-modal")&&0<=i.find('input[name="risksign_category_id"]').val()&&i.find(".button-disable").removeClass("button-disable")},window.digiriskdolibarr.risksign.createRiskSign=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".fichecenter").find(".risksign-content"),t=s.find(".risksign-category input").val(),s=s.find(".risksign-description textarea").val();window.saturne.loader.display($(".fichecenter.risksignlist")),$.ajax({url:document.URL+"&action=add&token="+e,type:"POST",data:JSON.stringify({riskSignCategory:t,riskSignDescription:s}),processData:!1,contentType:!1,success:function(i){$(".fichecenter.risksignlist").html($(i).find("#searchFormListRiskSigns"));var e=$(".messageSuccessRiskSignCreate");$(".fichecenter.risksignlist").removeClass("wpeo-loader"),e.html($(i).find(".risksign-create-success-notice")),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskCreate");e.html($(i).find(".risksign-create-error-notice")),e.removeClass("hidden")}})},window.digiriskdolibarr.risksign.saveRiskSign=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).attr("value");let t=$(this).closest(".risksign-container").find(".risksign-content"),a="";var n=t.find(".risksign-category input").val(),r=t.find(".risksign-description textarea").val();let o=$(".risksign_row_"+s).find(".risksign-container > div:nth-child(1)").text();window.saturne.loader.display(t),$.ajax({url:document.URL+"&action=saveRiskSign&token="+e,data:JSON.stringify({riskSignID:s,riskSignCategory:n,riskSignDescription:r}),type:"POST",processData:!1,contentType:!1,success:function(i){$(".fichecenter.risksignlist").html($(i).find("#searchFormListRiskSigns"));i=$(".messageSuccessRiskSignEdit");t.removeClass("wpeo-loader"),a=(a=(a+=i.find(".valueForEditRiskSign1").val())+o)+i.find(".valueForEditRiskSign2").val(),i.find(".notice-subtitle .text").text(a),i.removeClass("hidden")},error:function(){var i=$(".messageErrorRiskSignEdit");t.removeClass("wpeo-loader"),a=(a=(a+=i.find(".valueForEditRiskSign1").val())+o)+i.find(".valueForEditRiskSign2").val(),i.find(".notice-subtitle .text").text(a),i.removeClass("hidden")}})},window.digiriskdolibarr.risksign.unlinkSharedRiskSign=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value"),t=(window.saturne.loader.display($(this)),$(".risksign_row_"+s).find(".risksign-container > div:nth-child(1)").text());var a=document.URL.split(/#/);$.ajax({url:a[0]+"&action=unlinkSharedRiskSign&token="+e,type:"POST",processData:!1,data:JSON.stringify({risksignID:s}),contentType:!1,success:function(i){$(".fichecenter.sharedrisksignlist .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormSharedListRiskSigns .opacitymedium.colorblack.paddingleft"));var i=$(".messageSuccessRiskSignUnlinkShared"),e=($("#risksign_row_"+s).fadeOut(800),""),e=(e=(e+=i.find(".valueForUnlinkSharedRiskSign1").val())+t)+i.find(".valueForUnlinkSharedRiskSign2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskSignUnlinkShared"),s="",s=(s=(s+=e.find(".valueForUnlinkSharedRiskSign1").val())+t)+e.find(".valueForUnlinkSharedRiskSign2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask={},window.digiriskdolibarr.riskassessmenttask.init=function(){window.digiriskdolibarr.riskassessmenttask.event()},window.digiriskdolibarr.riskassessmenttask.event=function(){$(document).on("input",".riskassessment-task-label",window.digiriskdolibarr.riskassessmenttask.fillRiskAssessmentTaskLabel),$(document).on("click",".riskassessment-task-create",window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTask),$(document).on("click",".riskassessment-task-save",window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTask),$(document).on("click",".riskassessment-task-delete",window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTask),$(document).on("click",".riskassessment-task-timespent-create",window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-timespent-save",window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-timespent-delete",window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-progress-checkbox:not(.riskassessment-task-progress-checkbox-readonly)",window.digiriskdolibarr.riskassessmenttask.checkTaskProgress),$(document).on("change","#RiskassessmentTaskTimespentDatehour",window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateHour),$(document).on("change","#RiskassessmentTaskTimespentDatemin",window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateMin),$(document).on("keyup",".riskassessment-task-label",window.digiriskdolibarr.riskassessmenttask.checkRiskassessmentTaskLabelLength),$(document).on("click",".listingHeaderTaskTooltip",window.digiriskdolibarr.riskassessmenttask.redirectOnSharedTaskConfig)},window.digiriskdolibarr.riskassessmenttask.fillRiskAssessmentTaskLabel=function(i){var e=$(this).closest(".modal-container");window.digiriskdolibarr.riskassessmenttask.haveDataInInput(e)},window.digiriskdolibarr.riskassessmenttask.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("riskassessment-task-add-modal")&&i.find('input[name="label"]').val().length&&i.find(".button-disable").removeClass("button-disable")},window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".riskassessment-task-add-modal"),t=s.find(".modal-risk").attr("value"),s=s.find(".riskassessment-task-container"),a=s.find(".riskassessment-task-label").val(),a=window.digiriskdolibarr.risk.sanitizeBeforeRequest(a),n=s.find("#RiskassessmentTaskDateStart"+t).val(),r=s.find("#RiskassessmentTaskDateStart"+t+"hour").val(),o=s.find("#RiskassessmentTaskDateStart"+t+"min").val(),d=s.find("#RiskassessmentTaskDateEnd"+t).val(),l=s.find("#RiskassessmentTaskDateEnd"+t+"hour").val(),c=s.find("#RiskassessmentTaskDateEnd"+t+"min").val(),s=s.find(".riskassessment-task-budget").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-tasks"+t)),$.ajax({url:document.URL+"&action=addRiskAssessmentTask&token="+e,type:"POST",data:JSON.stringify({tasktitle:a,dateStart:n,hourStart:r,minStart:o,dateEnd:d,hourEnd:l,minEnd:c,budget:s,riskToAssign:t}),processData:!1,contentType:!1,success:function(i){$(".tasks-list-container-"+t).replaceWith($(i).find(".tasks-list-container-"+t));var e=$(".messageSuccessTaskCreate");$(".riskassessment-tasks"+t).fadeOut(800),$(".riskassessment-tasks"+t).fadeIn(800),e.find("a").attr("href","#risk_row_"+t),e.html($(i).find(".task-create-success-notice")),e.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e=$(".messageErrorTaskCreate"),s=($("#risk_assessment_task_add"+t).removeClass("modal-active"),""),s=(s=(s+=e.find(".valueForCreateTask1").val())+e.find(".valueForCreateTask2").val())+" : "+i.message;e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken(),t=$(this).closest(".wpeo-table.riskassessment-tasks").attr("value"),a=$(this).closest(".riskassessment-task-single-content").attr("value"),s=$(this).closest(".riskassessment-task-container-"+a).find(".labelForDelete").val();let n=$(".messageSuccessTaskDelete"),r=$(".messageErrorTaskDelete");if(1!=confirm(s))return!1;{let s=$(".riskassessment-task-container-"+a).attr("value");window.saturne.loader.display($(".riskassessment-task-container-"+a)),$.ajax({url:document.URL+"&action=deleteRiskAssessmentTask&deletedRiskAssessmentTaskId="+a+"&token="+e,type:"POST",processData:!1,contentType:!1,success:function(i){console.log($(".riskassessment-task-listing-wrapper-"+t)),console.log(t),$(".riskassessment-task-listing-wrapper-"+t).replaceWith($(i).find(".riskassessment-task-listing-wrapper-"+t)),$(".riskassessment-tasks"+t).fadeOut(800),$(".riskassessment-tasks"+t).fadeIn(800);i="",i=(i=(i+=n.find(".valueForDeleteTask1").val())+s)+n.find(".valueForDeleteTask2").val();n.find("a").attr("href","#risk_row_"+t),n.find(".notice-subtitle .text").text(i),n.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e="",e=(e=(e=(e+=r.find(".valueForDeleteTask1").val())+s)+r.find(".valueForDeleteTask2").val())+" : "+i.message;r.find(".notice-subtitle .text").text(e),r.removeClass("hidden")}})}},window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value");var t=$(this).closest(".modal-container"),a=$(this).closest(".modal-risk").attr("value");let n="";var r=t.find(".riskassessment-task-label"+s).val(),r=window.digiriskdolibarr.risk.sanitizeBeforeRequest(r);let o=$(".riskassessment-task-single-"+s+" .riskassessment-task-reference").attr("value"),d=0;t.find(".riskassessment-task-progress-checkbox"+s).is(":checked")&&(d=1);var l=t.find("#RiskassessmentTaskDateStartEdit"+s).val(),c=t.find("#RiskassessmentTaskDateStartEdit"+s+"hour").val(),k=t.find("#RiskassessmentTaskDateStartEdit"+s+"min").val(),u=t.find("#RiskassessmentTaskDateEndEdit"+s).val(),m=t.find("#RiskassessmentTaskDateEndEdit"+s+"hour").val(),v=t.find("#RiskassessmentTaskDateEndEdit"+s+"min").val(),t=t.find(".riskassessment-task-budget"+s).val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+s)),$.ajax({url:document.URL+"&action=saveRiskAssessmentTask&token="+e,data:JSON.stringify({riskAssessmentTaskID:s,tasktitle:r,dateStart:l,hourStart:c,minStart:k,dateEnd:u,hourEnd:m,minEnd:v,budget:t,taskProgress:d}),type:"POST",processData:!1,contentType:!1,success:function(i){$("#risk_assessment_task_edit"+s).removeClass("modal-active"),$(".riskassessment-task-container-"+s).replaceWith($(i).find(".riskassessment-task-container-"+s).first());i=$(".messageSuccessTaskEdit");$(".riskassessment-tasks"+a).fadeOut(800),$(".riskassessment-tasks"+a).fadeIn(800),n=(n=(n+=i.find(".valueForEditTask1").val())+o)+i.find(".valueForEditTask2").val(),$(".wpeo-loader").removeClass("wpeo-loader"),$(".loader-spin").remove(),i.find("a").attr("href","#risk_row_"+a),i.find(".notice-subtitle .text").text(n),i.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e=$(".messageErrorTaskEdit");$("#risk_assessment_task_edit"+s).removeClass("modal-active"),$(".wpeo-loader").removeClass("wpeo-loader"),n=(n=(n=(n+=e.find(".valueForEditTask1").val())+o)+e.find(".valueForEditTask2").val()+" : ")+i.message,e.find(".notice-subtitle .text").text(n),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value");var t=$(this).closest(".riskassessment-task-edit-modal"),a=t.find(".riskassessment-task-timespent-container");let n=t.find("riskassessment-task-single").attr("value"),r="",o=t.find(".riskassessment-task-reference").attr("value"),d=$(".id-container").find(".riskassessment-total-task-timespent-"+s);var t=a.find("#RiskassessmentTaskTimespentDate"+s).val(),l=a.find("#RiskassessmentTaskTimespentDate"+s+"hour").val(),c=a.find("#RiskassessmentTaskTimespentDate"+s+"min").val(),k=a.find(".riskassessment-task-timespent-comment").val(),k=window.digiriskdolibarr.risk.sanitizeBeforeRequest(k),a=a.find(".riskassessment-task-timespent-duration").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+s)),$.ajax({url:document.URL+"&action=addRiskAssessmentTaskTimeSpent&token="+e,type:"POST",data:JSON.stringify({taskID:s,date:t,hour:l,min:c,comment:k,duration:a}),processData:!1,contentType:!1,success:function(i){var e=$(".messageSuccessTaskTimeSpentCreate"+s);$(".riskassessment-tasks"+n).fadeOut(800),$(".riskassessment-tasks"+n).fadeIn(800),r=(r=(r+=e.find(".valueForCreateTaskTimeSpent1").val())+o)+e.find(".valueForCreateTaskTimeSpent2").val(),$(".riskassessment-task-timespent-container").find(".riskassessment-task-timespent-list-"+s).replaceWith($(i).find(".riskassessment-task-timespent-container").find(".riskassessment-task-timespent-list-"+s)),$(".riskassessment-task-container-"+s).closest(".riskassessment-tasks").replaceWith($(i).find(".riskassessment-task-container-"+s).closest(".riskassessment-tasks")),$(".loader-spin").remove(),$(".wpeo-loader").removeClass("wpeo-loader"),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden"),d.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+s).first())},error:function(i){$(this).closest(".risk-row-content-"+n).removeClass("wpeo-loader");var e=$(".messageErrorTaskTimeSpentCreate"+s);e.html($(i).find(".task-timespent-create-error-notice")),e.removeClass("hidden")},complete:function(){$("#risk_assessment_task_edit"+s+".wpeo-modal").addClass("modal-active")}})},window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let a=$(this).closest(".riskassessment-task-timespent-list").attr("value"),n=$(this).attr("value");var s=$(this).attr("value"),t=$(this).closest(".riskassessment-task-timespent-"+n).find(".labelForDelete").val();let r=$(".id-container").first().find(".riskassessment-total-task-timespent-"+a);if(1!=confirm(t))return!1;{let t=$(".riskassessment-task-container-"+a).attr("value");window.saturne.loader.display($(this)),$.ajax({url:document.URL+"&action=deleteRiskAssessmentTaskTimeSpent&deletedRiskAssessmentTaskTimeSpentId="+s+"&token="+e,type:"POST",processData:!1,contentType:!1,success:function(i){var e=$(".messageSuccessTaskTimeSpentDelete"+a),s=($(".riskassessment-task-timespent-"+n).fadeOut(800),""),s=(s=(s+=e.find(".valueForDeleteTaskTimeSpent1").val())+t)+e.find(".valueForDeleteTaskTimeSpent2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden"),r.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+a).first())},error:function(i){var e=$(".messageErrorTaskDeleteTimeSpent"+a),s="",s=(s=(s+=e.find(".valueForDeleteTaskTimeSpent1").val())+t)+e.find(".valueForDeleteTaskTimeSpent2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})}},window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let s=$(this);var t=$(this).attr("value"),a=$(this).closest(".riskassessment-task-timespent-edit-modal").find(".riskassessment-task-timespent-container");let n=a.attr("value"),r="",o=$(".riskassessment-task-container-"+n).attr("value"),d=$(".id-container").first().find(".riskassessment-total-task-timespent-"+n);var l=a.find("#RiskassessmentTaskTimespentDateEdit"+t).val(),c=a.find("#RiskassessmentTaskTimespentDateEdit"+t+"hour").val(),k=a.find("#RiskassessmentTaskTimespentDateEdit"+t+"min").val(),u=a.find(".riskassessment-task-timespent-comment").val(),u=window.digiriskdolibarr.risk.sanitizeBeforeRequest(u),a=a.find(".riskassessment-task-timespent-duration").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+n)),$.ajax({url:document.URL+"&action=saveRiskAssessmentTaskTimeSpent&token="+e,data:JSON.stringify({riskAssessmentTaskTimeSpentID:t,taskID:n,date:l,hour:c,min:k,comment:u,duration:a}),type:"POST",processData:!1,contentType:!1,success:function(i){s.closest(".modal-active").removeClass("modal-active");var e=$(".messageSuccessTaskTimeSpentEdit"+n);$(".wpeo-loader").removeClass("wpeo-loader"),r=(r=(r+=e.find(".valueForEditTaskTimeSpent1").val())+o)+e.find(".valueForEditTaskTimeSpent2").val(),d.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+n).first()),$(".riskassessment-task-timespent-list-"+n).html($(i).find(".riskassessment-task-timespent-list-"+n).children()),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden")},error:function(i){var e=$(".messageSuccessTaskTimeSpentEdit"+n);r=(r=(r+=e.find(".valueForEditTaskTimeSpent1").val())+o)+e.find(".valueForEditTaskTimeSpent2").val(),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.checkTaskProgress=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".risk-row").find(".riskassessment-task-container"),t=$(this).closest(".riskassessment-task-single-content").attr("value");let a=$(this).closest(".riskassessment-tasks").attr("value"),n="",r=s.attr("value"),o="";s.find(".riskassessment-task-progress-checkbox"+t).hasClass("progress-checkbox-check")?(o=0,s.find(".riskassessment-task-progress-checkbox"+t).toggleClass("progress-checkbox-check").toggleClass("progress-checkbox-uncheck")):s.find(".riskassessment-task-progress-checkbox"+t).hasClass("progress-checkbox-uncheck")&&(o=1,s.find(".riskassessment-task-progress-checkbox"+t).toggleClass("progress-checkbox-uncheck").toggleClass("progress-checkbox-check")),window.saturne.loader.display($(".riskassessment-task-single-"+t));s=window.location.href.replace(/#.*/,"");$.ajax({url:s+"&action=checkTaskProgress&token="+e,data:JSON.stringify({riskAssessmentTaskID:t,taskProgress:o}),type:"POST",processData:!1,contentType:!1,success:function(i){$(".fichecenter.risklist").html($(i).find("#searchFormListRisks"));i=$(".messageSuccessTaskEdit");$(".riskassessment-tasks"+a).fadeOut(800),$(".riskassessment-tasks"+a).fadeIn(800),n=(n=(n+=i.find(".valueForEditTask1").val())+r)+i.find(".valueForEditTask2").val(),i.find(".notice-subtitle .text").text(n),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorTaskEdit");n=(n=(n+=e.find(".valueForEditTask1").val())+r)+e.find(".valueForEditTask2").val(),e.find(".notice-subtitle .text").text(n),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateHour=function(i){$(this).closest(".nowraponall").find(".select-riskassessmenttask-timespent-datehour").remove(),$(this).before('{$("#sendFileForm").load(document.URL+n+"ticket_id="+a+" #fileLinkedTable")})},window.digiriskdolibarr.ticket.removeFile=function(i){let e=$(this).attr("value");e=e.replace("_mini","");var s=$("#ticket_id").val(),t=window.saturne.toolbox.getQuerySeparator(document.URL);fetch(document.URL+t+"action=removefile&filetodelete="+e+"&ticket_id="+s,{method:"POST"}).then(i=>{$(this).parent().parent().hide()})},window.digiriskdolibarr.ticket.addDashBoardTicketInfo=function(){var i=window.saturne.toolbox.getToken(),e=$("#select2-boxcombo-container").attr("title"),s=e.split(" : ")[0],e=e.split(" : ")[2],t=window.saturne.toolbox.getQuerySeparator(document.URL);$.ajax({url:document.URL+t+"action=adddashboardinfo&token="+i,type:"POST",processData:!1,data:JSON.stringify({digiriskelementID:s,catID:e}),contentType:!1,success:function(i){window.location.reload()},error:function(){}})},window.digiriskdolibarr.ticket.closeDashBoardTicketInfo=function(){var i=window.saturne.toolbox.getToken();let e=$(this);var s=e.attr("data-digiriskelementid"),t=e.attr("data-catid"),a=window.saturne.toolbox.getQuerySeparator(document.URL);$.ajax({url:document.URL+a+"action=closedashboardinfo&token="+i,type:"POST",processData:!1,data:JSON.stringify({digiriskelementID:s,catID:t}),contentType:!1,success:function(i){e.closest(".box-flex-item").fadeOut(400),$(".add-widget-box").attr("style",""),$(".add-widget-box").html($(i).find(".add-widget-box").children())},error:function(){}})},window.digiriskdolibarr.ticket.checkValidEmail=function(){0==/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(this.value)?$(this).css("border","3px solid red"):$(this).css("border","3px solid green")},window.digiriskdolibarr.ticket.checkValidPhone=function(){0==/^(?:(?:(?:\+|00)\d{2}[\s]?(?:\(0\)[\s]?)?)|0){1}[1-9]{1}([\s.-]?)(?:\d{2}\1?){3}\d{2}$/.test(this.value)?$(this).css("border","3px solid red"):$(this).css("border","3px solid green")},window.digiriskdolibarr.digiriskusers={},window.digiriskdolibarr.digiriskusers.init=function(){window.digiriskdolibarr.digiriskusers.event()},window.digiriskdolibarr.digiriskusers.event=function(){$(document).on("input",".digirisk-users #firstname",window.digiriskdolibarr.digiriskusers.fillEmail),$(document).on("input",".digirisk-users #lastname",window.digiriskdolibarr.digiriskusers.fillEmail)},window.digiriskdolibarr.digiriskusers.fillEmail=function(i){var e=$(".digirisk-users #firstname").val(),s=$(".digirisk-users #lastname").val(),t=$(".input-domain-mail").val(),e=window.digiriskdolibarr.digiriskusers.removeDiacritics(e+"."+s+"@"+t).toLowerCase();$(".digirisk-users #email").val(e)},window.digiriskdolibarr.digiriskusers.removeDiacritics=function(i){for(var e="",s=i.normalize("NFD"),t=0,a=0;ti.json()).then(i=>{i=i[0].option.matrix[e];t.find(".risk-evaluation-calculated-cotation").find(".risk-evaluation-cotation").attr("data-scale",window.digiriskdolibarr.evaluation.getDynamicScale(i)),t.find(".risk-evaluation-calculated-cotation").find(".risk-evaluation-cotation span").text(i),t.find(".risk-evaluation-content").find(".risk-evaluation-seuil").val(i),window.digiriskdolibarr.risk.haveDataInInput(t)})}},window.digiriskdolibarr.evaluator={},window.digiriskdolibarr.evaluator.init=function(){window.digiriskdolibarr.evaluator.event()},window.digiriskdolibarr.evaluator.event=function(){$(document).on("click",".evaluator-create",window.digiriskdolibarr.evaluator.createEvaluator),$(document).on("change","#fk_user_employer",window.digiriskdolibarr.evaluator.selectUser)},window.digiriskdolibarr.evaluator.selectUser=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".modal-container"),t=s.find("#fk_user_employer").val();window.saturne.loader.display(s.find('input[name="evaluatorJob"]')),$.ajax({url:document.URL+"&action=getEvaluatorJob&token="+e,type:"POST",processData:!1,data:JSON.stringify({userID:t}),contentType:!1,success:function(i){s.find('input[name="evaluatorJob"]').val($(i).find('input[name="evaluatorJob"]').val()),s.find('input[name="evaluatorJob"]').removeClass("wpeo-loader")},error:function(i){}}),window.digiriskdolibarr.evaluator.haveDataInInput(s)},window.digiriskdolibarr.evaluator.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("evaluator-add-modal")&&(0 div:nth-child(1)").text();var l=[];$(this).closest(".modal-container").find(".risk-categories").find(":selected").each(function(){l.push($(this).val())}),$.ajax({url:document.URL+"&action=saveRisk&token="+e,type:"POST",processData:!1,data:JSON.stringify({riskID:t,category:s,comment:r,newParent:o,categories:l}),contentType:!1,success:function(i){$(".wpeo-loader").removeClass("wpeo-loader");var e=$(".messageSuccessRiskEdit"),s=(o==a||n?($(".modal-active").removeClass("modal-active"),$(".risk-description-"+t).html($(i).find(".risk-description-"+t)),$(".risk-row-content-"+t).find(".risk-category .cell-risk").html($(i).find(".risk-row-content-"+t).find(".risk-category .cell-risk").children()),$(".risk-row-content-"+t).find(".risk-category").fadeOut(800),$(".risk-row-content-"+t).find(".risk-category").fadeIn(800),$(".risk-row-content-"+t).find(".risk-description-"+t).fadeOut(800),$(".risk-row-content-"+t).find(".risk-description-"+t).fadeIn(800)):$(".risk-row-content-"+t).fadeOut(800,function(){$(".fichecenter .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormListRisks .opacitymedium.colorblack.paddingleft"))}),""),s=(s=(s+=e.find(".valueForEditRisk1").val())+d)+e.find(".valueForEditRisk2").val();e.find("a").attr("href","#risk_row_"+t),e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskEdit"),s="",s=(s=(s+=e.find(".valueForEditRisk1").val())+d)+e.find(".valueForEditRisk2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.risk.unlinkSharedRisk=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value"),t=(window.saturne.loader.display($(this)),$(".risk_row_"+s).find(".risk-container > div:nth-child(1)").text());var a=document.URL.split(/#/);$.ajax({url:a[0]+"&action=unlinkSharedRisk&token="+e,type:"POST",processData:!1,data:JSON.stringify({riskID:s}),contentType:!1,success:function(i){$(".confirmquestions").html($(i).find(".confirmquestions").children()),$(".fichecenter.sharedrisklist .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormSharedListRisks .opacitymedium.colorblack.paddingleft"));var i=$(".messageSuccessRiskUnlinkShared"),e=($("#risk_row_"+s).fadeOut(800),""),e=(e=(e+=i.find(".valueForUnlinkSharedRisk1").val())+t)+i.find(".valueForUnlinkSharedRisk2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskUnlinkShared"),s="",s=(s=(s+=e.find(".valueForUnlinkSharedRisk1").val())+t)+e.find(".valueForUnlinkSharedRisk2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.risk.sharedRiskBoxLoader=function(i){"Oui"==$(this).text()&&window.saturne.loader.display($("#searchFormSharedListRisks"))},window.digiriskdolibarr.evaluation={},window.digiriskdolibarr.evaluation.init=function(){window.digiriskdolibarr.evaluation.event()},window.digiriskdolibarr.evaluation.event=function(){$(document).on("click",".select-evaluation-method",window.digiriskdolibarr.evaluation.selectEvaluationMethod),$(document).on("click",".cotation-container .risk-evaluation-cotation.cotation",window.digiriskdolibarr.evaluation.selectSeuil),$(document).on("click",".risk-evaluation-create",window.digiriskdolibarr.evaluation.createEvaluation),$(document).on("click",".risk-evaluation-save",window.digiriskdolibarr.evaluation.saveEvaluation),$(document).on("click",".risk-evaluation-delete",window.digiriskdolibarr.evaluation.deleteEvaluation)},window.digiriskdolibarr.evaluation.selectEvaluationMethod=function(i){var e=$(this).closest(".modal-container");0"+e.split(/\(/)[0]+"("+(+s-1)+")"),s-1<1&&$(".fichecenter.risklist").html($(i).find("#searchFormListRisks")),t.removeClass("wpeo-loader"),""),e=(e=(e+=r.find(".valueForDeleteEvaluation1").val())+n)+r.find(".valueForDeleteEvaluation2").val();r.find(".notice-subtitle .text").text(e),r.removeClass("hidden")},error:function(i){var e="",e=(e=(e+=o.find(".valueForDeleteEvaluation1").val())+n)+o.find(".valueForDeleteEvaluation2").val();o.find(".notice-subtitle .text").text(e),o.removeClass("hidden")}})}},window.digiriskdolibarr.evaluation.saveEvaluation=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).closest(".risk-evaluation-edit-modal"),t=s.attr("value");var a=s.find(".risk-evaluation-comment textarea").val();let n=$(this).closest(".risk-row").find(".risk-evaluations-list-content").attr("value"),r=$(".risk-evaluation-ref-"+t).attr("value"),o=$(".risk-evaluation-list-modal-"+n),d=$("#risk_evaluation_list"+n).hasClass("modal-active");var a=window.digiriskdolibarr.risk.sanitizeBeforeRequest(a),l=s.find(".risk-evaluation-method").val(),c=s.find(".risk-evaluation-seuil").val(),k=s.find("#RiskAssessmentDateEdit"+t).val(),u=s.find(".risk-evaluation-photo .filename").val();let m=[];Object.values($(".table-cell.active.cell-"+t)).forEach(function(i){-1<$(i).data("seuil")&&(m[$(i).data("type")]=$(i).data("seuil"))}),window.saturne.loader.display($(this)),$.ajax({url:document.URL+"&action=saveEvaluation&token="+e,type:"POST",processData:!1,data:JSON.stringify({cotation:c,comment:a,method:l,photo:u,date:k,evaluationID:t,criteres:{gravite:m.gravite||0,occurrence:m.occurrence||m.historique||0,protection:m.protection||m.milieu||0,formation:m.formation||m.maitrise||0,exposition:m.exposition||m.frequence||0}}),contentType:!1,success:function(i){$("#risk_evaluation_edit"+t).removeClass("modal-active"),0<$(i).find(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)").length?((d?($(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)")):($(".risk-evaluation-container-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-container-"+t+":not(.last-risk-assessment)"))).fadeIn(800),o.find(".risk-evaluation-ref-"+t).replaceWith($(i).find(".risk-evaluation-ref-"+t)),$(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)").replaceWith($(i).find(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)")),$("#risk_evaluation_add"+n).html($(i).find("#risk_evaluation_add"+n).children())):($(".div-table-responsive").html($(i).find(".div-table-responsive").children()),(d?($(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)")):($(".risk-evaluation-container-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-container-"+t+":not(.last-risk-assessment)"))).fadeIn(800)),$(".wpeo-loader").removeClass("wpeo-loader");var i=$(".messageSuccessEvaluationEdit"),e=(s.find("#risk_evaluation_edit"+t).removeClass("modal-active"),""),e=(e=(e+=i.find(".valueForEditEvaluation1").val())+r)+i.find(".valueForEditEvaluation2").val();i.find("a").attr("href","#risk_row_"+n),i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(){var i=$(".messageErrorEvaluationEdit"),e="",e=(e=(e+=i.find(".valueForEditEvaluation1").val())+r)+i.find(".valueForEditEvaluation2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")}})},window.digiriskdolibarr.risksign={},window.digiriskdolibarr.risksign.init=function(){window.digiriskdolibarr.risksign.event()},window.digiriskdolibarr.risksign.event=function(){$(document).on("click",".risksign-category-danger .item, .wpeo-table .risksign-category-danger .item",window.digiriskdolibarr.risksign.selectRiskSign),$(document).on("click",".risksign-create:not(.button-disable)",window.digiriskdolibarr.risksign.createRiskSign),$(document).on("click",".risksign-save",window.digiriskdolibarr.risksign.saveRiskSign),$(document).on("click",".risksign-unlink-shared",window.digiriskdolibarr.risksign.unlinkSharedRiskSign)},window.digiriskdolibarr.risksign.selectRiskSign=function(i){var e=$(this),e=(e.closest(".content").removeClass("active"),e.closest(".wpeo-dropdown").find(".dropdown-toggle span").hide(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").show(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("src",e.find("img").attr("src")),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("aria-label",e.closest(".wpeo-tooltip-event").attr("aria-label")),e.closest(".fichecenter").find(".input-hidden-danger").val(e.data("id")),$(this).closest(".modal-container"));window.digiriskdolibarr.risksign.haveDataInInput(e)},window.digiriskdolibarr.risksign.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("risksign-add-modal")&&0<=i.find('input[name="risksign_category_id"]').val()&&i.find(".button-disable").removeClass("button-disable")},window.digiriskdolibarr.risksign.createRiskSign=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".fichecenter").find(".risksign-content"),t=s.find(".risksign-category input").val(),s=s.find(".risksign-description textarea").val();window.saturne.loader.display($(".fichecenter.risksignlist")),$.ajax({url:document.URL+"&action=add&token="+e,type:"POST",data:JSON.stringify({riskSignCategory:t,riskSignDescription:s}),processData:!1,contentType:!1,success:function(i){$(".fichecenter.risksignlist").html($(i).find("#searchFormListRiskSigns"));var e=$(".messageSuccessRiskSignCreate");$(".fichecenter.risksignlist").removeClass("wpeo-loader"),e.html($(i).find(".risksign-create-success-notice")),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskCreate");e.html($(i).find(".risksign-create-error-notice")),e.removeClass("hidden")}})},window.digiriskdolibarr.risksign.saveRiskSign=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).attr("value");let t=$(this).closest(".risksign-container").find(".risksign-content"),a="",n=t.find(".risksign-category input").val(),r=t.find(".risksign-description textarea").val(),o=$(".risksign_row_"+s).find(".risksign-container > div:nth-child(1)").text();window.saturne.loader.display(t),$.ajax({url:document.URL+"&action=saveRiskSign&token="+e,data:JSON.stringify({riskSignID:s,riskSignCategory:n,riskSignDescription:r}),type:"POST",processData:!1,contentType:!1,success:function(i){$(".fichecenter.risksignlist").html($(i).find("#searchFormListRiskSigns"));i=$(".messageSuccessRiskSignEdit");t.removeClass("wpeo-loader"),a=(a=(a+=i.find(".valueForEditRiskSign1").val())+o)+i.find(".valueForEditRiskSign2").val(),i.find(".notice-subtitle .text").text(a),i.removeClass("hidden")},error:function(){var i=$(".messageErrorRiskSignEdit");t.removeClass("wpeo-loader"),a=(a=(a+=i.find(".valueForEditRiskSign1").val())+o)+i.find(".valueForEditRiskSign2").val(),i.find(".notice-subtitle .text").text(a),i.removeClass("hidden")}})},window.digiriskdolibarr.risksign.unlinkSharedRiskSign=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value"),t=(window.saturne.loader.display($(this)),$(".risksign_row_"+s).find(".risksign-container > div:nth-child(1)").text());var a=document.URL.split(/#/);$.ajax({url:a[0]+"&action=unlinkSharedRiskSign&token="+e,type:"POST",processData:!1,data:JSON.stringify({risksignID:s}),contentType:!1,success:function(i){$(".fichecenter.sharedrisksignlist .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormSharedListRiskSigns .opacitymedium.colorblack.paddingleft"));var i=$(".messageSuccessRiskSignUnlinkShared"),e=($("#risksign_row_"+s).fadeOut(800),""),e=(e=(e+=i.find(".valueForUnlinkSharedRiskSign1").val())+t)+i.find(".valueForUnlinkSharedRiskSign2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskSignUnlinkShared"),s="",s=(s=(s+=e.find(".valueForUnlinkSharedRiskSign1").val())+t)+e.find(".valueForUnlinkSharedRiskSign2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask={},window.digiriskdolibarr.riskassessmenttask.init=function(){window.digiriskdolibarr.riskassessmenttask.event()},window.digiriskdolibarr.riskassessmenttask.event=function(){$(document).on("input",".riskassessment-task-label",window.digiriskdolibarr.riskassessmenttask.fillRiskAssessmentTaskLabel),$(document).on("click",".riskassessment-task-create",window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTask),$(document).on("click",".riskassessment-task-save",window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTask),$(document).on("click",".riskassessment-task-delete",window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTask),$(document).on("click",".riskassessment-task-timespent-create",window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-timespent-save",window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-timespent-delete",window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-progress-checkbox:not(.riskassessment-task-progress-checkbox-readonly)",window.digiriskdolibarr.riskassessmenttask.checkTaskProgress),$(document).on("change","#RiskassessmentTaskTimespentDatehour",window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateHour),$(document).on("change","#RiskassessmentTaskTimespentDatemin",window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateMin),$(document).on("keyup",".riskassessment-task-label",window.digiriskdolibarr.riskassessmenttask.checkRiskassessmentTaskLabelLength),$(document).on("click",".listingHeaderTaskTooltip",window.digiriskdolibarr.riskassessmenttask.redirectOnSharedTaskConfig)},window.digiriskdolibarr.riskassessmenttask.fillRiskAssessmentTaskLabel=function(i){var e=$(this).closest(".modal-container");window.digiriskdolibarr.riskassessmenttask.haveDataInInput(e)},window.digiriskdolibarr.riskassessmenttask.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("riskassessment-task-add-modal")&&i.find('input[name="label"]').val().length&&i.find(".button-disable").removeClass("button-disable")},window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".riskassessment-task-add-modal"),t=s.find(".modal-risk").attr("value"),s=s.find(".riskassessment-task-container"),a=s.find(".riskassessment-task-label").val(),a=window.digiriskdolibarr.risk.sanitizeBeforeRequest(a),n=s.find("#RiskassessmentTaskDateStart"+t).val(),r=s.find("#RiskassessmentTaskDateStart"+t+"hour").val(),o=s.find("#RiskassessmentTaskDateStart"+t+"min").val(),d=s.find("#RiskassessmentTaskDateEnd"+t).val(),l=s.find("#RiskassessmentTaskDateEnd"+t+"hour").val(),c=s.find("#RiskassessmentTaskDateEnd"+t+"min").val(),s=s.find(".riskassessment-task-budget").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-tasks"+t)),$.ajax({url:document.URL+"&action=addRiskAssessmentTask&token="+e,type:"POST",data:JSON.stringify({tasktitle:a,dateStart:n,hourStart:r,minStart:o,dateEnd:d,hourEnd:l,minEnd:c,budget:s,riskToAssign:t}),processData:!1,contentType:!1,success:function(i){$(".tasks-list-container-"+t).replaceWith($(i).find(".tasks-list-container-"+t));var e=$(".messageSuccessTaskCreate");$(".riskassessment-tasks"+t).fadeOut(800),$(".riskassessment-tasks"+t).fadeIn(800),e.find("a").attr("href","#risk_row_"+t),e.html($(i).find(".task-create-success-notice")),e.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e=$(".messageErrorTaskCreate"),s=($("#risk_assessment_task_add"+t).removeClass("modal-active"),""),s=(s=(s+=e.find(".valueForCreateTask1").val())+e.find(".valueForCreateTask2").val())+" : "+i.message;e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken(),t=$(this).closest(".wpeo-table.riskassessment-tasks").attr("value"),a=$(this).closest(".riskassessment-task-single-content").attr("value"),s=$(this).closest(".riskassessment-task-container-"+a).find(".labelForDelete").val();let n=$(".messageSuccessTaskDelete"),r=$(".messageErrorTaskDelete"),o=confirm(s);if(1!=o)return!1;{let s=$(".riskassessment-task-container-"+a).attr("value");window.saturne.loader.display($(".riskassessment-task-container-"+a)),$.ajax({url:document.URL+"&action=deleteRiskAssessmentTask&deletedRiskAssessmentTaskId="+a+"&token="+e,type:"POST",processData:!1,contentType:!1,success:function(i){$(".riskassessment-task-listing-wrapper-"+t).replaceWith($(i).find(".riskassessment-task-listing-wrapper-"+t)),$(".riskassessment-tasks"+t).fadeOut(800),$(".riskassessment-tasks"+t).fadeIn(800);i="",i=(i=(i+=n.find(".valueForDeleteTask1").val())+s)+n.find(".valueForDeleteTask2").val();n.find("a").attr("href","#risk_row_"+t),n.find(".notice-subtitle .text").text(i),n.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e="",e=(e=(e=(e+=r.find(".valueForDeleteTask1").val())+s)+r.find(".valueForDeleteTask2").val())+" : "+i.message;r.find(".notice-subtitle .text").text(e),r.removeClass("hidden")}})}},window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value");var t=$(this).closest(".modal-container"),a=$(this).closest(".modal-risk").attr("value");let n="";var r=t.find(".riskassessment-task-label"+s).val(),r=window.digiriskdolibarr.risk.sanitizeBeforeRequest(r);let o=$(".riskassessment-task-single-"+s+" .riskassessment-task-reference").attr("value"),d=0;t.find(".riskassessment-task-progress-checkbox"+s).is(":checked")&&(d=1);var l=t.find("#RiskassessmentTaskDateStartEdit"+s).val(),c=t.find("#RiskassessmentTaskDateStartEdit"+s+"hour").val(),k=t.find("#RiskassessmentTaskDateStartEdit"+s+"min").val(),u=t.find("#RiskassessmentTaskDateEndEdit"+s).val(),m=t.find("#RiskassessmentTaskDateEndEdit"+s+"hour").val(),v=t.find("#RiskassessmentTaskDateEndEdit"+s+"min").val(),t=t.find(".riskassessment-task-budget"+s).val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+s)),$.ajax({url:document.URL+"&action=saveRiskAssessmentTask&token="+e,data:JSON.stringify({riskAssessmentTaskID:s,tasktitle:r,dateStart:l,hourStart:c,minStart:k,dateEnd:u,hourEnd:m,minEnd:v,budget:t,taskProgress:d}),type:"POST",processData:!1,contentType:!1,success:function(i){$("#risk_assessment_task_edit"+s).removeClass("modal-active"),$(".riskassessment-task-container-"+s).replaceWith($(i).find(".riskassessment-task-container-"+s).first()),$("#risk_assessment_task_edit"+s+" .riskassessment-task-data .riskassessment-task-budget").replaceWith($(i).find(".riskassessment-task-container-"+s+" .riskassessment-task-budget").first()),$("#risk_assessment_task_edit"+s).replaceWith($(i).find("#risk_assessment_task_edit"+s));i=$(".messageSuccessTaskEdit");$(".riskassessment-tasks"+a).fadeOut(800),$(".riskassessment-tasks"+a).fadeIn(800),n=(n=(n+=i.find(".valueForEditTask1").val())+o)+i.find(".valueForEditTask2").val(),$(".wpeo-loader").removeClass("wpeo-loader"),$(".loader-spin").remove(),i.find("a").attr("href","#risk_row_"+a),i.find(".notice-subtitle .text").text(n),i.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e=$(".messageErrorTaskEdit");$("#risk_assessment_task_edit"+s).removeClass("modal-active"),$(".wpeo-loader").removeClass("wpeo-loader"),n=(n=(n=(n+=e.find(".valueForEditTask1").val())+o)+e.find(".valueForEditTask2").val()+" : ")+i.message,e.find(".notice-subtitle .text").text(n),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value");var t=$(this).closest(".riskassessment-task-edit-modal"),a=t.find(".riskassessment-task-timespent-container");let n=t.find("riskassessment-task-single").attr("value"),r="",o=t.find(".riskassessment-task-reference").attr("value"),d=$(".id-container").find(".riskassessment-total-task-timespent-"+s);var t=a.find("#RiskassessmentTaskTimespentDate"+s).val(),l=a.find("#RiskassessmentTaskTimespentDate"+s+"hour").val(),c=a.find("#RiskassessmentTaskTimespentDate"+s+"min").val(),k=a.find(".riskassessment-task-timespent-comment").val(),k=window.digiriskdolibarr.risk.sanitizeBeforeRequest(k),a=a.find(".riskassessment-task-timespent-duration").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+s)),$.ajax({url:document.URL+"&action=addRiskAssessmentTaskTimeSpent&token="+e,type:"POST",data:JSON.stringify({taskID:s,date:t,hour:l,min:c,comment:k,duration:a}),processData:!1,contentType:!1,success:function(i){var e=$(".messageSuccessTaskTimeSpentCreate"+s);$(".riskassessment-tasks"+n).fadeOut(800),$(".riskassessment-tasks"+n).fadeIn(800),r=(r=(r+=e.find(".valueForCreateTaskTimeSpent1").val())+o)+e.find(".valueForCreateTaskTimeSpent2").val(),$(".riskassessment-task-timespent-container").find(".riskassessment-task-timespent-list-"+s).replaceWith($(i).find(".riskassessment-task-timespent-container").find(".riskassessment-task-timespent-list-"+s)),$(".riskassessment-task-container-"+s).closest(".riskassessment-tasks").replaceWith($(i).find(".riskassessment-task-container-"+s).closest(".riskassessment-tasks")),$(".loader-spin").remove(),$(".wpeo-loader").removeClass("wpeo-loader"),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden"),d.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+s).first())},error:function(i){$(this).closest(".risk-row-content-"+n).removeClass("wpeo-loader");var e=$(".messageErrorTaskTimeSpentCreate"+s);e.html($(i).find(".task-timespent-create-error-notice")),e.removeClass("hidden")},complete:function(){$("#risk_assessment_task_edit"+s+".wpeo-modal").addClass("modal-active")}})},window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let a=$(this).closest(".riskassessment-task-timespent-list").attr("value"),n=$(this).attr("value");var s=$(this).attr("value"),t=$(this).closest(".riskassessment-task-timespent-"+n).find(".labelForDelete").val();let r=$(".id-container").first().find(".riskassessment-total-task-timespent-"+a),o=confirm(t);if(1!=o)return!1;{let t=$(".riskassessment-task-container-"+a).attr("value");window.saturne.loader.display($(this)),$.ajax({url:document.URL+"&action=deleteRiskAssessmentTaskTimeSpent&deletedRiskAssessmentTaskTimeSpentId="+s+"&token="+e,type:"POST",processData:!1,contentType:!1,success:function(i){var e=$(".messageSuccessTaskTimeSpentDelete"+a),s=($(".riskassessment-task-timespent-"+n).fadeOut(800),""),s=(s=(s+=e.find(".valueForDeleteTaskTimeSpent1").val())+t)+e.find(".valueForDeleteTaskTimeSpent2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden"),r.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+a).first())},error:function(i){var e=$(".messageErrorTaskDeleteTimeSpent"+a),s="",s=(s=(s+=e.find(".valueForDeleteTaskTimeSpent1").val())+t)+e.find(".valueForDeleteTaskTimeSpent2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})}},window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let s=$(this);var t=$(this).attr("value"),a=$(this).closest(".riskassessment-task-timespent-edit-modal").find(".riskassessment-task-timespent-container");let n=a.attr("value"),r="",o=$(".riskassessment-task-container-"+n).attr("value"),d=$(".id-container").first().find(".riskassessment-total-task-timespent-"+n);var l=a.find("#RiskassessmentTaskTimespentDateEdit"+t).val(),c=a.find("#RiskassessmentTaskTimespentDateEdit"+t+"hour").val(),k=a.find("#RiskassessmentTaskTimespentDateEdit"+t+"min").val(),u=a.find(".riskassessment-task-timespent-comment").val(),u=window.digiriskdolibarr.risk.sanitizeBeforeRequest(u),a=a.find(".riskassessment-task-timespent-duration").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+n)),$.ajax({url:document.URL+"&action=saveRiskAssessmentTaskTimeSpent&token="+e,data:JSON.stringify({riskAssessmentTaskTimeSpentID:t,taskID:n,date:l,hour:c,min:k,comment:u,duration:a}),type:"POST",processData:!1,contentType:!1,success:function(i){s.closest(".modal-active").removeClass("modal-active");var e=$(".messageSuccessTaskTimeSpentEdit"+n);$(".wpeo-loader").removeClass("wpeo-loader"),r=(r=(r+=e.find(".valueForEditTaskTimeSpent1").val())+o)+e.find(".valueForEditTaskTimeSpent2").val(),d.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+n).first()),$(".riskassessment-task-timespent-list-"+n).html($(i).find(".riskassessment-task-timespent-list-"+n).children()),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden")},error:function(i){var e=$(".messageSuccessTaskTimeSpentEdit"+n);r=(r=(r+=e.find(".valueForEditTaskTimeSpent1").val())+o)+e.find(".valueForEditTaskTimeSpent2").val(),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.checkTaskProgress=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".risk-row").find(".riskassessment-task-container"),t=$(this).closest(".riskassessment-task-single-content").attr("value");let a=$(this).closest(".riskassessment-tasks").attr("value"),n="",r=s.attr("value"),o="";s.find(".riskassessment-task-progress-checkbox"+t).hasClass("progress-checkbox-check")?(o=0,s.find(".riskassessment-task-progress-checkbox"+t).toggleClass("progress-checkbox-check").toggleClass("progress-checkbox-uncheck")):s.find(".riskassessment-task-progress-checkbox"+t).hasClass("progress-checkbox-uncheck")&&(o=1,s.find(".riskassessment-task-progress-checkbox"+t).toggleClass("progress-checkbox-uncheck").toggleClass("progress-checkbox-check")),window.saturne.loader.display($(".riskassessment-task-single-"+t));s=window.location.href.replace(/#.*/,"");$.ajax({url:s+"&action=checkTaskProgress&token="+e,data:JSON.stringify({riskAssessmentTaskID:t,taskProgress:o}),type:"POST",processData:!1,contentType:!1,success:function(i){$(".fichecenter.risklist").html($(i).find("#searchFormListRisks"));i=$(".messageSuccessTaskEdit");$(".riskassessment-tasks"+a).fadeOut(800),$(".riskassessment-tasks"+a).fadeIn(800),n=(n=(n+=i.find(".valueForEditTask1").val())+r)+i.find(".valueForEditTask2").val(),i.find(".notice-subtitle .text").text(n),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorTaskEdit");n=(n=(n+=e.find(".valueForEditTask1").val())+r)+e.find(".valueForEditTask2").val(),e.find(".notice-subtitle .text").text(n),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateHour=function(i){$(this).closest(".nowraponall").find(".select-riskassessmenttask-timespent-datehour").remove(),$(this).before('{$("#sendFileForm").load(document.URL+n+"ticket_id="+a+" #fileLinkedTable")})},window.digiriskdolibarr.ticket.removeFile=function(i){let e=$(this).attr("value");e=e.replace("_mini","");var s=$("#ticket_id").val(),t=window.saturne.toolbox.getQuerySeparator(document.URL);fetch(document.URL+t+"action=removefile&filetodelete="+e+"&ticket_id="+s,{method:"POST"}).then(i=>{$(this).parent().parent().hide()})},window.digiriskdolibarr.ticket.addDashBoardTicketInfo=function(){var i=window.saturne.toolbox.getToken(),e=$("#select2-boxcombo-container").attr("title"),s=e.split(" : ")[0],e=e.split(" : ")[2],t=window.saturne.toolbox.getQuerySeparator(document.URL);$.ajax({url:document.URL+t+"action=adddashboardinfo&token="+i,type:"POST",processData:!1,data:JSON.stringify({digiriskelementID:s,catID:e}),contentType:!1,success:function(i){window.location.reload()},error:function(){}})},window.digiriskdolibarr.ticket.closeDashBoardTicketInfo=function(){var i=window.saturne.toolbox.getToken();let e=$(this);var s=e.attr("data-digiriskelementid"),t=e.attr("data-catid"),a=window.saturne.toolbox.getQuerySeparator(document.URL);$.ajax({url:document.URL+a+"action=closedashboardinfo&token="+i,type:"POST",processData:!1,data:JSON.stringify({digiriskelementID:s,catID:t}),contentType:!1,success:function(i){e.closest(".box-flex-item").fadeOut(400),$(".add-widget-box").attr("style",""),$(".add-widget-box").html($(i).find(".add-widget-box").children())},error:function(){}})},window.digiriskdolibarr.ticket.checkValidEmail=function(){0==/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(this.value)?$(this).css("border","3px solid red"):$(this).css("border","3px solid green")},window.digiriskdolibarr.ticket.checkValidPhone=function(){0==/^(?:(?:(?:\+|00)\d{2}[\s]?(?:\(0\)[\s]?)?)|0){1}[1-9]{1}([\s.-]?)(?:\d{2}\1?){3}\d{2}$/.test(this.value)?$(this).css("border","3px solid red"):$(this).css("border","3px solid green")},window.digiriskdolibarr.tools={},window.digiriskdolibarr.tools.init=function(){window.digiriskdolibarr.tools.event()},window.digiriskdolibarr.tools.event=function(){$(document).on("click","#data-migration-import-global-dolibarr",window.digiriskdolibarr.tools.submitForm)},window.digiriskdolibarr.tools.submitForm=function(s){s.preventDefault();var i=window.saturne.toolbox.getToken(),e=window.saturne.toolbox.getQuerySeparator(window.location.href),t=(window.saturne.loader.display($(s.target).parent()),$(s.target).parent().find('input[type="file"]')),a=new FormData;a.append("file",t.prop("files")[0]),$.ajax({url:window.location.href+e+"action=import_global_dolibarr&token="+i,type:"POST",data:a,contentType:!1,processData:!1,success:function(i){var e=$(i).find("input[name='error']");e.length?window.saturne.notice.showNotice("migration-dolibar-notice",e.data("title"),e.val(),"error"):(e=$(i).find("input[name='success']"),window.saturne.notice.showNotice("migration-dolibar-notice",e.data("title"),e.val(),"success")),window.saturne.loader.remove($(s.target).parent())}})},window.digiriskdolibarr.digiriskusers={},window.digiriskdolibarr.digiriskusers.init=function(){window.digiriskdolibarr.digiriskusers.event()},window.digiriskdolibarr.digiriskusers.event=function(){$(document).on("input",".digirisk-users #firstname",window.digiriskdolibarr.digiriskusers.fillEmail),$(document).on("input",".digirisk-users #lastname",window.digiriskdolibarr.digiriskusers.fillEmail)},window.digiriskdolibarr.digiriskusers.fillEmail=function(i){var e=$(".digirisk-users #firstname").val(),s=$(".digirisk-users #lastname").val(),t=$(".input-domain-mail").val(),e=window.digiriskdolibarr.digiriskusers.removeDiacritics(e+"."+s+"@"+t).toLowerCase();$(".digirisk-users #email").val(e)},window.digiriskdolibarr.digiriskusers.removeDiacritics=function(i){for(var e="",s=i.normalize("NFD"),t=0,a=0;t * - * @since 1.1.0 - * @version 1.1.0 - */ -window.digiriskdolibarr.ticket = {}; - -/** - * La méthode appelée automatiquement par la bibliothèque DigiriskDolibarr. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * @since 1.1.0 - * @version 1.1.0 + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * @return {void} + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Library javascript to enable Browser notifications */ -window.digiriskdolibarr.ticket.init = function() { - window.digiriskdolibarr.ticket.event(); -}; /** - * La méthode contenant tous les événements pour les tickets. - * - * @since 1.1.0 - * @version 1.1.0 - * - * @return {void} + * \file js/modules/ticket.js + * \ingroup digiriskdolibarr + * \brief JavaScript ticket file for module DigiriskDolibarr */ -window.digiriskdolibarr.ticket.event = function() { - $( document ).on( 'click', '.ticket-parentCategory', window.digiriskdolibarr.ticket.selectParentCategory ); - $( document ).on( 'click', '.ticket-subCategory', window.digiriskdolibarr.ticket.selectSubCategory ); - $( document ).on( 'submit', '#sendFile', window.digiriskdolibarr.ticket.tmpStockFile ); - $( document ).on( 'click', '.linked-file-delete', window.digiriskdolibarr.ticket.removeFile ); - $( document ).on( 'change', '.add-dashboard-info', window.digiriskdolibarr.ticket.addDashBoardTicketInfo ); - $( document ).on( 'click', '.close-dashboard-info', window.digiriskdolibarr.ticket.closeDashBoardTicketInfo ); - $( document ).on( 'keyup', '.email', window.digiriskdolibarr.ticket.checkValidEmail ); - $( document ).on( 'keyup', '.options_digiriskdolibarr_ticket_phone', window.digiriskdolibarr.ticket.checkValidPhone ); -}; + +'use strict'; /** - * Mets à jour les input du formulaire + * Init ticket JS + * + * @memberof DigiriskDolibarr_Ticket * * @since 1.1.0 * @version 1.1.0 * - * @return {void} + * @type {Object} */ -window.digiriskdolibarr.ticket.updateFormData = function( ) { - let parentCategoryID = window.digiriskdolibarr.ticket.getParentCategory() - let subCategoryID = window.digiriskdolibarr.ticket.getSubCategory() - - $('.ticket-parentCategory.active').removeClass('active') - $('.ticket-parentCategory'+parentCategoryID).addClass('active') - - $('.subCategories').attr('style','display:none') - $('.children'+parentCategoryID).attr('style','') - - $('.ticket-subCategory.active').removeClass('active') - $('.ticket-subCategory'+subCategoryID).addClass('active') -}; +window.digiriskdolibarr.ticket = {}; /** - * Clique sur une des catégories parentes de la liste. + * Ticket init + * + * @memberof DigiriskDolibarr_Ticket * * @since 1.1.0 * @version 1.1.0 * * @return {void} */ -window.digiriskdolibarr.ticket.selectParentCategory = function( ) { - let subCategoryInput = $('.ticketpublicarea').find("#subCategory"); - let parentCategoryInput = $('.ticketpublicarea').find("#parentCategory"); - - subCategoryInput.val(0) - parentCategoryInput.val($(this).attr('id')) - - window.digiriskdolibarr.ticket.updateFormData() +window.digiriskdolibarr.ticket.init = function() { + window.digiriskdolibarr.ticket.event(); }; /** - * Récupère la valeur de la catégorie parente sélectionnée + * Registers all event listeners for the ticket system. * - * @since 1.1.0 - * @version 1.1.0 + * This method binds various events to elements associated with ticket functionalities: + * - Click events for managing parent and subcategories. + * - Keyup events for validating email and phone inputs. * - * @return {void} + * The commented-out lines are placeholders for additional functionality, such as file handling + * and dashboard ticket info management, which can be activated as needed. + * + * @memberof DigiriskDolibarr_Ticket + * @since 1.1.0 + * @version 10.3.0 + * + * @returns {void} This method does not return a value. */ -window.digiriskdolibarr.ticket.getParentCategory = function( ) { - return $('.ticketpublicarea').find("#parentCategory").val() +window.digiriskdolibarr.ticket.event = function() { + $(document).on('click', '.ticket-parentCategory', function() { + window.digiriskdolibarr.ticket.handleCategorySelection({ + clickedElement: this, + isSubCategory: false + }); + }); + $(document).on('click', '.ticket-subCategory', function() { + window.digiriskdolibarr.ticket.handleCategorySelection({ + clickedElement: this, + isSubCategory: true + }); + }); + $(document).on( 'click', '.public-ticket-validate', window.digiriskdolibarr.ticket.addSignature); + $(document).on( 'submit', '#sendFile', window.digiriskdolibarr.ticket.tmpStockFile); + $(document).on( 'click', '.linked-file-delete', window.digiriskdolibarr.ticket.removeFile); + $(document).on( 'change', '.add-dashboard-info', window.digiriskdolibarr.ticket.addDashBoardTicketInfo); + $(document).on( 'click', '.close-dashboard-info', window.digiriskdolibarr.ticket.closeDashBoardTicketInfo); + $(document).on( 'keyup', '#email', window.digiriskdolibarr.ticket.checkValidEmail); + $(document).on( 'keyup', '#options_digiriskdolibarr_ticket_phone', window.digiriskdolibarr.ticket.checkValidPhone); }; /** - * Clique sur une des catégories enfants de la liste. + * Handles the retrieval of category data (main or subcategory) and updates the display. * - * @since 1.1.0 - * @version 1.1.0 + * This function performs the following actions: + * - Retrieves the `data-rowid` attribute of the clicked element to identify the category (main or sub). + * - Optionally identifies the currently active parent category if handling a subcategory. + * - Sends an AJAX request to fetch and update the category display based on the selected category. + * - Replaces the `.digirisk-page-container` content with the updated response. + * - Highlights the selected category as active. + * - Redraws the signature canvas using `window.saturne.signature.drawSignatureOnCanvas()`. * - * @return {void} + * Error handling can be added within the `error` callback to manage failures gracefully. + * + * @memberof DigiriskDolibarr_Ticket + * @since 10.3.0 + * @version 10.3.0 + * + * @param {Object} options An object containing configuration for the request: + * @param {HTMLElement} options.clickedElement The DOM element that triggered the click event. + * @param {boolean} options.isSubCategory Indicates whether the clicked element is a subcategory. + * + * @returns {void} This method does not return a value. */ -window.digiriskdolibarr.ticket.selectSubCategory = function( ) { - let subCategoryInput = $('.ticketpublicarea').find("#subCategory"); - subCategoryInput.val($(this).attr('id')) +window.digiriskdolibarr.ticket.handleCategorySelection = function(options) { + const { clickedElement, isSubCategory } = options; + + let mainCategoryID = isSubCategory ? $('.ticket-parentCategory.active').data('rowid') : $(clickedElement).data('rowid'); + let subCategoryID = isSubCategory ? $(clickedElement).data('rowid') : null; + let token = window.saturne.toolbox.getToken(); + let querySeparator = window.saturne.toolbox.getQuerySeparator(document.URL); + window.saturne.loader.display($('.categories-container')); - window.digiriskdolibarr.ticket.updateFormData() + let url = document.URL + querySeparator + 'parentCategory=' + mainCategoryID + (isSubCategory ? '&subCategory=' + subCategoryID : '') + '&token=' + token; + $.ajax({ + url: url, + type: 'POST', + processData: false, + contentType: false, + success: function(resp) { + $('.digirisk-page-container').replaceWith($(resp).find('.digirisk-page-container')); + $('.ticket-parentCategory[data-rowid=' + mainCategoryID + ']').addClass('active'); + if (isSubCategory) { + $('.ticket-subCategory[data-rowid=' + subCategoryID + ']').addClass('active'); + } + window.saturne.signature.drawSignatureOnCanvas(); + }, + error: function() { + console.error('Failed to retrieve category data. Please try again.'); + } + }); }; /** - * Récupère la valeur de la catégorie enfant sélectionnée + * Captures and stores the current signature from the canvas. * - * @since 1.1.0 - * @version 1.1.0 + * This function performs the following actions: + * - Checks if the `signaturePad` canvas exists and contains a drawn signature. + * - Converts the signature into a Base64 data URL format. + * - Stores the serialized signature data into a hidden input field named `signature`. * - * @return {void} + * @memberof DigiriskDolibarr_Ticket + * @since 10.3.0 + * @version 10.3.0 + * + * @returns {void} This method does not return a value. */ -window.digiriskdolibarr.ticket.getSubCategory = function( ) { - return $('.ticketpublicarea').find("#subCategory").val() +window.digiriskdolibarr.ticket.addSignature = function() { + if (window.saturne.signature.canvas) { + if (!window.saturne.signature.canvas.signaturePad.isEmpty()) { + let signature = window.saturne.signature.canvas.toDataURL(); + $('input[name="signature"]').val(JSON.stringify(signature)); + } + } }; /** diff --git a/js/modules/tools.js b/js/modules/tools.js new file mode 100644 index 000000000..c0c86d420 --- /dev/null +++ b/js/modules/tools.js @@ -0,0 +1,72 @@ + +"use strict"; +/** + * Initialise l'objet "tools" ainsi que la méthode "init" obligatoire pour la bibliothèque DigiriskDolibarr. + * + * @since 10.3.0 + * @version 10.3.0 + */ +window.digiriskdolibarr.tools = {}; + +/** + * La méthode appelée automatiquement par la bibliothèque DigiriskDolibarr. + * + * @since 10.3.0 + * @version 10.3.0 + * + * @return {void} + */ +window.digiriskdolibarr.tools.init = function() { + window.digiriskdolibarr.tools.event(); +}; + +/** + * La méthode contenant tous les événements pour les tools. + * + * @since 10.3.0 + * @version 10.3.0 + * + * @return {void} + */ +window.digiriskdolibarr.tools.event = function() { + $(document).on('click', '#data-migration-import-global-dolibarr', window.digiriskdolibarr.tools.submitForm); +}; + +/** + * La méthode appelée lors de la soumission du formulaire de migration des données. + * Elle permet de lancer la migration des données. + * + * @since 10.3.0 + * @version 10.3.0 + */ +window.digiriskdolibarr.tools.submitForm = function( e ) { + e.preventDefault(); + + let token = window.saturne.toolbox.getToken(); + let querySeparator = window.saturne.toolbox.getQuerySeparator(window.location.href); + + window.saturne.loader.display($(e.target).parent()); + + let fileInput = $(e.target).parent().find('input[type="file"]'); + let formData = new FormData(); + + formData.append('file', fileInput.prop('files')[0]); + + $.ajax({ + url: window.location.href + querySeparator + 'action=import_global_dolibarr' + '&token=' + token, + type: 'POST', + data: formData, + contentType: false, + processData: false, + success: function(resp) { + let error = $(resp).find("input[name='error']"); + if (error.length) { + window.saturne.notice.showNotice('migration-dolibar-notice', error.data('title'), error.val(), 'error'); + } else { + let success = $(resp).find("input[name='success']"); + window.saturne.notice.showNotice('migration-dolibar-notice', success.data('title'), success.val(), 'success'); + } + window.saturne.loader.remove($(e.target).parent()); + } + }); +}; diff --git a/langs/fr_FR/digiriskdolibarr.lang b/langs/fr_FR/digiriskdolibarr.lang index e7c206bad..3b0d47caa 100644 --- a/langs/fr_FR/digiriskdolibarr.lang +++ b/langs/fr_FR/digiriskdolibarr.lang @@ -284,7 +284,6 @@ PreventionPlanMustBeInProgressToValidate = Le plan de prévention e CSEMustBeAlerted3DaysBeforeVisit = Le CSE doit être prévenu 3 jours avant l'inspection commune préalable (art. R. 4514-1 1°, R. 4514-3 et R. 4514-9 du Code du travail) PreventionPlanData = Données du Plan de prévention MasterWorkerDescription = L'utilisateur utilisé par défaut comme Responsable de l'Entreprise Utilisatrice -PreventionPlanLinked = Plan de prévention lié NoPreventionPlanRisk = Aucun risque sur le plan de prévention NoPreventionPlanLinked = Aucun plan de prévention lié PreventionPlanManagement = Gestion des plans de prévention @@ -369,7 +368,6 @@ FirePermitDescription = Projet des permis de feu FirePermitData = Données du Permis de feu FirePermitManagement = Gestion des permis de feu FPRProject = Projet lié aux permis de feu -FirePermitLinked = Permis de feu lié firepermitdocument.odt = Permis de feu firepermitdocument_custom.odt = Permis de feu personnalisé UsedEquipment = Matériel utilisé @@ -532,7 +530,6 @@ ConfirmDeleteAccidentWorkStop = Êtes-vous sûr de vouloir supprimer l'arrê AccidentMetaDataLesion = Données complémentaires des lésions TotalWorkStopDays = Nombre total de jours d'arrêt de travail RegisterAccident = Accident bénin -AccidentLinked = Accident lié AccidentsLinked = Accident(s) lié(s) GaugeCounter = Ce champ est utilisé dans le compteur de la jauge DateStartWorkStop = Date de début d'arrêt de travail @@ -586,7 +583,6 @@ CloneWorkStop = Cloner les arrêts de travail ? CloneMetadata = Cloner les données complémentaires ? CloneLesion = Cloner les données complémentaires des lésions ? CloneFrom = Clone de -AccidentInvestigationLinked = Enquête accident liée AccidentInvestigationRole = Les rôles de l'enquête accident LesionsOrWorkStop = lésions ou arrêts de travail AccidentsCategoriesArea = Espace des tags/catégories des accidents @@ -597,6 +593,7 @@ FirepermitsCategoriesArea = Espace des tags/catégories des permis de fe AddFirepermitIntoCategory = Assigner cette catégorie au permis de feu RisksCategoriesArea = Espace des tags/catégories des risques AddRiskIntoCategory = Assigner cette catégorie au risque +AddTicketIntoCategory = Assigner cette catégorie au ticket # AccidentTooltip - Tooltip des accidents VictimActivityTooltip = Précisez l’activité ou la tâche de la victime au moment de l’accident, c’est-à-dire ce que faisait la victime @@ -631,7 +628,7 @@ Head = Tête Eyes = Yeux InternalSeating = Sièges internes Neck = Cou -Back = Bas +Back = Dos WholeBody = Ensemble du corps NotSpecified = Non précisé @@ -729,10 +726,10 @@ GenerateZipArchiveWithDigiriskElementDocumentsDescription = Génération automat RiskAssessmentDocumentDescription = Plan d'action Document Unique # Boxes - Widget -LastGenerateDate = DU généré le -NextGenerateDate = Prochain DU le -NbDaysBeforeNextGenerateDate = Nombre de jours avant la prochaine date de génération du DU -NbDaysAfterNextGenerateDate = Nombre de jours de retard pour la génération du DU +NextGenerateDate = Prochain génération +LastGenerateDate = Dernière génération +DelayGenerateDate = Retard dans la génération +NoDelay = Pas de retard # Email - Mail RiskAssessmentDocumentLabel = Récapitulatif du document unique @@ -937,7 +934,6 @@ RiskDescriptionNotActivated = Veuillez activer le champ description AddRisk = Ajouter un risque NoDescriptionThere = Aucune description renseignée sur ce risque NoRiskThere = "Aucun risque spécifique sur cette unité" Cependant vous pouvez être soumis aux risques génériques de vos groupements de travail. -RiskLinked = Risque lié MoveRisk = Déplacer le risque MoveRisks = Déplacer les risques MoveRisksDescription = Permet de déplacer les risques d'un groupement ou d'une unité de travail à un(e) autre @@ -1007,6 +1003,7 @@ Environment = Environnement Riskenvironmental = Risque environnemental RiskEnvironmentals = Risques environnementaux Riskenvironmentals = Risques environnementaux +AddRiskenvironmentalTitle = Ajout du risque environnemental DigiriskElementRiskenvironmentalsList = Liste des risques environnementaux DigiriskElementInheritedRiskenvironmentalsList = Liste des risques hérités environnementaux DigiriskElementSharedRiskenvironmentalsList = Liste des risques partagés environnementaux @@ -1060,7 +1057,6 @@ MultipleRiskAssessmentMethodName = Méthodes d'évaluations MultipleRiskAssessmentMethodDescription = Activer le changement de méthode d'évaluation AdvancedRiskAssessmentMethod = Méthode d'évaluation avancée AdvancedRiskAssessmentMethodDescription = Activer la méthode d'évaluation avancée -NoRiskAssessment = Pas d'évaluation assignée au risque RiskAssessmentList = Liste des évaluations du risque EditRiskAssessment = Editer l'évaluation ShowAllRiskAssessments = Voir toutes les évaluations @@ -1332,16 +1328,18 @@ TicketDigiriskElementRequired = GP/UT obligatoire pour créer un tick TicketDigiriskElementRequiredHelp = Activer cette option pour rendre obligatoire la selection d'un GP/UT pour créer un ticket dans l'interface publique TicketDigiriskElementHideRef = Cacher la référence des GP/UT dans le sélecteur de service l'interface publique TicketDigiriskElementHideRefHelp = Activer cette option pour rendre cacher la référence d'un GP/UT dans l'interface publique -TicketDigiriskElementVisible = Afficher le champ GP/UT pour créer un ticket -TicketDigiriskElementVisibleHelp = Activer cette option pour afficher le champ GP/UT dans l'interface publique et le rendre obligatoire si nécessaire +TicketDigiriskelementVisible = Afficher le champ GP/UT pour créer un ticket +TicketServiceVisible = Afficher le champ GP/UT pour créer un ticket +TicketDigiriskelementVisibleHelp = Activer cette option pour afficher le champ GP/UT dans l'interface publique et le rendre obligatoire si nécessaire +TicketServiceVisibleHelp = Activer cette option pour afficher le champ GP/UT dans l'interface publique et le rendre obligatoire si nécessaire TicketPhotoVisible = Afficher le champ Photo pour créer un ticket TicketPhotoVisibleHelp = Activer cette option pour afficher le champ Photo dans l'interface publique TicketEmailVisible = Afficher le champ Email pour créer un ticket TicketEmailVisibleHelp = Activer cette option pour afficher le champ Email dans l'interface publique et le rendre obligatoire si nécessaire -TicketFirstNameVisible = Afficher le champ Prénom pour créer un ticket -TicketFirstNameVisibleHelp = Activer cette option pour afficher le champ Prénom dans l'interface publique et le rendre obligatoire si nécessaire -TicketLastNameVisible = Afficher le champ Nom pour créer un ticket -TicketLastNameVisibleHelp = Activer cette option pour afficher le champ Nom dans l'interface publique et le rendre obligatoire si nécessaire +TicketLastnameVisible = Afficher le champ Nom pour créer un ticket +TicketLastnameVisibleHelp = Activer cette option pour afficher le champ Nom dans l'interface publique et le rendre obligatoire si nécessaire +TicketFirstnameVisible = Afficher le champ Prénom pour créer un ticket +TicketFirstnameVisibleHelp = Activer cette option pour afficher le champ Prénom dans l'interface publique et le rendre obligatoire si nécessaire TicketPhoneVisible = Afficher le champ Téléphone pour créer un ticket TicketPhoneVisibleHelp = Activer cette option pour afficher le champ Téléphone dans l'interface publique et le rendre obligatoire si nécessaire TicketLocationVisible = Afficher le champ Lieu pour créer un ticket @@ -1354,6 +1352,11 @@ PublicTicket = Interface publique des tickets TicketPublicInterfaceForbidden = Accès interdit à l'interface publique des tickets WHSRegister = Registre SST +#Public interface - Interface publique +TicketPublicInterfaceShowCategoryDescription = Afficher la description des catégories de ticket dans l'interface publique +TicketPublicInterfaceShowCategoryDescriptionHelp = Activer cette option pour afficher la description des catégories de ticket dans l'interface publique + + # Stats - Statistiques TicketStatistics = Statistiques des tickets ExportCSV = Export CSV @@ -1383,6 +1386,19 @@ NumberOfTicketsByMainTagAndByDigiriskElement = Nombre de registres par catég NumberOfTicketsByMainSubTagAndByDigiriskElement = Nombre de registres par sous-catégorie et par GP NumberOfTicketsByYear = Nombre de tickets par année +# Ticket Management Dashboard - Tableau de bord de gestion des tickets +TicketManagementDashboard = Tableau de bord de gestion des tickets +RunningTicket = Tickets en cours +NbOfOpenedTicket = Nombre de tickets ouverts +OldestTicket = Ticket le plus ancien +OldestTicketDescription = Ticket le plus ancien avec le temps écoulé depuis sa création +OldestMessageTicket = Ticket le plus ancien avec un message +OldestMessageTicketDescription = Ticket le plus ancien avec un message et le temps écoulé depuis la création du message +MeanAnswerTime = Temps moyen de réponse +NbTicketPerUser = Nombre de tickets assignés par personnes en moyenne +NbExchangePerTicket = Nombre d'échanges par ticket +TicketRepartitionPerUserAndMeanAnswerTime = Répartition des tickets par utilisateur et temps moyen de réponse +TopSocietyWithMostTickets = Top %s des sociétés avec le plus de tickets # Email - Email The = Le @@ -1392,6 +1408,7 @@ AutoNotificationTicket = Notification mail envoyée automatiquement par TicketPublicInterfaceOtherName = Interface de gestion des registres SST et DGI + # Ticket document # Data - Donnée @@ -1431,6 +1448,8 @@ DataMigrationImportRisks = Importation des données des risq DataMigrationImportRisksDescription = Importation des données des risques de Digirisk WordPress au format ZIP ErrorFileNotWellFormatted = Le fichier n'est pas au bon format ou est vide. Vous devez joindre un fichier d'import provenant de Digirisk WordPress nommé DATE_OBJET_export.json ErrorFileNotWellFormattedZIP = Le fichier n'est pas au bon format ou est vide. Vous devez joindre un fichier d'import provenant de Digirisk WordPress nommé DATE_OBJET_export.zip +ErrorJsonBadFormatted = Le fichier JSON n'est pas bien formaté +SuccessImport = Importation réussie des données DataMigrationImportRiskSigns = Importation des données des signalisations de Digirisk DataMigrationImportRiskSignsDescription = Importation des données des signalisations de Digirisk WordPress au format ZIP DataMigrationImportGlobal = Importation des données globales de Digirisk
(Arborescence, risques et signalisations) @@ -1450,8 +1469,25 @@ RepairRisks = Réparer les risques NumberOfRisksCorrupted = Vous avez %s risque(s) dont la catégorie est corrompue, allez sur la page "Outils" pour le(s) réparer NoRiskToRepair = Aucun risque à réparer RiskSuccessfullyRepaired = Risques réparés avec succès +RiskAssessmentSuccessfullyRepaired = Évaluation réparées avec succès CorruptedCategoryOnRiskList = Liste des risques dont la catégorie est corrompue +# Clean - Nettoyer +Clean = Nettoyer +CleanObject = Nettoyer les données +CleanRiskFkElement = %d risques ont un GP/UT non valide +CleanRiskStatus = %d risques ont un statut non valide +CleanRiskExistFkElement = %d risques sont orphelins +CleanRiskExistRiskAssessment = %d risques ont aucune évaluation +CleanRisk = Nettoyer les risques +CleanRiskAssessmentStatus = %d évaluations ont un statut non valide +CleanRiskAssessmentCotation = %d évaluations ont une cotation vide +CleanRiskAssessmentExistFkRisk = %d évaluations sont orphelines +CleanRiskAssessment = Nettoyer les évaluations +NoRiskToClean = Aucun risque à nettoyer +NoRiskAssessmentToClean = Aucune évaluation à nettoyer + + # # Other # @@ -1494,3 +1530,5 @@ ManuelInputNBEmployeesDescription = Si l'option est activée, vous pouvez sais ManuelInputNBWorkedHours = Saisir manuellement le nombre d'heures travaillées ManuelInputNBWorkedHoursDescription = Si l'option est activée, vous pouvez saisir manuellement le nombre d'heures travaillées dans la configuration de la société.
Sinon le nombre d'heures travaillées est calculé.
Consulter la documentation pour plus d'informations. HowToConfigureSetupConf = Pour configurer les donnés de la société lié à Digirisk,
veuillez vous rendre sur Digirisk - Configuration - Réglages +PermissionInheritedFromConfig = Les permissions sont héritées de la configuration générale ou de la configuration parente +CategorieManagement = Gestion des catégories diff --git a/lib/digiriskdolibarr_function.lib.php b/lib/digiriskdolibarr_function.lib.php index e9d415b2b..0d61d15f0 100644 --- a/lib/digiriskdolibarr_function.lib.php +++ b/lib/digiriskdolibarr_function.lib.php @@ -79,17 +79,17 @@ function digirisk_header($title = '', $helpUrl = '', $arrayofjs = [], $arrayofcs
global->MAIN_INFO_SOCIETE_NOM ?>
- rights->digiriskdolibarr->digiriskelement->write) : ?> -
- -
prefix; ?>
- - -
prefix; ?>
- -
- + rights->digiriskdolibarr->digiriskelement->write) : ?> +
+ +
prefix; ?>
+ + +
prefix; ?>
+ +
+
0) : ?>
@@ -217,6 +217,7 @@ function display_recurse_tree($digiriskElementTree) if ($user->rights->digiriskdolibarr->digiriskelement->read) { if ( ! empty($digiriskElementTree)) { + $riskType = GETPOSTISSET('type') && !empty(GETPOST('type')) ? GETPOST('type') : 'risk'; foreach ($digiriskElementTree as $element) { ?> id == $conf->global->DIGIRISKDOLIBARR_DIGIRISKELEMENT_TRASH) : ?>
@@ -238,7 +239,7 @@ function display_recurse_tree($digiriskElementTree)
rights->digiriskdolibarr->risk->read) : ?> - + ref; ?> label, 20); ?> @@ -555,38 +556,6 @@ function show_category_image($object, $upload_dir, $noprint = 0) } } -/** -* Show header for public page ticket -* -* @param string $title Title -* @param string $head Head array -* @param int $disablejs More content into html header -* @param int $disablehead More content into html header -* @param array $arrayofjs Array of complementary js files -* @param array $arrayofcss Array of complementary css files -* @return void -*/ -function digiriskdolibarr_ticket_header($title, $head = "", $disablejs = 0, $disablehead = 0,$arrayofjs = array(), $arrayofcss = array()) -{ - global $conf, $mysoc; - - require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; - - top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, 1); // Show html headers - - if (!empty($conf->global->DIGIRISKDOLIBARR_TICKET_SHOW_COMPANY_LOGO)) { - $urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&entity=' . $conf->entity . '&file=' . urlencode('/logos/thumbs/'.$mysoc->logo_small); - - // Output html code for logo - if ($urllogo) { - print ''; - } - print '
'; - } -} - /** * @param $sdir * @param string $size @@ -1532,13 +1501,15 @@ function getNomUrlEntity($object, $withpicto = 0, $option = '', $addlabel = 0, $ $linkstart = ''; $linkend = ''; + $result .= $linkstart; } - $result .= $linkstart; if ($withpicto) $result .= '' . ' '; if ($withpicto != 2) $result .= 'S' . $object->entity; if ($withpicto != 2) $result .= (($addlabel && dolibarr_get_const($db, 'MAIN_INFO_SOCIETE_NOM', $object->entity)) ? $sep . dol_trunc(dolibarr_get_const($db, 'MAIN_INFO_SOCIETE_NOM', $object->entity), ($addlabel > 1 ? $addlabel : 0)) : ''); - $result .= $linkend; + if (isset($linked)) { + $result .= $linkend; + } global $action; $hookmanager->initHooks(array('entitydao')); @@ -2054,95 +2025,6 @@ function fetchDictionnary($tablename) } } -/** - * Delete an optional attribute - * - * @param string $attrname Code of attribute to delete - * @param string $elementtype Element type ('member', 'product', 'thirdparty', 'contact', ...) - * @return int < 0 if KO, 0 if nothing is done, 1 if OK - */ -function extrafield_soft_delete($attrname, $elementtype = 'member', $extrafields) -{ - if ($elementtype == 'thirdparty') { - $elementtype = 'societe'; - } - if ($elementtype == 'contact') { - $elementtype = 'socpeople'; - } - - $error = 0; - - if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) { - $result = extrafields_delete_label($attrname, $elementtype, $extrafields); - if ($result < 0) { - $extrafields->error = $extrafields->db->lasterror(); - $extrafields->errors[] = $extrafields->db->lasterror(); - $error++; - } - - if (!$error) { - $sql = "SELECT COUNT(rowid) as nb"; - $sql .= " FROM ".MAIN_DB_PREFIX."extrafields"; - $sql .= " WHERE elementtype = '".$extrafields->db->escape($elementtype)."'"; - $sql .= " AND name = '".$extrafields->db->escape($attrname)."'"; - //$sql.= " AND entity IN (0,".$conf->entity.")"; Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table - $resql = $extrafields->db->query($sql); - if ($resql) { - $obj = $extrafields->db->fetch_object($resql); - if ($obj->nb <= 0) { -// $result = $extrafields->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key - if ($result < 0) { - $extrafields->error = $extrafields->db->lasterror(); - $extrafields->errors[] = $extrafields->db->lasterror(); - } - } - } - } - - return $result; - } else { - return 0; - } -} - -// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps -/** - * Delete description of an optional attribute - * - * @param string $attrname Code of attribute to delete - * @param string $elementtype Element type ('member', 'product', 'thirdparty', ...) - * @return int < 0 if KO, 0 if nothing is done, 1 if OK - */ -function extrafields_delete_label($attrname, $elementtype = 'member', $extrafields) -{ - global $conf; - - if ($elementtype == 'thirdparty') { - $elementtype = 'societe'; - } - if ($elementtype == 'contact') { - $elementtype = 'socpeople'; - } - - if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields"; - $sql .= " WHERE name = '".$extrafields->db->escape($attrname)."'"; - $sql .= " AND entity IN (0,".$conf->entity.')'; - $sql .= " AND elementtype = '".$extrafields->db->escape($elementtype)."'"; - - dol_syslog(get_class($extrafields)."::delete_label", LOG_DEBUG); - $resql = $extrafields->db->query($sql); - if ($resql) { - return 1; - } else { - dol_print_error($extrafields->db); - return -1; - } - } else { - return 0; - } -} - /** * Return list of fetched instance of elements having this category * diff --git a/lib/digiriskdolibarr_ticket.lib.php b/lib/digiriskdolibarr_ticket.lib.php index 75399a65e..62ee9f098 100644 --- a/lib/digiriskdolibarr_ticket.lib.php +++ b/lib/digiriskdolibarr_ticket.lib.php @@ -80,14 +80,19 @@ function ticketstats_prepare_head(): array $h = 0; $head = []; - if ($user->rights->ticket->read) { - $head[$h][0] = DOL_URL_ROOT . '/custom/digiriskdolibarr/view/ticket/ticketstats.php'; - $head[$h][1] = $conf->browser->layout != 'phone' ? '' . $langs->trans('ByMonthYear') : ''; + if ($user->hasRight('ticket', 'read')) { + $head[$h][0] = dol_buildpath('custom/digiriskdolibarr/view/ticket/ticket_management_dashboard.php', 1); + $head[$h][1] = $conf->browser->layout == 'classic' ? '' . $langs->transnoentities('TicketManagementDashboard') : ''; + $head[$h][2] = 'dashboard'; + $h++; + + $head[$h][0] = dol_buildpath('custom/digiriskdolibarr/view/ticket/ticketstats.php', 1); + $head[$h][1] = $conf->browser->layout == 'classic' ? '' . $langs->trans('ByMonthYear') : ''; $head[$h][2] = 'byyear'; $h++; - $head[$h][0] = DOL_URL_ROOT . '/custom/digiriskdolibarr/view/ticket/ticketstatscsv.php'; - $head[$h][1] = $conf->browser->layout != 'phone' ? '' . $langs->trans('ExportCSV') : ''; + $head[$h][0] = dol_buildpath('custom/digiriskdolibarr/view/ticket/ticketstatscsv.php', 1); + $head[$h][1] = $conf->browser->layout == 'classic' ? '' . $langs->trans('ExportCSV') : ''; $head[$h][2] = 'exportcsv'; } diff --git a/public/ticket/create_ticket.php b/public/ticket/create_ticket.php index 5daac2b5b..d2a8c3b52 100644 --- a/public/ticket/create_ticket.php +++ b/public/ticket/create_ticket.php @@ -55,7 +55,9 @@ require_once __DIR__ . '/../../lib/digiriskdolibarr_function.lib.php'; require_once __DIR__ . '/../../class/digiriskelement.class.php'; +// Load Saturne libraries require_once __DIR__ . '/../../../saturne/lib/saturne_functions.lib.php'; +require_once __DIR__ . '/../../../saturne/class/saturnesignature.class.php'; global $conf, $db, $hookmanager, $langs, $mc, $user; @@ -80,6 +82,9 @@ $extrafields = new ExtraFields($db); $category = new Categorie($db); $digiriskelement = new DigiriskElement($db); +$signatory = new SaturneSignature($db, $moduleNameLowerCase, $object->element); + +$form = new Form($db); $numRefConf = strtoupper($object->element) . '_ADDON'; @@ -225,6 +230,16 @@ $object->fk_project = $conf->global->DIGIRISKDOLIBARR_TICKET_PROJECT; + if (!empty($date)) { + $timeStamp = dol_stringtotime($date); + $date = dol_getdate($timeStamp); + $_POST['options_digiriskdolibarr_ticket_datehour'] = $date['hours']; + $_POST['options_digiriskdolibarr_ticket_datemin'] = $date['minutes']; + $_POST['options_digiriskdolibarr_ticket_dateday'] = $date['mday']; + $_POST['options_digiriskdolibarr_ticket_datemonth'] = $date['mon']; + $_POST['options_digiriskdolibarr_ticket_dateyear'] = $date['year']; + } + $extrafields->setOptionalsFromPost(null, $object); // Check Captcha code if is enabled @@ -288,6 +303,25 @@ } } + if (GETPOSTISSET('signature')) { + $signatory->status = SaturneSignature::STATUS_SIGNED; + $signatory->role = 'Attendant'; + $signatory->firstname = $firstname; + $signatory->lastname = $lastname; + $signatory->signature_date = dol_now(); + $signatory->signature = GETPOST('signature'); + $signatory->signature_url = generate_random_id(); + $signatory->element_type = 'user'; + $signatory->element_id = 0; + $signatory->object_type = 'ticket'; + $signatory->fk_object = $result; + $signatory->module_name = 'digiriskdolibarr'; + + $signatory->create($user); + } + + $object->call_trigger('TICKET_PUBLIC_INTERFACE_CREATE', $user); + // Creation OK dol_delete_dir_recursive($ticket_upload_dir . '/ticket/' . $ticketTmpId . '/'); $urltogo = $_SERVER['PHP_SELF'] . '/../ticket_success.php?track_id=' . $track_id; @@ -375,13 +409,13 @@ * View */ -$form = new Form($db); -$formticket = new FormTicket($db); +$title = $langs->trans('CreateTicket'); +$moreJS = ['/saturne/js/includes/signature-pad.min.js']; -$arrayofjs = array("/digiriskdolibarr/js/digiriskdolibarr.min.js", "/saturne/js/saturne.min.js"); -$arrayofcss = array('/opensurvey/css/style.css', '/ticket/css/styles.css.php', "/digiriskdolibarr/css/digiriskdolibarr.css", "/saturne/css/saturne.css"); +$conf->dol_hide_topmenu = 1; +$conf->dol_hide_leftmenu = 1; -digiriskdolibarr_ticket_header($langs->trans("CreateTicket"), "", 0, 0, $arrayofjs, $arrayofcss); +saturne_header(0,'', $title, '', '', 0, 0, $moreJS, [], '', 'page-public-card page-signature'); if ($entity > 0) { if ( ! $conf->global->DIGIRISKDOLIBARR_TICKET_ENABLE_PUBLIC_INTERFACE) { @@ -394,7 +428,7 @@ print load_fiche_titre($langs->trans("CreateTicket"), '', "digiriskdolibarr_color@digiriskdolibarr"); - print '
'; + print ''; print ''; print ''; print ''; @@ -420,17 +454,22 @@ print '

' . $conf->global->DIGIRISKDOLIBARR_TICKET_PARENT_CATEGORY_LABEL . ' *

'; $mainCategoryObject = $category->rechercher($conf->global->DIGIRISKDOLIBARR_TICKET_MAIN_CATEGORY, '', 'ticket', true); + $mainCategoryChildrenExtrafields = new StdClass(); + $subCategoryExtrafields = new StdClass(); + $categoryDescription = ''; - print '
'; + print '
'; if ( ! empty($mainCategoryObject) && $mainCategoryObject > 0) { $mainCategoryChildren = $mainCategoryObject[0]->get_filles(); if ( ! empty($mainCategoryChildren) && $mainCategoryChildren > 0) { $k = 1; foreach ($mainCategoryChildren as $cat) { if ($cat->id == GETPOST('parentCategory')) { - print '
'; + $mainCategoryChildrenExtrafields = json_decode($cat->array_options['options_ticket_category_config']); + $categoryDescription = $cat->description; + print '
'; } else { - print '
'; + print '
'; } print '
'; @@ -447,7 +486,7 @@ foreach ($mainCategoryChildren as $cat) { $selectedParentCategory = $category; - $selectedParentCategory->fetch($cat->id); + $selectedParentCategory->fetch($cat->id); $selectedParentCategoryChildren = $selectedParentCategory->get_filles(); if ( ! empty($selectedParentCategoryChildren)) { @@ -457,9 +496,11 @@ foreach ($selectedParentCategoryChildren as $subCategory) { if ($subCategory->id == GETPOST('subCategory')) { - print '
'; + $subCategoryExtrafields = json_decode($subCategory->array_options['options_ticket_category_config']); + $categoryDescription = $subCategory->description; + print '
'; } else { - print '
'; + print '
'; } show_category_image($subCategory, $upload_dir); print '' . $subCategory->label . ''; @@ -472,161 +513,154 @@ print '
'; } - } ?> - -
-
-
- trans("Message"); ?> * - -
-
- global->DIGIRISKDOLIBARR_TICKET_PHOTO_VISIBLE) {?> -
- trans("FilesLinked"); ?> - -
- -
-
- digiriskdolibarr->multidir_output[isset($conf->entity) ? $conf->entity : 1] . '/temp/ticket/' . $ticketTmpId . '/thumbs/'); ?> -
- -
-
- entity . '&file=' . urlencode('/temp/ticket/' . $ticketTmpId . '/thumbs/' . $fileLinked['name']) . '" title="' . dol_escape_htmltag($alt) . '">'; ?> -
-
- -
-
-
'; ?> -
-
-
-
trans('NoFileLinked'); ?>
-
- -
-
-
- -
-
- - multicompany->enabled) { - $entity = $conf->entity; - } else { - $entity = GETPOST('entity'); - } - if ($entity > 0 && dolibarr_get_const($db, 'DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS', 0) == 1) { - if ($conf->global->DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_VISIBLE) { - $selectDigiriskElement = '
global->DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_REQUIRED) ? 'style="font-weight:600"' : '') . '>' . $langs->trans('Service') . (($conf->global->DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_REQUIRED) ? ' *' : '') . ''; - - $deletedElements = $digiriskelement->getMultiEntityTrashList(); - if (empty($deletedElements)) { - $deletedElements = [0]; - } - $selectDigiriskElement .= $digiriskelement->selectDigiriskElementList(GETPOST('options_digiriskdolibarr_ticket_service'), 'options_digiriskdolibarr_ticket_service', ['customsql' => 't.rowid NOT IN (' . implode(',', $deletedElements) . ') AND t.show_in_selector = 1'], $langs->trans('PleaseSelectADigiriskElement'), 0, array(), 0, 0, 'minwidth500', 0, false, 1, '', true, $conf->global->DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_HIDE_REF); - $selectDigiriskElement .= '

'; - print($selectDigiriskElement); - } - - if ($conf->global->DIGIRISKDOLIBARR_TICKET_LASTNAME_VISIBLE) { - $lastnamefield = '
'; - $lastnamefield .= 'global->DIGIRISKDOLIBARR_TICKET_LASTNAME_REQUIRED) ? '' : 'style="font-weight:300"') . '>' . $langs->trans("LastName") . (($conf->global->DIGIRISKDOLIBARR_TICKET_LASTNAME_REQUIRED) ? ' *' : '') . ''; - $lastnamefield .= ''; - $lastnamefield .= '
'; - print($lastnamefield); - } - - if ($conf->global->DIGIRISKDOLIBARR_TICKET_FIRSTNAME_VISIBLE) { - $firstnamefield = '
'; - $firstnamefield .= 'global->DIGIRISKDOLIBARR_TICKET_FIRSTNAME_REQUIRED) ? '' : 'style="font-weight:300"') . '>' . $langs->trans("FirstName") . (($conf->global->DIGIRISKDOLIBARR_TICKET_FIRSTNAME_REQUIRED) ? ' *' : '') . ''; - $firstnamefield .= ''; - $firstnamefield .= '
'; - print($firstnamefield); - } - - if ($conf->global->DIGIRISKDOLIBARR_TICKET_EMAIL_VISIBLE) { - $emailfield = '
'; - $emailfield .= 'global->DIGIRISKDOLIBARR_TICKET_EMAIL_REQUIRED) ? '' : 'style="font-weight:300"') . '>' . $langs->trans("Email") . (($conf->global->DIGIRISKDOLIBARR_TICKET_EMAIL_REQUIRED) ? ' *' : '') . ''; - $emailfield .= ''; - $emailfield .= '
'; - print($emailfield); - } - - if ($conf->global->DIGIRISKDOLIBARR_TICKET_PHONE_VISIBLE) { - $phonefield = '
'; - $phonefield .= 'global->DIGIRISKDOLIBARR_TICKET_PHONE_REQUIRED) ? '' : 'style="font-weight:300"') . '>' . $langs->trans("Phone") . (($conf->global->DIGIRISKDOLIBARR_TICKET_PHONE_REQUIRED) ? ' *' : '') . ''; - $phonefield .= ''; - $phonefield .= ''; - $phonefield .= '
'; - print($phonefield); - } - - if ($conf->global->DIGIRISKDOLIBARR_TICKET_LOCATION_VISIBLE) { - $locationfield = '
'; - $locationfield .= 'global->DIGIRISKDOLIBARR_TICKET_LOCATION_REQUIRED) ? '' : 'style="font-weight:300"') . '>' . $langs->trans("Location") . (($conf->global->DIGIRISKDOLIBARR_TICKET_LOCATION_REQUIRED) ? ' *' : '') . ''; - $locationfield .= ''; - $locationfield .= '
'; - print($locationfield); - } - - if ($conf->global->DIGIRISKDOLIBARR_TICKET_DATE_VISIBLE) { - $datefield = '
'; - $datefield .= 'global->DIGIRISKDOLIBARR_TICKET_DATE_REQUIRED) ? '' : 'style="font-weight:300"') . '>' . $langs->trans("Date") . (($conf->global->DIGIRISKDOLIBARR_TICKET_DATE_REQUIRED) ? ' *' : '') . ''; - $datefield .= $form->selectDate(dol_now('tzuser'), 'options_digiriskdolibarr_ticket_date', 1, 1, 0, '', 1, 1); - $datefield .= '
'; - print($datefield); - } - } - - //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php'; - - if ( ! empty($conf->global->DIGIRISKDOLIBARR_USE_CAPTCHA)) { - require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php'; - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print '' . img_picto($langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"') . ''; - print ''; - print '
'; - }?> - - '; ?> -
- +
+
+ show_description) + || (!getDolGlobalInt('DIGIRISKDOLIBARR_TICKET_PUBLIC_INTERFACE_SHOW_CATEGORY_DESCRIPTION') && $mainCategoryChildrenExtrafields->show_description == NUll && $subCategoryExtrafields->show_description); + if ($visible && dol_strlen($categoryDescription) > 0) : ?> +
+ trans('Description'); ?> + +
+ +
+ trans("Message"); ?> * + +
+
+ global->DIGIRISKDOLIBARR_TICKET_PHOTO_VISIBLE || (!$conf->global->DIGIRISKDOLIBARR_TICKET_PHOTO_VISIBLE && $mainCategoryChildrenExtrafields->photo_visible)) {?> +
+ trans("FilesLinked"); ?> + +
+ +
+
+ digiriskdolibarr->multidir_output[isset($conf->entity) ? $conf->entity : 1] . '/temp/ticket/' . $ticketTmpId . '/thumbs/'); ?> +
+ +
+
+ entity . '&file=' . urlencode('/temp/ticket/' . $ticketTmpId . '/thumbs/' . $fileLinked['name']) . '" title="' . dol_escape_htmltag($alt) . '">'; ?> +
+
+ +
+
+
'; ?> +
+
+
+
trans('NoFileLinked'); ?>
+
+ +
+
+
+ +
+ global->DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_VISIBLE || (!$conf->global->DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_VISIBLE && $mainCategoryChildrenExtrafields->digiriskelement_visible)) { + $selectDigiriskElement = '
global->DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_REQUIRED) ? 'style="font-weight:600"' : '') . '>' . $langs->trans('Service') . (($conf->global->DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_REQUIRED) ? ' *' : '') . ''; + + $deletedElements = $digiriskelement->getMultiEntityTrashList(); + if (empty($deletedElements)) { + $deletedElements = [0]; + } + $selectDigiriskElement .= $digiriskelement->selectDigiriskElementList(GETPOST('options_digiriskdolibarr_ticket_service'), 'options_digiriskdolibarr_ticket_service', ['customsql' => 't.rowid NOT IN (' . implode(',', $deletedElements) . ') AND t.show_in_selector = 1'], $langs->trans('PleaseSelectADigiriskElement'), 0, array(), 0, 0, 'minwidth500', 0, false, 1, '', true, $conf->global->DIGIRISKDOLIBARR_TICKET_DIGIRISKELEMENT_HIDE_REF); + $selectDigiriskElement .= '
'; + print($selectDigiriskElement); + } + + $fields = [ + 'digiriskdolibarr_ticket_email' => ['type' => 'email', 'name' => 'email'], + 'digiriskdolibarr_ticket_date' => ['type' => 'datetime-local'] + ]; + $extrafields->attributes[$object->table_element]['label']['digiriskdolibarr_ticket_email'] = $langs->trans('Email'); + unset($extrafields->attributes[$object->table_element]['label']['digiriskdolibarr_ticket_service']); + foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $field) { + if (strpos($key, 'digiriskdolibarr_ticket') === false) { + continue; // Goes to the next element if ‘digiriskdolibarr_ticket’ is not found + } + $visible = getDolGlobalInt(dol_strtoupper($key) . '_VISIBLE') || (!getDolGlobalInt(dol_strtoupper($key) . '_VISIBLE') && $mainCategoryChildrenExtrafields->{$key . '_visible'}) + || (!getDolGlobalInt(dol_strtoupper($key) . '_VISIBLE') && $mainCategoryChildrenExtrafields->{$key . '_visible'} == NUll && $subCategoryExtrafields->{$key . '_visible'}); + $required = getDolGlobalInt(dol_strtoupper($key) . '_REQUIRED') || (!getDolGlobalInt(dol_strtoupper($key) . '_REQUIRED') && $mainCategoryChildrenExtrafields->{$key . '_required'}) + || (!getDolGlobalInt(dol_strtoupper($key) . '_REQUIRED') && $mainCategoryChildrenExtrafields->{$key . '_required'} == NUll && $subCategoryExtrafields->{$key . '_required'}); + if ($visible) { + $out = '
'; + $out .= ''; + $out .= '
'; + print($out); + } + } + } + print '
'; + if (!empty($conf->global->DIGIRISKDOLIBARR_USE_CAPTCHA)) { + require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php'; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print '' . img_picto($langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"') . ''; + print ''; + print '
'; + } + print '
'; + print dol_get_fiche_end(); + + $visible = getDolGlobalInt('DIGIRISKDOLIBARR_TICKET_PUBLIC_INTERFACE_USE_SIGNATORY') || (!getDolGlobalInt('DIGIRISKDOLIBARR_TICKET_PUBLIC_INTERFACE_USE_SIGNATORY') && $mainCategoryChildrenExtrafields->use_signatory) + || (!getDolGlobalInt('DIGIRISKDOLIBARR_TICKET_PUBLIC_INTERFACE_USE_SIGNATORY') && $mainCategoryChildrenExtrafields->use_signatory && $subCategoryExtrafields->use_signatory); + if ($visible) { + // Load Saturne libraries + require_once __DIR__ . '/../../../saturne/lib/saturne_functions.lib.php'; + require_once __DIR__ . '/../../../saturne/class/saturnesignature.class.php'; + + $signatory = new SaturneSignature($db, $moduleNameLowerCase, $object->element); + + $previousStatus = $object->status; + $object->status = $object::STATUS_READ; // Special case because public answer need draft status object to complete question + $moreParams['moreCSS'] = 'hidden'; // Needed for prevent click on signature button action + print '
'; + require_once __DIR__ . '/../../../saturne/core/tpl/signature/public_signature_view.tpl.php'; + print '
'; + $object->status = $previousStatus; + print ''; + } + if ($object->status == $object::STATUS_NOT_READ) { + print '
'; + print ''; + print '
'; + } + endif; } else { print '
'; print ''; diff --git a/view/accident/accident_card.php b/view/accident/accident_card.php index 3f02511b3..9b7ab7da1 100644 --- a/view/accident/accident_card.php +++ b/view/accident/accident_card.php @@ -865,7 +865,7 @@ $arrayAccident[] = $object->accident_location; break; } - $arrayAccident[] = $userVictim->id; + $arrayAccident[] = $userVictim->id > 0 ? $userVictim->id : ''; $accidentLesions = $accidentLesion->fetchAll('', '', 0, 0, ['customsql' => 't.fk_accident = ' . $object->id]); $arrayAccident[] = (is_array($accidentLesions) && !empty($accidentLesions)) ? count($accidentLesions) : ''; @@ -987,14 +987,6 @@ } print ''; - //User Victim -- Victime de l'accident - print ''; - print $form->textwithpicto($langs->trans("UserVictim"), $langs->trans("GaugeCounter"), 1, 'info'); - print ''; - print ''; - print $userVictim->getNomUrl(1); - print ''; - //Accident type -- Type de l'accident print ''; print $form->textwithpicto($langs->trans("AccidentType"), $langs->trans("GaugeCounter"), 1, 'info'); diff --git a/view/accident/accident_list.php b/view/accident/accident_list.php index 6237124c0..46dad4988 100644 --- a/view/accident/accident_list.php +++ b/view/accident/accident_list.php @@ -90,7 +90,7 @@ // List of fields to search into when doing a "search in all" $fieldstosearchall = []; foreach ($accident->fields as $key => $val) { - if ($val['searchall']) { + if (!empty($val['searchall'])) { $fieldstosearchall['t.' . $key] = $val['label']; } } @@ -100,10 +100,11 @@ foreach ($accident->fields as $key => $val) { // If $val['visible']==0, then we never show the field - if ( ! empty($val['visible'])) $arrayfields['t.' . $key] = array('label' => $val['label'], 'checked' => (($val['visible'] < 0) ? 0 : 1), 'enabled' => ($val['enabled'] && ($val['visible'] != 3)), 'position' => $val['position']); + if (!empty($val['visible'])) $arrayfields['t.' . $key] = ['label' => $val['label'], 'checked' => (($val['visible'] < 0) ? 0 : 1), 'enabled' => ($val['enabled'] && ($val['visible'] != 3)), 'position' => $val['position']]; } -// Load accident object +$id = GETPOST('id', 'int'); // get if for actions_fetchobject.inc.php +// Load accident object, why ? include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. //Permission for accident @@ -284,7 +285,8 @@ $sql = preg_replace('/,\s*$/', '', $sql); $sql .= " FROM " . MAIN_DB_PREFIX . $accident->table_element . " as t"; -if (is_array($extrafields->attributes[$accident->table_element]['label']) && count($extrafields->attributes[$accident->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $accident->table_element . "_extrafields as ef on (t.rowid = ef.fk_object)"; +if (isset($extrafields->attributes[$accident->table_element]['label']) && + is_array($extrafields->attributes[$accident->table_element]['label']) && count($extrafields->attributes[$accident->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $accident->table_element . "_extrafields as ef on (t.rowid = ef.fk_object)"; if ($accident->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (" . getEntity($accident->element) . ")"; else $sql .= " WHERE 1 = 1"; $sql .= ' AND status != ' . $accident::STATUS_DELETED; @@ -378,10 +380,10 @@ if ( ! empty($arrayfields['t.' . $key]['checked'])) { print ''; - if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_' . $key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); + if (isset($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_' . $key, $val['arrayofkeyval'], $search[$key] ?? '', $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); elseif (strpos($val['type'], 'integer:') === 0) { - print $accident->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1); - } elseif ( ! preg_match('/^(date|timestamp)/', $val['type'])) print ''; + print $accident->showInputField($val, $key, $search[$key] ?? '', '', '', 'search_', 'maxwidth150', 1); + } elseif ( ! preg_match('/^(date|timestamp)/', $val['type'])) print ''; print ''; } if ($key == 'Custom') { @@ -458,7 +460,7 @@ // contenu $i = 0; $kCounter = 0; -$totalarray = []; +$totalarray = ['nbfield' => 0]; while ($i < ($limit ? min($num, $limit) : $num)) { $obj = $db->fetch_object($resql); @@ -470,7 +472,11 @@ $accident->setVarsFromFetchObj($obj); $userVictim = $accident->getUserVictim(); - $json = json_decode($accident->json, false, 512, JSON_UNESCAPED_UNICODE)->Accident; + if (isset($accident->json)) { + $json = json_decode($accident->json, false, 512, JSON_UNESCAPED_UNICODE)->Accident; + } else { + $json = []; + } // Show here line of result print ''; @@ -508,7 +514,7 @@ $arrayAccident[] = $accident->accident_location; break; } - $arrayAccident[] = $userVictim->id; + $arrayAccident[] = $userVictim->id > 0 ? $userVictim->id : ''; $accidentLesions = $accidentLesion->fetchAll('', '', 0, 0, ['customsql' => 't.fk_accident = ' . $accident->id]); $arrayAccident[] = (is_array($accidentLesions) && !empty($accidentLesions)) ? count($accidentLesions) : ''; @@ -608,7 +614,7 @@ } $db->free($resql); -$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql); +$parameters = ['arrayfields' => $arrayfields, 'sql' => $sql]; $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $risk); // Note that $action and $risk may have been modified by hook print $hookmanager->resPrint; diff --git a/view/accidentinvestigation/accidentinvestigation_card.php b/view/accidentinvestigation/accidentinvestigation_card.php index 740a4cdb8..fe861f04a 100644 --- a/view/accidentinvestigation/accidentinvestigation_card.php +++ b/view/accidentinvestigation/accidentinvestigation_card.php @@ -333,8 +333,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php'; - print '' . $langs->trans("UserVictim") . ''; - print '' . $victim->getNomUrl(1) . ''; + print '' . $langs->trans("UserVictim") . ''; + print '' . ($victim->id > 0 ? $victim->getNomUrl(1) : '') . ''; print ' '; print ''; $pathPhotos = $conf->digiriskdolibarr->multidir_output[$conf->entity] . '/accidentinvestigation/'. $object->ref . '/causality_tree/'; diff --git a/view/digiriskelement/risk_list.php b/view/digiriskelement/risk_list.php index 20f80dae0..4e09f0e6d 100644 --- a/view/digiriskelement/risk_list.php +++ b/view/digiriskelement/risk_list.php @@ -80,6 +80,8 @@ $search_category_array = GETPOST('search_category_risk_list', 'array'); } +$onPhone = $conf->browser->layout == 'phone'; + // Initialize technical objects $object = new DigiriskStandard($db); $risk = new Risk($db); @@ -108,7 +110,7 @@ // Default sort order (if not yet defined by previous GETPOST) if ( ! $sortfield) $sortfield = $conf->global->DIGIRISKDOLIBARR_SORT_LISTINGS_BY_COTATION ? "evaluation.cotation" : "r." . key($risk->fields);; // Set here default search field. By default 1st field in definition. if ( ! $sortorder) $sortorder = $conf->global->DIGIRISKDOLIBARR_SORT_LISTINGS_BY_COTATION ? "DESC" : "ASC" ; -if ( ! $evalsortfield) $evalsortfield = "evaluation." . key($evaluation->fields); +if (!isset($evalsortfield) || !$evalsortfield) $evalsortfield = "evaluation." . key($evaluation->fields); $offset = $limit * $page; $pageprev = $page - 1; @@ -127,7 +129,7 @@ // List of fields to search into when doing a "search in all" $fieldstosearchall = array(); foreach ($risk->fields as $key => $val) { - if ($val['searchall']) $fieldstosearchall['r.' . $key] = $val['label']; + if (!empty($val['searchall'])) $fieldstosearchall['r.' . $key] = $val['label']; } // Definition of fields for list diff --git a/view/digiriskstandard/digiriskstandard_auditreportdocument.php b/view/digiriskstandard/digiriskstandard_auditreportdocument.php index 1f2cf8c14..c7dd2b1ae 100644 --- a/view/digiriskstandard/digiriskstandard_auditreportdocument.php +++ b/view/digiriskstandard/digiriskstandard_auditreportdocument.php @@ -130,10 +130,10 @@ print ''; // DateRange -- Plage de date -$dateStart = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? dol_mktime(0, 0, 0, getDolGlobalInt('SOCIETE_FISCAL_MONTH_START'), 1, strftime("%Y", dol_now())) : dol_now(); +$currentDate = dol_now(); print '' . $langs->trans("DateRange") . ''; -print '' . $langs->trans('From') . $form->selectDate($dateStart, 'datestart'); -print $langs->trans('At') . $form->selectDate(dol_time_plus_duree($dateStart, 1, 'y'), 'dateend'); +print '' . $langs->trans('From') . $form->selectDate(dol_time_plus_duree($currentDate, -1, 'd'), 'datestart'); +print $langs->trans('At') . $form->selectDate($currentDate, 'dateend'); print $langs->trans('UseDateRange'); print ''; print ''; diff --git a/view/digirisktools.php b/view/digirisktools.php index 9c6a23420..47ead4d8a 100644 --- a/view/digirisktools.php +++ b/view/digirisktools.php @@ -84,6 +84,7 @@ $dangerCategories = $risk->getDangerCategories(); $risk->type = 'riskenvironmental'; $environmentalCategories = $risk->getDangerCategories(); +$risk->type = 'risk'; // Security check - Protection if external user $permissiontoread = $user->rights->digiriskdolibarr->adminpage->read; @@ -218,19 +219,22 @@ //Risk foreach ($digiriskExportArray['risks'] as $digiriskExportRisk) { - $risk->ref = $refRiskMod->getNextValue($risk); - $risk->category = $risk->getDangerCategoryPositionByName($digiriskExportRisk['danger_category']['name']); - $risk->fk_element = $digiriskElement->fetch_id_from_wp_digi_id($digiriskExportRisk['parent_id']); - $risk->fk_projet = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT; - - if ( ! $error) { + $risk->ref = $refRiskMod->getNextValue($risk); + $risk->status = Risk::STATUS_VALIDATED; + $risk->category = $risk->getDangerCategoryPositionByName($digiriskExportRisk['danger_category']['name']); + $risk->fk_element = $digiriskElement->fetch_id_from_wp_digi_id($digiriskExportRisk['parent_id']); + $risk->fk_projet = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT; + $risk->date_creation = $digiriskExportRisk['evaluation']['date']['raw']; + + if (!$error) { $result = $risk->create($user, true); if ($result > 0) { $riskAssessment->ref = $refRiskAssessmentMod->getNextValue($riskAssessment); $riskAssessment->date_riskassessment = $digiriskExportRisk['evaluation']['date']['raw']; - $riskAssessment->cotation = $digiriskExportRisk['current_equivalence']; - $riskAssessment->status = 1; - $riskAssessment->fk_risk = $risk->id; + $riskAssessment->date_creation = $digiriskExportRisk['evaluation']['date']['raw']; + $riskAssessment->cotation = $digiriskExportRisk['current_equivalence']; + $riskAssessment->status = RiskAssessment::STATUS_VALIDATED; + $riskAssessment->fk_risk = $risk->id; if ($digiriskExportRisk['evaluation_method']['name'] == 'Evarisk') { $riskassessment_variables = array_values($digiriskExportRisk['evaluation']['variables']); @@ -416,18 +420,21 @@ //Risk foreach ($digiriskExportArray['risks'] as $digiriskExportRisk) { - $risk->ref = $refRiskMod->getNextValue($risk); - $risk->category = $risk->getDangerCategoryPositionByName($digiriskExportRisk['danger_category']['name']); - $risk->fk_element = $digiriskElement->fetch_id_from_wp_digi_id($digiriskExportRisk['parent_id']); - $risk->fk_projet = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT; - - if ( ! $error) { + $risk->ref = $refRiskMod->getNextValue($risk); + $risk->status = Risk::STATUS_VALIDATED; + $risk->category = $risk->getDangerCategoryPositionByName($digiriskExportRisk['danger_category']['name']); + $risk->fk_element = $digiriskElement->fetch_id_from_wp_digi_id($digiriskExportRisk['parent_id']); + $risk->fk_projet = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT; + $risk->date_creation = $digiriskExportRisk['evaluation']['date']['raw']; + + if (!$error) { $result = $risk->create($user, true); if ($result > 0) { $riskAssessment->ref = $refRiskAssessmentMod->getNextValue($riskAssessment); - $riskAssessment->date_riskassessment = $digiriskExportRisk['evaluation']['date']['raw']; + $riskAssessment->date_riskassessment = $digiriskExportRisk['evaluation']['date']['raw']; + $riskAssessment->date_creation = $digiriskExportRisk['evaluation']['date']['raw']; $riskAssessment->cotation = $digiriskExportRisk['current_equivalence']; - $riskAssessment->status = 1; + $riskAssessment->status = RiskAssessment::STATUS_VALIDATED; $riskAssessment->fk_risk = $risk->id; if ($digiriskExportRisk['evaluation_method']['name'] == 'Evarisk') { @@ -617,165 +624,180 @@ } } -if (GETPOST('dataMigrationImportGlobalDolibarr', 'alpha') && ! empty($conf->global->MAIN_UPLOAD_DOC)) { +if ($action == 'import_global_dolibarr' && ! empty($conf->global->MAIN_UPLOAD_DOC)) { // Submit file + $actionError = []; + if ( ! empty($_FILES)) { - if ( ! preg_match('/dolibarr_global_export.zip/', $_FILES['dataMigrationImportGlobalDolibarrfile']['name'][0]) || $_FILES['dataMigrationImportGlobalDolibarrfile']['size'][0] < 1) { - setEventMessages($langs->trans('ErrorFileNotWellFormattedZIP'), null, 'errors'); + if ( ! preg_match('/dolibarr_global_export.zip/', $_FILES['file']['name']) || $_FILES['file']['size'] < 1) { + $actionError[] = $langs->trans('ErrorFileNotWellFormattedZIP'); } else { - if (is_array($_FILES['dataMigrationImportGlobalDolibarrfile']['tmp_name'])) $userfiles = $_FILES['dataMigrationImportGlobalDolibarrfile']['tmp_name']; - else $userfiles = array($_FILES['dataMigrationImportGlobalDolibarrfile']['tmp_name']); - foreach ($userfiles as $key => $userfile) { - if (empty($_FILES['dataMigrationImportGlobalDolibarrfile']['tmp_name'][$key])) { - $error++; - if ($_FILES['dataMigrationImportGlobalDolibarrfile']['error'][$key] == 1 || $_FILES['dataMigrationImportGlobalDolibarrfile']['error'][$key] == 2) { - setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors'); - } else { - setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors'); - } - } - } + if (empty($_FILES['file']['tmp_name'])) { + $error++; + if ($_FILES['file']['error'] == 1 || $_FILES['file']['error'] == 2) { + $actionError[] = $langs->trans('ErrorFileSizeTooLarge'); + } else { + $actionError[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")); + } + } if ( ! $error) { $filedir = $upload_dir . '/temp/'; if ( ! empty($filedir)) { - $result = dol_add_file_process($filedir, 0, 1, 'dataMigrationImportGlobalDolibarrfile', '', null, '', 0, null); + $result = dol_add_file_process($filedir, 0, 1, 'file', '', null, '', 0, null); } } if ($result > 0) { $zip = new ZipArchive; - if ($zip->open($filedir . $_FILES['dataMigrationImportGlobalDolibarrfile']['name'][0]) === TRUE) { + if ($zip->open($filedir . $_FILES['file']['name']) === TRUE) { $zip->extractTo($filedir); $zip->close(); } } - $filename = preg_replace( '/\.zip/', '.json', $_FILES['dataMigrationImportGlobalDolibarrfile']['name'][0]); + $filename = preg_replace( '/\.zip/', '.json', $_FILES['file']['name']); $json = file_get_contents($filedir . $filename); $digiriskExportArray = json_decode($json, true); - if (is_array($digiriskExportArray['digiriskelements']) && !empty($digiriskExportArray['digiriskelements'])) { - foreach ($digiriskExportArray['digiriskelements'] as $digiriskelementsingle) { - if ($digiriskelementsingle['element_type'] == 'groupment') { - $digiriskElement->ref = $refGroupmentMod->getNextValue($digiriskElement); - } elseif ($digiriskelementsingle['element_type'] == 'workunit') { - $digiriskElement->ref = $refWorkUnitMod->getNextValue($digiriskElement); - } - $digiriskElement->label = $digiriskelementsingle['label']; - $digiriskElement->status = $digiriskelementsingle['status']; - $digiriskElement->description = $digiriskelementsingle['description']; - $digiriskElement->element = $digiriskelementsingle['element_type']; - $digiriskElement->element_type = $digiriskelementsingle['element_type']; - $digiriskElement->photo = $digiriskelementsingle['photo']; - $digiriskElement->show_in_selector = $digiriskelementsingle['show_in_selector']; - $digiriskElement->ranks = $digiriskelementsingle['ranks']; - - $digiriskElement->array_options['wp_digi_id'] = $digiriskelementsingle['rowid']; - $digiriskElement->array_options['entity'] = $conf->entity; - - $digiriskElement->fk_parent = $digiriskElement->fetch_id_from_wp_digi_id($digiriskelementsingle['fk_parent']) ?: 0; - - $digiriskelementid = $digiriskElement->create($user); - - //Risk - if (array_key_exists('risks', $digiriskelementsingle)) { - foreach ($digiriskelementsingle['risks'] as $digiriskExportRisk) { - $risk->ref = $refRiskMod->getNextValue($risk); - $risk->status = $digiriskExportRisk['status']; - $risk->category = $digiriskExportRisk['category']; - $risk->description = $digiriskExportRisk['description']; - $risk->type = $digiriskExportRisk['type']; - $risk->fk_element = $digiriskelementid; - $risk->fk_projet = $digiriskExportRisk['type'] == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT; - - if ( ! $error) { - $result = $risk->create($user, true); - if ($result > 0) { - if (array_key_exists('riskassessments', $digiriskExportRisk)) { - foreach ($digiriskExportRisk['riskassessments'] as $digiriskExportRiskAssessement) { - $riskAssessment->ref = $refRiskAssessmentMod->getNextValue($riskAssessment); - $riskAssessment->status = $digiriskExportRiskAssessement['status']; - $riskAssessment->method = $digiriskExportRiskAssessement['method']; - $riskAssessment->cotation = $digiriskExportRiskAssessement['cotation']; - $riskAssessment->gravite = $digiriskExportRiskAssessement['gravite']; - $riskAssessment->protection = $digiriskExportRiskAssessement['protection']; - $riskAssessment->occurrence = $digiriskExportRiskAssessement['occurrence']; - $riskAssessment->formation = $digiriskExportRiskAssessement['formation']; - $riskAssessment->exposition = $digiriskExportRiskAssessement['exposition']; - $riskAssessment->date_riskassessment = $digiriskExportRiskAssessement['date_riskassessment']; - $riskAssessment->comment = $digiriskExportRiskAssessement['comment']; - $riskAssessment->photo = $digiriskExportRiskAssessement['photo']; - $riskAssessment->fk_risk = $risk->id; - - $result2 = $riskAssessment->create($user, true, false); - - if ($result2 < 0) { - // Creation evaluation KO - if ( ! empty($riskAssessment->errors)) setEventMessages('', $riskAssessment->errors, 'errors'); - else setEventMessages($riskAssessment->error, array(), 'errors'); - } - } - } - if (array_key_exists('tasks', $digiriskExportRisk)) { - foreach ($digiriskExportRisk['tasks'] as $digiriskExportTask) { - $task->ref = $refTaskMod->getNextValue('', $task); - $task->date_start = $digiriskExportTask['date_start']; - $task->date_end = $digiriskExportTask['date_end']; - $task->label = $digiriskExportTask['label']; - $task->description = $digiriskExportTask['description']; - $task->duration_effective = $digiriskExportTask['duration_effective']; - $task->planned_workload = $digiriskExportTask['planned_workload']; - $task->progress = $digiriskExportTask['progress']; - $task->priority = $digiriskExportTask['priority']; - $task->budget_amount = $digiriskExportTask['budget_amount']; - // $task->fk_statut = $digiriskExportTask['fk_statut']; - $task->note_public = $digiriskExportTask['note_public']; - $task->note_private = $digiriskExportTask['note_private']; - $task->fk_project = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT; - $task->array_options['fk_risk'] = $risk->id; - - $result3 = $task->create($user, true); - - if ($result3 < 0) { - // Creation task KO - if ( ! empty($task->errors)) setEventMessages('', $task->errors, 'errors'); - else setEventMessages($task->error, array(), 'errors'); - } - } - } - } else { - // Creation risk KO - if ( ! empty($risk->errors)) setEventMessages('', $risk->errors, 'errors'); - else setEventMessages($risk->error, array(), 'errors'); - } - } - } - } - - //RiskSign - if (array_key_exists('risksigns', $digiriskelementsingle)) { - foreach ($digiriskelementsingle['risksigns'] as $digiriskExportRiskSign) { - $risksign->ref = $refRiskSignMod->getNextValue($risksign); - $risksign->status = $digiriskExportRiskSign['status']; - $risksign->category = $digiriskExportRiskSign['category']; - $risksign->description = $digiriskExportRiskSign['description']; - $risksign->fk_element = $digiriskelementid; - - if (!$error) { - $result = $risksign->create($user, true); - if ($result < 0) { - // Creation risksign KO - if (!empty($risksign->errors)) setEventMessages(null, $risksign->errors, 'errors'); - else setEventMessages($risksign->error, null, 'errors'); - } - } - } - } - } - } + if ($digiriskExportArray != null) { + if (is_array($digiriskExportArray['digiriskelements']) && !empty($digiriskExportArray['digiriskelements'])) { + foreach ($digiriskExportArray['digiriskelements'] as $digiriskelementsingle) { + if ($digiriskelementsingle['element_type'] == 'groupment') { + $digiriskElement->ref = $refGroupmentMod->getNextValue($digiriskElement); + } elseif ($digiriskelementsingle['element_type'] == 'workunit') { + $digiriskElement->ref = $refWorkUnitMod->getNextValue($digiriskElement); + } + $digiriskElement->label = $digiriskelementsingle['label']; + $digiriskElement->status = $digiriskelementsingle['status']; + $digiriskElement->description = $digiriskelementsingle['description']; + $digiriskElement->element = $digiriskelementsingle['element_type']; + $digiriskElement->element_type = $digiriskelementsingle['element_type']; + $digiriskElement->photo = $digiriskelementsingle['photo']; + $digiriskElement->show_in_selector = $digiriskelementsingle['show_in_selector']; + $digiriskElement->ranks = $digiriskelementsingle['ranks']; + + $digiriskElement->array_options['wp_digi_id'] = $digiriskelementsingle['rowid']; + $digiriskElement->array_options['entity'] = $conf->entity; + + $digiriskElement->fk_parent = $digiriskElement->fetch_id_from_wp_digi_id($digiriskelementsingle['fk_parent']) ?: 0; + + $digiriskelementid = $digiriskElement->create($user); + + //Risk + if (array_key_exists('risks', $digiriskelementsingle)) { + foreach ($digiriskelementsingle['risks'] as $digiriskExportRisk) { + $risk->ref = $refRiskMod->getNextValue($risk); + $risk->status = $digiriskExportRisk['status']; + $risk->category = $digiriskExportRisk['category']; + $risk->description = $digiriskExportRisk['description']; + $risk->type = $digiriskExportRisk['type']; + $risk->fk_element = $digiriskelementid; + $risk->fk_projet = $digiriskExportRisk['type'] == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT; + + if (!$error) { + $result = $risk->create($user, true); + if ($result > 0) { + if (array_key_exists('riskassessments', $digiriskExportRisk)) { + foreach ($digiriskExportRisk['riskassessments'] as $digiriskExportRiskAssessement) { + $riskAssessment->ref = $refRiskAssessmentMod->getNextValue($riskAssessment); + $riskAssessment->status = $digiriskExportRiskAssessement['status']; + $riskAssessment->method = $digiriskExportRiskAssessement['method']; + $riskAssessment->cotation = $digiriskExportRiskAssessement['cotation']; + $riskAssessment->gravite = $digiriskExportRiskAssessement['gravite']; + $riskAssessment->protection = $digiriskExportRiskAssessement['protection']; + $riskAssessment->occurrence = $digiriskExportRiskAssessement['occurrence']; + $riskAssessment->formation = $digiriskExportRiskAssessement['formation']; + $riskAssessment->exposition = $digiriskExportRiskAssessement['exposition']; + $riskAssessment->date_riskassessment = $digiriskExportRiskAssessement['date_riskassessment']; + $riskAssessment->comment = $digiriskExportRiskAssessement['comment']; + $riskAssessment->photo = $digiriskExportRiskAssessement['photo']; + $riskAssessment->fk_risk = $risk->id; + + $result2 = $riskAssessment->create($user, true, false); + + if ($result2 < 0) { + // Creation evaluation KO + if (!empty($riskAssessment->errors)) { + $actionError[] = join('
', $riskAssessment->errors); + } else { + $actionError[] = $riskAssessment->error; + } + } + } + } + if (array_key_exists('tasks', $digiriskExportRisk)) { + foreach ($digiriskExportRisk['tasks'] as $digiriskExportTask) { + $task->ref = $refTaskMod->getNextValue('', $task); + $task->date_start = $digiriskExportTask['date_start']; + $task->date_end = $digiriskExportTask['date_end']; + $task->label = $digiriskExportTask['label']; + $task->description = $digiriskExportTask['description']; + $task->duration_effective = $digiriskExportTask['duration_effective']; + $task->planned_workload = $digiriskExportTask['planned_workload']; + $task->progress = $digiriskExportTask['progress']; + $task->priority = $digiriskExportTask['priority']; + $task->budget_amount = $digiriskExportTask['budget_amount']; + // $task->fk_statut = $digiriskExportTask['fk_statut']; + $task->note_public = $digiriskExportTask['note_public']; + $task->note_private = $digiriskExportTask['note_private']; + $task->fk_project = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT; + $task->array_options['fk_risk'] = $risk->id; + + $result3 = $task->create($user, true); + + if ($result3 < 0) { + // Creation task KO + if (!empty($task->errors)) { + $actionError[] = join('
', $task->errors); + } else { + $actionError[] = $task->error; + } + + } + } + } + } else { + // Creation risk KO + if (!empty($risk->errors)) { + $actionError[] = join('
', $risk->errors); + } else { + $actionError[] = $risk->error; + } + } + } + } + } + + //RiskSign + if (array_key_exists('risksigns', $digiriskelementsingle)) { + foreach ($digiriskelementsingle['risksigns'] as $digiriskExportRiskSign) { + $risksign->ref = $refRiskSignMod->getNextValue($risksign); + $risksign->status = $digiriskExportRiskSign['status']; + $risksign->category = $digiriskExportRiskSign['category']; + $risksign->description = $digiriskExportRiskSign['description']; + $risksign->fk_element = $digiriskelementid; + + if (!$error) { + $result = $risksign->create($user, true); + if ($result < 0) { + // Creation risksign KO + if (!empty($risksign->errors)) { + $actionError[] = join('
', $risksign->errors); + } else { + $actionError[] = $risksign->error; + } + } + } + } + } + } + } + } else { + $actionError[] = $langs->transnoentities('ErrorJsonBadFormatted'); + } } $fileImportGlobals = dol_dir_list($filedir, "files", 0, '', '', '', '', 1); @@ -784,7 +806,12 @@ unlink($fileImportGlobal['fullname']); } } - } + if (empty($actionError)) { + $actionSuccess = $langs->transnoentities('SuccessImport'); + } + } else { + $actionError[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")); + } } if ($action == 'repair_category') { @@ -812,6 +839,92 @@ $action = ''; } +if ($action == 'repair_risk') { + $riskFkElements = $risk->fetchAll('', '', 0, 0, ['customsql' => 't.fk_element <= 0']); + $riskAssessmentFkElements = saturne_fetch_all_object_type('RiskAssessment', '', '', 0, 0, ['customsql' => 'r.fk_element <= 0'], 'AND', false, true, false, ' LEFT JOIN ' . MAIN_DB_PREFIX . $risk->table_element . ' as r ON r.rowid = t.fk_risk'); + $riskStatus = $risk->fetchAll('', '', 0, 0, ['customsql' => 't.status < 0']); + $riskAssessmentStatus = saturne_fetch_all_object_type('RiskAssessment', '', '', 0, 0, ['customsql' => 'r.status <= 0'], 'AND', false, true, false, ' LEFT JOIN ' . MAIN_DB_PREFIX . $risk->table_element . ' as r ON r.rowid = t.fk_risk'); + $riskExistFkElements = $risk->checkNotExistsDigiriskElementForRisk(); + $riskExistRiskAssessment = $risk->checkNotExistsRiskAssessmentForRisk(); + $riskAssessmentExistFkRisks = $riskAssessment->checkNotExistsRiskForRiskAssessment(); + + $ObjectToDeletes = []; + if (is_array($riskFkElements)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $riskFkElements); + } + if (is_array($riskFkElements)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $riskFkElements); + } + if (is_array($riskStatus)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $riskStatus); + } + if (is_array($riskAssessmentStatus)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $riskAssessmentStatus); + } + if (is_array($riskExistFkElements)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $riskExistFkElements); + } + if (is_array($riskExistRiskAssessment)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $riskExistRiskAssessment); + } + if (is_array($riskAssessmentExistFkRisks)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $riskAssessmentExistFkRisks); + } + + foreach ($ObjectToDeletes as $object) { + $result = $object->delete($user, '', false); + if ($result <= 0) { + $errors[] = $object->errors; + } + } + + if (!empty($errors)) { + setEventMessages('', $errors, 'errors'); + } else { + setEventMessages($langs->trans('RiskSuccessfullyRepaired'), []); + } + + header("Location: " . $_SERVER["PHP_SELF"]); + exit; +} + +if ($action == 'repair_risk_assessment') { + $riskAssessmentStatus = $riskAssessment->fetchAll('', '', 0, 0, ['customsql' => 't.status < 0 || t.status IS NULL']); + $riskAssessmentCotations = $riskAssessment->fetchAll('', '', 0, 0, ['customsql' => 't.cotation IS NULL']); + $risks = saturne_fetch_all_object_type('Risk', '', '', 0, 0, ['customsql' => 'ra.cotation IS NULL'], 'AND', false, true, false, ' LEFT JOIN ' . MAIN_DB_PREFIX . $riskAssessment->table_element . ' as ra ON ra.fk_risk = t.rowid'); + $riskAssessmentExistFkRisks = $riskAssessment->checkNotExistsRiskForRiskAssessment(); + + $ObjectToDeletes = []; + if (is_array($riskAssessmentStatus)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $riskAssessmentStatus); + } + if (is_array($riskAssessmentCotations)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $riskAssessmentCotations); + } + if (is_array($risks)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $risks); + } + if (is_array($riskAssessmentExistFkRisks)) { + $ObjectToDeletes = array_merge($ObjectToDeletes, $riskAssessmentExistFkRisks); + } + + foreach ($ObjectToDeletes as $object) { + $result = $object->delete($user, '', false); + if ($result <= 0) { + $errors[] = $object->errors; + } + } + + if (!empty($errors)) { + setEventMessages('', $errors, 'errors'); + } else { + setEventMessages($langs->trans('RiskAssessmentSuccessfullyRepaired'), []); + } + + header("Location: " . $_SERVER["PHP_SELF"]); + exit; +} + /* * View */ @@ -823,6 +936,12 @@ print load_fiche_titre($title, '', 'wrench'); +if (!empty($actionError)) { + echo ''; +} elseif (isset($actionSuccess)) { + echo ''; +} + if ($user->rights->digiriskdolibarr->adminpage->read) { if ($conf->global->DIGIRISKDOLIBARR_TOOLS_TREE_ALREADY_IMPORTED == 1) : ?>
@@ -924,6 +1043,8 @@ print ''; print ''; + print saturne_show_notice('', '', '', 'migration-dolibarr-notice'); + print load_fiche_titre($langs->trans("DataMigrationDolibarrToDolibarr"), '', ''); print '
'; @@ -962,8 +1083,8 @@ print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; print ''; @@ -1038,6 +1159,94 @@ print $button; print '
'; print ''; + + print load_fiche_titre($langs->trans('CleanObject'), '', ''); + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + print ''; + print ''; + print ''; + + print ''; + print ''; + + print ''; + print ''; + print ''; + + print ''; + + print ''; + print '
' . $langs->trans('Name') . '' . $langs->trans('Description') . '' . $langs->trans('Action') . '
'; + print $langs->trans('CleanRisk'); + print ''; + print '
'; + print '
'; + + $nbRisks = 0; + $risks = $risk->fetchAll('', '', 0, 0, ['customsql' => 't.fk_element <= 0']); + if (is_array($risks) && !empty($risks)) { + $nbRisks = count($risks); + print '
' . $langs->transnoentities('CleanRiskFkElement', $nbRisks) . '
'; + } + $risks = $risk->fetchAll('', '', 0, 0, ['customsql' => 't.status < 0']); + if (is_array($risks) && !empty($risks)) { + $nbRisks = count($risks); + print '
' . $langs->transnoentities('CleanRiskStatus', $nbRisks) . '
'; + } + $risks = $risk->checkNotExistsDigiriskElementForRisk(); + if (is_array($risks) && !empty($risks)) { + $nbRisks = count($risks); + print '
' . $langs->transnoentities('CleanRiskExistFkElement', $nbRisks) . '
'; + } + $risks = $risk->checkNotExistsRiskAssessmentForRisk(); + if (is_array($risks) && !empty($risks)) { + $nbRisks = count($risks); + print '
' . $langs->transnoentities('CleanRiskExistRiskAssessment', $nbRisks) . '
'; + } + if ($nbRisks == 0) { + print '
' . $langs->trans('NoRiskToClean') . '
'; + } + + print '
'; + print '		'; + print ''; + print '
'; + print $langs->trans('CleanRiskAssessment'); + print ''; + print '
'; + print '
'; + + $nbRiskAssessments = 0; + $riskAssessments = $riskAssessment->fetchAll('', '', 0, 0, ['customsql' => 't.status < 0 || t.status IS NULL']); + if (is_array($riskAssessments) && !empty($riskAssessments)) { + $nbRiskAssessments = count($riskAssessments); + print '
' . $langs->transnoentities('CleanRiskAssessmentStatus', $nbRiskAssessments) . '
'; + } + $riskAssessments = $riskAssessment->fetchAll('', '', 0, 0, ['customsql' => 't.cotation IS NULL']);; + if (is_array($riskAssessments) && !empty($riskAssessments)) { + $nbRiskAssessments = count($riskAssessments); + print '
' . $langs->transnoentities('CleanRiskAssessmentCotation', $nbRiskAssessments) . '
'; + } + $riskAssessments = $riskAssessment->checkNotExistsRiskForRiskAssessment(); + if (is_array($riskAssessments) && !empty($riskAssessments)) { + $nbRiskAssessments = count($riskAssessments); + print '
' . $langs->transnoentities('CleanRiskAssessmentExistFkRisk', $nbRiskAssessments) . '
'; + } + if ($nbRiskAssessments == 0) { + print '
' . $langs->trans('NoRiskAssessmentToClean') . '
'; + } + + print '
'; + print '		'; + print ''; + print '
'; } // End of page diff --git a/view/digiriskusers.php b/view/digiriskusers.php index f18829f9e..51fbb1b36 100644 --- a/view/digiriskusers.php +++ b/view/digiriskusers.php @@ -160,7 +160,7 @@ */ if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; } -if ( ! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; } +if ( isset($massaction) && !GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; } $parameters = array(); $reshook = $hookmanager->executeHooks('doActions', $parameters); // Note that $action and $object may have been modified by some hooks @@ -329,7 +329,7 @@ } else { $sql .= " WHERE u.entity IN (".getEntity('user').")"; } -if ($socid > 0) $sql .= " AND u.fk_soc = " . $socid; +if (isset($socid) && $socid > 0) $sql .= " AND u.fk_soc = " . $socid; //if ($search_user != '') $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user); if ($search_supervisor > 0) $sql .= " AND u.fk_user IN (" . $db->escape($search_supervisor) . ")"; if ($search_thirdparty != '') $sql .= natural_search(array('s.nom'), $search_thirdparty); @@ -588,13 +588,13 @@ print "\n"; $i = 0; -$totalarray = array(); +$totalarray = ['nbfield' => 0]; while ($i < min($num, $limit)) { $obj = $db->fetch_object($result); $userstatic->id = $obj->rowid; $userstatic->admin = $obj->admin; - $userstatic->ref = $obj->label; + $userstatic->ref = $obj->label ?? ''; $userstatic->login = $obj->login; $userstatic->statut = $obj->statut; $userstatic->email = $obj->email; diff --git a/view/firepermit/firepermit_card.php b/view/firepermit/firepermit_card.php index ce201dcb2..1afb4d9ae 100644 --- a/view/firepermit/firepermit_card.php +++ b/view/firepermit/firepermit_card.php @@ -1536,153 +1536,153 @@ class="attachment-thumbail size-thumbnail photo photowithmargin" alt=""> if (GETPOST('modelselected', 'alpha')) { $action = 'presend'; } - if ($action == 'presend') { - $langs->load("mails"); + // Presend form + if ($action == 'presend') { + $langs->load('mails'); - $titreform = 'SendMail'; + $object->fetch_projet(); + if (!in_array($object->element, ['societe', 'user', 'member'])) { + include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; - $object->fetch_projet(); + $ref = dol_sanitizeFileName($object->ref); + $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/') . '[^\-]+'); + $file = $fileparams['fullname']; + } - if ( ! in_array($object->element, array('societe', 'user', 'member'))) { - $ref = dol_sanitizeFileName($object->ref); - include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/') . '[^\-]+'); - $file = $fileparams['fullname']; - } + // Define output language + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) { + $newlang = $_REQUEST['lang_id']; + } + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) { + $newlang = $object->thirdparty->default_lang; + } - // Define output language - $outputlangs = $langs; - $newlang = ''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) { - $newlang = $_REQUEST['lang_id']; - } - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) { - $newlang = $object->thirdparty->default_lang; - } + if (!empty($newlang)) { + $outputlangs = new Translate('', $conf); + $outputlangs->setDefaultLang($newlang); + // Load traductions files required by page + $outputlangs->loadLangs(['digiriskdolibarr']); + } - if ( ! empty($newlang)) { - $outputlangs = new Translate('', $conf); - $outputlangs->setDefaultLang($newlang); - // Load traductions files required by page - $outputlangs->loadLangs(array('digiriskdolibarr')); - } + $topicmail = ''; + if (empty($object->ref_client)) { + $topicmail = $outputlangs->trans($defaulttopic, '__REF__'); + } else { + $topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)'); + } - $topicmail = ''; - if (empty($object->ref_client)) { - $topicmail = $outputlangs->trans($defaulttopic, '__REF__'); - } elseif ( ! empty($object->ref_client)) { - $topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)'); - } + print load_fiche_titre($langs->trans('SendMail'), '', $object->picto, '', 'formmailbeforetitle'); - print load_fiche_titre($langs->trans($titreform), '', $object->picto, '', 'formmailbeforetitle'); + print dol_get_fiche_head(''); - print dol_get_fiche_head(''); + // Create form for email + include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php'; + $formmail = new FormMail($db); + $masterWorker = $signatory->fetchSignatory('MasterWorker', $object->id, 'firepermit'); + $masterWorker = array_shift($masterWorker); - // Create form for email - include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php'; - $formmail = new FormMail($db); - $masterWorker = $signatory->fetchSignatory('MasterWorker', $object->id, 'firepermit'); - $masterWorker = array_shift($masterWorker); + $formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang); + $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user')); + $formmail->fromid = $masterWorker->id; + $formmail->trackid = $trackid; + $formmail->fromname = $masterWorker->firstname . ' ' . $masterWorker->lastname; + $formmail->frommail = $masterWorker->email; + $formmail->fromalsorobot = 1; + $formmail->withfrom = 1; - $formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang); - $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : ( ! empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user')); - $formmail->fromid = $masterWorker->id; - $formmail->trackid = $trackid; - $formmail->fromname = $masterWorker->firstname . ' ' . $masterWorker->lastname; - $formmail->frommail = $masterWorker->email; - $formmail->fromalsorobot = 1; - $formmail->withfrom = 1; + // Fill list of recipient with email inside <>. + $liste = []; - // Fill list of recipient with email inside <>. - $liste = array(); + $labourInspectorContact = $digiriskresources->fetchResourcesFromObject('LabourInspectorAssigned', $object); - $labourInspectorContact = $digiriskresources->fetchResourcesFromObject('LabourInspectorAssigned', $object); + if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) { + $listeuser = []; + $fuserdest = new User($db); - if ( ! empty($object->socid) && $object->socid > 0 && ! is_object($object->thirdparty) && method_exists($object, 'fetch_thirdparty')) { - $object->fetch_thirdparty(); - } - if (is_object($object->thirdparty)) { - foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) { - $liste[$key] = $value; - } - } + $result = $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, ['customsql' => 't.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''], 'AND', true); + if ($result > 0 && is_array($fuserdest->users) && count($fuserdest->users) > 0) { + foreach ($fuserdest->users as $uuserdest) { + $listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id, 'email'); + } + } elseif ($result < 0) { + setEventMessages(null, $fuserdest->errors, 'errors'); + } + if (count($listeuser) > 0) { + $formmail->withtouser = $listeuser; + $formmail->withtoccuser = $listeuser; + } + } - if ( ! empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) { - $listeuser = array(); - $fuserdest = new User($db); + $signatoriesArray = $signatory->fetchSignatories($object->id, 'preventionplan'); + if (is_array($signatoriesArray) && !empty($signatoriesArray)) { + foreach ($signatoriesArray as $objectSignatory) { + $liste[$objectSignatory->id] = dol_strtoupper($objectSignatory->lastname) . ' ' . ucfirst($objectSignatory->firstname) . (!empty($objectSignatory->email) ? ' <' . $objectSignatory->email . '>' : ''); + } + } - $result = $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql' => 't.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''), 'AND', true); - if ($result > 0 && is_array($fuserdest->users) && count($fuserdest->users) > 0) { - foreach ($fuserdest->users as $uuserdest) { - $listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id, 'email'); - } - } elseif ($result < 0) { - setEventMessages(null, $fuserdest->errors, 'errors'); - } - if (count($listeuser) > 0) { - $formmail->withtouser = $listeuser; - $formmail->withtoccuser = $listeuser; - } - } + if (!array_key_exists($labourInspectorContact->id, $liste)) { + $liste[$labourInspectorContact->id] = $labourInspectorContact->firstname . ' ' . $labourInspectorContact->lastname . (!empty($labourInspectorContact->email) ? ' <' . $labourInspectorContact->email . '>' : ''); + } + $formmail->withto = $liste; + $formmail->withtofree = (GETPOSTISSET('sendto') ? (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1') : '1'); + $formmail->withtocc = $liste; + $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC; + $formmail->withtopic = $topicmail; + $formmail->withfile = 2; + $formmail->withbody = 1; + $formmail->withdeliveryreceipt = 1; + $formmail->withcancel = 1; + + //$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...); + if (!isset($arrayoffamiliestoexclude)) { + $arrayoffamiliestoexclude = null; + } - $withto = array($labourInspectorContact->id => $labourInspectorContact->firstname . ' ' . $labourInspectorContact->lastname . " <" . $labourInspectorContact->email . ">"); - - $formmail->withto = $withto; - $formmail->withtofree = (GETPOSTISSET('sendto') ? (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1') : '1'); - $formmail->withtocc = $liste; - $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC; - $formmail->withtopic = $topicmail; - $formmail->withfile = 2; - $formmail->withbody = 1; - $formmail->withdeliveryreceipt = 1; - $formmail->withcancel = 1; - - //$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...); - if ( ! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude = null; - - // Make substitution in email content - $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object); - $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '' : ''; - $substitutionarray['__PERSONALIZED__'] = ''; // deprecated - $substitutionarray['__CONTACTCIVNAME__'] = ''; - $parameters = array( - 'mode' => 'formemail' - ); - complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters); - - // Find the good contact address - $tmpobject = $object; - - $contactarr = array(); - $contactarr = $tmpobject->liste_contact(-1, 'external'); - - if (is_array($contactarr) && count($contactarr) > 0) { - require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; - $contactstatic = new Contact($db); - - foreach ($contactarr as $contact) { - $contactstatic->fetch($contact['id']); - $substitutionarray['__CONTACT_NAME_' . $contact['code'] . '__'] = $contactstatic->getFullName($outputlangs, 1); - } - } + // Make substitution in email content + $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object); + $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '' : ''; + $substitutionarray['__PERSONALIZED__'] = ''; // deprecated + $substitutionarray['__CONTACTCIVNAME__'] = ''; + $parameters = [ + 'mode' => 'formemail' + ]; + complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters); + + // Find the good contact address + $tmpobject = $object; + + $contactarr = []; + $contactarr = $tmpobject->liste_contact(-1, 'external'); + + if (is_array($contactarr) && count($contactarr) > 0) { + require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; + $contactstatic = new Contact($db); + + foreach ($contactarr as $contact) { + $contactstatic->fetch($contact['id']); + $substitutionarray['__CONTACT_NAME_' . $contact['code'] . '__'] = $contactstatic->getFullName($outputlangs, 1); + } + } - // Array of substitutions - $formmail->substit = $substitutionarray; + // Array of substitutions + $formmail->substit = $substitutionarray; - // Array of other parameters - $formmail->param['action'] = 'send'; - $formmail->param['models'] = $modelmail; - $formmail->param['models_id'] = GETPOST('modelmailselected', 'int'); - $formmail->param['id'] = $object->id; - $formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id; - $formmail->param['fileinit'] = array($file); + // Array of other parameters + $formmail->param['action'] = 'send'; + $formmail->param['models'] = $modelmail; + $formmail->param['models_id'] = GETPOST('modelmailselected', 'int'); + $formmail->param['id'] = $object->id; + $formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id; + $formmail->param['fileinit'] = [$file]; - // Show form - print $formmail->get_form(); + // Show form + print $formmail->get_form(); - print dol_get_fiche_end(); - } + print dol_get_fiche_end(); + } } // End of page diff --git a/view/firepermit/firepermit_list.php b/view/firepermit/firepermit_list.php index 4602a3804..4a959128a 100644 --- a/view/firepermit/firepermit_list.php +++ b/view/firepermit/firepermit_list.php @@ -95,6 +95,10 @@ $hookmanager->initHooks(['firepermitlist']); // Note that conf->hooks_modules contains array. +if (!isset($socid)) { + $socid = $user->socid != null ? $user->socid : 0; +} + // Default sort order (if not yet defined by previous GETPOST). if ( ! $sortfield) $sortfield = "t.ref"; if ( ! $sortorder) $sortorder = "ASC"; @@ -109,7 +113,7 @@ // List of fields to search into when doing a "search in all" $fieldstosearchall = array(); foreach ($object->fields as $key => $val) { - if ($val['searchall']) $fieldstosearchall['t.' . $key] = $val['label']; + if (!empty($val['searchall'])) $fieldstosearchall['t.' . $key] = $val['label']; } // Definition of fields for list @@ -222,7 +226,7 @@ print ''; print ''; print ''; -print ''; +print ''; print ''; include DOL_DOCUMENT_ROOT . '/core/tpl/massactions_pre.tpl.php'; @@ -245,7 +249,8 @@ $sql = preg_replace('/,\s*$/', '', $sql); $sql .= " FROM " . MAIN_DB_PREFIX . $object->table_element . " as t"; -if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $object->table_element . "_extrafields as ef on (t.rowid = ef.fk_object)"; +if (isset($extrafields->attributes[$object->table_element]['label']) && + is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $object->table_element . "_extrafields as ef on (t.rowid = ef.fk_object)"; if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (" . getEntity($object->element) . ")"; else $sql .= " WHERE 1 = 1"; $sql .= ' AND status != -1'; @@ -318,7 +323,7 @@ $arrayfields['ExtSocietyResponsible'] = array('label' => 'ExtSocietyResponsible', 'checked' => 1); $arrayfields['ExtSocietyAttendant'] = array('label' => 'ExtSocietyAttendant', 'checked' => 1); -print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1); +print_barre_liste($form->textwithpicto($title, $texthelp ?? ''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1); $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1); @@ -338,10 +343,10 @@ if ( ! empty($arrayfields['t.' . $key]['checked'])) { print ''; - if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_' . $key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); + if (isset($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_' . $key, $val['arrayofkeyval'], $search[$key] ?? '', $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); elseif (strpos($val['type'], 'integer:') === 0) { - print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1); - } elseif ( ! preg_match('/^(date|timestamp)/', $val['type'])) print ''; + print $object->showInputField($val, $key, $search[$key] ?? '', '', '', 'search_', 'maxwidth150', 1); + } elseif ( ! preg_match('/^(date|timestamp)/', $val['type'])) print ''; print ''; } if ($key == 'Custom') { @@ -407,14 +412,14 @@ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ') . "\n"; print '' . "\n"; -$arrayofselected = is_array($toselect) ? $toselect : array(); +$arrayofselected = is_array($toselect) ? $toselect : []; // Loop on record // -------------------------------------------------------------------- // contenu $i = 0; -$totalarray = array(); +$totalarray = ['nbfield' => 0]; while ($i < ($limit ? min($num, $limit) : $num)) { $obj = $db->fetch_object($resql); @@ -425,7 +430,11 @@ // Store properties in $objectdocument $object->setVarsFromFetchObj($obj); - $json = json_decode($object->json, false, 512, JSON_UNESCAPED_UNICODE)->FirePermit; + if (isset($object->json)) { + $json = json_decode($object->json, false, 512, JSON_UNESCAPED_UNICODE)->FirePermit; + } else { + $json = []; + } // Show here line of result print ''; diff --git a/view/preventionplan/preventionplan_card.php b/view/preventionplan/preventionplan_card.php index 27919be33..1bd54459e 100644 --- a/view/preventionplan/preventionplan_card.php +++ b/view/preventionplan/preventionplan_card.php @@ -51,7 +51,7 @@ require_once __DIR__ . '/../../lib/digiriskdolibarr_preventionplan.lib.php'; // Global variables definitions -global $conf, $db, $hookmanager, $langs, $user; +global $conf, $db, $hookmanager, $langs, $moduleNameLowerCase, $user; // Load translation files required by the page saturne_load_langs(['other', 'mails']); @@ -383,8 +383,11 @@ if ($result < 0) { // Delete accident KO - if (!empty($accident->errors)) setEventMessages(null, $accident->errors, 'errors'); - else setEventMessages($accident->error, null, 'errors'); + if (!empty($object->errors)) { + setEventMessages(null, $object->errors, 'errors'); + } else { + setEventMessages($object->error, [], 'errors'); + } } // Delete accident OK $urltogo = str_replace('preventionplan_card.php', 'preventionplan_list.php', $_SERVER["PHP_SELF"]); @@ -1503,153 +1506,153 @@ class="attachment-thumbail size-thumbnail photo photowithmargin" alt=""> if (GETPOST('modelselected', 'alpha')) { $action = 'presend'; } - if ($action == 'presend') { - $langs->load("mails"); + // Presend form + if ($action == 'presend') { + $langs->load('mails'); - $titreform = 'SendMail'; + $object->fetch_projet(); + if (!in_array($object->element, ['societe', 'user', 'member'])) { + include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; - $object->fetch_projet(); + $ref = dol_sanitizeFileName($object->ref); + $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/') . '[^\-]+'); + $file = $fileparams['fullname']; + } - if ( ! in_array($object->element, array('societe', 'user', 'member'))) { - $ref = dol_sanitizeFileName($object->ref); - include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; - $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/') . '[^\-]+'); - $file = $fileparams['fullname']; - } + // Define output language + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) { + $newlang = $_REQUEST['lang_id']; + } + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) { + $newlang = $object->thirdparty->default_lang; + } - // Define output language - $outputlangs = $langs; - $newlang = ''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) { - $newlang = $_REQUEST['lang_id']; - } - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) { - $newlang = $object->thirdparty->default_lang; - } + if (!empty($newlang)) { + $outputlangs = new Translate('', $conf); + $outputlangs->setDefaultLang($newlang); + // Load traductions files required by page + $outputlangs->loadLangs(['digiriskdolibarr']); + } - if ( ! empty($newlang)) { - $outputlangs = new Translate('', $conf); - $outputlangs->setDefaultLang($newlang); - // Load traductions files required by page - $outputlangs->loadLangs(array('digiriskdolibarr')); - } + $topicmail = ''; + if (empty($object->ref_client)) { + $topicmail = $outputlangs->trans($defaulttopic, '__REF__'); + } else { + $topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)'); + } - $topicmail = ''; - if (empty($object->ref_client)) { - $topicmail = $outputlangs->trans($defaulttopic, '__REF__'); - } elseif ( ! empty($object->ref_client)) { - $topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)'); - } + print load_fiche_titre($langs->trans('SendMail'), '', $object->picto, '', 'formmailbeforetitle'); - print load_fiche_titre($langs->trans($titreform), '', $object->picto, '', 'formmailbeforetitle'); + print dol_get_fiche_head(''); - print dol_get_fiche_head(''); + // Create form for email + include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php'; + $formmail = new FormMail($db); + $masterWorker = $signatory->fetchSignatory('MasterWorker', $object->id, 'preventionplan'); + $masterWorker = array_shift($masterWorker); - // Create form for email - include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php'; - $formmail = new FormMail($db); - $masterWorker = $signatory->fetchSignatory('MasterWorker', $object->id, 'preventionplan'); - $masterWorker = array_shift($masterWorker); + $formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang); + $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user')); + $formmail->fromid = $masterWorker->id; + $formmail->trackid = $trackid; + $formmail->fromname = $masterWorker->firstname . ' ' . $masterWorker->lastname; + $formmail->frommail = $masterWorker->email; + $formmail->fromalsorobot = 1; + $formmail->withfrom = 1; - $formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang); - $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : ( ! empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user')); - $formmail->fromid = $masterWorker->id; - $formmail->trackid = $trackid; - $formmail->fromname = $masterWorker->firstname . ' ' . $masterWorker->lastname; - $formmail->frommail = $masterWorker->email; - $formmail->fromalsorobot = 1; - $formmail->withfrom = 1; + // Fill list of recipient with email inside <>. + $liste = []; - // Fill list of recipient with email inside <>. - $liste = array(); + $labourInspectorContact = $digiriskresources->fetchResourcesFromObject('LabourInspectorAssigned', $object); - $labourInspectorContact = $digiriskresources->fetchResourcesFromObject('LabourInspectorAssigned', $object); + if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) { + $listeuser = []; + $fuserdest = new User($db); - if ( ! empty($object->socid) && $object->socid > 0 && ! is_object($object->thirdparty) && method_exists($object, 'fetch_thirdparty')) { - $object->fetch_thirdparty(); - } - if (is_object($object->thirdparty)) { - foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) { - $liste[$key] = $value; - } - } + $result = $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, ['customsql' => 't.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''], 'AND', true); + if ($result > 0 && is_array($fuserdest->users) && count($fuserdest->users) > 0) { + foreach ($fuserdest->users as $uuserdest) { + $listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id, 'email'); + } + } elseif ($result < 0) { + setEventMessages(null, $fuserdest->errors, 'errors'); + } + if (count($listeuser) > 0) { + $formmail->withtouser = $listeuser; + $formmail->withtoccuser = $listeuser; + } + } - if ( ! empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) { - $listeuser = array(); - $fuserdest = new User($db); + $signatoriesArray = $signatory->fetchSignatories($object->id, 'preventionplan'); + if (is_array($signatoriesArray) && !empty($signatoriesArray)) { + foreach ($signatoriesArray as $objectSignatory) { + $liste[$objectSignatory->id] = dol_strtoupper($objectSignatory->lastname) . ' ' . ucfirst($objectSignatory->firstname) . (!empty($objectSignatory->email) ? ' <' . $objectSignatory->email . '>' : ''); + } + } - $result = $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql' => 't.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''), 'AND', true); - if ($result > 0 && is_array($fuserdest->users) && count($fuserdest->users) > 0) { - foreach ($fuserdest->users as $uuserdest) { - $listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id, 'email'); - } - } elseif ($result < 0) { - setEventMessages(null, $fuserdest->errors, 'errors'); - } - if (count($listeuser) > 0) { - $formmail->withtouser = $listeuser; - $formmail->withtoccuser = $listeuser; - } - } + if (!array_key_exists($labourInspectorContact->id, $liste)) { + $liste[$labourInspectorContact->id] = $labourInspectorContact->firstname . ' ' . $labourInspectorContact->lastname . (!empty($labourInspectorContact->email) ? ' <' . $labourInspectorContact->email . '>' : ''); + } + $formmail->withto = $liste; + $formmail->withtofree = (GETPOSTISSET('sendto') ? (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1') : '1'); + $formmail->withtocc = $liste; + $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC; + $formmail->withtopic = $topicmail; + $formmail->withfile = 2; + $formmail->withbody = 1; + $formmail->withdeliveryreceipt = 1; + $formmail->withcancel = 1; + + //$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...); + if (!isset($arrayoffamiliestoexclude)) { + $arrayoffamiliestoexclude = null; + } - $withto = array($labourInspectorContact->id => $labourInspectorContact->firstname . ' ' . $labourInspectorContact->lastname . " <" . $labourInspectorContact->email . ">"); - - $formmail->withto = $withto; - $formmail->withtofree = (GETPOSTISSET('sendto') ? (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1') : '1'); - $formmail->withtocc = $liste; - $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC; - $formmail->withtopic = $topicmail; - $formmail->withfile = 2; - $formmail->withbody = 1; - $formmail->withdeliveryreceipt = 1; - $formmail->withcancel = 1; - - //$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...); - if ( ! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude = null; - - // Make substitution in email content - $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object); - $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '' : ''; - $substitutionarray['__PERSONALIZED__'] = ''; // deprecated - $substitutionarray['__CONTACTCIVNAME__'] = ''; - $parameters = array( - 'mode' => 'formemail' - ); - complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters); - - // Find the good contact address - $tmpobject = $object; - - $contactarr = array(); - $contactarr = $tmpobject->liste_contact(-1, 'external'); - - if (is_array($contactarr) && count($contactarr) > 0) { - require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; - $contactstatic = new Contact($db); - - foreach ($contactarr as $contact) { - $contactstatic->fetch($contact['id']); - $substitutionarray['__CONTACT_NAME_' . $contact['code'] . '__'] = $contactstatic->getFullName($outputlangs, 1); - } - } + // Make substitution in email content + $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object); + $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '' : ''; + $substitutionarray['__PERSONALIZED__'] = ''; // deprecated + $substitutionarray['__CONTACTCIVNAME__'] = ''; + $parameters = [ + 'mode' => 'formemail' + ]; + complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters); + + // Find the good contact address + $tmpobject = $object; + + $contactarr = []; + $contactarr = $tmpobject->liste_contact(-1, 'external'); + + if (is_array($contactarr) && count($contactarr) > 0) { + require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; + $contactstatic = new Contact($db); + + foreach ($contactarr as $contact) { + $contactstatic->fetch($contact['id']); + $substitutionarray['__CONTACT_NAME_' . $contact['code'] . '__'] = $contactstatic->getFullName($outputlangs, 1); + } + } - // Array of substitutions - $formmail->substit = $substitutionarray; + // Array of substitutions + $formmail->substit = $substitutionarray; - // Array of other parameters - $formmail->param['action'] = 'send'; - $formmail->param['models'] = $modelmail; - $formmail->param['models_id'] = GETPOST('modelmailselected', 'int'); - $formmail->param['id'] = $object->id; - $formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id; - $formmail->param['fileinit'] = array($file); + // Array of other parameters + $formmail->param['action'] = 'send'; + $formmail->param['models'] = $modelmail; + $formmail->param['models_id'] = GETPOST('modelmailselected', 'int'); + $formmail->param['id'] = $object->id; + $formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id; + $formmail->param['fileinit'] = [$file]; - // Show form - print $formmail->get_form(); + // Show form + print $formmail->get_form(); - print dol_get_fiche_end(); - } + print dol_get_fiche_end(); + } } // End of page diff --git a/view/preventionplan/preventionplan_list.php b/view/preventionplan/preventionplan_list.php index 0b6f4c032..0f6083f92 100644 --- a/view/preventionplan/preventionplan_list.php +++ b/view/preventionplan/preventionplan_list.php @@ -257,7 +257,7 @@ print ''; print ''; print ''; -print ''; +print ''; print ''; include DOL_DOCUMENT_ROOT . '/core/tpl/massactions_pre.tpl.php'; @@ -280,7 +280,8 @@ $sql = preg_replace('/,\s*$/', '', $sql); $sql .= " FROM " . MAIN_DB_PREFIX . $object->table_element . " as t"; -if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $object->table_element . "_extrafields as ef on (t.rowid = ef.fk_object)"; +if (isset($extrafields->attributes[$object->table_element]['label']) && + is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $object->table_element . "_extrafields as ef on (t.rowid = ef.fk_object)"; if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (" . getEntity($object->element) . ")"; else $sql .= " WHERE 1 = 1"; $sql .= ' AND status != -1'; @@ -288,8 +289,8 @@ foreach ($search as $key => $val) { if ($key == 'status' && $search[$key] == -1) continue; - $mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0); - if (strpos($object->fields[$key]['type'], 'integer:') === 0) { + $mode_search = ((isset($object->fields[$key]) && ($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key]))) ? 1 : 0); + if (strpos($object->fields[$key]['type'] ?? '', 'integer:') === 0) { if ($search[$key] == '-1') $search[$key] = ''; $mode_search = 2; } @@ -353,7 +354,7 @@ $arrayfields['ExtSocietyResponsible'] = array('label' => 'ExtSocietyResponsible', 'checked' => 1); $arrayfields['ExtSocietyAttendant'] = array('label' => 'ExtSocietyAttendant', 'checked' => 1); -print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1); +print_barre_liste($form->textwithpicto($title, $texthelp ?? ''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1); $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1); @@ -373,10 +374,10 @@ if ( ! empty($arrayfields['t.' . $key]['checked'])) { print ''; - if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_' . $key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); + if (isset($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_' . $key, $val['arrayofkeyval'], $search[$key] ?? '', $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); elseif (strpos($val['type'], 'integer:') === 0) { - print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1); - } elseif ( ! preg_match('/^(date|timestamp)/', $val['type'])) print ''; + print $object->showInputField($val, $key, $search[$key] ?? '', '', '', 'search_', 'maxwidth150', 1); + } elseif ( ! preg_match('/^(date|timestamp)/', $val['type'])) print ''; print ''; } if ($key == 'Custom') { @@ -449,7 +450,7 @@ // contenu $i = 0; -$totalarray = array(); +$totalarray = ['nbfield' => 0]; while ($i < ($limit ? min($num, $limit) : $num)) { $obj = $db->fetch_object($resql); @@ -459,7 +460,11 @@ // Store properties in $objectdocument $object->setVarsFromFetchObj($obj); - $json = json_decode($object->json, false, 512, JSON_UNESCAPED_UNICODE)->PreventionPlan; + if (isset($object->json)) { + $json = json_decode($object->json, false, 512, JSON_UNESCAPED_UNICODE)->PreventionPlan; + } else { + $json = []; + } // Show here line of result print ''; @@ -492,7 +497,7 @@ print ''; if ($resource['label'] == 'MasterWorker') { $element = $signatory->fetchSignatory('MasterWorker', $object->id, 'preventionplan'); - if (is_array($element)) { + if (is_array($element) && !empty($element)) { $element = array_shift($element); $usertmp->fetch($element->element_id); print $usertmp->getNomUrl(1); @@ -505,7 +510,7 @@ } if ($resource['label'] == 'ExtSocietyResponsible') { $element = $signatory->fetchSignatory('ExtSocietyResponsible', $object->id, 'preventionplan'); - if (is_array($element)) { + if (is_array($element) && !empty($element)) { $element = array_shift($element); $contact->fetch($element->element_id); print $contact->getNomUrl(1); diff --git a/view/ticket/category_config.php b/view/ticket/category_config.php new file mode 100644 index 000000000..682be60cd --- /dev/null +++ b/view/ticket/category_config.php @@ -0,0 +1,295 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file view/ticket/category_config.php + * \ingroup digiriskdolibarr + * \brief Page to manage the category configuration of the ticket + */ + +// Load DigiriskDolibarr environment +if (file_exists('../digiriskdolibarr.main.inc.php')) { + require_once __DIR__ . '/../digiriskdolibarr.main.inc.php'; +} elseif (file_exists('../../digiriskdolibarr.main.inc.php')) { + require_once __DIR__ . '/../../digiriskdolibarr.main.inc.php'; +} else { + die('Include of digiriskdolibarr main fails'); +} + +// load Dolibarr libraries +require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/categories.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php'; + +// Global variables definitions +global $conf, $db, $hookmanager, $langs, $user; + +// Load translation files required by the page +saturne_load_langs(['users']); + +// Get parameters +$id = GETPOST('id', 'int'); +$ref = GETPOST('ref', 'alpha'); +$action = GETPOST('action', 'aZ09'); +$cancel = GETPOST('cancel', 'aZ09'); +$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'digiriskelementcard'; // To manage different context of search +$backtopage = GETPOST('backtopage', 'alpha'); + +// Initialize technical objects +$object = new Categorie($db); +$extraFields = new ExtraFields($db); +$userTmp = new User($db); + +// Initialize view objects +$form = new Form($db); +$formMail = new FormMail($db); + +$hookmanager->initHooks(['digiriskelementcard', 'globalcard']); // Note that conf->hooks_modules contains array + +// Fetch optionals attributes and labels +$extraFields->fetch_name_optionals_label('ticket'); + +// Initialize array of search criterias +if (empty($action) && empty($id) && empty($ref)) { + $action = 'view'; +} + +// Load object +require_once DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be included, not include_once + +// Security check - Protection if external user +$permissionToRead = $user->hasRight('categorie', 'creer') && $user->hasRight('digiriskdolibarr', 'adminpage', 'read');; +saturne_check_access($permissionToRead, $object); + +/* + * Actions + */ + +$parameters = []; +$resHook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks +if ($resHook < 0) { + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); +} + +if (empty($resHook)) { + if ($action == 'set_ticket_category_config') { + $data['use_signatory'] = GETPOST('use_signatory'); + $data['show_description'] = GETPOST('show_description'); + $data['mail_template'] = GETPOST('mail_template'); + $data['recipients'] = implode(',', GETPOST('recipients', 'array')); + $data['photo_visible'] = GETPOST('photo_visible'); + + $extraFields->attributes['ticket']['label']['digiriskdolibarr_ticket_email'] = $langs->trans('Email'); + foreach ($extraFields->attributes['ticket']['label'] as $key => $field) { + $extraFieldVisible = $key . '_visible'; + $extraFieldRequired = $key . '_required'; + + $data[$extraFieldVisible] = GETPOST($extraFieldVisible); + $data[$extraFieldRequired] = GETPOST($extraFieldRequired); + } + + $object->table_element = 'categories'; + $object->array_options['options_ticket_category_config'] = json_encode($data); + $object->updateExtraField('ticket_category_config'); + + setEventMessage('SavedConfig'); + header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $id . '&type=ticket'); + exit; + } +} + +/* + * View + */ + +$title = $langs->trans(ucfirst($object->element)); +$helpUrl = 'FR:Module_Digirisk'; + +saturne_header(0, '', $title, $helpUrl); + +$object->fetch_optionals(); +$ticketCategoryConfig = json_decode($object->array_options['options_ticket_category_config']); + +$head = categories_prepare_head($object, 'ticket'); +print dol_get_fiche_head($head, 'config', $langs->trans($title), -1, 'category'); + +$backurlforlist = dol_buildpath('categories/index.php?type=ticket&mainmenu=ticket', 1); +$linkback = '' . $langs->trans('BackToList') . ''; +$object->next_prev_filter = 'type:=:'.((int) $object->type); +$object->ref = $object->label; +$morehtmlref = '
' . $langs->trans('Root') . ' >> '; +$ways = $object->print_all_ways(" >> ", '', 1); +foreach ($ways as $way) { + $morehtmlref .= $way."
\n"; +} +$morehtmlref .= '
'; + +dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'rowid', 'ref', $morehtmlref, '&type=ticket'); + +print '
'; +print '
'; + +$link = img_picto('', 'fa-cog', 'class="paddingrightonly"') . '' . $langs->transnoentities('GeneralConfig') . ''; +print load_fiche_titre($langs->transnoentities('CategorieManagement'), $link, ''); + +print '
'; +print ''; +print ''; + +print ''; +print ''; +print ''; +print ''; +print ''; + +// Use signatory +print ''; +print ''; + +// Show category description +print ''; +print ''; + +// Email template +print ''; +print ''; + +// Recipient +print ''; +print ''; + +if (getDolGlobalInt('DIGIRISKDOLIBARR_TICKET_ENABLE_PUBLIC_INTERFACE')) { + if (getDolGlobalInt('DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS')) { + print load_fiche_titre($langs->transnoentities('PublicInterfaceConfiguration'), $link, ''); + + print '
' . $langs->trans('Parameters') . '' . $langs->trans('Value') . '
'; +print img_picto('', 'fa-signature', 'class="paddingrightonly"') . $form->textwithpicto($langs->transnoentities('Signatory'), $langs->transnoentities('PublicInterfaceUseSignatoryDescription'), 1, 'info') . ''; +print 'use_signatory ? ' checked=""' : '') . '"> '; +print '
'; +print img_picto('', 'fa-font', 'class="paddingrightonly"') . $form->textwithpicto($langs->transnoentities('Description'), $langs->transnoentities('TicketPublicInterfaceShowCategoryDescriptionHelp'), 1, 'info') . ''; +print 'show_description ? ' checked=""' : '') . '"> '; +if (getDolGlobalInt('DIGIRISKDOLIBARR_TICKET_PUBLIC_INTERFACE_SHOW_CATEGORY_DESCRIPTION')) { + print $form->textwithtooltip($langs->transnoentities('Inherited'), $langs->transnoentities('PermissionInheritedFromConfig')); +} +print '
'; +print img_picto('', 'fa-envelope', 'class="paddingrightonly"') . $form->textwithpicto($langs->transnoentities('EmailTemplate'), $langs->transnoentities('EmailTemplateDescription'), 1, 'info') . ''; +$formMail->fetchAllEMailTemplate('ticket_send', $user, $langs); +$emailTemplateLabels = []; +foreach ($formMail->lines_model as $emailTemplateLine) { + $emailTemplateLabels[$emailTemplateLine->id] = $emailTemplateLine->label; +} +if (!empty($emailTemplateLabels)) { + print Form::selectarray('mail_template', $emailTemplateLabels, $ticketCategoryConfig->mail_template, 1); +} else { + print $langs->transnoentities('NoEmailTemplate'); +} +print '
'; +print img_picto('', 'fa-user', 'class="paddingrightonly"') . $form->textwithpicto($langs->transnoentities('Recipient'), $langs->transnoentities('RecipientDescription'), 1, 'info') . ''; +$userTmp->fetchAll('ASC', 't.lastname', 0, 0, "(t.statut:=:1) AND (t.employee:=:1) AND (t.email:isnot:NULL) AND (t.email:!=:'')", 'AND', true); +if (is_array($userTmp->users) && !empty($userTmp->users)) { + $recipients = []; + foreach ($userTmp->users as $recipient) { + $recipients[$recipient->id] = dolGetFirstLastname($recipient->firstname, $recipient->lastname) . ' (' . $recipient->email . ')'; + } + print Form::multiselectarray('recipients', $recipients, explode(',', $ticketCategoryConfig->recipients)); +} else { + print $langs->transnoentities('NoRecipient'); +} +print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + + // Photo visible + print ''; + print ''; + + // Get all categories and their configuration + $categories = $object->get_all_ways(); + $categoriesConfig = []; + foreach ($categories[0] as $category) { + if ($category->id == $id) { + continue; + } + $categoriesConfig[$category->label] = json_decode($category->array_options['options_ticket_category_config'], true); + } + + $keysWithValueOn = []; + $fields = [ + 'digiriskdolibarr_ticket_service' => ['picto' => 'fa-network-wired'], + 'digiriskdolibarr_ticket_email' => ['picto' => 'fa-envelope'], + 'digiriskdolibarr_ticket_firstname' => ['picto' => 'fa-user'], + 'digiriskdolibarr_ticket_lastname' => ['picto' => 'fa-user'], + 'digiriskdolibarr_ticket_phone' => ['picto' => 'fa-phone'], + 'digiriskdolibarr_ticket_location' => ['picto' => 'fa-map-marker'], + 'digiriskdolibarr_ticket_date' => ['picto' => 'fa-calendar-alt'] + ]; + + $extraFields->attributes['ticket']['label']['digiriskdolibarr_ticket_email'] = $langs->trans('Email'); + foreach ($extraFields->attributes['ticket']['label'] as $key => $field) { + $label = str_replace('digiriskdolibarr_ticket_', '', $key); + if (strpos($key, 'digiriskdolibarr_ticket') === false) { + continue; // Goes to the next element if ‘digiriskdolibarr_ticket’ is not found + } + + $extraFieldVisible = $key . '_visible'; + $extraFieldRequired = $key . '_required'; + + // Check if the field is visible or required in the other categories + foreach ($categoriesConfig as $category) { + if (isset($category[$extraFieldVisible]) && $category[$extraFieldVisible] === 'on') { + $keysWithValueOn[$extraFieldVisible] = true; + } + if (isset($category[$extraFieldRequired]) && $category[$extraFieldRequired] === 'on') { + $keysWithValueOn[$extraFieldRequired] = true; + } + } + + // Extra field visible and required + print ''; + print ''; + } + + print '
' . $langs->trans('Parameters') . '' . $langs->transnoentities('Visible') . '' . $langs->transnoentities('Required') . '
'; + print img_picto('', 'fa-image', 'class="paddingrightonly"') . $form->textwithpicto($langs->transnoentities('TicketPhotoVisible'), $langs->transnoentities('TicketPhotoVisibleHelp'), 1, 'info') . ''; + print 'photo_visible ? ' checked=""' : '') . '"> '; + print '
'; + print ($fields[$key]['picto'] ? img_picto('', $fields[$key]['picto'], 'class="paddingrightonly"') : getPictoForType($extraFields->attributes['ticket']['type'][$key])) . $form->textwithpicto($langs->transnoentities('Ticket' . ucfirst($label) . 'Visible'), $langs->transnoentities('Ticket' . ucfirst($label) . 'VisibleHelp'), 1, 'info') . ''; + print '$extraFieldVisible ? ' checked' : '') . (getDolGlobalInt(dol_strtoupper($key) . '_VISIBLE') || $keysWithValueOn[$extraFieldVisible] ? ' disabled' : '') . '>'; + if (getDolGlobalInt(dol_strtoupper($key) . '_VISIBLE') || $keysWithValueOn[$extraFieldVisible]) { + print $form->textwithtooltip($langs->transnoentities('Inherited'), $langs->transnoentities('PermissionInheritedFromConfig')); + } + print ''; + print '$extraFieldRequired ? ' checked=""' : '') . (getDolGlobalInt(dol_strtoupper($key) . '_REQUIRED') || $keysWithValueOn[$extraFieldRequired] ? ' disabled' : '') . '>'; + if (getDolGlobalInt(dol_strtoupper($key) . '_REQUIRED') || $keysWithValueOn[$extraFieldRequired]) { + print $form->textwithtooltip($langs->transnoentities('Inherited'), $langs->transnoentities('PermissionInheritedFromConfig')); + } + print '
'; + } +} + +print ''; +print $form->buttonsSaveCancel('Save', ''); +print '
'; +print '
'; + +// End of page +print dol_get_fiche_end(); +llxFooter(); +$db->close(); diff --git a/view/ticket/dashboard_ticket.php b/view/ticket/dashboard_ticket.php deleted file mode 100644 index a7c6eeed5..000000000 --- a/view/ticket/dashboard_ticket.php +++ /dev/null @@ -1,83 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file view/ticket/dashboard_ticket.php - * \ingroup digiriskdolibarr - * \brief Dashboard page of Ticket - */ - -// Load Dolibarr environment -$res = 0; -// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined) -if ( ! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"] . "/main.inc.php"; -// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME -$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1; -while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; } -if ( ! $res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1)) . "/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1)) . "/main.inc.php"; -if ( ! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1))) . "/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1))) . "/main.inc.php"; -// Try main.inc.php using relative path -if ( ! $res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php"; -if ( ! $res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php"; -if ( ! $res && file_exists("../../../../main.inc.php")) $res = @include "../../../../main.inc.php"; -if ( ! $res) die("Include of main fails"); - -require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; - -require_once './../../lib/digiriskdolibarr_function.lib.php'; -require_once __DIR__ . '/../../class/digiriskelement.class.php'; - -global $conf, $db, $langs, $user; - -// Load translation files required by the page -$langs->loadLangs(array("boxes", "digiriskdolibarr@digiriskdolibarr")); - -$digiriskelement = new DigiriskElement($db); - -// Get parameters -$action = GETPOST('action', 'aZ09'); - -$upload_dir = $conf->categorie->multidir_output[$conf->entity]; - -//Permission for digiriskelement_evaluator -$permissiontoread = $user->rights->digiriskdolibarr->lire; - -// Security check -if ( ! $permissiontoread && $user->rights->ticket->read) accessforbidden(); - -/* - * View - */ - -$help_url = 'FR:Module_Digirisk#Statistiques_des_tickets'; -$morejs = array("/digiriskdolibarr/js/digiriskdolibarr.js"); -$morecss = array("/digiriskdolibarr/css/digiriskdolibarr.css"); - -llxHeader("", $langs->trans("DashBoard"), $help_url, '', '', '', $morejs, $morecss); - -print load_fiche_titre($langs->trans("DashBoard"), '', 'digiriskdolibarr_color.png@digiriskdolibarr'); - -/* - * Dashboard Ticket - */ - -require_once __DIR__ . '/../core/tpl/digiriskdolibarr_dashboard_ticket.tpl.php'; - -// End of page -llxFooter(); -$db->close(); diff --git a/view/ticket/ticket_management_dashboard.php b/view/ticket/ticket_management_dashboard.php new file mode 100644 index 000000000..c483646f1 --- /dev/null +++ b/view/ticket/ticket_management_dashboard.php @@ -0,0 +1,96 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file view/ticket/ticket_management_dashboard.php + * \ingroup digiriskdolibarr + * \brief Page with ticket dashboard and statistics + */ + +if (file_exists('../digiriskdolibarr.main.inc.php')) { + require_once __DIR__ . '/../digiriskdolibarr.main.inc.php'; +} elseif (file_exists('../../digiriskdolibarr.main.inc.php')) { + require_once __DIR__ . '/../../digiriskdolibarr.main.inc.php'; +} else { + die('Include of digiriskdolibarr main fails'); +} + +// Load Saturne libraries +require_once __DIR__ . '/../../../saturne/class/saturnedashboard.class.php'; + +// Load DigiriskDolibarr libraries +require_once __DIR__ . '/../../lib/digiriskdolibarr_ticket.lib.php'; + +// Global variables definitions +global $conf, $db, $langs, $hookmanager, $moduleName, $moduleNameLowerCase, $user; + +// Load translation files required by the page +saturne_load_langs(); + +// Get parameters +$action = GETPOST('action', 'aZ09'); + +// Initialize technical objects +$dashboard = new SaturneDashboard($db, $moduleNameLowerCase); + +$upload_dir = $conf->$moduleNameLowerCase->multidir_output[$conf->entity ?? 1]; + +$hookmanager->initHooks([$moduleNameLowerCase . 'ticket_management_dashboard', 'globalcard']); // Note that conf->hooks_modules contains array + +// Security check - Protection if external user +$permissionToRead = $user->hasRight($moduleNameLowerCase, 'read'); +saturne_check_access($permissionToRead); + +/* + * Actions + */ + +$parameters = []; +$resHook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks +if ($resHook < 0) { + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); +} + +if (empty($resHook)) { + // Actions adddashboardinfo, closedashboardinfo, dashboardfilter, generate_csv + require_once __DIR__ . '/../../../saturne/core/tpl/actions/dashboard_actions.tpl.php'; +} + +/* + * View + */ + +$title = $langs->transnoentities('TicketManagementDashboard'); +$helpUrl = 'FR:Module_' . $moduleName; + +saturne_header(0, '', $title, $helpUrl); + +print load_fiche_titre($title, '', 'ticket'); + +$head = ticketstats_prepare_head(); +print dol_get_fiche_head($head, 'dashboard',$title, -1, 'ticket'); + +print '
'; + +$moreParams = ['LoadTicketStatsDashboard' => 1]; +$dashboard->show_dashboard($moreParams); + +print '
'; + +// End of page +llxFooter(); +$db->close(); diff --git a/view/ticket/ticketstats.php b/view/ticket/ticketstats.php index 041899ddf..1d7cdbeee 100644 --- a/view/ticket/ticketstats.php +++ b/view/ticket/ticketstats.php @@ -216,7 +216,7 @@ // Status print '' . $form->textwithpicto($langs->trans('Status'), $langs->trans('StatusHelp')) . ''; -print $form->multiselectarray('status', $all + $none + $object->statuts_short, (!empty(GETPOST('refresh', 'int')) ? GETPOST('status', 'array') : $all + $none + $object->statuts_short), 0, 0, 'minwidth100imp widthcentpercentminusx maxwidth300', 1); +print $form->multiselectarray('status', $all + $none + $object->labelStatusShort, (!empty(GETPOST('refresh', 'int')) ? GETPOST('status', 'array') : $all + $none + $object->labelStatusShort), 0, 0, 'minwidth100imp widthcentpercentminusx maxwidth300', 1); print ''; // DateRange