[openads-Commits] r8525 - in branches/4.10.0-develop_interface_erp: . obj

[svi...@adullact.net]

Author: svicedo
Date: 2019-01-18 15:14:02 +0100 (Fri, 18 Jan 2019)
New Revision: 8525

Modified:
branches/4.10.0-develop_interface_erp/HISTORY.txt
branches/4.10.0-develop_interface_erp/obj/consultation.class.php
branches/4.10.0-develop_interface_erp/obj/dossier.class.php
Log:
Modification du fonctionnement de la case ?\195?\160 cocher ERP, modification de la r?\195?\169cup?\195?\169ration des services consult?\195?\169s, changelog

Modified: branches/4.10.0-develop_interface_erp/HISTORY.txt
===================================================================
--- branches/4.10.0-develop_interface_erp/HISTORY.txt 2019-01-18 13:27:43 UTC (rev 8524)
+++ branches/4.10.0-develop_interface_erp/HISTORY.txt 2019-01-18 14:14:02 UTC (rev 8525)
@@ -4,7 +4,11 @@
4.10.0 (unreleased)
-------------------

-* Aucun changement.
+* Évolution - Lorsque l'option d'interface avec un référentiel ERP est activée,
+ la case à cocher ERP deviendra non modifiable pour les formulaires des
+ dossiers d'instruction non référencés dans les différents paramètres des
+ déclencheurs de l'interfaçage
+ Ticket #9121.


4.9.0 (14/12/2018)

Modified: branches/4.10.0-develop_interface_erp/obj/consultation.class.php
===================================================================
--- branches/4.10.0-develop_interface_erp/obj/consultation.class.php 2019-01-18 13:27:43 UTC (rev 8524)
+++ branches/4.10.0-develop_interface_erp/obj/consultation.class.php 2019-01-18 14:14:02 UTC (rev 8525)
@@ -2008,6 +2008,49 @@
));
$sql_service_by_di = str_replace('<collectivite_di>', $di->getVal("om_collectivite"), $sql_service_by_di);

+ $query_where_service_pc = "";
+ if( $this->f->is_option_referentiel_erp_enabled($di->getVal("om_collectivite")) === true
+ && $this->f->getDATCode($di->getVal('dossier')) == $this->f-> getParameter ('erp__dossier__nature__pc')
+ &&($this->f->getParameter('erp__dossier__type_di__pc')) !== null )
+ {
+ $erp_di_pc = $this->f->getParameter('erp__dossier__type_di__pc');
+ $erp_di_pc = explode(";", $erp_di_pc);
+ $type_di = $di->getVal('dossier_instruction_type') ;
+ if (in_array($type_di,$erp_di_pc) === false) {
+ //Cas consultation avis
+ if ($this->f->getParameter('erp__services__avis__pc') !== null) {
+ $erp_service_pc = $this->f->getParameter('erp__services__avis__pc');
+ $erp_service_pc = explode(";", $erp_service_pc);
+ if (is_array($erp_service_pc) === true
+ && $erp_service_pc !== array()){
+ $query_where_service_pc .= " AND service.service NOT IN (";
+ foreach ($erp_service_pc as $erp_service){
+ $query_where_service_pc.=$erp_service.",";
+ }
+ $query_where_service_pc = substr($query_where_service_pc, 0, -1).")
+ ";
+ }
+ }
+ //Cas consultation pour conformité
+ if ($this->f->getParameter('erp__services__conformite__pc') !== null) {
+
+ $erp_service_pc = $this->f->getParameter('erp__services__conformite__pc');
+ $erp_service_pc = explode(";", $erp_service_pc);
+ if (is_array($erp_service_pc) === true
+ && $erp_service_pc !== array()){
+ $query_where_service_pc .= " AND service.service NOT IN (";
+ foreach ($erp_service_pc as $erp_service){
+ $query_where_service_pc.=$erp_service.",";
+ }
+ $query_where_service_pc = substr($query_where_service_pc, 0, -1).")
+ ";
+ }
+ }
+ }
+
+ $sql_service_by_di = str_replace('ORDER BY', $query_where_service_pc."ORDER BY", $sql_service_by_di);
+ }
+
$this->init_select($form, $db, $maj, $debug, "service",
$sql_service_by_di, $sql_service_by_id, true);
} else {

Modified: branches/4.10.0-develop_interface_erp/obj/dossier.class.php
===================================================================
--- branches/4.10.0-develop_interface_erp/obj/dossier.class.php 2019-01-18 13:27:43 UTC (rev 8524)
+++ branches/4.10.0-develop_interface_erp/obj/dossier.class.php 2019-01-18 14:14:02 UTC (rev 8525)
@@ -2022,6 +2022,31 @@
$all_fields['geom'] = 'hidden';
}

+ //Gestion de l'interfaçage ERP
+ if ($crud === 'update'){
+ if ($this->f->is_option_referentiel_erp_enabled($this->getVal('om_collectivite')) === true){
+ $all_fields['erp'] = 'checkboxhiddenstatic' ;
+ if (isset ($parameters['erp__dossier__nature__at']) === true){
+ if ($this->f->getDATCode($this->parameters['idx']) == $this->f->getParameter('erp__dossier__nature__at')){
+ $all_fields['erp'] = 'checkbox' ;
+ }
+ }
+
+ if (isset ($parameters['erp__dossier__nature__pc']) === true){
+ if ($this->f->getDATCode($this->parameters['idx']) == $this->f->getParameter('erp__dossier__nature__pc')){
+ $erp_di_pc = $parameters['erp__dossier__type_di__pc'];
+
+ $erp_di_pc = explode(";", $erp_di_pc);
+ if (is_array($erp_di_pc) === true) {
+ if (in_array($this->getVal("dossier_instruction_type"),$erp_di_pc) === true){
+ $all_fields['erp'] = 'checkbox' ;
+ }
+ }
+ }
+ }
+ }
+ }
+
//
// Gestion du contexte
//