fray...@adullact.net
unread,Feb 14, 2017, 4:13:10 AM2/14/17Sign in to reply to author
Sign in to forward
You do not have permission to delete messages in this group
Sign in to report message
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to openmairie-...@googlegroups.com
Author: fraynaud
Date: 2017-02-14 10:13:07 +0100 (Tue, 14 Feb 2017)
New Revision: 896
Modified:
branches/test_5.0.0-a1/app/widget_tachenonsolde.php
branches/test_5.0.0-a1/dyn/debug.inc.php
branches/test_5.0.0-a1/gen/obj/diffusion.class.php
branches/test_5.0.0-a1/gen/sql/pgsql/diffusion.form.inc.php
branches/test_5.0.0-a1/gen/sql/pgsql/diffusion.inc.php
branches/test_5.0.0-a1/sql/pgsql/courrier_arrivee.inc.php
branches/test_5.0.0-a1/sql/pgsql/diffusion.form.inc.php
Log:
modifications diffusion
Modified: branches/test_5.0.0-a1/app/widget_tachenonsolde.php
===================================================================
--- branches/test_5.0.0-a1/app/widget_tachenonsolde.php 2017-01-09 17:01:04 UTC (rev 895)
+++ branches/test_5.0.0-a1/app/widget_tachenonsolde.php 2017-02-14 09:13:07 UTC (rev 896)
@@ -56,7 +56,7 @@
".DB_PREFIXE."courrier
ON tache.courrier = courrier.courrier
WHERE
- tache.solde = 'f' ";
+ tache.solde = 'f' and tache.traitement='".$_SESSION['service']."'";
// Si l'option de filtrage de la recherche est activée
if ($f->getParameter('filtre_recherche_service') == 'true') {
@@ -176,4 +176,4 @@
// Message s'il n'y a pas de données
$message = _("Il n'y a pas de taches non soldees");
$f->displayDescription($message);
-}
\ No newline at end of file
+}
Modified: branches/test_5.0.0-a1/dyn/debug.inc.php
===================================================================
--- branches/test_5.0.0-a1/dyn/debug.inc.php 2017-01-09 17:01:04 UTC (rev 895)
+++ branches/test_5.0.0-a1/dyn/debug.inc.php 2017-02-14 09:13:07 UTC (rev 896)
@@ -15,7 +15,7 @@
/**
*
*/
-//define('DEBUG', EXTRA_VERBOSE_MODE);
+define('DEBUG', EXTRA_VERBOSE_MODE);
//define('DEBUG', VERBOSE_MODE);
//define('DEBUG', DEBUG_MODE);
//define('DEBUG', PRODUCTION_MODE);
Modified: branches/test_5.0.0-a1/gen/obj/diffusion.class.php
===================================================================
--- branches/test_5.0.0-a1/gen/obj/diffusion.class.php 2017-01-09 17:01:04 UTC (rev 895)
+++ branches/test_5.0.0-a1/gen/obj/diffusion.class.php 2017-02-14 09:13:07 UTC (rev 896)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 09/01/2017 15:49
+//gen openMairie le 31/01/2017 14:20
require_once "../obj/om_dbform.class.php";
@@ -66,10 +66,10 @@
$this->valF['envoi'] = false;
}
$this->valF['message'] = $val['message'];
- if ($val['courrier_arrivee'] == 1 || $val['courrier_arrivee'] == "t" || $val['courrier_arrivee'] == "Oui") {
- $this->valF['courrier_arrivee'] = true;
+ if ($val['insertion_auto'] == 1 || $val['insertion_auto'] == "t" || $val['insertion_auto'] == "Oui") {
+ $this->valF['insertion_auto'] = true;
} else {
- $this->valF['courrier_arrivee'] = false;
+ $this->valF['insertion_auto'] = false;
}
if (!is_numeric($val['service_origine'])) {
$this->valF['service_origine'] = NULL;
@@ -142,7 +142,7 @@
}
$form->setType("envoi", "checkbox");
$form->setType("message", "textarea");
- $form->setType("courrier_arrivee", "checkbox");
+ $form->setType("insertion_auto", "checkbox");
if ($this->is_in_context_of_foreign_key("service", $this->retourformulaire)) {
$form->setType("service_origine", "selecthiddenstatic");
} else {
@@ -179,7 +179,7 @@
}
$form->setType("envoi", "checkbox");
$form->setType("message", "textarea");
- $form->setType("courrier_arrivee", "checkbox");
+ $form->setType("insertion_auto", "checkbox");
if ($this->is_in_context_of_foreign_key("service", $this->retourformulaire)) {
$form->setType("service_origine", "selecthiddenstatic");
} else {
@@ -204,7 +204,7 @@
$form->setType("dossier", "selectstatic");
$form->setType("envoi", "hiddenstatic");
$form->setType("message", "hiddenstatic");
- $form->setType("courrier_arrivee", "hiddenstatic");
+ $form->setType("insertion_auto", "hiddenstatic");
$form->setType("service_origine", "selectstatic");
$form->setType("maj_date", "hiddenstatic");
$form->setType("maj_login", "hiddenstatic");
@@ -225,7 +225,7 @@
$form->setType("dossier", "selectstatic");
$form->setType("envoi", "checkboxstatic");
$form->setType("message", "textareastatic");
- $form->setType("courrier_arrivee", "checkboxstatic");
+ $form->setType("insertion_auto", "checkboxstatic");
$form->setType("service_origine", "selectstatic");
$form->setType("maj_date", "static");
$form->setType("maj_login", "static");
@@ -260,7 +260,7 @@
$form->setTaille("dossier", 11);
$form->setTaille("envoi", 1);
$form->setTaille("message", 80);
- $form->setTaille("courrier_arrivee", 1);
+ $form->setTaille("insertion_auto", 1);
$form->setTaille("service_origine", 11);
$form->setTaille("maj_date", 8);
$form->setTaille("maj_login", 30);
@@ -283,7 +283,7 @@
$form->setMax("dossier", 11);
$form->setMax("envoi", 1);
$form->setMax("message", 6);
- $form->setMax("courrier_arrivee", 1);
+ $form->setMax("insertion_auto", 1);
$form->setMax("service_origine", 11);
$form->setMax("maj_date", 8);
$form->setMax("maj_login", 30);
@@ -305,7 +305,7 @@
$form->setLib('dossier',_('dossier'));
$form->setLib('envoi',_('envoi'));
$form->setLib('message',_('message'));
- $form->setLib('courrier_arrivee',_('courrier_arrivee'));
+ $form->setLib('insertion_auto',_('insertion_auto'));
$form->setLib('service_origine',_('service_origine'));
$form->setLib('maj_date',_('maj_date'));
$form->setLib('maj_login',_('maj_login'));
Modified: branches/test_5.0.0-a1/gen/sql/pgsql/diffusion.form.inc.php
===================================================================
--- branches/test_5.0.0-a1/gen/sql/pgsql/diffusion.form.inc.php 2017-01-09 17:01:04 UTC (rev 895)
+++ branches/test_5.0.0-a1/gen/sql/pgsql/diffusion.form.inc.php 2017-02-14 09:13:07 UTC (rev 896)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 09/01/2017 15:49
+//gen openMairie le 31/01/2017 14:20
$DEBUG=0;
$ico="../img/ico_application.png";
@@ -17,7 +17,7 @@
"dossier",
"envoi",
"message",
- "courrier_arrivee",
+ "insertion_auto",
"service_origine",
"maj_date",
"maj_login",
Modified: branches/test_5.0.0-a1/gen/sql/pgsql/diffusion.inc.php
===================================================================
--- branches/test_5.0.0-a1/gen/sql/pgsql/diffusion.inc.php 2017-01-09 17:01:04 UTC (rev 895)
+++ branches/test_5.0.0-a1/gen/sql/pgsql/diffusion.inc.php 2017-02-14 09:13:07 UTC (rev 896)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 09/01/2017 15:49
+//gen openMairie le 31/01/2017 14:20
$DEBUG=0;
$serie=15;
@@ -39,7 +39,7 @@
'diffusion.typetraitement as "'._("typetraitement").'"',
'dossier.courrier as "'._("dossier").'"',
"case diffusion.envoi when 't' then 'Oui' else 'Non' end as \""._("envoi")."\"",
- "case diffusion.courrier_arrivee when 't' then 'Oui' else 'Non' end as \""._("courrier_arrivee")."\"",
+ "case diffusion.insertion_auto when 't' then 'Oui' else 'Non' end as \""._("insertion_auto")."\"",
'service3.servicelib as "'._("service_origine").'"',
'diffusion.maj_date as "'._("maj_date").'"',
'diffusion.maj_login as "'._("maj_login").'"',
Modified: branches/test_5.0.0-a1/sql/pgsql/courrier_arrivee.inc.php
===================================================================
--- branches/test_5.0.0-a1/sql/pgsql/courrier_arrivee.inc.php 2017-01-09 17:01:04 UTC (rev 895)
+++ branches/test_5.0.0-a1/sql/pgsql/courrier_arrivee.inc.php 2017-02-14 09:13:07 UTC (rev 896)
@@ -35,7 +35,7 @@
|| COALESCE(courrier.emetteurprenom, \'\') as "'._("emetteur").'"',
'service.servicelib as "'._("traitement").'"',
'categorie_courrier.libelle as "'._("categorie").'"',
- 'substring(courrier.objetcourrier, 1,20) as "'._("objet courrier").'"',
+ 'substring(courrier.objetcourrier, 1,50) as "'._("objet courrier").'"',
'nbtache as "'._("Tache(s)").'"'
);
Modified: branches/test_5.0.0-a1/sql/pgsql/diffusion.form.inc.php
===================================================================
--- branches/test_5.0.0-a1/sql/pgsql/diffusion.form.inc.php 2017-01-09 17:01:04 UTC (rev 895)
+++ branches/test_5.0.0-a1/sql/pgsql/diffusion.form.inc.php 2017-02-14 09:13:07 UTC (rev 896)
@@ -20,7 +20,7 @@
"adresse",
"typetraitement",
"envoi",
- "courrier_arrivee",
+ "courrier",
"message",
"service_origine",
"etat",