From 9e54f8b18c91f8d8876dcbe7e32807b556820082 Mon Sep 17 00:00:00 2001
From: A643206 <benjamin.pilorge@atos.net>
Date: Mon, 27 Nov 2017 16:45:30 +0100
Subject: [PATCH 1/3] [FIX #2791] deplacer le bouton de suppresion

---
 application/layouts/dossier.phtml       | 5 +++++
 application/layouts/etablissement.phtml | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/application/layouts/dossier.phtml b/application/layouts/dossier.phtml
index fd0f633b..a3dc3c70 100755
--- a/application/layouts/dossier.phtml
+++ b/application/layouts/dossier.phtml
@@ -85,6 +85,11 @@
             <a class="sep" href='/calendrier-des-commissions/gestionodj/dateCommId/<?php echo $this->idDateCommissionAffect; ?>'><i class='icon-calendar icon-black'></i> Afficher ordre du jour</a>
         </li>
         <?php endif; ?>
+		<?php if(!$verrou && $this->is_allowed_delete_dossier): ?>
+        <li>
+            <a id="suppressionDossier" href="#"><i class="icon-remove icon-black"></i>Supprimer le dossier</a>
+        </li>
+        <?php endif ?>
     </ul>
 <?php $this->placeholder('lateral_navigation')->captureEnd();
 endif; ?>
diff --git a/application/layouts/etablissement.phtml b/application/layouts/etablissement.phtml
index b1f01e05..68da1c30 100755
--- a/application/layouts/etablissement.phtml
+++ b/application/layouts/etablissement.phtml
@@ -12,7 +12,12 @@
         <li class="<?php echo $action_name == 'historique' ? 'active' : '' ?>"><a class='sep' href='<?php echo $this->url(array("action"=>"historique")) ?>'><i class="icon-repeat icon-black"></i> Afficher l'historique</a></li>
         <li class="nav-header">Actions</li>
         <li><a href='<?php echo $this->url(array('controller' => 'dossier', 'action' => 'add', 'id_etablissement' => $this->etablissement['general']['ID_ETABLISSEMENT']), null, true)?> '><i class="icon-plus icon-black"></i> Ajouter un dossier</a></li>
-    </ul>
+		<?php if($this->is_allowed_delete_etablissement): ?>
+        <li>
+            <a id="suppressionEtablissement" href="#"><i class="icon-remove icon-black"></i>Supprimer l'établissement</a>
+        </li>
+        <?php endif ?>
+	</ul>
 <?php $this->placeholder('lateral_navigation')->captureEnd(); ?>
 <?php $this->placeholder('before_content')->captureStart(); // Capture du 'before_content' ?>
 

From 9fba86da07364b2b4f36f20f7ce65259e5428f99 Mon Sep 17 00:00:00 2001
From: A643206 <benjamin.pilorge@atos.net>
Date: Mon, 27 Nov 2017 17:26:28 +0100
Subject: [PATCH 2/3] =?UTF-8?q?[FIX=20#2791]=20D=C3=A9placer=20le=20bouton?=
 =?UTF-8?q?=20de=20suppression?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/layouts/dossier.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/layouts/dossier.phtml b/application/layouts/dossier.phtml
index a3dc3c70..50198de0 100755
--- a/application/layouts/dossier.phtml
+++ b/application/layouts/dossier.phtml
@@ -85,11 +85,11 @@
             <a class="sep" href='/calendrier-des-commissions/gestionodj/dateCommId/<?php echo $this->idDateCommissionAffect; ?>'><i class='icon-calendar icon-black'></i> Afficher ordre du jour</a>
         </li>
         <?php endif; ?>
-		<?php if(!$verrou && $this->is_allowed_delete_dossier): ?>
+        <?php if(!$verrou && $this->is_allowed_delete_dossier) : ?>
         <li>
             <a id="suppressionDossier" href="#"><i class="icon-remove icon-black"></i>Supprimer le dossier</a>
         </li>
-        <?php endif ?>
+        <?php endif; ?>
     </ul>
 <?php $this->placeholder('lateral_navigation')->captureEnd();
 endif; ?>

From 966cb23b3957f912c3bbf406396fe398d6de96ad Mon Sep 17 00:00:00 2001
From: A643206 <benjamin.pilorge@atos.net>
Date: Tue, 5 Dec 2017 14:37:03 +0100
Subject: [PATCH 3/3] Ajout fichier sql 'ajoutDroitsSuppression.sql'

---
 sql/migrations/2.5-02-ajoutDroitsSuppression.sql | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 sql/migrations/2.5-02-ajoutDroitsSuppression.sql

diff --git a/sql/migrations/2.5-02-ajoutDroitsSuppression.sql b/sql/migrations/2.5-02-ajoutDroitsSuppression.sql
new file mode 100644
index 00000000..44362fe0
--- /dev/null
+++ b/sql/migrations/2.5-02-ajoutDroitsSuppression.sql
@@ -0,0 +1,14 @@
+set names 'utf8';
+
+#Ajout de la resource de suppression
+INSERT INTO PRV_prevarisc_v2.resources (id_resource, name, text) VALUES (60, 'suppression', 'Suppression');
+
+#Ajout des privileges de suppression
+INSERT INTO PRV_prevarisc_v2.privileges (id_privilege, name, text, id_resource) VALUES (70, 'delete_dossier', 'Suppression des dossiers', 60);
+INSERT INTO PRV_prevarisc_v2.privileges (id_privilege, name, text, id_resource) VALUES (71, 'delete_etablissement', 'Suppression des établissements', 60);
+
+#Ajout flag dossier pour suppression
+ALTER TABLE PRV_prevarisc_v2.dossier ADD DATESUPPRESSION_DOSSIER DATE;
+
+#Ajout flag etablissement pour suppression
+ALTER TABLE PRV_prevarisc_v2.etablissement ADD DATESUPPRESSION_ETABLISSEMENT DATE;