[openads-Commits] r18052 - in branches/6.6.0-develop--ihm-ajout_module: . sql/pgsql

[ejpri...@users.adullact.net]

Author: ejpritchard
Date: 2024-06-24 14:32:41 +0200 (Mon, 24 Jun 2024)
New Revision: 18052

Added:
branches/6.6.0-develop--ihm-ajout_module/sql/pgsql/parametrage_annexe.inc.php
Modified:
branches/6.6.0-develop--ihm-ajout_module/
Log:
merge: fusion de la branche inte '6.6.0-develop' dans la branche de dev '6.6.0-develop--ihm-ajout-module'

Index: branches/6.6.0-develop--ihm-ajout_module
===================================================================
--- branches/6.6.0-develop--ihm-ajout_module 2024-06-24 12:31:02 UTC (rev 18051)
+++ branches/6.6.0-develop--ihm-ajout_module 2024-06-24 12:32:41 UTC (rev 18052)

Property changes on: branches/6.6.0-develop--ihm-ajout_module
___________________________________________________________________
Modified: svn:mergeinfo
## -713,7 +713,7 ##
/branches/6.5.0-develop-error-contrainte-traitement-sig:17384-17432
/branches/6.5.0-develop_fix_avis_produit_onglet_pieces:17288-17414
/branches/6.6.0-10411:17736-17870
-/branches/6.6.0-develop:17965-18049
+/branches/6.6.0-develop:17965-18051
/branches/6.6.0-develop--fix-evol-mod:17681-18023
/branches/6.6.0-develop--impl-extra-data:17897-18034
/branches/6.6.0-develop--improve-task:17580-17609
Copied: branches/6.6.0-develop--ihm-ajout_module/sql/pgsql/parametrage_annexe.inc.php (from rev 18051, branches/6.6.0-develop/sql/pgsql/parametrage_annexe.inc.php)
===================================================================
--- branches/6.6.0-develop--ihm-ajout_module/sql/pgsql/parametrage_annexe.inc.php (rev 0)
+++ branches/6.6.0-develop--ihm-ajout_module/sql/pgsql/parametrage_annexe.inc.php 2024-06-24 12:32:41 UTC (rev 18052)
@@ -0,0 +1,61 @@
+<?php
+//$Id$
+//gen openMairie le 12/06/2024 16:14
+
+$DEBUG=0;
+$serie=15;
+$ent = __("application")." -> ".__("parametrage_annexe");
+if(!isset($premier)) $premier='';
+if(!isset($tricolsf)) $tricolsf='';
+if(!isset($premiersf)) $premiersf='';
+if(!isset($selection)) $selection='';
+if(!isset($retourformulaire)) $retourformulaire='';
+if (!isset($idxformulaire)) {
+ $idxformulaire = '';
+}
+if (!isset($tricol)) {
+ $tricol = '';
+}
+if (!isset($valide)) {
+ $valide = '';
+}
+// FROM
+$table = DB_PREFIXE."parametrage_annexe
+ LEFT JOIN ".DB_PREFIXE."instruction
+ ON parametrage_annexe.instruction=instruction.instruction ";
+// SELECT
+$champAffiche = array(
+ 'parametrage_annexe.parametrage_annexe as "'.__("parametrage_annexe").'"',
+ 'instruction.dossier as "'.__("dossier").'"',
+ 'parametrage_annexe.instruction as "'.__("instruction").'"',
+ 'parametrage_annexe.document_object_type as "'.__("document_object_type").'"',
+ 'parametrage_annexe.document_object_type_id as "'.__("document_object_type_id").'"',
+ 'parametrage_annexe.condition as "'.__("condition").'"',
+ );
+//
+$champNonAffiche = array(
+ );
+//
+$champRecherche = array(
+ 'parametrage_annexe.parametrage_annexe as "'.__("parametrage_annexe").'"',
+ 'instruction.destinataire as "'.__("dossier").'"',
+ 'parametrage_annexe.document_object_type as "'.__("document_object_type").'"',
+ 'parametrage_annexe.document_object_type_id as "'.__("document_object_type_id").'"',
+ 'parametrage_annexe.condition as "'.__("condition").'"',
+ );
+$tri="ORDER BY instruction.destinataire ASC NULLS LAST";
+$edition="parametrage_annexe";
+/**
+ * Gestion de la clause WHERE => $selection
+ */
+// Filtre listing standard
+$selection = "";
+// Liste des clés étrangères avec leurs éventuelles surcharges
+$foreign_keys_extended = array(
+ "instruction" => array("instruction", "instruction_modale", ),
+);
+// Filtre listing sous formulaire - instruction
+if (in_array($retourformulaire, $foreign_keys_extended["instruction"])) {
+ $selection = " WHERE (parametrage_annexe.instruction = ".intval($idxformulaire).") ";
+}
+