diff --git a/admin/setup.php b/admin/setup.php index a2eb7d919..33f34b087 100644 --- a/admin/setup.php +++ b/admin/setup.php @@ -177,7 +177,7 @@ print $langs->trans('ManuelInputNBEmployeesDescription'); print ''; print ''; -print ajax_constantonoff('DIGIRISKDOLIBARR_MANUEL_INPUT_NB_EMPLOYEES'); +print ajax_constantonoff('DIGIRISKDOLIBARR_MANUAL_INPUT_NB_EMPLOYEES'); print ''; print ''; diff --git a/class/accident.class.php b/class/accident.class.php index ac1c639ea..4687ec565 100644 --- a/class/accident.class.php +++ b/class/accident.class.php @@ -513,7 +513,7 @@ public function load_dashboard() 'label' => array($langs->transnoentities("FrequencyIndex"), $langs->transnoentities("FrequencyRate"), $langs->transnoentities("GravityRate")), 'content' => array($arrayFrequencyIndex['frequencyindex'], $arrayFrequencyRate['frequencyrate'], $arrayGravityRate['gravityrate']), 'tooltip' => array( - (($conf->global->DIGIRISKDOLIBARR_NB_EMPLOYEES > 0 && $conf->global->DIGIRISKDOLIBARR_MANUEL_INPUT_NB_EMPLOYEES) ? $langs->transnoentities("FrequencyIndexTooltip") . '
' . $langs->transnoentities("NbEmployeesConfTooltip") : $langs->transnoentities("FrequencyIndexTooltip")), + (($conf->global->DIGIRISKDOLIBARR_NB_EMPLOYEES > 0 && $conf->global->DIGIRISKDOLIBARR_MANUAL_INPUT_NB_EMPLOYEES) ? $langs->transnoentities("FrequencyIndexTooltip") . '
' . $langs->transnoentities("NbEmployeesConfTooltip") : $langs->transnoentities("FrequencyIndexTooltip")), (($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")) ), diff --git a/class/actions_digiriskdolibarr.class.php b/class/actions_digiriskdolibarr.class.php index 9dabebb25..7b1465e62 100644 --- a/class/actions_digiriskdolibarr.class.php +++ b/class/actions_digiriskdolibarr.class.php @@ -69,7 +69,7 @@ public function __construct($db) */ public function printCommonFooter($parameters) { - global $db, $conf, $langs; + global $conf, $db, $form, $langs; /* print_r($parameters); print_r($object); echo "action: " . $action; */ if ($parameters['currentcontext'] == 'admincompany') { // do something only for the context 'somecontext1' or 'somecontext2' @@ -84,12 +84,8 @@ public function printCommonFooter($parameters) $idcc_form = digirisk_select_dictionary('DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE', 'c_conventions_collectives', 'code', 'libelle', $conf->global->DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE, 1, '', '', 'minwidth100'); $pee_input = 'global->DIGIRISKDOLIBARR_PEE_ENABLED ? 'checked' : '') .'>'; $perco_input = 'global->DIGIRISKDOLIBARR_PERCO_ENABLED ? 'checked' : '') .'>'; - if ($conf->global->DIGIRISKDOLIBARR_MANUEL_INPUT_NB_EMPLOYEES) { - $nbemployees_input = ''; - } - if ($conf->global->DIGIRISKDOLIBARR_MANUAL_INPUT_NB_WORKED_HOURS) { - $nbworkedhours_input = ''; - } + $nbemployees_input = 'global->DIGIRISKDOLIBARR_MANUAL_INPUT_NB_EMPLOYEES ? '' : 'disabled') . '>'; + $nbworkedhours_input = 'global->DIGIRISKDOLIBARR_MANUAL_INPUT_NB_WORKED_HOURS ? '' : 'disabled') . '>'; ?>