From 00951a8144d3379b6ae9c28c57b466a559e4ec90 Mon Sep 17 00:00:00 2001 From: "Sekan, Tobias" Date: Fri, 25 Sep 2020 08:10:48 +0200 Subject: [PATCH 1/3] New allow to reopen interventions --- htdocs/fichinter/card.php | 30 +++++++++++++++++++++++++++ htdocs/langs/en_US/interventions.lang | 3 +++ 2 files changed, 33 insertions(+) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 7a6f0563dec..9bf42da256a 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -555,6 +555,21 @@ if (empty($reshook)) } } + // Reopen + elseif ($action == 'confirm_reopen' && $user->rights->ficheinter->creer) + { + $result = $object->setStatut(Fichinter::STATUS_VALIDATED); + if ($result > 0) + { + header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); + exit; + } + else + { + $mesg = $object->error; + } + } + /* * Mise a jour d'une ligne d'intervention */ @@ -1099,6 +1114,12 @@ if ($action == 'create') $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify', '', 0, 1); } + // Confirm back to open + if ($action == 'reopen') + { + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Reopen'), $langs->trans('ConfirmReopenIntervention', $object->ref), 'confirm_reopen', '', 0, 1); + } + // Confirm deletion of line if ($action == 'ask_deleteline') { @@ -1568,6 +1589,15 @@ if ($action == 'create') print ''; } + // Reopen + if ($object->statut > Fichinter::STATUS_CLOSED) + { + if ($user->rights->ficheinter->creer) + { + print '
'.$langs->trans('Reopen').'
'; + } else print '
'.$langs->trans('Reopen').'
'; + } + // Send if (empty($user->socid)) { if ($object->statut > Fichinter::STATUS_DRAFT) diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index e5936f8246e..2123552bb2b 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -64,3 +64,6 @@ InterLineDuration=Line duration intervention InterLineDesc=Line description intervention RepeatableIntervention=Template of intervention ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template +Reopen=Reopen +Reopen=Reopen +ConfirmReopenIntervention=Are you sure you want to open back the intervention %s? From 6fbc5360612915a9a4b4ea5375cf96edc3ab0c75 Mon Sep 17 00:00:00 2001 From: "Sekan, Tobias" Date: Fri, 25 Sep 2020 08:15:20 +0200 Subject: [PATCH 2/3] Remoeve double lang entry --- htdocs/langs/en_US/interventions.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 2123552bb2b..51079fca278 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -65,5 +65,4 @@ InterLineDesc=Line description intervention RepeatableIntervention=Template of intervention ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template Reopen=Reopen -Reopen=Reopen ConfirmReopenIntervention=Are you sure you want to open back the intervention %s? From 6e2d12413c2c4cb09a3d281e2e3808bd0ffa6621 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Fri, 25 Sep 2020 06:17:52 +0000 Subject: [PATCH 3/3] Fixing style errors. --- htdocs/fichinter/card.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 9bf42da256a..4f9f3d47201 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -564,8 +564,7 @@ if (empty($reshook)) header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; } - else - { + else { $mesg = $object->error; } }