From 1a54b9a3f9a3f048f84e4c229599f9d251f99d29 Mon Sep 17 00:00:00 2001
From: Arnaud Fornerot <afornerot@cadoles.com>
Date: Mon, 5 Dec 2022 12:05:16 +0100
Subject: [PATCH] evolution items

---
 .../Controller/ItemController.php             | 26 ++++++++++++++++++-
 .../Cadoles/PortalBundle/Form/ItemType.php    |  4 ++-
 .../PortalBundle/Resources/config/routing.yml |  4 +++
 .../Resources/views/Item/edit.html.twig       | 11 +-------
 .../Resources/views/Item/list.html.twig       |  2 ++
 5 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php
index 6b415c20..9e3deade 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php
@@ -65,7 +65,11 @@ class ItemController extends Controller
     {
         // Initialisation de l'enregistrement
         $data = new Item();
-        
+        if($this->GetParameter("activate_widsonde")) {
+            $data->setClicksonde(true);
+            $data->setClicksondeservice("PAGE_ENT");
+        }
+
         // Création du formulaire
         $form = $this->createForm(ItemType::class,$data,array(
             "mode"                  => "submit",
@@ -206,6 +210,26 @@ class ItemController extends Controller
         return $response;        
     }
 
+
+    public function forceorderAction(Request $request)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $categorys=$em->getRepository("CadolesPortalBundle:Itemcategory")->findAll();
+        
+        foreach($categorys as $category) {
+            $i=0;
+            $items=$em->getRepository("CadolesPortalBundle:Item")->findBy(["itemcategory"=>$category],["title"=>"ASC"]);
+            foreach($items as $item) {
+                $i++;
+                $item->setRowOrder($i);
+                $em->flush();
+            }
+        }
+
+        // Retour à la liste
+        return $this->redirectToRoute($this->labelroute);
+    }
+
     protected function getDatas()
     {
         $em = $this->getDoctrine()->getManager();
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php
index 11234434..59376d62 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php
@@ -150,10 +150,12 @@ class ItemType extends AbstractType
 
         if($options["activate_widsonde"]) {
             $builder
+            /*
             ->add('clicksonde', CheckboxType::class, [
                 "label"         => "Exécuter une sonde statistique sur le clic",
                 "required"      => false
-            ])   
+            ])
+            */   
             
             ->add('clicksondeservice', ChoiceType::class, [
                 "label" => 'Type de Service associé à la sonde',
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
index f9cf7648..cdfae5b4 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
@@ -117,6 +117,10 @@ cadoles_portal_config_item_order:
     path: /config/item/order
     defaults: { _controller: CadolesPortalBundle:Item:order }  
 
+cadoles_portal_config_item_forceorder:
+    path: /config/item/forceorder
+    defaults: { _controller: CadolesPortalBundle:Item:forceorder }  
+
 cadoles_portal_config_ajax_item_seleclist:
     path: /config/item/ajax/selectlist
     defaults: { _controller: CadolesPortalBundle:Item:ajaxseleclist }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
index 5e012200..ae1f9fc2 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
@@ -67,8 +67,7 @@
                 {{ form_row(form.ssoitem) }}
             {% endif %}
 
-            {% if form.clicksonde is defined %}
-                {{ form_row(form.clicksonde) }}
+            {% if form.clicksondeservice is defined %}
                 <div id="divclicksondeservice">
                 {{ form_row(form.clicksondeservice) }}
                 </div>
@@ -133,13 +132,5 @@
         if($("#item_target").val()=="frame") {
             $("#divhelp").show();
         }
-        
-
-        if($("#item_clicksonde").is(':checked')) {
-            $("#divclicksondeservice").show();
-        }
-        else {
-            $("#divclicksondeservice").hide();
-        }
     }
 {% endblock %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig
index 6f163631..cf7af1a7 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig
@@ -11,6 +11,8 @@
             <p>
                 <a href="{{ path('cadoles_portal_config_item_submit') }}" class="btn btn-success">Ajouter un Item</a>
                 <a href="{{ path('cadoles_portal_config_itemcategory_submit') }}" class="btn btn-success">Ajouter une Categorie</a>
+
+                <a href="{{ path('cadoles_portal_config_item_forceorder') }}" class="btn btn-success pull-right">Ordonner les items en alpha</a>
             </p>
 
             <div class="category-list">