[openelec-Commits] r1211 - in branches/4.4.3_bug_nom_procuration: . sql/pgsql

[jyma...@adullact.net]

Author: jymadier
Date: 2017-05-24 12:56:49 +0200 (Wed, 24 May 2017)
New Revision: 1211

Modified:
branches/4.4.3_bug_nom_procuration/HISTORY.txt
branches/4.4.3_bug_nom_procuration/sql/pgsql/pdf_listeregistreprocuration.inc
branches/4.4.3_bug_nom_procuration/sql/pgsql/pdf_listeregistretotproc.inc
Log:
* Reformulation de l'entr?\195?\169e dans HISTORY.txt
* La r?\195?\169cup?\195?\169ration des champs origine ?\195?\169tait bugg?\195?\169e : le 24?\195?\168me caract?\195?\168re de chaque origine ?\195?\169tait r?\195?\169cup?\195?\169r?\195?\169 2 fois, ?\195?\160 la fin de la 1?\195?\168re ligne et au d?\195?\169but de la 2nde ligne


Modified: branches/4.4.3_bug_nom_procuration/HISTORY.txt
===================================================================
--- branches/4.4.3_bug_nom_procuration/HISTORY.txt 2017-05-23 14:58:15 UTC (rev 1210)
+++ branches/4.4.3_bug_nom_procuration/HISTORY.txt 2017-05-24 10:56:49 UTC (rev 1211)
@@ -1,7 +1,8 @@
4.4.3 (unreleased)
==================

-* Evolution de l'expression de l'origine des procurations.
+* Le contenu du champ *Origine 2* n'était pas récupérée dans les éditions
+ de registre des procurations.
#8823 [atReal][Jérémy Cerini]



Modified: branches/4.4.3_bug_nom_procuration/sql/pgsql/pdf_listeregistreprocuration.inc
===================================================================
--- branches/4.4.3_bug_nom_procuration/sql/pgsql/pdf_listeregistreprocuration.inc 2017-05-23 14:58:15 UTC (rev 1210)
+++ branches/4.4.3_bug_nom_procuration/sql/pgsql/pdf_listeregistreprocuration.inc 2017-05-24 10:56:49 UTC (rev 1211)
@@ -24,10 +24,10 @@
$sql=$sql." b.prenom as prenomm,";
//
$sql=$sql." substring(procuration.origine1 from 1 for 25) as origine1_1, ";
-$sql=$sql." substring(procuration.origine1 from 25 for 25) as origine1_2, ";
+$sql=$sql." substring(procuration.origine1 from 26 for 25) as origine1_2, ";
//
$sql=$sql." substring(procuration.origine2 from 1 for 25) as origine2_1, ";
-$sql=$sql." substring(procuration.origine2 from 25 for 25) as origine2_2, ";
+$sql=$sql." substring(procuration.origine2 from 26 for 25) as origine2_2, ";


$sql=$sql." CASE refus WHEN 'O' THEN 'Oui' ELSE 'Non' END as refus, ";

Modified: branches/4.4.3_bug_nom_procuration/sql/pgsql/pdf_listeregistretotproc.inc
===================================================================
--- branches/4.4.3_bug_nom_procuration/sql/pgsql/pdf_listeregistretotproc.inc 2017-05-23 14:58:15 UTC (rev 1210)
+++ branches/4.4.3_bug_nom_procuration/sql/pgsql/pdf_listeregistretotproc.inc 2017-05-24 10:56:49 UTC (rev 1211)
@@ -18,10 +18,10 @@
$sql=$sql." b.code_bureau as bureaum,";
//
$sql=$sql." substring(procuration.origine1 from 1 for 25) as origine1_1, ";
-$sql=$sql." substring(procuration.origine1 from 25 for 25) as origine1_2, ";
+$sql=$sql." substring(procuration.origine1 from 26 for 25) as origine1_2, ";
//
$sql=$sql." substring(procuration.origine2 from 1 for 25) as origine2_1, ";
-$sql=$sql." substring(procuration.origine2 from 25 for 25) as origine2_2, ";
+$sql=$sql." substring(procuration.origine2 from 26 for 25) as origine2_2, ";
//
$sql=$sql." CASE refus WHEN 'O' THEN 'Oui' ELSE 'Non' END as refus, ";