[openads-Commits] r22886 - in branches/v6.20.0-develop: . data/pgsql obj sql/pgsql tests

[nathan...@users.adullact.net]

Author: nathanaelhoun
Date: 2026-04-09 12:22:24 +0200 (Thu, 09 Apr 2026)
New Revision: 22886

Modified:
branches/v6.20.0-develop/
branches/v6.20.0-develop/HISTORY.txt
branches/v6.20.0-develop/data/pgsql/v6.20.0.dev0.sql
branches/v6.20.0-develop/obj/
branches/v6.20.0-develop/sql/pgsql/task.inc.php
branches/v6.20.0-develop/tests/
Log:
merge: 10920_EVO_opti_listing_task dans l'integration courante

Index: branches/v6.20.0-develop
===================================================================
--- branches/v6.20.0-develop 2026-04-09 10:18:55 UTC (rev 22885)
+++ branches/v6.20.0-develop 2026-04-09 10:22:24 UTC (rev 22886)

Property changes on: branches/v6.20.0-develop
___________________________________________________________________
Modified: svn:mergeinfo
## -264,6 +264,7 ##
/branches/10913_BUG_double_fire_get_modules:22818-22845
/branches/10916_EVO_suivi_tache_titre:22837-22848
/branches/10917_EVO_message_ajout_pieces:22845-22881
+/branches/10920_EVO_opti_listing_task:22875-22885
/branches/1800_BUG_replication_geo_ssdossier:21901-21931
/branches/3.33.X:4845-4901
/branches/3.33.x:4956-5023
Modified: branches/v6.20.0-develop/HISTORY.txt
===================================================================
--- branches/v6.20.0-develop/HISTORY.txt 2026-04-09 10:18:55 UTC (rev 22885)
+++ branches/v6.20.0-develop/HISTORY.txt 2026-04-09 10:22:24 UTC (rev 22886)
@@ -4,6 +4,8 @@
6.20.0 (unreleased)
-------------------

+* Évolution - Optimisation du listing des tâches
+ Ticket #10920.
* Évolution - Évolution du message d'ajout de pièces
Ticket #10917.
* Évolution - Ajout des identifiants externes manquants sur les tâches à destination de Plat'AU

Modified: branches/v6.20.0-develop/data/pgsql/v6.20.0.dev0.sql
===================================================================
--- branches/v6.20.0-develop/data/pgsql/v6.20.0.dev0.sql 2026-04-09 10:18:55 UTC (rev 22885)
+++ branches/v6.20.0-develop/data/pgsql/v6.20.0.dev0.sql 2026-04-09 10:22:24 UTC (rev 22886)
@@ -13,3 +13,14 @@
--
-- END / [#10886] Matrice DIT / taches sortantes autorisees
--
+
+
+--
+-- BEGIN / [#10920] Optimiser le listing des tâches
+--
+
+CREATE INDEX IF NOT EXISTS task_category_type_idx ON openads.task (category, type);
+
+--
+-- END / [#10920] Optimiser le listing des tâches
+--

Index: branches/v6.20.0-develop/obj
===================================================================
--- branches/v6.20.0-develop/obj 2026-04-09 10:18:55 UTC (rev 22885)
+++ branches/v6.20.0-develop/obj 2026-04-09 10:22:24 UTC (rev 22886)

Property changes on: branches/v6.20.0-develop/obj
___________________________________________________________________
Modified: svn:mergeinfo
## -240,6 +240,7 ##
/branches/10913_BUG_double_fire_get_modules/obj:22818-22845
/branches/10916_EVO_suivi_tache_titre/obj:22837-22848
/branches/10917_EVO_message_ajout_pieces/obj:22845-22881
+/branches/10920_EVO_opti_listing_task/obj:22875-22885
/branches/1800_BUG_replication_geo_ssdossier/obj:21901-21931
/branches/3.33.X/obj:4845-4901
/branches/3.33.x/obj:4956-5023
Modified: branches/v6.20.0-develop/sql/pgsql/task.inc.php
===================================================================
--- branches/v6.20.0-develop/sql/pgsql/task.inc.php 2026-04-09 10:18:55 UTC (rev 22885)
+++ branches/v6.20.0-develop/sql/pgsql/task.inc.php 2026-04-09 10:22:24 UTC (rev 22886)
@@ -187,14 +187,21 @@
'libelle' => __("type"),
'type' => 'select',
'subtype' => 'sqlselect',
- 'sql' => 'SELECT
- DISTINCT(type),
- '.$template_case_traduction_type.'
- FROM
- '.DB_PREFIXE.'task
- WHERE
- task.category = \''. $category .'\'
- ORDER BY type ASC',
+ 'sql' => sprintf(<<<'SQL'
+ SELECT
+ type,
+ %2$s
+ FROM
+ %1$stask
+ WHERE
+ task.category = '%3$s'
+ GROUP BY type
+ ORDER BY type ASC
+ SQL,
+ DB_PREFIXE,
+ $template_case_traduction_type,
+ $category,
+ ),
),

'state' => array(
@@ -297,6 +304,6 @@
'task.comment as "'.__("commentaire").'"',
);

-$selection = " WHERE LOWER(task.category) = '".PLATAU."'";
+$selection = " WHERE task.category = '".PLATAU."'";

$tri="ORDER BY task.task ASC NULLS LAST";

Index: branches/v6.20.0-develop/tests
===================================================================
--- branches/v6.20.0-develop/tests 2026-04-09 10:18:55 UTC (rev 22885)
+++ branches/v6.20.0-develop/tests 2026-04-09 10:22:24 UTC (rev 22886)

Property changes on: branches/v6.20.0-develop/tests
___________________________________________________________________
Modified: svn:mergeinfo
## -236,6 +236,7 ##
/branches/10913_BUG_double_fire_get_modules/tests:22818-22845
/branches/10916_EVO_suivi_tache_titre/tests:22837-22848
/branches/10917_EVO_message_ajout_pieces/tests:22845-22881
+/branches/10920_EVO_opti_listing_task/tests:22875-22885
/branches/1800_BUG_replication_geo_ssdossier/tests:21901-21931
/branches/3.33.X/tests:4845-4901
/branches/3.33.x/tests:4956-5023