[openscrutin-Commits] r148 - in trunk: . sql/pgsql

[fray...@adullact.net]

Author: fraynaud
Date: 2015-12-09 12:19:02 +0100 (Wed, 09 Dec 2015)
New Revision: 148

Added:
trunk/sql/pgsql/scrutin_agent.reqmo.inc
Modified:
trunk/HISTORY.txt
trunk/sql/pgsql/scrutin_elu.reqmo.inc
Log:

ajout de requetes memorisees pour etat cumule sur tableur agent + elu



Modified: trunk/HISTORY.txt
===================================================================
--- trunk/HISTORY.txt 2015-03-31 16:47:59 UTC (rev 147)
+++ trunk/HISTORY.txt 2015-12-09 11:19:02 UTC (rev 148)
@@ -4,8 +4,8 @@
2.1.0-dev - ??/??/????
----------------------
* correction heure_scrutin_groupe - prise en compte heure de nuit [f.raynaud] [arles]
+* scrutin_agent.reqmo.sql et correction scrutin_elu.reqmo.sql [f.raynaud] [arles] 09-12-2015

-
2.0.3 - 02/04/2014
------------------


Added: trunk/sql/pgsql/scrutin_agent.reqmo.inc
===================================================================
--- trunk/sql/pgsql/scrutin_agent.reqmo.inc (rev 0)
+++ trunk/sql/pgsql/scrutin_agent.reqmo.inc 2015-12-09 11:19:02 UTC (rev 148)
@@ -0,0 +1,25 @@
+<?php
+//$Id: scrutin_elu.reqmo.inc,v 1.2 2008-07-28 09:09:50 jbastide Exp $
+$reqmo['libelle']="elus";
+$reqmo['sql']="select [scrutin],
+ nom||' '||prenom as nom,
+ [bureau],
+ [candidature.poste as poste],
+ [periode],
+ [case decision when 't' then 'Oui' else 'Non' end as decision]
+ from ".DB_PREFIXE."candidature inner join ".DB_PREFIXE."agent on candidature.agent=agent.agent
+ where scrutin = '[SCRUTIN]'
+ order by [TRI]";
+
+$reqmo['TRI']= array('bureau','poste','periode');
+// and decision is true
+
+$reqmo['scrutin']="checked";
+$reqmo['nom']="checked";
+$reqmo['bureau']="checked";
+$reqmo['poste']="checked";
+$reqmo['periode']="checked";
+$reqmo['decision']="checked";
+$reqmo['SCRUTIN']="select scrutin, scrutin from ".DB_PREFIXE."scrutin where solde is not true";
+//
+?>

Modified: trunk/sql/pgsql/scrutin_elu.reqmo.inc
===================================================================
--- trunk/sql/pgsql/scrutin_elu.reqmo.inc 2015-03-31 16:47:59 UTC (rev 147)
+++ trunk/sql/pgsql/scrutin_elu.reqmo.inc 2015-12-09 11:19:02 UTC (rev 148)
@@ -1,16 +1,17 @@
<?php
//$Id: scrutin_elu.reqmo.inc,v 1.2 2008-07-28 09:09:50 jbastide Exp $
$reqmo['libelle']="elus";
-$reqmo['sql']="select [scrutin],
- nom||' '||prenom as nom,
+$reqmo['sql']="select [affectation.scrutin as scrutin],
+ elu.nom||' '||prenom as nom,
[bureau],
[affectation.poste as poste],
[periode],
- [candidat]
- [decision],
+ [case decision when 't' then 'Oui' else 'Non' end as decision],
+ [candidat.nom as candidat]
from ".DB_PREFIXE."affectation inner join ".DB_PREFIXE."elu on affectation.elu=elu.elu
inner join ".DB_PREFIXE."poste on affectation.poste=poste.poste
- where scrutin = '[SCRUTIN]'
+ left join ".DB_PREFIXE."candidat on affectation.candidat=candidat.candidat
+ where affectation.scrutin = '[SCRUTIN]'
order by bureau,poste.ordre";
//$reqmo['TRI']= array('bureau','poste','periode'
// );