From f568aaf732daefb56912554bbdbb886f6608ddac Mon Sep 17 00:00:00 2001
From: vdumas <vincent.dumas@combodo.com>
Date: Tue, 4 Jun 2024 11:40:59 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B06303=20-=20Add=20search=20ticket=20brick?=
 =?UTF-8?q?s=20in=20portal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datamodel.itop-faq-light.xml              |  2 +-
 .../dictionaries/en.dict.itop-portal.php      |  5 ++
 .../dictionaries/fr.dict.itop-portal.php      |  5 ++
 .../itop-tickets/datamodel.itop-tickets.xml   | 86 +++++++++++++++++++
 4 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
index 9392f8950..415ee1663 100755
--- a/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
+++ b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
@@ -240,7 +240,7 @@
           <rank>
             <default>40</default>
           </rank>
-          <width>12</width>
+          <width>6</width>
           <title>
             <navigation_menu>Brick:Portal:FAQ:Menu</navigation_menu>
             <home>Brick:Portal:FAQ:Title</home>
diff --git a/datamodels/2.x/itop-portal/dictionaries/en.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/en.dict.itop-portal.php
index c8738c463..2807892c5 100644
--- a/datamodels/2.x/itop-portal/dictionaries/en.dict.itop-portal.php
+++ b/datamodels/2.x/itop-portal/dictionaries/en.dict.itop-portal.php
@@ -40,4 +40,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open',
 	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved',
 	'Brick:Portal:ClosedRequests:Title' => 'Closed requests',
+	'Brick:Portal:ListAllRequests:Title' => 'All requests',
+	'Brick:Portal:ListAllRequests:Title+' => '<p>View all requests regardless of their status.</p>',
+	'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed',
+	'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests',
+	'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>',
 ));
diff --git a/datamodels/2.x/itop-portal/dictionaries/fr.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/fr.dict.itop-portal.php
index 924de6c94..22bcba39c 100644
--- a/datamodels/2.x/itop-portal/dictionaries/fr.dict.itop-portal.php
+++ b/datamodels/2.x/itop-portal/dictionaries/fr.dict.itop-portal.php
@@ -38,4 +38,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Ouvertes',
 	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Résolues',
 	'Brick:Portal:ClosedRequests:Title' => 'Demandes fermées',
+	'Brick:Portal:ListAllRequests:Title' => 'Toutes les demandes',
+    'Brick:Portal:ListAllRequests:Title+' => '<p>Consultez toutes vos demandes en cours ou fermées.</p>',
+    'Brick:Portal:ListAllRequests:Tab' => 'En cours et fermées',
+    'Brick:Portal:SearchInAllRequests:Title' => 'Rechercher une demande',
+    'Brick:Portal:SearchInAllRequests:Title+' => '<p>Quelque soit son état</p>',
 ));
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index d5e9a7aef..5596b1a0b 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -1169,6 +1169,92 @@
             <export_default_fields>true</export_default_fields>
           </export>
         </brick>
+        <brick id="manage-all-tickets-for-portal-user" xsi:type="Combodo\iTop\Portal\Brick\ManageBrick" _delta="define">
+          <active>true</active>
+          <rank>
+            <default>120</default>
+          </rank>
+          <visible>
+            <home>false</home>
+            <navigation_menu>false</navigation_menu>
+          </visible>
+          <width>6</width>
+          <title>
+            <default>Brick:Portal:ListAllRequests:Title</default>
+          </title>
+          <!-- Optional tag to define which display modes can be used in the brick's page and the brick's tile -->
+          <!--<display_modes>-->
+          <!-- Optional tag that must contain at least 1 <mode> tag. -->
+          <!--<availables>-->
+          <!--<mode id="list"/>-->
+          <!--<mode id="pie-chart"/>-->
+          <!--<mode id="bar-chart"/>-->
+          <!--</availables>-->
+          <!-- Optional tag to define which display mode will be used by default when opening the brick -->
+          <!--<default>list</default>-->
+          <!-- Optional tag to define which display mode will be used to render the brick's tile -->
+          <!--<tile>text</tile>-->
+          <!--</display_modes>-->
+          <description>Brick:Portal:ListAllRequests:Title+</description>
+          <decoration_class>
+            <default>fc fc-ongoing-request fc-2x</default>
+          </decoration_class>
+          <oql><![CDATA[SELECT Ticket]]></oql>
+          <!-- Optional tag to define if the action should be done in a modal window ("modal"), a new window ("new") or the current window ("self") -->
+          <!--<opening_target>modal</opening_target>-->
+          <!-- Optional tag to define the how the objects should be opened. Values can be edit|view. Note that even if this is set to edit, objects not allowed in edition mode for the user (cf. scopes and security layers) will open in view mode -->
+          <!-- <opening_mode>edit</opening_mode> -->
+          <!-- Can be either a class tag with the class name or an oql tag with the query -->
+          <!-- <class>Ticket</class> -->
+          <fields>
+            <field id="title"/>
+            <field id="description"/>
+            <field id="status"/>
+          </fields>
+          <!-- Optional tag to add attributes to the table by their code -->
+          <grouping>
+            <!-- Mandatory -->
+            <tabs>
+              <!-- Optional. Show object count for each tabs. Available values are true|false. Default is false. -->
+              <show_tab_counts>true</show_tab_counts>
+              <!-- Mandatory. Grouping by tabs -->
+              <groups>
+                <group id="all">
+                  <rank>1</rank>
+                  <title>Brick:Portal:ListAllRequests:Tab</title>
+                  <condition><![CDATA[SELECT Ticket]]></condition>
+                </group>
+              </groups>
+            </tabs>
+            <!-- Implicit grouping on y axis by finalclass -->
+          </grouping>
+          <!-- Optional. Set the default number of item lists will display. -->
+          <!-- <default_list_length>20</default_list_length> -->
+          <data_loading>auto</data_loading>
+          <export>
+            <export_default_fields>true</export_default_fields>
+          </export>
+        </brick>
+        <brick id="search-within-tickets-for-portal-user" xsi:type="Combodo\iTop\Portal\Brick\FilterBrick" _delta="define">
+          <active>true</active>
+          <rank>
+            <default>30</default>
+          </rank>
+          <visible>
+            <home>true</home>
+            <navigation_menu>false</navigation_menu>
+          </visible>
+          <width>6</width>
+          <title>
+            <default>Brick:Portal:SearchInAllRequests:Title</default>
+          </title>
+          <description>Brick:Portal:SearchInAllRequests:Title+</description>
+          <!-- <search_submit_class/> -->
+          <target_brick>
+            <id>manage-all-tickets-for-portal-user</id>
+            <type>Combodo\iTop\Portal\Brick\ManageBrick</type>
+          </target_brick>
+        </brick>
       </bricks>
       <forms>
         <form id="service-view" _delta="define">