[opencourrier-Commits] r1086 - in branches/4.2.x-develop: . sql/pgsql

[sof...@adullact.net]

Author: softime
Date: 2019-11-06 17:49:44 +0100 (Wed, 06 Nov 2019)
New Revision: 1086

Modified:
branches/4.2.x-develop/HISTORY.txt
branches/4.2.x-develop/sql/pgsql/tache.reqmo.inc.php
Log:
* WIP - ?\195?\137volution reqmo tache


Modified: branches/4.2.x-develop/HISTORY.txt
===================================================================
--- branches/4.2.x-develop/HISTORY.txt 2019-10-28 14:50:07 UTC (rev 1085)
+++ branches/4.2.x-develop/HISTORY.txt 2019-11-06 16:49:44 UTC (rev 1086)
@@ -1,6 +1,13 @@
openCourrier Historique des versions
====================================

+4.2.x (unreleased)
+------------------
+
+* Ajout de plusieurs champs et de nouveau critère de tri pour la requête
+ mémorisées des tâches.
+ Ticket #????. [Sofien TIMEZOUAGHT][atReal]
+
4.1.4 (21/09/2017)
------------------


Modified: branches/4.2.x-develop/sql/pgsql/tache.reqmo.inc.php
===================================================================
--- branches/4.2.x-develop/sql/pgsql/tache.reqmo.inc.php 2019-10-28 14:50:07 UTC (rev 1085)
+++ branches/4.2.x-develop/sql/pgsql/tache.reqmo.inc.php 2019-11-06 16:49:44 UTC (rev 1086)
@@ -3,21 +3,27 @@
//gen openMairie le 07/12/2010 10:18
$reqmo['libelle']=' tache';
$reqmo['reqmo_libelle']=' tache';
-$reqmo['sql']="select [tache], [courrier], [traitement], [datebutoir], [dateexecution], [solde], [observation], [chronoreponse], [etat_tache.libelle as etat], [categorie_tache.libelle as categorie] from ".DB_PREFIXE."tache
+$reqmo['sql']="select [tache], [courrier.courrier as courrier], [registre], [datearrivee], [datecourrier], [tache.traitement as traitement], [service.servicelib as service], [datebutoir], [dateexecution], [solde], [observation], [chronoreponse], [etat_tache.libelle as etat], [categorie_tache.libelle as categorie]
+from ".DB_PREFIXE."tache
+inner join ".DB_PREFIXE."courrier on tache.courrier = courrier.courrier
inner join ".DB_PREFIXE."categorie_tache on categorie_tache.categorie_tache=tache.categorie_tache
inner join ".DB_PREFIXE."etat_tache on etat_tache.etat_tache=tache.etat_tache
+inner join ".DB_PREFIXE."service on tache.traitement=service.service
order by [tri]";
$reqmo['tache']='checked';
$reqmo['courrier']='checked';
+$reqmo['registre']='checked';
+$reqmo['datearrivee']='checked';
+$reqmo['datecourrier']='checked';
$reqmo['traitement']='checked';
+$reqmo['service']='checked';
$reqmo['datebutoir']='checked';
$reqmo['dateexecution']='checked';
$reqmo['solde']='checked';
$reqmo['observation']='checked';
$reqmo['chronoreponse']='checked';
-
$reqmo['etat']='checked';
$reqmo['categorie']='checked';

-$reqmo['tri']=array('tache','courrier','traitement','datebutoir','dateexecution','solde','observation','chronoreponse');
+$reqmo['tri']=array('tache ASC', 'tache DESC', 'courrier ASC', 'courrier DESC', 'registre ASC', 'registre DESC', 'datearrivee ASC', 'datearrivee DESC', 'datecourrier ASC', 'datecourrier DESC', 'traitement ASC', 'traitement DESC', 'service ASC', 'service DESC', 'datebutoir ASC', 'datebutoir DESC', 'dateexecution ASC', 'dateexecution DESC', 'solde ASC', 'solde DESC', 'observation ASC', 'observation DESC', 'chronoreponse ASC', 'chronoreponse DESC');
?>