From da1c3a61340aa5a45a61131c428e343c19713296 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 23 Jan 2023 15:34:51 +0100 Subject: [PATCH 01/35] =?UTF-8?q?Cr=C3=A9ation=20de=20la=20table=20des=20s?= =?UTF-8?q?tatuts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2.5-47-platau-export-pieces-jointes.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 sql/migrations/2.5-47-platau-export-pieces-jointes.sql diff --git a/sql/migrations/2.5-47-platau-export-pieces-jointes.sql b/sql/migrations/2.5-47-platau-export-pieces-jointes.sql new file mode 100644 index 00000000..2add0d7f --- /dev/null +++ b/sql/migrations/2.5-47-platau-export-pieces-jointes.sql @@ -0,0 +1,16 @@ +SET NAMES 'utf8'; + +CREATE TABLE IF NOT EXISTS `piecejointestatut` ( + `ID_PIECEJOINTESTATUT` int(20) NOT NULL AUTO_INCREMENT, + `NOM_STATUT` varchar(50), + PRIMARY KEY (`ID_PIECEJOINTESTATUT`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +INSERT INTO `piecejointestatut`(`NOM_STATUT`) VALUES +('not_exported'), +('to_be_exported'), +('exported'); + +ALTER TABLE `piecejointe` ADD COLUMN `ID_PIECEJOINTESTATUT` int(20) DEFAULT 1; +ALTER TABLE `piecejointe` + ADD CONSTRAINT `fk_piecejointe_piecejointestatut1` FOREIGN KEY (`ID_PIECEJOINTESTATUT`) REFERENCES `piecejointestatut` (`ID_PIECEJOINTESTATUT`) ON DELETE SET NULL ON UPDATE CASCADE; From 23b96d37f4cc5012288b570cec0f61b70ea72674 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 23 Jan 2023 16:53:25 +0100 Subject: [PATCH 02/35] =?UTF-8?q?Suppression=20d'un=20fichier=20non=20util?= =?UTF-8?q?is=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/scripts/dossier/piecejointe.phtml | 190 ------------------ 1 file changed, 190 deletions(-) delete mode 100755 application/views/scripts/dossier/piecejointe.phtml diff --git a/application/views/scripts/dossier/piecejointe.phtml b/application/views/scripts/dossier/piecejointe.phtml deleted file mode 100755 index 3585dcf0..00000000 --- a/application/views/scripts/dossier/piecejointe.phtml +++ /dev/null @@ -1,190 +0,0 @@ -"; - foreach($fichier as $value) { - //on retire le / qui précéde le nom des fichiers - $nom = substr($value,1); - if($value != '/Thumbs.db'){ - $type_fic = explode('.', $nom); - switch($type_fic[1]){ - case "pdf": - $classe= "pj_icon pdf"; - break; - case "jpg": - $classe= "pj_icon jpg"; - break; - case "odt": - $classe= "pj_icon doc"; - break; - default: - - break; - } - echo " -
  • - - ".$nom." - - × - -
    • - "; - } - } - echo ""; -} - -//Si on détecte un upload -if( isset($_POST['upload']) ) // si formulaire soumis -{ - $content_dir = './pj/dossier/'.$this->id_dossier.'/'; // dossier où sera déplacé le fichier - if (is_dir($content_dir) == true) - { - //echo "Le dossier existe déjà
    "; - } - else - { - mkdir ($content_dir, 0777); - } - - $tmp_file = $_FILES['fichier']['tmp_name']; - if( !is_uploaded_file($tmp_file) ) - { - //exit("Le fichier est introuvable"); - } - - // on vérifie maintenant l'extension - $type_file = $_FILES['fichier']['type']; - if( !strstr($type_file, 'jpg') && !strstr($type_file, 'jpeg') && !strstr($type_file, 'bmp') && !strstr($type_file, 'gif') && !strstr($type_file, 'png') && !strstr($type_file, 'pdf') && !strstr($type_file, 'odt') && !strstr($type_file, 'doc') && !strstr($type_file, 'sdc') && !strstr($type_file, 'xls')) - { - //exit("Le fichier n'est pas une image"); - } - - // on copie le fichier dans le dossier de destination - $name_file = $_FILES['fichier']['name']; - - if( !move_uploaded_file($tmp_file, $content_dir . $name_file) ) - { - //exit("Impossible de copier le fichier dans $content_dir"); - } - - //echo "Le fichier a bien été uploadé"; -} - -if( !isset($_POST['do'])) -{ - -?> - - - - -

    Liste des pièces jointes

    -
    + Ajouter une pièce jointe
    - -
    -
    Classer par
    - type - ordre alphabétique - date -
    - "; - - //$testHelper = $this->_helper->fctTest('DossierPj'); - //$this->DossierPj('listing'); - - //echo $this->listing(); - echo listing("pj/dossier/".$this->id_dossier,$this->id_dossier); - echo " - - "; - -}else{ - if($_POST['do'] == 'deletePj'){ - echo unlink("pj/dossier/".$this->id_dossier."/".$_POST['name']); - } -} - -?> \ No newline at end of file From 4b63a9e758fec71cd89ceb5a5cf109cec7f08fef Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Wed, 25 Jan 2023 11:04:35 +0100 Subject: [PATCH 03/35] =?UTF-8?q?Ajout=20des=20cases=20=C3=A0=20cocher?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/PieceJointeController.php | 2 + application/models/DbTable/PieceJointe.php | 12 +- application/modules/api/configs/routes.xml | 6 +- .../views/scripts/piece-jointe/display.phtml | 79 +++-- .../views/scripts/piece-jointe/form.phtml | 36 +-- .../views/scripts/piece-jointe/index.phtml | 299 ++++++++---------- public/css/pieces-jointes.css | 7 + 7 files changed, 228 insertions(+), 213 deletions(-) create mode 100644 public/css/pieces-jointes.css diff --git a/application/controllers/PieceJointeController.php b/application/controllers/PieceJointeController.php index 7d4d82e8..fc7e923c 100755 --- a/application/controllers/PieceJointeController.php +++ b/application/controllers/PieceJointeController.php @@ -16,6 +16,8 @@ public function init() public function indexAction() { + $this->view->headLink()->appendStylesheet('/css/pieces-jointes.css', 'all'); + // Modèles $DBused = new Model_DbTable_PieceJointe; diff --git a/application/models/DbTable/PieceJointe.php b/application/models/DbTable/PieceJointe.php index 02876593..ec460075 100755 --- a/application/models/DbTable/PieceJointe.php +++ b/application/models/DbTable/PieceJointe.php @@ -3,16 +3,18 @@ class Model_DbTable_PieceJointe extends Zend_Db_Table_Abstract { protected $_name="piecejointe"; // Nom de la base - protected $_primary = "ID_PIECEJOINTE"; // Clé primaire + protected $_primary = "ID_PIECEJOINTE"; // Cl� primaire public function affichagePieceJointe($table, $champ, $identifiant) { $select = $this->select() ->setIntegrityCheck(false) - ->from("piecejointe") - ->join($table, "piecejointe.ID_PIECEJOINTE = $table.ID_PIECEJOINTE") - ->where($champ." = ".$identifiant) - ->order("piecejointe.ID_PIECEJOINTE DESC"); + ->from(['pj' => 'piecejointe']) + ->join($table, "pj.ID_PIECEJOINTE = {$table}.ID_PIECEJOINTE") + ->joinLeft(['pjs' => 'piecejointestatut'], 'pj.ID_PIECEJOINTESTATUT = pjs.ID_PIECEJOINTESTATUT', ['NOM_STATUT']) + ->where($champ.' = '.$identifiant) + ->order('pj.ID_PIECEJOINTE DESC') + ; return ( $this->fetchAll( $select ) != null ) ? $this->fetchAll( $select )->toArray() : null; } diff --git a/application/modules/api/configs/routes.xml b/application/modules/api/configs/routes.xml index b5a97539..e68a9726 100755 --- a/application/modules/api/configs/routes.xml +++ b/application/modules/api/configs/routes.xml @@ -135,7 +135,7 @@ - + user @@ -163,8 +163,8 @@ - + - \ No newline at end of file + diff --git a/application/views/scripts/piece-jointe/display.phtml b/application/views/scripts/piece-jointe/display.phtml index 3dddd20a..45db3d1e 100755 --- a/application/views/scripts/piece-jointe/display.phtml +++ b/application/views/scripts/piece-jointe/display.phtml @@ -1,29 +1,52 @@ listePj as $pj) : ?> - - - - 'piece-jointe', 'action' => 'get', 'id' => $this->id, 'idpj' => $pj['ID_PIECEJOINTE'], 'type' => $this->type)) ?>' title="" target='_blank' > - - - - ", "" ,$pj['DESCRIPTION_PIECEJOINTE'])) ?> - - - - get( Zend_Date::DAY."/".Zend_Date::MONTH."/".Zend_Date::YEAR ); - ?> - - - - verrou != 1): ?> - - - - - - - \ No newline at end of file + + + + 'piece-jointe', 'action' => 'get', 'id' => $this->id, 'idpj' => $pj['ID_PIECEJOINTE'], 'type' => $this->type)) ?>' + title="" + target='_blank' > + + + + + + ", "" ,$pj['DESCRIPTION_PIECEJOINTE'])) ?> + + + + get( Zend_Date::DAY."/".Zend_Date::MONTH."/".Zend_Date::YEAR ); + ?> + + + + + + + +
    En attente d'envoi
    + +
    Envoyé
    + +
    Statut inconnu
    + + + + + + verrou != 1): ?> + + + + + + + diff --git a/application/views/scripts/piece-jointe/form.phtml b/application/views/scripts/piece-jointe/form.phtml index 8197fc08..5672ae9f 100755 --- a/application/views/scripts/piece-jointe/form.phtml +++ b/application/views/scripts/piece-jointe/form.phtml @@ -1,39 +1,39 @@
    - +
    Fichier à envoyer
    type == 'etablissement') : ?> -
    Mise en avant (si c'est une image)
    -
    -
      -
    • Seulement dans la liste principale
      • -
    • Afficher l'image dans le diaporama
      • -
    • Afficher l'image dans les plans
      • -
    -
    +
    Mise en avant (si c'est une image)
    +
    +
      +
    • Seulement dans la liste principale
      • +
    • Afficher l'image dans le diaporama
      • +
    • Afficher l'image dans les plans
      • +
    +
    - +
    Libellé de la pièce jointe (laissez vide pour conserver le nom par défaut)
    - +
    Description
    - + type == 'dossier') : ?>
    Entités avec lesquels vous souhaitez lier la pièce jointe
    - listeEtablissement as $etab) : ?> - ' /> ( )
    - + listeEtablissement as $etab) : ?> + ' /> ( )
    +
    - +
    - -
    \ No newline at end of file + + diff --git a/application/views/scripts/piece-jointe/index.phtml b/application/views/scripts/piece-jointe/index.phtml index 208008da..1909da7f 100755 --- a/application/views/scripts/piece-jointe/index.phtml +++ b/application/views/scripts/piece-jointe/index.phtml @@ -1,136 +1,129 @@ -

    Liste de pièces jointes -Ajouter une piece jointe - - "; -?> + + +

    - - +
    + - + + - - + + - partial("piece-jointe/display.phtml", array("path" => $this->path, "listePj" => $this->listePj, "type" => $this->type, "id" => $this->identifiant, "verrou" => $this->verrou)) - ?> + partial("piece-jointe/display.phtml", array("path" => $this->path, "listePj" => $this->listePj, "type" => $this->type, "id" => $this->identifiant, "verrou" => $this->verrou)) + ?>
    NomNom Description Date d'ajoutEnvoyer vers Plat'AU
    - \ No newline at end of file + + }); + + // Si un fichier est bien uploadé, on l'ajoute à la liste + function callback(id, ext) { + $.ajax({ + url: "/piece-jointe/check", + data: { + "format": "json", + "idpj" : id, + "ext" : ext, + "type" : "type ?>", + "id" : "identifiant ?>" + }, + type: "post", + success: function(result) { + // On détruit la fenetre de load + $("#load").remove(); + + if (result.exists) { + // Ajout d'une ligne + $("#tabPieceJointe tbody").prepend(result.html); + + // Mise à jour + $("#listePieceJointe table").trigger("update"); + $("#listePieceJointe table").trigger("sorton", [[3,1]]); + } + + $("#listePieceJointe").show(); + $("#listePieceJointe-no").hide(); + } + }); + } + + diff --git a/public/css/pieces-jointes.css b/public/css/pieces-jointes.css new file mode 100644 index 00000000..ee63b57f --- /dev/null +++ b/public/css/pieces-jointes.css @@ -0,0 +1,7 @@ +.table td.checkbox { + text-align: center; +} + +.table td.checkbox input { + float: none; +} \ No newline at end of file From 0d55f73bfd69e750358f2d76de2e2dfd00177e6d Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 30 Jan 2023 16:08:04 +0100 Subject: [PATCH 04/35] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20statuts=20"p?= =?UTF-8?q?as=20envoy=C3=A9"=20=3D>=20"en=20attente=20d'envoi"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/PieceJointeController.php | 31 ++++++++-- application/models/DbTable/PieceJointe.php | 52 ++++++++-------- application/navigation.xml | 5 ++ .../views/scripts/piece-jointe/display.phtml | 9 ++- .../views/scripts/piece-jointe/index.phtml | 61 +++++++++++++------ public/css/pieces-jointes.css | 8 +-- 6 files changed, 110 insertions(+), 56 deletions(-) diff --git a/application/controllers/PieceJointeController.php b/application/controllers/PieceJointeController.php index fc7e923c..a418ffae 100755 --- a/application/controllers/PieceJointeController.php +++ b/application/controllers/PieceJointeController.php @@ -10,8 +10,11 @@ public function init() // Actions à effectuées en AJAX $ajaxContext = $this->_helper->getHelper('AjaxContext'); - $ajaxContext->addActionContext('check', 'json') - ->initContext(); + $ajaxContext + ->addActionContext('check', 'json') + ->addActionContext('export-platau', 'json') + ->initContext() + ; } public function indexAction() @@ -360,6 +363,26 @@ public function checkAction() )); } } - - + + public function exportPlatauAction() + { + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + + $dbPj = new Model_DbTable_PieceJointe(); + $post = $this->getRequest()->getPost(); + + $formData = $post['formData']; + $toBeExported = []; + + $toBeExported = array_filter($formData, function ($v) { + $checkboxValue = filter_var($v['value'], FILTER_VALIDATE_BOOLEAN); + + return $checkboxValue === true; + }); + + array_map(function ($value) use ($dbPj) { + $dbPj->updatePlatauStatus($value['id'], 2); + }, $toBeExported); + } } diff --git a/application/models/DbTable/PieceJointe.php b/application/models/DbTable/PieceJointe.php index ec460075..3bf90449 100755 --- a/application/models/DbTable/PieceJointe.php +++ b/application/models/DbTable/PieceJointe.php @@ -1,31 +1,35 @@ select() + ->setIntegrityCheck(false) + ->from(['pj' => 'piecejointe']) + ->join($table, "pj.ID_PIECEJOINTE = {$table}.ID_PIECEJOINTE") + ->joinLeft(['pjs' => 'piecejointestatut'], 'pj.ID_PIECEJOINTESTATUT = pjs.ID_PIECEJOINTESTATUT', ['NOM_STATUT']) + ->where($champ.' = '.$identifiant) + ->order('pj.ID_PIECEJOINTE DESC') + ; + + return ( $this->fetchAll( $select ) != null ) ? $this->fetchAll( $select )->toArray() : null; + } - public function affichagePieceJointe($table, $champ, $identifiant) - { - $select = $this->select() - ->setIntegrityCheck(false) - ->from(['pj' => 'piecejointe']) - ->join($table, "pj.ID_PIECEJOINTE = {$table}.ID_PIECEJOINTE") - ->joinLeft(['pjs' => 'piecejointestatut'], 'pj.ID_PIECEJOINTESTATUT = pjs.ID_PIECEJOINTESTATUT', ['NOM_STATUT']) - ->where($champ.' = '.$identifiant) - ->order('pj.ID_PIECEJOINTE DESC') - ; + public function maxPieceJointe() + { + $select = 'SELECT MAX(ID_PIECEJOINTE) + FROM piecejointe + ;'; - return ( $this->fetchAll( $select ) != null ) ? $this->fetchAll( $select )->toArray() : null; - } + return $this->getAdapter()->fetchRow($select); + } - public function maxPieceJointe() - { - //echo "les champs : ".$table.$champ.$identifiant."
    "; - $select = "SELECT MAX(ID_PIECEJOINTE) - FROM piecejointe - ;"; - //echo $select; - return $this->getAdapter()->fetchRow($select); - } + public function updatePlatauStatus(int $id, int $status): void + { + $this->update(["ID_PIECEJOINTESTATUT" => $status], "ID_PIECEJOINTE = $id"); } +} diff --git a/application/navigation.xml b/application/navigation.xml index a98cb62d..d3b73523 100755 --- a/application/navigation.xml +++ b/application/navigation.xml @@ -686,6 +686,11 @@ check modification_odj + + piece-jointe + exportPlatau + modification_odj + diff --git a/application/views/scripts/piece-jointe/display.phtml b/application/views/scripts/piece-jointe/display.phtml index 45db3d1e..15939aa7 100755 --- a/application/views/scripts/piece-jointe/display.phtml +++ b/application/views/scripts/piece-jointe/display.phtml @@ -22,21 +22,20 @@ ?> - - + -
    En attente d'envoi
    +
    En attente d'envoi
    -
    Envoyé
    +
    Envoyé
    -
    Statut inconnu
    +
    Statut inconnu
    diff --git a/application/views/scripts/piece-jointe/index.phtml b/application/views/scripts/piece-jointe/index.phtml index 1909da7f..d29f2209 100755 --- a/application/views/scripts/piece-jointe/index.phtml +++ b/application/views/scripts/piece-jointe/index.phtml @@ -9,24 +9,29 @@
    -
    - - - - - - - - - - - - partial("piece-jointe/display.phtml", array("path" => $this->path, "listePj" => $this->listePj, "type" => $this->type, "id" => $this->identifiant, "verrou" => $this->verrou)) - ?> - -
    NomDescriptionDate d'ajoutEnvoyer vers Plat'AU
    -
    +
    +
    + + + + + + + + + + + + partial("piece-jointe/display.phtml", array("path" => $this->path, "listePj" => $this->listePj, "type" => $this->type, "id" => $this->identifiant, "verrou" => $this->verrou)) + ?> + +
    NomDescriptionDate d'ajoutEnvoyer vers Plat'AU
    +
    + + +
    + - diff --git a/public/css/pieces-jointes.css b/public/css/pieces-jointes.css index ee63b57f..a4eb307c 100644 --- a/public/css/pieces-jointes.css +++ b/public/css/pieces-jointes.css @@ -1,7 +1,7 @@ -.table td.checkbox { - text-align: center; +.table td.checkbox input { + margin-left: 0; } -.table td.checkbox input { - float: none; +.table td.checkbox > .alert { + margin: auto; } \ No newline at end of file From 2571be52a96701c89b3876a343c20393a6b63ca7 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 30 Jan 2023 16:38:40 +0100 Subject: [PATCH 05/35] =?UTF-8?q?Simplifie=20le=20passage=20des=20donn?= =?UTF-8?q?=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/PieceJointeController.php | 15 +++++---------- .../views/scripts/piece-jointe/index.phtml | 7 +++---- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/application/controllers/PieceJointeController.php b/application/controllers/PieceJointeController.php index a418ffae..b4b95fec 100755 --- a/application/controllers/PieceJointeController.php +++ b/application/controllers/PieceJointeController.php @@ -372,17 +372,12 @@ public function exportPlatauAction() $dbPj = new Model_DbTable_PieceJointe(); $post = $this->getRequest()->getPost(); - $formData = $post['formData']; - $toBeExported = []; - - $toBeExported = array_filter($formData, function ($v) { - $checkboxValue = filter_var($v['value'], FILTER_VALIDATE_BOOLEAN); - - return $checkboxValue === true; + $toBeExported = array_filter($post, function ($v) { + return filter_var($v, FILTER_VALIDATE_BOOLEAN) === true; }); - array_map(function ($value) use ($dbPj) { - $dbPj->updatePlatauStatus($value['id'], 2); - }, $toBeExported); + foreach (array_keys($toBeExported) as $idPj) { + $dbPj->updatePlatauStatus($idPj, 2); + } } } diff --git a/application/views/scripts/piece-jointe/index.phtml b/application/views/scripts/piece-jointe/index.phtml index d29f2209..65fd52e5 100755 --- a/application/views/scripts/piece-jointe/index.phtml +++ b/application/views/scripts/piece-jointe/index.phtml @@ -181,19 +181,18 @@ disabledTest(); $('#export-platau').click(function() { - const formData = [] + const formData = {} const inputs = document.querySelectorAll('input[name="export-pj-platau"]') inputs.forEach(input => { const idPj = input['attributes']['data-id'].value - const object = { 'id': idPj, 'value': input.checked } - formData.push(object) + formData[idPj] = input.checked }) $.post( "/piece-jointe/export-platau", - { formData }, + formData, () => { location.reload() } From 81bda3d909ae2f99292e741d8d9140ea876c6e3b Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 30 Jan 2023 16:55:49 +0100 Subject: [PATCH 06/35] Ajout d'un statut d'erreur --- application/views/scripts/piece-jointe/display.phtml | 3 +++ sql/migrations/2.5-47-platau-export-pieces-jointes.sql | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/application/views/scripts/piece-jointe/display.phtml b/application/views/scripts/piece-jointe/display.phtml index 15939aa7..608153af 100755 --- a/application/views/scripts/piece-jointe/display.phtml +++ b/application/views/scripts/piece-jointe/display.phtml @@ -32,6 +32,9 @@
    Envoyé
    + +
    Erreur lors de l'envoi
    diff --git a/sql/migrations/2.5-47-platau-export-pieces-jointes.sql b/sql/migrations/2.5-47-platau-export-pieces-jointes.sql index 2add0d7f..41b7adf4 100644 --- a/sql/migrations/2.5-47-platau-export-pieces-jointes.sql +++ b/sql/migrations/2.5-47-platau-export-pieces-jointes.sql @@ -9,7 +9,8 @@ CREATE TABLE IF NOT EXISTS `piecejointestatut` ( INSERT INTO `piecejointestatut`(`NOM_STATUT`) VALUES ('not_exported'), ('to_be_exported'), -('exported'); +('exported'), +('on_error'); ALTER TABLE `piecejointe` ADD COLUMN `ID_PIECEJOINTESTATUT` int(20) DEFAULT 1; ALTER TABLE `piecejointe` From 46afe12397f55d8ecfa0ec8f41618ef0d9bbc90e Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 6 Feb 2023 15:58:42 +0100 Subject: [PATCH 07/35] =?UTF-8?q?Interdit=20la=20suppression=20d'une=20pj?= =?UTF-8?q?=20en=20attente=20d'envoi=20ou=20envoy=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/scripts/piece-jointe/display.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/scripts/piece-jointe/display.phtml b/application/views/scripts/piece-jointe/display.phtml index 608153af..c2db8640 100755 --- a/application/views/scripts/piece-jointe/display.phtml +++ b/application/views/scripts/piece-jointe/display.phtml @@ -44,7 +44,7 @@ - verrou != 1): ?> + verrou != 1 && !in_array($pj['NOM_STATUT'], ['to_be_exported', 'exported'])): ?> From 3b01b4743ad1147e17dc75630f1bd5077bee2a97 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 6 Feb 2023 17:04:46 +0100 Subject: [PATCH 08/35] =?UTF-8?q?Permet=20de=20renvoyer=20une=20pj=20dont?= =?UTF-8?q?=20l'envoi=20=C3=A9tait=20en=20erreur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/PieceJointeController.php | 17 +++++++++++++++-- application/models/DbTable/PieceJointe.php | 12 ++++++++++-- .../models/DbTable/PieceJointeStatut.php | 7 +++++++ application/navigation.xml | 5 +++++ .../views/scripts/piece-jointe/display.phtml | 3 +++ public/css/pieces-jointes.css | 4 ++++ public/js/dossier/pieceJointe.js | 13 +++++++++++++ 7 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 application/models/DbTable/PieceJointeStatut.php create mode 100644 public/js/dossier/pieceJointe.js diff --git a/application/controllers/PieceJointeController.php b/application/controllers/PieceJointeController.php index b4b95fec..16f9473b 100755 --- a/application/controllers/PieceJointeController.php +++ b/application/controllers/PieceJointeController.php @@ -3,6 +3,7 @@ class PieceJointeController extends Zend_Controller_Action { public $store; + private $dbPj; public function init() { @@ -15,10 +16,13 @@ public function init() ->addActionContext('export-platau', 'json') ->initContext() ; + + $this->dbPj = new Model_DbTable_PieceJointe(); } public function indexAction() { + $this->view->headScript()->appendFile('/js/dossier/pieceJointe.js', 'text/javascript'); $this->view->headLink()->appendStylesheet('/css/pieces-jointes.css', 'all'); // Modèles @@ -369,7 +373,6 @@ public function exportPlatauAction() $this->_helper->layout->disableLayout(); $this->_helper->viewRenderer->setNoRender(); - $dbPj = new Model_DbTable_PieceJointe(); $post = $this->getRequest()->getPost(); $toBeExported = array_filter($post, function ($v) { @@ -377,7 +380,17 @@ public function exportPlatauAction() }); foreach (array_keys($toBeExported) as $idPj) { - $dbPj->updatePlatauStatus($idPj, 2); + $this->dbPj->updatePlatauStatus($idPj, 'to_be_exported'); } } + + public function retryExportPlatauAction() + { + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + + $idPj = filter_var($this->getRequest()->getPost()['idPj'], FILTER_VALIDATE_INT); + + $this->dbPj->updatePlatauStatus($idPj, 'to_be_exported'); + } } diff --git a/application/models/DbTable/PieceJointe.php b/application/models/DbTable/PieceJointe.php index 3bf90449..89adec9d 100755 --- a/application/models/DbTable/PieceJointe.php +++ b/application/models/DbTable/PieceJointe.php @@ -28,8 +28,16 @@ public function maxPieceJointe() return $this->getAdapter()->fetchRow($select); } - public function updatePlatauStatus(int $id, int $status): void + public function updatePlatauStatus(int $id, string $status): void { - $this->update(["ID_PIECEJOINTESTATUT" => $status], "ID_PIECEJOINTE = $id"); + $modelPjStatus = new Model_DbTable_PieceJointeStatut(); + + $idStatus = $modelPjStatus->fetchRow( + $modelPjStatus->select() + ->from('piecejointestatut') + ->where('NOM_STATUT = ?', $status) + )['ID_PIECEJOINTESTATUT']; + + $this->update(["ID_PIECEJOINTESTATUT" => $idStatus], "ID_PIECEJOINTE = $id"); } } diff --git a/application/models/DbTable/PieceJointeStatut.php b/application/models/DbTable/PieceJointeStatut.php new file mode 100644 index 00000000..a8b7cc66 --- /dev/null +++ b/application/models/DbTable/PieceJointeStatut.php @@ -0,0 +1,7 @@ +exportPlatau modification_odj + + piece-jointe + retryExportPlatau + modification_odj + diff --git a/application/views/scripts/piece-jointe/display.phtml b/application/views/scripts/piece-jointe/display.phtml index c2db8640..5f1fb170 100755 --- a/application/views/scripts/piece-jointe/display.phtml +++ b/application/views/scripts/piece-jointe/display.phtml @@ -35,6 +35,9 @@
    Erreur lors de l'envoi
    +
    + Renvoyer +
    diff --git a/public/css/pieces-jointes.css b/public/css/pieces-jointes.css index a4eb307c..44540a2e 100644 --- a/public/css/pieces-jointes.css +++ b/public/css/pieces-jointes.css @@ -4,4 +4,8 @@ .table td.checkbox > .alert { margin: auto; +} + +.label ~ div { + margin-top: 0.5rem; } \ No newline at end of file diff --git a/public/js/dossier/pieceJointe.js b/public/js/dossier/pieceJointe.js new file mode 100644 index 00000000..d4fac9bf --- /dev/null +++ b/public/js/dossier/pieceJointe.js @@ -0,0 +1,13 @@ +document.addEventListener('DOMContentLoaded', function() { + document.querySelectorAll('.retry-export-platau').forEach((link) => { + link.addEventListener('click', function() { + $.post( + "/piece-jointe/retry-export-platau", + { idPj: link['attributes']['data-id'].value }, + () => { + location.reload() + } + ) + }) + }) +}) \ No newline at end of file From 6cac5ceff78dbcd421a196949d3b2432ec3fffaf Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Tue, 7 Feb 2023 08:27:00 +0100 Subject: [PATCH 09/35] =?UTF-8?q?Libell=C3=A9s=20plus=20descriptifs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/scripts/piece-jointe/index.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/scripts/piece-jointe/index.phtml b/application/views/scripts/piece-jointe/index.phtml index 65fd52e5..7ffccd1e 100755 --- a/application/views/scripts/piece-jointe/index.phtml +++ b/application/views/scripts/piece-jointe/index.phtml @@ -17,7 +17,7 @@ Nom Description Date d'ajout - Envoyer vers Plat'AU + Statut Plat'AU @@ -29,7 +29,7 @@ - + + + + N'oubliez pas de sélectionner les documents à envoyer vers Plat'AU + + do; ?> verrouDossier != 1 && 'edit' == $action): ?>
    @@ -1894,7 +1940,7 @@ echo "
      -
    • +
    • "; if (count($this->preventionnistes) > 0) { foreach ($this->preventionnistes as $prev) { diff --git a/application/views/scripts/piece-jointe/display.phtml b/application/views/scripts/piece-jointe/display.phtml index e650ddad..465b1b95 100755 --- a/application/views/scripts/piece-jointe/display.phtml +++ b/application/views/scripts/piece-jointe/display.phtml @@ -26,7 +26,7 @@ - +
      En attente d'envoi
      diff --git a/application/views/scripts/piece-jointe/export.phtml b/application/views/scripts/piece-jointe/export.phtml new file mode 100644 index 00000000..ec8a731e --- /dev/null +++ b/application/views/scripts/piece-jointe/export.phtml @@ -0,0 +1,18 @@ +
    • +
      + + Liste des pièces jointes pouvant être envoyées vers Plat'AU +
      +
      + piecesJointes as $pieceJointe): ?> +
      +
      + +
      +
      + +
      +
      + +
      +
      • diff --git a/application/views/scripts/piece-jointe/index.phtml b/application/views/scripts/piece-jointe/index.phtml index 3786722f..944103ec 100755 --- a/application/views/scripts/piece-jointe/index.phtml +++ b/application/views/scripts/piece-jointe/index.phtml @@ -30,10 +30,6 @@
    - - isPlatau && count($this->listePj) > 0): ?> - - From 309d24f7276dfeaf8959ddb7554fc7b11e9a0359 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 20 Feb 2023 09:57:54 +0100 Subject: [PATCH 17/35] Renommage du fichier --- ...eces-jointes.sql => 2.x-01 - platau-export-pieces-jointes.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql/migrations/{2.5-47-platau-export-pieces-jointes.sql => 2.x-01 - platau-export-pieces-jointes.sql} (100%) diff --git a/sql/migrations/2.5-47-platau-export-pieces-jointes.sql b/sql/migrations/2.x-01 - platau-export-pieces-jointes.sql similarity index 100% rename from sql/migrations/2.5-47-platau-export-pieces-jointes.sql rename to sql/migrations/2.x-01 - platau-export-pieces-jointes.sql From a62bcce1a5df0768846623706e4417bddcc6d664 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Wed, 15 Mar 2023 10:08:21 +0100 Subject: [PATCH 18/35] syntaxe composer 2 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 52931164..78228fea 100755 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { - "name": "SDIS62/prevarisc", + "name": "sdis62/prevarisc", "description": "Application web open-source gérant l'ensemble de l'activité du service prévention au sein d'un SDIS.", @@ -23,7 +23,7 @@ "cybermonde/odtphp": "^1.0", "michelf/php-markdown": "^1.0", "kdubuc/gd_resize": "^1.0", - "SDIS62/toolbox": "dev-master", + "sdis62/toolbox": "dev-master", "sebastian/git": "^1.0", "sabre/vobject": "^4.0" }, From c0e0a6b28b58ed08548b9c8317877457f8789d7d Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 27 Feb 2023 16:04:45 +0100 Subject: [PATCH 19/35] Ajout de statuts pour la pec et l'avis platau & Affichage en front --- application/controllers/DossierController.php | 17 ++++ application/layouts/dossier.phtml | 75 ++++++++++------ .../models/DbTable/PlatauConsultation.php | 6 ++ application/models/Enum/PlatauStatutAvis.php | 21 +++++ application/models/Enum/PlatauStatutPec.php | 21 +++++ application/models/PlatauConsultation.php | 70 +++++++++++++++ .../models/PlatauConsultationMapper.php | 88 +++++++++++++++++++ .../2.x-02 - platau-renvoi-pec-avis.sql | 10 +++ 8 files changed, 282 insertions(+), 26 deletions(-) create mode 100644 application/models/DbTable/PlatauConsultation.php create mode 100644 application/models/Enum/PlatauStatutAvis.php create mode 100644 application/models/Enum/PlatauStatutPec.php create mode 100644 application/models/PlatauConsultation.php create mode 100644 application/models/PlatauConsultationMapper.php create mode 100644 sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql diff --git a/application/controllers/DossierController.php b/application/controllers/DossierController.php index 2dcea60e..0866718f 100644 --- a/application/controllers/DossierController.php +++ b/application/controllers/DossierController.php @@ -169,6 +169,23 @@ public function init() $dossier = $DBdossier->find($id_dossier)->current(); $this->view->id_platau = null !== $dossier['ID_PLATAU'] ? $dossier['ID_PLATAU'] : null; + if (null !== $dossier['ID_PLATAU']) { + $platauConsultationMapper = new Model_PlatauConsultationMapper(); + $platauConsultationModel = new Model_PlatauConsultation(); + $this->view->enumStatutsPec = new Model_Enum_PlatauStatutPec(); + $this->view->enumStatutsAvis = new Model_Enum_PlatauStatutAvis(); + + $this->view->statutPec = $this->view->enumStatutsPec::INCONNU; + $this->view->statutAvis = $this->view->enumStatutsAvis::INCONNU; + + $platauConsultation = $platauConsultationMapper->find($dossier['ID_PLATAU'], $platauConsultationModel); + + if (null !== $platauConsultation) { + $this->view->statutPec = $platauConsultation->getStatutPec(); + $this->view->statutAvis = $platauConsultation->getStatutAvis(); + } + } + $DBdossierType = new Model_DbTable_DossierType(); $libelleType = $DBdossierType->find($dossier->TYPE_DOSSIER)->current(); diff --git a/application/layouts/dossier.phtml b/application/layouts/dossier.phtml index 34d770a7..405ea835 100755 --- a/application/layouts/dossier.phtml +++ b/application/layouts/dossier.phtml @@ -1,15 +1,13 @@ action != "add" && $this->do != "new" ) : ?> placeholder('lateral_navigation')->captureStart(); // Capture du 'lateral_navigation' ?> - +
      - - -
    • "> - Informations générales -
      • - - action == "index" ) ? "active" : "read" ?>"> + Informations générales + + + idTypeDossier == 1 && $this->natureDossier != 3 && $this->natureDossier != 9) { echo "
    • "; } ?> - +
    • - Établissements et dossiers liés
      • - + natureDossier != 40 && $this->natureDossier != 41 && $this->natureDossier != 42 && $this->natureDossier != 44) { echo "
    • @@ -52,7 +50,7 @@
      • "; } ?> - +
    • Pièces jointes @@ -63,7 +61,7 @@ if ($this->verrou == 1 || (isset($action) && $action == 'new')) { $label = "Déverrouiller"; $idLink = "DEVERROU"; - } else { + } else { $label = "Verrouiller"; $idLink = "VERROU"; $verrou = false; @@ -91,7 +89,7 @@ endif; ?> placeholder('page_header')->captureStart(); //$this->placeholder('before_content')->captureStart() // Capture du 'before_content' ?> -action == "add" || $this->do == "new" ){ //Cas d'ajout d'un nouveau dossier echo " @@ -141,7 +139,7 @@ endif; ?> } echo ")"; } - + echo " #".$etablissementInfos['general']['NUMEROID_ETABLISSEMENT'].""; } echo " @@ -156,9 +154,34 @@ endif; ?>
      ".nl2br($this->objetDossier)."       "; - if($this->id_platau !== null) { - echo "

      CONSULTATION PLATAU : " . $this->id_platau . "

      "; - } + if($this->id_platau !== null){ ?> +

      CONSULTATION PLATAU : id_platau ?>

      +
      + + enumStatutsPec::INCONNU !== $this->statutPec): ?> + enumStatutsPec::EN_ATTENTE === $this->statutPec): ?> +

      + enumStatutsPec::PRISE_EN_COMPTE === $this->statutPec): ?> +

      + enumStatutsPec::A_RENVOYER === $this->statutPec): ?> +

      + + Statut de la prise en compte métier : enumStatutsPec->getLabel($this->statutPec) ?> +

      + + + enumStatutsAvis::INCONNU !== $this->statutAvis): ?> + enumStatutsAvis::EN_COURS === $this->statutAvis): ?> +

      + enumStatutsAvis::TRAITE === $this->statutAvis): ?> +

      + enumStatutsAvis::A_RENVOYER === $this->statutAvis): ?> +

      + + Statut de l'avis : enumStatutsAvis->getLabel($this->statutAvis) ?> +

      + + @@ -168,13 +191,13 @@ endif; ?> if($nbEtab > 0){ if($nbEtab == 1 && $this->enteteEtab[0]["LIBELLE_GENRE"] == "Site"){ echo "Site concerné :  "; - + echo " - ".$this->enteteEtab[0]['LIBELLE_ETABLISSEMENTINFORMATIONS']." + ".$this->enteteEtab[0]['LIBELLE_ETABLISSEMENTINFORMATIONS']." "; - + echo " #".$this->enteteEtab[0]['infosEtab']['general']['NUMEROID_ETABLISSEMENT'].""; }else{ echo "Etablissement(s) concerné(s) :  "; @@ -233,9 +256,9 @@ endif; ?> } echo ")"; } - - echo " #".$value['infosEtab']['general']['NUMEROID_ETABLISSEMENT'].""; - + + echo " #".$value['infosEtab']['general']['NUMEROID_ETABLISSEMENT'].""; + $i++; } } @@ -304,7 +327,7 @@ endif; ?> }); return false; }); - + $("#DEVERROU").live('click',function(){ $.ajax({ url: "/dossier/deverrou", diff --git a/application/models/DbTable/PlatauConsultation.php b/application/models/DbTable/PlatauConsultation.php new file mode 100644 index 00000000..47d48767 --- /dev/null +++ b/application/models/DbTable/PlatauConsultation.php @@ -0,0 +1,6 @@ + null, + self::EN_COURS => 'En cours', + self::TRAITE => 'Traité', + self::A_RENVOYER => 'Traité (en attente de renvoi)', + ]; + + public const INCONNU = 'unknown'; + public const EN_COURS = 'in_progress'; + public const TRAITE = 'treated'; + public const A_RENVOYER = 'to_export'; + + public function getLabel(string $enumValue): string + { + return self::LABELS[$enumValue]; + } +} diff --git a/application/models/Enum/PlatauStatutPec.php b/application/models/Enum/PlatauStatutPec.php new file mode 100644 index 00000000..043e755d --- /dev/null +++ b/application/models/Enum/PlatauStatutPec.php @@ -0,0 +1,21 @@ + null, + self::EN_ATTENTE => 'En attente', + self::PRISE_EN_COMPTE => 'Prise en compte', + self::A_RENVOYER => 'Prise en compte (en attente de renvoi)', + ]; + + public const INCONNU = 'unknown'; + public const EN_ATTENTE = 'awaiting'; + public const PRISE_EN_COMPTE = 'taken_into_account'; + public const A_RENVOYER = 'to_export'; + + public function getLabel(string $enumValue): string + { + return self::LABELS[$enumValue]; + } +} diff --git a/application/models/PlatauConsultation.php b/application/models/PlatauConsultation.php new file mode 100644 index 00000000..dfc384c1 --- /dev/null +++ b/application/models/PlatauConsultation.php @@ -0,0 +1,70 @@ +id = $id; + + return $this; + } + + public function getId(): string + { + return $this->id; + } + + public function setStatutAvis(string $statutAvis): self + { + $this->statutAvis = $statutAvis; + + return $this; + } + + public function getStatutAvis(): string + { + return $this->statutAvis; + } + + public function setDateAvis(string $dateAvis): self + { + $this->dateAvis = $dateAvis; + + return $this; + } + + public function getDateAvis(): string + { + return $this->dateAvis; + } + + public function setStatutPec(string $statutPec): self + { + $this->statutPec = $statutPec; + + return $this; + } + + public function getStatutPec(): string + { + return $this->statutPec; + } + + public function setDatePec(string $datePec): self + { + $this->datePec = $datePec; + + return $this; + } + + public function getDatePec(): string + { + return $this->datePec; + } +} diff --git a/application/models/PlatauConsultationMapper.php b/application/models/PlatauConsultationMapper.php new file mode 100644 index 00000000..8a58f01c --- /dev/null +++ b/application/models/PlatauConsultationMapper.php @@ -0,0 +1,88 @@ +dbTable = $dbTable; + + return $this; + } + + public function getDbTable() + { + if (null === $this->dbTable) { + $this->setDbTable(Model_DbTable_PlatauConsultation::class); + } + + return $this->dbTable; + } + + public function save(Model_PlatauConsultation $consultation): void + { + $data = [ + 'statutAvis' => $consultation->getStatutAvis(), + 'dateAvis' => $consultation->getDateAvis(), + 'statutPec' => $consultation->getStatutPec(), + 'datePec' => $consultation->getDatePec(), + ]; + + if (null === ($id = $consultation->getId())) { + unset($data['id']); + $this->getDbTable()->insert($data); + } else { + $this->getDbTable()->update($data, ['id = ?' => $id]); + } + } + + /** + * @return null|Model_PlatauConsultation + */ + public function find(string $id, Model_PlatauConsultation $consultation) + { + $result = $this->getDbTable()->find($id); + + if (0 === count($result)) { + return null; + } + + $row = $result->current(); + $consultation->setId($row->ID_PLATAU) + ->setStatutAvis($row->STATUT_AVIS) + ->setDateAvis($row->DATE_AVIS) + ->setStatutPec($row->STATUT_PEC) + ->setDatePec($row->DATE_PEC) + ; + + return $consultation; + } + + // TODO A voir si utile, à priori je pense pas + public function fetchAll(): array + { + $resultSet = $this->getDbTable()->fetchAll(); + $consultations = []; + + foreach ($resultSet as $row) { + $consultation = new Model_PlatauConsultation(); + $consultation->setId($row->id) + ->setStatutAvis($row->STATUT_AVIS) + ->setDateAvis($row->DATE_AVIS) + ->setStatutPec($row->STATUT_PEC) + ->setDatePec($row->DATE_PEC) + ; + + $consultations[] = $consultation; + } + + return $consultations; + } +} diff --git a/sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql b/sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql new file mode 100644 index 00000000..78e7fb5d --- /dev/null +++ b/sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql @@ -0,0 +1,10 @@ +SET NAMES 'utf8'; + +CREATE TABLE `platauconsultation` ( + `ID_PLATAU` char(11) NOT NULL, + `STATUT_AVIS` varchar(50), + `DATE_AVIS` date, + `STATUT_PEC` varchar(50), + `DATE_PEC` date, + PRIMARY KEY (`ID_PLATAU`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; From 13c7e2d3b4b024e05d9eb92b1822113f81e02a66 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 27 Feb 2023 17:09:23 +0100 Subject: [PATCH 20/35] Permet de renvoyer une pec ou un avis --- application/controllers/DossierController.php | 3 +- application/controllers/PlatauController.php | 43 +++++++++++++++++++ application/layouts/dossier.phtml | 14 +++++- .../models/PlatauConsultationMapper.php | 34 ++------------- application/navigation.xml | 5 --- public/js/dossier/platau.js | 29 +++++++++++++ 6 files changed, 90 insertions(+), 38 deletions(-) create mode 100644 application/controllers/PlatauController.php create mode 100644 public/js/dossier/platau.js diff --git a/application/controllers/DossierController.php b/application/controllers/DossierController.php index 0866718f..50c4a6d0 100644 --- a/application/controllers/DossierController.php +++ b/application/controllers/DossierController.php @@ -142,7 +142,8 @@ class DossierController extends Zend_Controller_Action public function init() { $this->_helper->layout->setLayout('dossier'); - $this->view->inlineScript()->appendFile('/js/dossier/dossierGeneral.js','text/javascript'); + $this->view->inlineScript()->appendFile('/js/dossier/dossierGeneral.js', 'text/javascript'); + $this->view->inlineScript()->appendFile('/js/dossier/platau.js', 'text/javascript'); // Actions à effectuées en AJAX $ajaxContext = $this->_helper->getHelper('AjaxContext'); diff --git a/application/controllers/PlatauController.php b/application/controllers/PlatauController.php new file mode 100644 index 00000000..3e27c75d --- /dev/null +++ b/application/controllers/PlatauController.php @@ -0,0 +1,43 @@ +_helper->getHelper('AjaxContext'); + $ajaxContext->addActionContext('selectionabreviation', 'json') + ->addActionContext('retryExportPec', 'json') + ->addActionContext('retryExportAvis', 'json') + ->initContext() + ; + + $this->platauConsultationMapper = new Model_PlatauConsultationMapper(); + } + + public function retryExportPecAction(): void + { + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + + $platauConsultation = $this->platauConsultationMapper->find($this->getParam('id'), new Model_PlatauConsultation()); + $platauConsultation->setStatutPec('to_export'); + + $this->platauConsultationMapper->save($platauConsultation); + } + + public function retryExportAvisAction(): void + { + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + + $platauConsultation = $this->platauConsultationMapper->find($this->getParam('id'), new Model_PlatauConsultation()); + $platauConsultation->setStatutAvis('to_export'); + + $this->platauConsultationMapper->save($platauConsultation); + } +} diff --git a/application/layouts/dossier.phtml b/application/layouts/dossier.phtml index 405ea835..db7479be 100755 --- a/application/layouts/dossier.phtml +++ b/application/layouts/dossier.phtml @@ -166,7 +166,14 @@ endif; ?> enumStatutsPec::A_RENVOYER === $this->statutPec): ?>

      - Statut de la prise en compte métier : enumStatutsPec->getLabel($this->statutPec) ?> + + Statut de la prise en compte métier : enumStatutsPec->getLabel($this->statutPec) ?> + enumStatutsPec::PRISE_EN_COMPTE === $this->statutPec): ?> + + + + +

      @@ -179,6 +186,11 @@ endif; ?>

      Statut de l'avis : enumStatutsAvis->getLabel($this->statutAvis) ?> + enumStatutsAvis::TRAITE === $this->statutAvis): ?> + + + +

      $consultation->getStatutAvis(), - 'dateAvis' => $consultation->getDateAvis(), - 'statutPec' => $consultation->getStatutPec(), - 'datePec' => $consultation->getDatePec(), + 'STATUT_AVIS' => $consultation->getStatutAvis(), + 'STATUT_PEC' => $consultation->getStatutPec(), ]; - if (null === ($id = $consultation->getId())) { - unset($data['id']); - $this->getDbTable()->insert($data); - } else { - $this->getDbTable()->update($data, ['id = ?' => $id]); - } + $this->getDbTable()->update($data, ['ID_PLATAU = ?' => $consultation->getId()]); } /** @@ -64,25 +57,4 @@ public function find(string $id, Model_PlatauConsultation $consultation) return $consultation; } - - // TODO A voir si utile, à priori je pense pas - public function fetchAll(): array - { - $resultSet = $this->getDbTable()->fetchAll(); - $consultations = []; - - foreach ($resultSet as $row) { - $consultation = new Model_PlatauConsultation(); - $consultation->setId($row->id) - ->setStatutAvis($row->STATUT_AVIS) - ->setDateAvis($row->DATE_AVIS) - ->setStatutPec($row->STATUT_PEC) - ->setDatePec($row->DATE_PEC) - ; - - $consultations[] = $consultation; - } - - return $consultations; - } } diff --git a/application/navigation.xml b/application/navigation.xml index ca611360..a98cb62d 100755 --- a/application/navigation.xml +++ b/application/navigation.xml @@ -686,11 +686,6 @@ check modification_odj - - piece-jointe - retryExportPlatau - modification_odj - diff --git a/public/js/dossier/platau.js b/public/js/dossier/platau.js new file mode 100644 index 00000000..33c990a1 --- /dev/null +++ b/public/js/dossier/platau.js @@ -0,0 +1,29 @@ +document.addEventListener('DOMContentLoaded', function() { + const retryExportPec = document.querySelector('#retry-export-pec') + + if (!!retryExportPec) { + retryExportPec.addEventListener('click', function () { + $.post( + "/platau/retry-export-pec", + { id: retryExportPec['attributes']['data-id'].value }, + () => { + location.reload() + } + ) + }) + } + + const retryExportAvis = document.querySelector('#retry-export-avis') + + if (!!retryExportAvis) { + retryExportAvis.addEventListener('click', function () { + $.post( + "/platau/retry-export-avis", + { id: retryExportAvis['attributes']['data-id'].value }, + () => { + location.reload() + } + ) + }) + } +}) \ No newline at end of file From dec2630d5d9bc4e23d6d937f40c259ecce38368e Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 6 Mar 2023 16:23:50 +0100 Subject: [PATCH 21/35] =?UTF-8?q?Correction=20sur=20la=20d=C3=A9finition?= =?UTF-8?q?=20de=20la=20table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql b/sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql index 78e7fb5d..a537964e 100644 --- a/sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql +++ b/sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql @@ -1,10 +1,10 @@ SET NAMES 'utf8'; -CREATE TABLE `platauconsultation` ( - `ID_PLATAU` char(11) NOT NULL, - `STATUT_AVIS` varchar(50), - `DATE_AVIS` date, - `STATUT_PEC` varchar(50), - `DATE_PEC` date, +CREATE TABLE IF NOT EXISTS `platauconsultation` ( + `ID_PLATAU` char(11), + `STATUT_AVIS` varchar(50) DEFAULT NULL, + `DATE_AVIS` date DEFAULT NULL, + `STATUT_PEC` varchar(50) DEFAULT NULL, + `DATE_PEC` date DEFAULT NULL, PRIMARY KEY (`ID_PLATAU`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From 613c2290fe84a39107713693003a7ccdbac94a3e Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 6 Mar 2023 16:28:11 +0100 Subject: [PATCH 22/35] =?UTF-8?q?Correction=20sur=20les=20valeurs=20par=20?= =?UTF-8?q?d=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/models/PlatauConsultation.php | 8 ++++---- application/models/PlatauConsultationMapper.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/models/PlatauConsultation.php b/application/models/PlatauConsultation.php index dfc384c1..62c97f4b 100644 --- a/application/models/PlatauConsultation.php +++ b/application/models/PlatauConsultation.php @@ -32,14 +32,14 @@ public function getStatutAvis(): string return $this->statutAvis; } - public function setDateAvis(string $dateAvis): self + public function setDateAvis(?string $dateAvis): self { $this->dateAvis = $dateAvis; return $this; } - public function getDateAvis(): string + public function getDateAvis(): ?string { return $this->dateAvis; } @@ -56,14 +56,14 @@ public function getStatutPec(): string return $this->statutPec; } - public function setDatePec(string $datePec): self + public function setDatePec(?string $datePec): self { $this->datePec = $datePec; return $this; } - public function getDatePec(): string + public function getDatePec(): ?string { return $this->datePec; } diff --git a/application/models/PlatauConsultationMapper.php b/application/models/PlatauConsultationMapper.php index 4c2746fc..a2a952ef 100644 --- a/application/models/PlatauConsultationMapper.php +++ b/application/models/PlatauConsultationMapper.php @@ -49,9 +49,9 @@ public function find(string $id, Model_PlatauConsultation $consultation) $row = $result->current(); $consultation->setId($row->ID_PLATAU) - ->setStatutAvis($row->STATUT_AVIS) + ->setStatutAvis($row->STATUT_AVIS ?? Model_Enum_PlatauStatutAvis::INCONNU) ->setDateAvis($row->DATE_AVIS) - ->setStatutPec($row->STATUT_PEC) + ->setStatutPec($row->STATUT_PEC ?? Model_Enum_PlatauStatutPec::INCONNU) ->setDatePec($row->DATE_PEC) ; From a156029fd905d19044dec4833bf587aad46646b2 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 6 Mar 2023 17:39:01 +0100 Subject: [PATCH 23/35] Ajout de la date d'envoi --- application/controllers/DossierController.php | 5 ++--- application/layouts/dossier.phtml | 10 ++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/application/controllers/DossierController.php b/application/controllers/DossierController.php index 50c4a6d0..c70f2bdc 100644 --- a/application/controllers/DossierController.php +++ b/application/controllers/DossierController.php @@ -176,14 +176,13 @@ public function init() $this->view->enumStatutsPec = new Model_Enum_PlatauStatutPec(); $this->view->enumStatutsAvis = new Model_Enum_PlatauStatutAvis(); - $this->view->statutPec = $this->view->enumStatutsPec::INCONNU; - $this->view->statutAvis = $this->view->enumStatutsAvis::INCONNU; - $platauConsultation = $platauConsultationMapper->find($dossier['ID_PLATAU'], $platauConsultationModel); if (null !== $platauConsultation) { $this->view->statutPec = $platauConsultation->getStatutPec(); + $this->view->datePec = $platauConsultation->getDatePec(); $this->view->statutAvis = $platauConsultation->getStatutAvis(); + $this->view->dateAvis = $platauConsultation->getDateAvis(); } } diff --git a/application/layouts/dossier.phtml b/application/layouts/dossier.phtml index db7479be..965a3c9f 100755 --- a/application/layouts/dossier.phtml +++ b/application/layouts/dossier.phtml @@ -168,6 +168,11 @@ endif; ?> Statut de la prise en compte métier : enumStatutsPec->getLabel($this->statutPec) ?> + + datePec): ?> + le datePec ?> + + enumStatutsPec::PRISE_EN_COMPTE === $this->statutPec): ?> @@ -186,6 +191,11 @@ endif; ?>

      Statut de l'avis : enumStatutsAvis->getLabel($this->statutAvis) ?> + + dateAvis): ?> + le dateAvis ?> + + enumStatutsAvis::TRAITE === $this->statutAvis): ?> From 0dbca175b8288f399c8ab8a7cbad7def4e431296 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 13 Mar 2023 11:08:49 +0100 Subject: [PATCH 24/35] Ajout d'un statut d'erreur --- application/layouts/dossier.phtml | 4 ++++ application/models/Enum/PlatauStatutAvis.php | 2 ++ application/models/Enum/PlatauStatutPec.php | 2 ++ 3 files changed, 8 insertions(+) diff --git a/application/layouts/dossier.phtml b/application/layouts/dossier.phtml index 965a3c9f..f10360a6 100755 --- a/application/layouts/dossier.phtml +++ b/application/layouts/dossier.phtml @@ -165,6 +165,8 @@ endif; ?>

      enumStatutsPec::A_RENVOYER === $this->statutPec): ?>

      + enumStatutsPec::EN_ERREUR === $this->statutPec): ?> +

      Statut de la prise en compte métier : enumStatutsPec->getLabel($this->statutPec) ?> @@ -189,6 +191,8 @@ endif; ?>

      enumStatutsAvis::A_RENVOYER === $this->statutAvis): ?>

      + enumStatutsAvis::EN_ERREUR === $this->statutAvis): ?> +

      Statut de l'avis : enumStatutsAvis->getLabel($this->statutAvis) ?> diff --git a/application/models/Enum/PlatauStatutAvis.php b/application/models/Enum/PlatauStatutAvis.php index 0a4ba01c..323f3af3 100644 --- a/application/models/Enum/PlatauStatutAvis.php +++ b/application/models/Enum/PlatauStatutAvis.php @@ -7,12 +7,14 @@ class Model_Enum_PlatauStatutAvis self::EN_COURS => 'En cours', self::TRAITE => 'Traité', self::A_RENVOYER => 'Traité (en attente de renvoi)', + self::EN_ERREUR => 'En erreur', ]; public const INCONNU = 'unknown'; public const EN_COURS = 'in_progress'; public const TRAITE = 'treated'; public const A_RENVOYER = 'to_export'; + public const EN_ERREUR = 'in_error'; public function getLabel(string $enumValue): string { diff --git a/application/models/Enum/PlatauStatutPec.php b/application/models/Enum/PlatauStatutPec.php index 043e755d..231423b9 100644 --- a/application/models/Enum/PlatauStatutPec.php +++ b/application/models/Enum/PlatauStatutPec.php @@ -7,12 +7,14 @@ class Model_Enum_PlatauStatutPec self::EN_ATTENTE => 'En attente', self::PRISE_EN_COMPTE => 'Prise en compte', self::A_RENVOYER => 'Prise en compte (en attente de renvoi)', + self::EN_ERREUR => 'En erreur', ]; public const INCONNU = 'unknown'; public const EN_ATTENTE = 'awaiting'; public const PRISE_EN_COMPTE = 'taken_into_account'; public const A_RENVOYER = 'to_export'; + public const EN_ERREUR = 'in_error'; public function getLabel(string $enumValue): string { From 3efd5e9a80083eda7b1fb4f4df58191287fe8263 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 13 Mar 2023 11:22:35 +0100 Subject: [PATCH 25/35] =?UTF-8?q?Emp=C3=AAche=20le=20renvoi=20de=20PEC=20e?= =?UTF-8?q?t=20le=20changement=20d'avis=20une=20fois=20l'avis=20rendu=20su?= =?UTF-8?q?r=20Plat'AU?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/layouts/dossier.phtml | 5 +- application/views/scripts/dossier/index.phtml | 619 +++++++++++------- 2 files changed, 390 insertions(+), 234 deletions(-) diff --git a/application/layouts/dossier.phtml b/application/layouts/dossier.phtml index f10360a6..fcc63de6 100755 --- a/application/layouts/dossier.phtml +++ b/application/layouts/dossier.phtml @@ -175,7 +175,10 @@ endif; ?> le datePec ?> - enumStatutsPec::PRISE_EN_COMPTE === $this->statutPec): ?> + enumStatutsPec::PRISE_EN_COMPTE === $this->statutPec && + null === $this->dateAvis + ): ?> diff --git a/application/views/scripts/dossier/index.phtml b/application/views/scripts/dossier/index.phtml index 3c8fefc7..c78024d0 100755 --- a/application/views/scripts/dossier/index.phtml +++ b/application/views/scripts/dossier/index.phtml @@ -1736,239 +1736,392 @@ echo " } } elseif (2 == $this->infosDossier['TYPE_DOSSIER'] || 3 == $this->infosDossier['TYPE_DOSSIER']) { //visite et groupe de visite - if ($this->natureConcerne[0]['ID_NATURE'] == 20 || $this->natureConcerne[0]['ID_NATURE'] == 25) { - //Reception de travaux - echo " à la reception des travaux"; - } else { - //Reste des visites - echo " à l'exploitation"; - } - } - echo " - - -

      - -     - is_allowed_change_avis) ? '' : 'disabled')."/> Répercuter l'avis sur les établissements enfants -
      -
      • -
    • infosDossier['FACTDANGE_DOSSIER'] != NULL && $this->infosDossier['FACTDANGE_DOSSIER'] != 0) ? "" : "display:none;")."'> -
      Facteur de criticité
      -
      ".$this->infosDossier['FACTDANGE_DOSSIER']."
      -
      - -
      -
      • -
    • infosDossier['ECHEANCIERTRAV_DOSSIER'] != NULL) ? "" : "display:none;")."'> -
      Echéancier de travaux / Schéma de mise en sécurité
      -
      ".$this->infosDossier['ECHEANCIERTRAV_DOSSIER']."
      -
      - infosDossier['ECHEANCIERTRAV_DOSSIER'] != NULL) ? "checked='checked'" : "")."/> - -
      -
      • -
    • infosDossier['ANOMALIE_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Analyse de risque
      -
      ".nl2br($this->infosDossier['ANOMALIE_DOSSIER'])."
      -
      - -
      -
      • -
    • afficherChamps) && $this->infosDossier['OBSERVATION_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Observations
      -
      ".nl2br($this->infosDossier['OBSERVATION_DOSSIER'])."
      -
      - -
      -
      • - -
    • afficherChamps) && $this->infosDossier['DATEPREF_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Date réception préfecture
      -
      ".$this->infosDossier['DATEPREF_DOSSIER']."
      -
      - -   -
      -
      • -
    • afficherChamps) && $this->infosDossier['DATEREP_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Date de réponse
      -
      ".$this->infosDossier['DATEREP_DOSSIER']."
      -
      - -   -
      -
      • -
    • afficherChamps) && $this->infosDossier['DATETRANSFERTCOMM_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Date de transfert à la commissions compétente
      -
      ".$this->infosDossier['DATETRANSFERTCOMM_DOSSIER']."
      -
      - "; - if($this->DATETRANSFERTCOMM){ - $dateTransfertTemp= new Zend_Date($this->DATETRANSFERTCOMM, Zend_Date::DATES); - $dateTransfertComm = $dateTransfertTemp->get(Zend_Date::DAY."/".Zend_Date::MONTH."/".Zend_Date::YEAR); - }else{ - $dateTransfertComm = ""; - } - echo " - -   -
      -
      • -
    • afficherChamps) && $this->infosDossier['DATERECEPTIONCOMM_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Date de réception à la commissions compétente
      -
      ".$this->infosDossier['DATERECEPTIONCOMM_DOSSIER']."
      -
      - "; - if($this->DATERECEPTIONCOMM){ - $dateReceptTemp= new Zend_Date($this->DATERECEPTIONCOMM, Zend_Date::DATES); - $dateReceptTemp = $dateReceptTemp->get(Zend_Date::DAY."/".Zend_Date::MONTH."/".Zend_Date::YEAR); - }else{ - $dateReceptTemp = ""; - } - echo " - -   -
      -
      • -
    • afficherChamps) && $this->infosDossier['DATEREUN_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Date réunion
      -
      ".$this->infosDossier['DATEREUN_DOSSIER']."
      -
      - -   -
      -
      • -
    • afficherChamps) && $this->infosDossier['OPERSDIS_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Opération (intervention) SDIS
      -
      - "; - if (1 == $this->infosDossier['OPERSDIS_DOSSIER']) { - echo "oui"; - } elseif (0 == $this->infosDossier['OPERSDIS_DOSSIER']) { - echo "non"; - } - echo " -
      -
      -
      - infosDossier['OPERSDIS_DOSSIER']) ? "checked" : "").">Oui
      - infosDossier['OPERSDIS_DOSSIER']) ? "checked" : "").">Non
      -
      -
      -
      • -
    • afficherChamps) && $this->infosDossier['RCCI_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      RCCI (oui/non) lien rapport
      -
      - "; - if (1 == $this->infosDossier['RCCI_DOSSIER']) { - echo "oui"; - } elseif (0 == $this->infosDossier['RCCI_DOSSIER']) { - echo "non"; - } - echo " -
      -
      -
      - infosDossier['RCCI_DOSSIER']) ? "checked" : "").">Oui
      - infosDossier['RCCI_DOSSIER']) ? "checked" : "").">Non
      -
      -
      -
      • -
    • afficherChamps) && $this->infosDossier['REX_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      REX
      -
      ".$this->infosDossier['REX_DOSSIER']."
      -
      - infosDossier['REX_DOSSIER'] : "")."' /> -
      -
      • -
    • afficherChamps) && $this->infosDossier['CHARGESEC_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Chargé de sécurité (T)
      -
      ".$this->infosDossier['CHARGESEC_DOSSIER']."
      -
      - -
      -
      • -
    • afficherChamps) && $this->infosDossier['DUREEDEPL_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Durée de déplacement
      -
      ".$this->infosDossier['DUREEDEPL_DOSSIER']."
      -
      - -
      -
      • -
    • afficherChamps) && $this->infosDossier['GRAVPRESC_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Gravité prescription
      -
      ".$this->infosDossier['GRAVPRESC_DOSSIER']."
      -
      - -
      -
      • -
    • afficherChamps) && $this->infosDossier['NUMINTERV_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Numéro d'intervention
      -
      ".$this->infosDossier['NUMINTERV_DOSSIER']."
      -
      - infosDossier['NUMINTERV_DOSSIER'] : "")."' /> -
      -
      • -
    • afficherChamps) && $this->infosDossier['DATEINTERV_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Date et heure d'intervention
      -
      ".$this->infosDossier['DATEINTERV_DOSSIER']." - ".$this->HEUREINTERV_INPUT."
      -
      - - -
      -
      • -
    • afficherChamps) && $this->infosDossier['DUREEINTERV_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Durée intervention
      -
      ".$this->infosDossier['DUREEINTERV_DOSSIER']."
      -
      - infosDossier['DUREEINTERV_DOSSIER'] : "")."' /> -
      -
      • -
    • afficherChamps) && $this->infosDossier['DATESIGN_DOSSIER'] != '') ? "" : "display:none;")."margin-bottom:20px;'> -
      Date de signature
      -
      ".$this->infosDossier['DATESIGN_DOSSIER']."
      -
      - -   -
      -
      • -
    • afficherChamps) && count($this->preventionnistes) != 0) ? "" : "display:none;")."margin-bottom:20px;'> -
      Préventionniste(s) du dossier
      -
      - ".$this->partialLoop('users/embedded/user.phtml', $this->preventionnistes)." -
      -
      -
        -
      • - "; - if (count($this->preventionnistes) > 0) { - foreach ($this->preventionnistes as $prev) { - echo " - - + if (in_array($this->natureConcerne[0]['ID_NATURE'], array(20, 25))) : ?> + + à la reception des travaux + + + à l'exploitation + + + +
      +
      > + +
      +
      • +
    • afficherChamps) && $this->infosDossier['DELAIPRESC_DOSSIER'] != '0000-00-00' && $this->infosDossier['DELAIPRESC_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Date avant laquelle les prescriptions doivent être + levées
      +
      > + infosDossier['DELAIPRESC_DOSSIER'] ?> +
      +
      > + infosDossier['DELAIPRESC_DOSSIER']) ? "checked" : "" ?>> + afficherChamps) && $this->infosDossier['DELAIPRESC_DOSSIER'] != '0000-00-00' && $this->infosDossier['DELAIPRESC_DOSSIER'] != '') ? "" : "display:none;" ?>'> + +   + + +
      +
      • +
    • afficherChamps) && $this->infosDossier['AVIS_DOSSIER_COMMISSION'] != '0' && 1 == $this->afficheAvis) ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Avis de la commission
      +
      > + '> + AVIS_COMMISSION_VALUE['LIBELLE_AVIS']; + if (1 == $this->infosDossier['TYPE_DOSSIER']) : + //etude + if (in_array($this->natureConcerne[0]['ID_NATURE'], array(7, 16, 17, 19))) : ?> + à l'exploitation + + à l'étude + infosDossier['TYPE_DOSSIER'], array(2, 3))) : + //visite et groupe de visite + if (in_array($this->natureConcerne[0]['ID_NATURE'], array(20, 25))) : ?> + + à la reception des travaux + + + à l'exploitation + + +
      +
      > + +     + is_allowed_change_avis && null === $this->dateAvis) ? '' : 'disabled' ?> /> Répercuter l'avis sur les + établissements enfants +
      +
      • +
    • infosDossier['FACTDANGE_DOSSIER'] != null && $this->infosDossier['FACTDANGE_DOSSIER'] != 0) ? "" : "display:none;" ?>'> +
      Facteur de criticité
      +
      > + '> + infosDossier['FACTDANGE_DOSSIER'] ?> + +
      +
      > + +
      +
      • +
    • infosDossier['ECHEANCIERTRAV_DOSSIER'] != null) ? "" : "display:none;" ?>'> +
      Echéancier de travaux / Schéma de mise en sécurité +
      +
      > + infosDossier['ECHEANCIERTRAV_DOSSIER'] ?> +
      +
      > + infosDossier['ECHEANCIERTRAV_DOSSIER'] != null) ? "checked='checked'" : "" ?> /> + ' + id='ECHEANCIERTRAV_DOSSIER' name='ECHEANCIERTRAV_DOSSIER' /> +
      +
      • +
    • infosDossier['ANOMALIE_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Analyse de risque
      +
      > + infosDossier['ANOMALIE_DOSSIER']) ?> +
      +
      > + +
      +
      • +
    • afficherChamps) && $this->infosDossier['OBSERVATION_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Observations
      +
      > + infosDossier['OBSERVATION_DOSSIER']) ?> +
      +
      > + +
      +
      • +
    • afficherChamps) && $this->infosDossier['DATEPREF_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Date réception préfecture
      +
      > + infosDossier['DATEPREF_DOSSIER'] ?> +
      +
      > + +   + +
      +
      • +
    • afficherChamps) && $this->infosDossier['DATEREP_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Date de réponse
      +
      > + infosDossier['DATEREP_DOSSIER'] ?> +
      +
      > + +   + +
      +
      • +
    • afficherChamps) && $this->infosDossier['DATETRANSFERTCOMM_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Date de transfert à la commissions compétente
      +
      > + infosDossier['DATETRANSFERTCOMM_DOSSIER'] ?> +
      +
      > + DATETRANSFERTCOMM) { + $dateTransfertTemp= new Zend_Date($this->DATETRANSFERTCOMM, Zend_Date::DATES); + $dateTransfertComm = $dateTransfertTemp->get(Zend_Date::DAY."/".Zend_Date::MONTH."/".Zend_Date::YEAR); + } ?> + +   + +
      +
      • +
    • afficherChamps) && $this->infosDossier['DATERECEPTIONCOMM_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Date de réception à la commissions compétente
      +
      > + infosDossier['DATERECEPTIONCOMM_DOSSIER'] ?> +
      +
      > + DATERECEPTIONCOMM) { + $dateReceptTemp= new Zend_Date($this->DATERECEPTIONCOMM, Zend_Date::DATES); + $dateReceptTemp = $dateReceptTemp->get(Zend_Date::DAY."/".Zend_Date::MONTH."/".Zend_Date::YEAR); + } ?> + +   + +
      +
      • +
    • afficherChamps) && $this->infosDossier['DATEREUN_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Date réunion
      +
      > + infosDossier['DATEREUN_DOSSIER'] ?> +
      +
      > + +   + +
      +
      • +
    • afficherChamps) && $this->infosDossier['OPERSDIS_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Opération (intervention) SDIS
      +
      > + infosDossier['OPERSDIS_DOSSIER']) : ?> + oui + infosDossier['OPERSDIS_DOSSIER']) : ?> + non + +
      +
      > +
      + infosDossier['OPERSDIS_DOSSIER']) ? "checked" : "" ?>> Oui
      + infosDossier['OPERSDIS_DOSSIER']) ? "checked" : "" ?>> Non
      +
      +
      +
      • +
    • afficherChamps) && $this->infosDossier['RCCI_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      RCCI (oui/non) lien rapport
      +
      > + infosDossier['RCCI_DOSSIER']) : ?> + oui + infosDossier['RCCI_DOSSIER']) : ?> + non + +
      +
      > +
      + infosDossier['RCCI_DOSSIER']) ? "checked" : "" ?>> Oui
      + infosDossier['RCCI_DOSSIER']) ? "checked" : "" ?>> Non
      +
      +
      +
      • +
    • afficherChamps) && $this->infosDossier['REX_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      REX
      +
      > + infosDossier['REX_DOSSIER'] ?> +
      +
      > + infosDossier['REX_DOSSIER'] : "" ?>' /> +
      +
      • +
    • afficherChamps) && $this->infosDossier['CHARGESEC_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Chargé de sécurité (T)
      +
      > + infosDossier['CHARGESEC_DOSSIER'] ?> +
      +
      > + +
      +
      • +
    • afficherChamps) && $this->infosDossier['DUREEDEPL_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Durée de déplacement
      +
      > + infosDossier['DUREEDEPL_DOSSIER'] ?> +
      +
      > + +
      +
      • +
    • afficherChamps) && $this->infosDossier['GRAVPRESC_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Gravité prescription
      +
      > + infosDossier['GRAVPRESC_DOSSIER'] ?> +
      +
      > + +
      +
      • +
    • afficherChamps) && $this->infosDossier['NUMINTERV_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Numéro d'intervention
      +
      > + infosDossier['NUMINTERV_DOSSIER'] ?> +
      +
      > + infosDossier['NUMINTERV_DOSSIER'] : "" ?>' /> +
      +
      • +
    • afficherChamps) && $this->infosDossier['DATEINTERV_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Date et heure d'intervention
      +
      > + infosDossier['DATEINTERV_DOSSIER']." - ".$this->HEUREINTERV_INPUT ?> +
      +
      > + + +
      +
      • +
    • afficherChamps) && $this->infosDossier['DUREEINTERV_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Durée intervention
      +
      > + infosDossier['DUREEINTERV_DOSSIER'] ?> +
      +
      > + infosDossier['DUREEINTERV_DOSSIER'] : "" ?>' /> +
      +
      • +
    • afficherChamps) && $this->infosDossier['DATESIGN_DOSSIER'] != '') ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Date de signature
      +
      > + infosDossier['DATESIGN_DOSSIER'] ?> +
      +
      > + +   + +
      +
      • +
    • afficherChamps) && count($this->preventionnistes) != 0) ? "" : "display:none;" ?>margin-bottom:20px;'> +
      Préventionniste(s) du dossier
      +
      > + partialLoop('users/embedded/user.phtml', $this->preventionnistes) ?> +
      +
      > +
        +
      • + preventionnistes) > 0) : + foreach ($this->preventionnistes as $prev) : ?> + + ".$prev["NOM_UTILISATEURINFORMATIONS"]." ".$prev["PRENOM_UTILISATEURINFORMATIONS"]." From 35ec646f9e945910a17ebba400566b03f00bd81b Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 13 Mar 2023 11:55:13 +0100 Subject: [PATCH 26/35] =?UTF-8?q?Affiche=20la=20liste=20des=20PJs=20si=20l?= =?UTF-8?q?e=20statut=20est=20"=C3=A0=20renvoyer"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/layouts/dossier.phtml | 16 ++++++++-------- application/views/scripts/dossier/index.phtml | 8 ++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/application/layouts/dossier.phtml b/application/layouts/dossier.phtml index fcc63de6..6164d1e4 100755 --- a/application/layouts/dossier.phtml +++ b/application/layouts/dossier.phtml @@ -160,13 +160,13 @@ endif; ?> enumStatutsPec::INCONNU !== $this->statutPec): ?> enumStatutsPec::EN_ATTENTE === $this->statutPec): ?> -

        +

        enumStatutsPec::PRISE_EN_COMPTE === $this->statutPec): ?> -

        +

        enumStatutsPec::A_RENVOYER === $this->statutPec): ?> -

        +

        enumStatutsPec::EN_ERREUR === $this->statutPec): ?> -

        +

        Statut de la prise en compte métier : enumStatutsPec->getLabel($this->statutPec) ?> @@ -189,13 +189,13 @@ endif; ?> enumStatutsAvis::INCONNU !== $this->statutAvis): ?> enumStatutsAvis::EN_COURS === $this->statutAvis): ?> -

        +

        enumStatutsAvis::TRAITE === $this->statutAvis): ?> -

        +

        enumStatutsAvis::A_RENVOYER === $this->statutAvis): ?> -

        +

        enumStatutsAvis::EN_ERREUR === $this->statutAvis): ?> -

        +

        Statut de l'avis : enumStatutsAvis->getLabel($this->statutAvis) ?> diff --git a/application/views/scripts/dossier/index.phtml b/application/views/scripts/dossier/index.phtml index c78024d0..0ac5e073 100755 --- a/application/views/scripts/dossier/index.phtml +++ b/application/views/scripts/dossier/index.phtml @@ -965,6 +965,14 @@ document.getElementById('PIECESJOINTES').scrollIntoView() $('#PIECESJOINTES').focus() }) + + if ($('#statut-pec').hasClass('label-warning')) { + afficheInfosPlatau($('#INCOMPLET')) + } + + if ($('#statut-avis').hasClass('label-warning')) { + afficheInfosPlatau($('#AVIS_COMMISSION')) + } } function gestionMasquageInfosPlatau() { From 91287a5a715986aeda5ce198e85f84645adfacc6 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Wed, 29 Mar 2023 16:30:18 +0200 Subject: [PATCH 27/35] =?UTF-8?q?Correction=20pour=20les=20dossiers=20arri?= =?UTF-8?q?v=C3=A9s=20avant=20l'ajout=20des=20statuts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/layouts/dossier.phtml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/application/layouts/dossier.phtml b/application/layouts/dossier.phtml index 6164d1e4..80421b09 100755 --- a/application/layouts/dossier.phtml +++ b/application/layouts/dossier.phtml @@ -158,7 +158,10 @@ endif; ?>

        CONSULTATION PLATAU : id_platau ?>


        - enumStatutsPec::INCONNU !== $this->statutPec): ?> + statutPec && + $this->enumStatutsPec::INCONNU !== $this->statutPec + ): ?> enumStatutsPec::EN_ATTENTE === $this->statutPec): ?>

        enumStatutsPec::PRISE_EN_COMPTE === $this->statutPec): ?> @@ -187,7 +190,10 @@ endif; ?>

        - enumStatutsAvis::INCONNU !== $this->statutAvis): ?> + statutAvis && + $this->enumStatutsAvis::INCONNU !== $this->statutAvis + ): ?> enumStatutsAvis::EN_COURS === $this->statutAvis): ?>

        enumStatutsAvis::TRAITE === $this->statutAvis): ?> From 169b3727e3ee7197ddc288e285bc418cb70e4fa5 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Wed, 5 Apr 2023 17:05:46 +0200 Subject: [PATCH 28/35] =?UTF-8?q?Renommage=20des=20SQLs=20pour=20ne=20pas?= =?UTF-8?q?=20planter=20=C3=A0=20l'installation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pieces-jointes.sql => 2.x-01-platau-export-pieces-jointes.sql} | 0 ...atau-renvoi-pec-avis.sql => 2.x-02-platau-renvoi-pec-avis.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename sql/migrations/{2.x-01 - platau-export-pieces-jointes.sql => 2.x-01-platau-export-pieces-jointes.sql} (100%) rename sql/migrations/{2.x-02 - platau-renvoi-pec-avis.sql => 2.x-02-platau-renvoi-pec-avis.sql} (100%) diff --git a/sql/migrations/2.x-01 - platau-export-pieces-jointes.sql b/sql/migrations/2.x-01-platau-export-pieces-jointes.sql similarity index 100% rename from sql/migrations/2.x-01 - platau-export-pieces-jointes.sql rename to sql/migrations/2.x-01-platau-export-pieces-jointes.sql diff --git a/sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql b/sql/migrations/2.x-02-platau-renvoi-pec-avis.sql similarity index 100% rename from sql/migrations/2.x-02 - platau-renvoi-pec-avis.sql rename to sql/migrations/2.x-02-platau-renvoi-pec-avis.sql From d9fb157e0b881f617e4931faceb97841508b11f9 Mon Sep 17 00:00:00 2001 From: Maxime Merrien Date: Mon, 19 Jun 2023 09:04:25 +0200 Subject: [PATCH 29/35] =?UTF-8?q?Code=20plus=20utilis=C3=A9=20depuis=20le?= =?UTF-8?q?=20d=C3=A9placement=20dans=20la=20modification=20du=20dossier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/scripts/piece-jointe/display.phtml | 2 +- .../views/scripts/piece-jointe/index.phtml | 60 ++++++------------- 2 files changed, 20 insertions(+), 42 deletions(-) diff --git a/application/views/scripts/piece-jointe/display.phtml b/application/views/scripts/piece-jointe/display.phtml index 465b1b95..bfca0ddd 100755 --- a/application/views/scripts/piece-jointe/display.phtml +++ b/application/views/scripts/piece-jointe/display.phtml @@ -26,7 +26,7 @@ - +

        Non envoyé
        En attente d'envoi
        diff --git a/application/views/scripts/piece-jointe/index.phtml b/application/views/scripts/piece-jointe/index.phtml index 944103ec..9f050c64 100755 --- a/application/views/scripts/piece-jointe/index.phtml +++ b/application/views/scripts/piece-jointe/index.phtml @@ -9,28 +9,25 @@
        -
        -
        - - - - - - - isPlatau): ?> - - - - - - - partial("piece-jointe/display.phtml", array("path" => $this->path, "listePj" => $this->listePj, "type" => $this->type, "id" => $this->identifiant, "verrou" => $this->verrou, "isPlatau" => $this->isPlatau)) - ?> - -
        NomDescriptionDate d'ajoutStatut Plat'AU
        -
        -
        +
        + + + + + + + isPlatau): ?> + + + + + + partial("piece-jointe/display.phtml", array("path" => $this->path, "listePj" => $this->listePj, "type" => $this->type, "id" => $this->identifiant, "verrou" => $this->verrou, "isPlatau" => $this->isPlatau)) + ?> + +
        NomDescriptionDate d'ajoutStatut Plat'AU
        +