[openads-Commits] r8341 - in branches/4.9.0-dossiers-parallele: data/pgsql gen/obj gen/sql/pgsql obj sql/pgsql tests/resources/app/gen

[sof...@adullact.net]

Author: softime
Date: 2018-11-15 18:30:44 +0100 (Thu, 15 Nov 2018)
New Revision: 8341

Added:
branches/4.9.0-dossiers-parallele/gen/obj/lien_demande_type_dossier_instruction_type.class.php
branches/4.9.0-dossiers-parallele/gen/sql/pgsql/lien_demande_type_dossier_instruction_type.inc.php
branches/4.9.0-dossiers-parallele/tests/resources/app/gen/lien_demande_type_dossier_instruction_type.robot
Removed:
branches/4.9.0-dossiers-parallele/gen/obj/lien_demande_type_dossier.class.php
branches/4.9.0-dossiers-parallele/gen/sql/pgsql/lien_demande_type_dossier.inc.php
branches/4.9.0-dossiers-parallele/tests/resources/app/gen/lien_demande_type_dossier.robot
Modified:
branches/4.9.0-dossiers-parallele/data/pgsql/v4.9.0.dev0.sql
branches/4.9.0-dossiers-parallele/gen/obj/demande_type.class.php
branches/4.9.0-dossiers-parallele/gen/obj/dossier_instruction_type.class.php
branches/4.9.0-dossiers-parallele/gen/sql/pgsql/demande_type.inc.php
branches/4.9.0-dossiers-parallele/gen/sql/pgsql/dossier_instruction_type.inc.php
branches/4.9.0-dossiers-parallele/obj/demande_type.class.php
branches/4.9.0-dossiers-parallele/obj/dossier_instruction_type.class.php
branches/4.9.0-dossiers-parallele/sql/pgsql/demande_type.form.inc.php
branches/4.9.0-dossiers-parallele/tests/resources/app/gen/gen_resources.robot
Log:
* Renommage de la table lien_demande_type_dossier en
lien_demande_type_dossier_instruction_type
* Gestion multi-select des types de DI compatbles (en cours)

Modified: branches/4.9.0-dossiers-parallele/data/pgsql/v4.9.0.dev0.sql
===================================================================
--- branches/4.9.0-dossiers-parallele/data/pgsql/v4.9.0.dev0.sql 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/data/pgsql/v4.9.0.dev0.sql 2018-11-15 17:30:44 UTC (rev 8341)
@@ -8,35 +8,35 @@
--

-- Table
-CREATE TABLE lien_demande_type_dossier(
- lien_demande_type_dossier integer,
+CREATE TABLE lien_demande_type_dossier_instruction_type(
+ lien_demande_type_dossier_instruction_type integer,
demande_type integer,
dossier_instruction_type integer
);

-- Séquence
-CREATE SEQUENCE lien_demande_type_dossier_seq
+CREATE SEQUENCE lien_demande_type_dossier_instruction_type_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-ALTER SEQUENCE lien_demande_type_dossier_seq
- OWNED BY lien_demande_type_dossier.lien_demande_type_dossier;
+ALTER SEQUENCE lien_demande_type_dossier_instruction_type_seq
+ OWNED BY lien_demande_type_dossier_instruction_type.lien_demande_type_dossier_instruction_type;

-- Contrainte
-ALTER TABLE ONLY lien_demande_type_dossier
- ADD CONSTRAINT lien_demande_type_dossier_pkey PRIMARY KEY (lien_demande_type_dossier);
-ALTER TABLE ONLY lien_demande_type_dossier
- ADD CONSTRAINT lien_demande_type_dossier_demande_type_fk FOREIGN KEY (demande_type) REFERENCES demande_type(demande_type);
-ALTER TABLE ONLY lien_demande_type_dossier
- ADD CONSTRAINT lien_demande_type_dossier_dossier_instruction_type_fk FOREIGN KEY (dossier_instruction_type) REFERENCES dossier_instruction_type(dossier_instruction_type);
+ALTER TABLE ONLY lien_demande_type_dossier_instruction_type
+ ADD CONSTRAINT lien_demande_type_dossier_instruction_type_pkey PRIMARY KEY (lien_demande_type_dossier_instruction_type);
+ALTER TABLE ONLY lien_demande_type_dossier_instruction_type
+ ADD CONSTRAINT lien_demande_type_dossier_instruction_type_demande_type_fk FOREIGN KEY (demande_type) REFERENCES demande_type(demande_type);
+ALTER TABLE ONLY lien_demande_type_dossier_instruction_type
+ ADD CONSTRAINT lien_demande_type_dossier_instruction_type_dossier_instruction_type_fk FOREIGN KEY (dossier_instruction_type) REFERENCES dossier_instruction_type(dossier_instruction_type);

-- Commentaire
-COMMENT ON TABLE lien_demande_type_dossier IS 'Table de liaison entre demande type et dossiers d''instruction type';
-COMMENT ON COLUMN lien_demande_type_dossier.lien_demande_type_dossier IS 'Identifiant unique';
-COMMENT ON COLUMN lien_demande_type_dossier.demande_type IS 'Fait le lien avec la demadne type';
-COMMENT ON COLUMN lien_demande_type_dossier.dossier_instruction_type IS 'Fait le lien avec le type du dossier d''instruction';
+COMMENT ON TABLE lien_demande_type_dossier_instruction_type IS 'Table de liaison entre demande type et dossiers d''instruction type';
+COMMENT ON COLUMN lien_demande_type_dossier_instruction_type.lien_demande_type_dossier_instruction_type IS 'Identifiant unique';
+COMMENT ON COLUMN lien_demande_type_dossier_instruction_type.demande_type IS 'Fait le lien avec la demadne type';
+COMMENT ON COLUMN lien_demande_type_dossier_instruction_type.dossier_instruction_type IS 'Fait le lien avec le type du dossier d''instruction';

ALTER TABLE dossier_instruction_type
ADD maj_da_localisation boolean NOT NULL DEFAULT FALSE,

Modified: branches/4.9.0-dossiers-parallele/gen/obj/demande_type.class.php
===================================================================
--- branches/4.9.0-dossiers-parallele/gen/obj/demande_type.class.php 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/gen/obj/demande_type.class.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 29/10/2018 15:37
+//gen openMairie le 15/11/2018 16:09

require_once "../obj/om_dbform.class.php";

@@ -493,8 +493,8 @@
parent::cleSecondaire($id);
// Verification de la cle secondaire : demande
$this->rechercheTable($this->f->db, "demande", "demande_type", $id);
- // Verification de la cle secondaire : lien_demande_type_dossier
- $this->rechercheTable($this->f->db, "lien_demande_type_dossier", "demande_type", $id);
+ // Verification de la cle secondaire : lien_demande_type_dossier_instruction_type
+ $this->rechercheTable($this->f->db, "lien_demande_type_dossier_instruction_type", "demande_type", $id);
// Verification de la cle secondaire : lien_demande_type_etat
$this->rechercheTable($this->f->db, "lien_demande_type_etat", "demande_type", $id);
}

Modified: branches/4.9.0-dossiers-parallele/gen/obj/dossier_instruction_type.class.php
===================================================================
--- branches/4.9.0-dossiers-parallele/gen/obj/dossier_instruction_type.class.php 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/gen/obj/dossier_instruction_type.class.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 29/10/2018 15:49
+//gen openMairie le 15/11/2018 16:09

require_once "../obj/om_dbform.class.php";

@@ -386,8 +386,8 @@
$this->rechercheTable($this->f->db, "demande_type", "dossier_instruction_type", $id);
// Verification de la cle secondaire : dossier
$this->rechercheTable($this->f->db, "dossier", "dossier_instruction_type", $id);
- // Verification de la cle secondaire : lien_demande_type_dossier
- $this->rechercheTable($this->f->db, "lien_demande_type_dossier", "dossier_instruction_type", $id);
+ // Verification de la cle secondaire : lien_demande_type_dossier_instruction_type
+ $this->rechercheTable($this->f->db, "lien_demande_type_dossier_instruction_type", "dossier_instruction_type", $id);
// Verification de la cle secondaire : lien_dossier_instruction_type_evenement
$this->rechercheTable($this->f->db, "lien_dossier_instruction_type_evenement", "dossier_instruction_type", $id);
}

Deleted: branches/4.9.0-dossiers-parallele/gen/obj/lien_demande_type_dossier.class.php
===================================================================
--- branches/4.9.0-dossiers-parallele/gen/obj/lien_demande_type_dossier.class.php 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/gen/obj/lien_demande_type_dossier.class.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -1,253 +0,0 @@
-<?php
-//$Id$
-//gen openMairie le 29/10/2018 15:37
-
-require_once "../obj/om_dbform.class.php";
-
-class lien_demande_type_dossier_gen extends om_dbform {
-
- protected $_absolute_class_name = "lien_demande_type_dossier";
-
- var $table = "lien_demande_type_dossier";
- var $clePrimaire = "lien_demande_type_dossier";
- var $typeCle = "N";
- var $required_field = array(
- "lien_demande_type_dossier"
- );
-
- var $foreign_keys_extended = array(
- "demande_type" => array("demande_type", ),
- "dossier_instruction_type" => array("dossier_instruction_type", ),
- );
-
- /**
- *
- * @return string
- */
- function get_default_libelle() {
- return $this->getVal($this->clePrimaire)."&nbsp;".$this->getVal("demande_type");
- }
-
- /**
- *
- * @return array
- */
- function get_var_sql_forminc__champs() {
- return array(
- "lien_demande_type_dossier",
- "demande_type",
- "dossier_instruction_type",
- );
- }
-
- /**
- *
- * @return string
- */
- function get_var_sql_forminc__sql_demande_type() {
- return "SELECT demande_type.demande_type, demande_type.libelle FROM ".DB_PREFIXE."demande_type ORDER BY demande_type.libelle ASC";
- }
-
- /**
- *
- * @return string
- */
- function get_var_sql_forminc__sql_demande_type_by_id() {
- return "SELECT demande_type.demande_type, demande_type.libelle FROM ".DB_PREFIXE."demande_type WHERE demande_type = <idx>";
- }
-
- /**
- *
- * @return string
- */
- function get_var_sql_forminc__sql_dossier_instruction_type() {
- return "SELECT dossier_instruction_type.dossier_instruction_type, dossier_instruction_type.libelle FROM ".DB_PREFIXE."dossier_instruction_type ORDER BY dossier_instruction_type.libelle ASC";
- }
-
- /**
- *
- * @return string
- */
- function get_var_sql_forminc__sql_dossier_instruction_type_by_id() {
- return "SELECT dossier_instruction_type.dossier_instruction_type, dossier_instruction_type.libelle FROM ".DB_PREFIXE."dossier_instruction_type WHERE dossier_instruction_type = <idx>";
- }
-
-
-
-
- function setvalF($val = array()) {
- //affectation valeur formulaire
- if (!is_numeric($val['lien_demande_type_dossier'])) {
- $this->valF['lien_demande_type_dossier'] = ""; // -> requis
- } else {
- $this->valF['lien_demande_type_dossier'] = $val['lien_demande_type_dossier'];
- }
- if (!is_numeric($val['demande_type'])) {
- $this->valF['demande_type'] = NULL;
- } else {
- $this->valF['demande_type'] = $val['demande_type'];
- }
- if (!is_numeric($val['dossier_instruction_type'])) {
- $this->valF['dossier_instruction_type'] = NULL;
- } else {
- $this->valF['dossier_instruction_type'] = $val['dossier_instruction_type'];
- }
- }
-
- //=================================================
- //cle primaire automatique [automatic primary key]
- //==================================================
-
- function setId(&$dnu1 = null) {
- //numero automatique
- $this->valF[$this->clePrimaire] = $this->f->db->nextId(DB_PREFIXE.$this->table);
- }
-
- function setValFAjout($val = array()) {
- //numero automatique -> pas de controle ajout cle primaire
- }
-
- function verifierAjout($val = array(), &$dnu1 = null) {
- //numero automatique -> pas de verfication de cle primaire
- }
-
- //==========================
- // Formulaire [form]
- //==========================
- /**
- *
- */
- function setType(&$form, $maj) {
- // Récupération du mode de l'action
- $crud = $this->get_action_crud($maj);
-
- // MODE AJOUTER
- if ($maj == 0 || $crud == 'create') {
- $form->setType("lien_demande_type_dossier", "hidden");
- if ($this->is_in_context_of_foreign_key("demande_type", $this->retourformulaire)) {
- $form->setType("demande_type", "selecthiddenstatic");
- } else {
- $form->setType("demande_type", "select");
- }
- if ($this->is_in_context_of_foreign_key("dossier_instruction_type", $this->retourformulaire)) {
- $form->setType("dossier_instruction_type", "selecthiddenstatic");
- } else {
- $form->setType("dossier_instruction_type", "select");
- }
- }
-
- // MDOE MODIFIER
- if ($maj == 1 || $crud == 'update') {
- $form->setType("lien_demande_type_dossier", "hiddenstatic");
- if ($this->is_in_context_of_foreign_key("demande_type", $this->retourformulaire)) {
- $form->setType("demande_type", "selecthiddenstatic");
- } else {
- $form->setType("demande_type", "select");
- }
- if ($this->is_in_context_of_foreign_key("dossier_instruction_type", $this->retourformulaire)) {
- $form->setType("dossier_instruction_type", "selecthiddenstatic");
- } else {
- $form->setType("dossier_instruction_type", "select");
- }
- }
-
- // MODE SUPPRIMER
- if ($maj == 2 || $crud == 'delete') {
- $form->setType("lien_demande_type_dossier", "hiddenstatic");
- $form->setType("demande_type", "selectstatic");
- $form->setType("dossier_instruction_type", "selectstatic");
- }
-
- // MODE CONSULTER
- if ($maj == 3 || $crud == 'read') {
- $form->setType("lien_demande_type_dossier", "static");
- $form->setType("demande_type", "selectstatic");
- $form->setType("dossier_instruction_type", "selectstatic");
- }
-
- }
-
-
- function setOnchange(&$form, $maj) {
- //javascript controle client
- $form->setOnchange('lien_demande_type_dossier','VerifNum(this)');
- $form->setOnchange('demande_type','VerifNum(this)');
- $form->setOnchange('dossier_instruction_type','VerifNum(this)');
- }
- /**
- * Methode setTaille
- */
- function setTaille(&$form, $maj) {
- $form->setTaille("lien_demande_type_dossier", 11);
- $form->setTaille("demande_type", 11);
- $form->setTaille("dossier_instruction_type", 11);
- }
-
- /**
- * Methode setMax
- */
- function setMax(&$form, $maj) {
- $form->setMax("lien_demande_type_dossier", 11);
- $form->setMax("demande_type", 11);
- $form->setMax("dossier_instruction_type", 11);
- }
-
-
- function setLib(&$form, $maj) {
- //libelle des champs
- $form->setLib('lien_demande_type_dossier', __('lien_demande_type_dossier'));
- $form->setLib('demande_type', __('demande_type'));
- $form->setLib('dossier_instruction_type', __('dossier_instruction_type'));
- }
- /**
- *
- */
- function setSelect(&$form, $maj, &$dnu1 = null, $dnu2 = null) {
-
- // demande_type
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "demande_type",
- $this->get_var_sql_forminc__sql("demande_type"),
- $this->get_var_sql_forminc__sql("demande_type_by_id"),
- false
- );
- // dossier_instruction_type
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "dossier_instruction_type",
- $this->get_var_sql_forminc__sql("dossier_instruction_type"),
- $this->get_var_sql_forminc__sql("dossier_instruction_type_by_id"),
- false
- );
- }
-
-
- //==================================
- // sous Formulaire
- //==================================
-
-
- function setValsousformulaire(&$form, $maj, $validation, $idxformulaire, $retourformulaire, $typeformulaire, &$dnu1 = null, $dnu2 = null) {
- $this->retourformulaire = $retourformulaire;
- if($validation == 0) {
- if($this->is_in_context_of_foreign_key('demande_type', $this->retourformulaire))
- $form->setVal('demande_type', $idxformulaire);
- if($this->is_in_context_of_foreign_key('dossier_instruction_type', $this->retourformulaire))
- $form->setVal('dossier_instruction_type', $idxformulaire);
- }// fin validation
- $this->set_form_default_values($form, $maj, $validation);
- }// fin setValsousformulaire
-
- //==================================
- // cle secondaire
- //==================================
-
-
-}

Added: branches/4.9.0-dossiers-parallele/gen/obj/lien_demande_type_dossier_instruction_type.class.php
===================================================================
--- branches/4.9.0-dossiers-parallele/gen/obj/lien_demande_type_dossier_instruction_type.class.php (rev 0)
+++ branches/4.9.0-dossiers-parallele/gen/obj/lien_demande_type_dossier_instruction_type.class.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -0,0 +1,253 @@
+<?php
+//$Id$
+//gen openMairie le 15/11/2018 16:09
+
+require_once "../obj/om_dbform.class.php";
+
+class lien_demande_type_dossier_instruction_type_gen extends om_dbform {
+
+ protected $_absolute_class_name = "lien_demande_type_dossier_instruction_type";
+
+ var $table = "lien_demande_type_dossier_instruction_type";
+ var $clePrimaire = "lien_demande_type_dossier_instruction_type";
+ var $typeCle = "N";
+ var $required_field = array(
+ "lien_demande_type_dossier_instruction_type"
+ );
+
+ var $foreign_keys_extended = array(
+ "demande_type" => array("demande_type", ),
+ "dossier_instruction_type" => array("dossier_instruction_type", ),
+ );
+
+ /**
+ *
+ * @return string
+ */
+ function get_default_libelle() {
+ return $this->getVal($this->clePrimaire)."&nbsp;".$this->getVal("demande_type");
+ }
+
+ /**
+ *
+ * @return array
+ */
+ function get_var_sql_forminc__champs() {
+ return array(
+ "lien_demande_type_dossier_instruction_type",
+ "demande_type",
+ "dossier_instruction_type",
+ );
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_demande_type() {
+ return "SELECT demande_type.demande_type, demande_type.libelle FROM ".DB_PREFIXE."demande_type ORDER BY demande_type.libelle ASC";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_demande_type_by_id() {
+ return "SELECT demande_type.demande_type, demande_type.libelle FROM ".DB_PREFIXE."demande_type WHERE demande_type = <idx>";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_dossier_instruction_type() {
+ return "SELECT dossier_instruction_type.dossier_instruction_type, dossier_instruction_type.libelle FROM ".DB_PREFIXE."dossier_instruction_type ORDER BY dossier_instruction_type.libelle ASC";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_dossier_instruction_type_by_id() {
+ return "SELECT dossier_instruction_type.dossier_instruction_type, dossier_instruction_type.libelle FROM ".DB_PREFIXE."dossier_instruction_type WHERE dossier_instruction_type = <idx>";
+ }
+
+
+
+
+ function setvalF($val = array()) {
+ //affectation valeur formulaire
+ if (!is_numeric($val['lien_demande_type_dossier_instruction_type'])) {
+ $this->valF['lien_demande_type_dossier_instruction_type'] = ""; // -> requis
+ } else {
+ $this->valF['lien_demande_type_dossier_instruction_type'] = $val['lien_demande_type_dossier_instruction_type'];
+ }
+ if (!is_numeric($val['demande_type'])) {
+ $this->valF['demande_type'] = NULL;
+ } else {
+ $this->valF['demande_type'] = $val['demande_type'];
+ }
+ if (!is_numeric($val['dossier_instruction_type'])) {
+ $this->valF['dossier_instruction_type'] = NULL;
+ } else {
+ $this->valF['dossier_instruction_type'] = $val['dossier_instruction_type'];
+ }
+ }
+
+ //=================================================
+ //cle primaire automatique [automatic primary key]
+ //==================================================
+
+ function setId(&$dnu1 = null) {
+ //numero automatique
+ $this->valF[$this->clePrimaire] = $this->f->db->nextId(DB_PREFIXE.$this->table);
+ }
+
+ function setValFAjout($val = array()) {
+ //numero automatique -> pas de controle ajout cle primaire
+ }
+
+ function verifierAjout($val = array(), &$dnu1 = null) {
+ //numero automatique -> pas de verfication de cle primaire
+ }
+
+ //==========================
+ // Formulaire [form]
+ //==========================
+ /**
+ *
+ */
+ function setType(&$form, $maj) {
+ // Récupération du mode de l'action
+ $crud = $this->get_action_crud($maj);
+
+ // MODE AJOUTER
+ if ($maj == 0 || $crud == 'create') {
+ $form->setType("lien_demande_type_dossier_instruction_type", "hidden");
+ if ($this->is_in_context_of_foreign_key("demande_type", $this->retourformulaire)) {
+ $form->setType("demande_type", "selecthiddenstatic");
+ } else {
+ $form->setType("demande_type", "select");
+ }
+ if ($this->is_in_context_of_foreign_key("dossier_instruction_type", $this->retourformulaire)) {
+ $form->setType("dossier_instruction_type", "selecthiddenstatic");
+ } else {
+ $form->setType("dossier_instruction_type", "select");
+ }
+ }
+
+ // MDOE MODIFIER
+ if ($maj == 1 || $crud == 'update') {
+ $form->setType("lien_demande_type_dossier_instruction_type", "hiddenstatic");
+ if ($this->is_in_context_of_foreign_key("demande_type", $this->retourformulaire)) {
+ $form->setType("demande_type", "selecthiddenstatic");
+ } else {
+ $form->setType("demande_type", "select");
+ }
+ if ($this->is_in_context_of_foreign_key("dossier_instruction_type", $this->retourformulaire)) {
+ $form->setType("dossier_instruction_type", "selecthiddenstatic");
+ } else {
+ $form->setType("dossier_instruction_type", "select");
+ }
+ }
+
+ // MODE SUPPRIMER
+ if ($maj == 2 || $crud == 'delete') {
+ $form->setType("lien_demande_type_dossier_instruction_type", "hiddenstatic");
+ $form->setType("demande_type", "selectstatic");
+ $form->setType("dossier_instruction_type", "selectstatic");
+ }
+
+ // MODE CONSULTER
+ if ($maj == 3 || $crud == 'read') {
+ $form->setType("lien_demande_type_dossier_instruction_type", "static");
+ $form->setType("demande_type", "selectstatic");
+ $form->setType("dossier_instruction_type", "selectstatic");
+ }
+
+ }
+
+
+ function setOnchange(&$form, $maj) {
+ //javascript controle client
+ $form->setOnchange('lien_demande_type_dossier_instruction_type','VerifNum(this)');
+ $form->setOnchange('demande_type','VerifNum(this)');
+ $form->setOnchange('dossier_instruction_type','VerifNum(this)');
+ }
+ /**
+ * Methode setTaille
+ */
+ function setTaille(&$form, $maj) {
+ $form->setTaille("lien_demande_type_dossier_instruction_type", 11);
+ $form->setTaille("demande_type", 11);
+ $form->setTaille("dossier_instruction_type", 11);
+ }
+
+ /**
+ * Methode setMax
+ */
+ function setMax(&$form, $maj) {
+ $form->setMax("lien_demande_type_dossier_instruction_type", 11);
+ $form->setMax("demande_type", 11);
+ $form->setMax("dossier_instruction_type", 11);
+ }
+
+
+ function setLib(&$form, $maj) {
+ //libelle des champs
+ $form->setLib('lien_demande_type_dossier_instruction_type', __('lien_demande_type_dossier_instruction_type'));
+ $form->setLib('demande_type', __('demande_type'));
+ $form->setLib('dossier_instruction_type', __('dossier_instruction_type'));
+ }
+ /**
+ *
+ */
+ function setSelect(&$form, $maj, &$dnu1 = null, $dnu2 = null) {
+
+ // demande_type
+ $this->init_select(
+ $form,
+ $this->f->db,
+ $maj,
+ null,
+ "demande_type",
+ $this->get_var_sql_forminc__sql("demande_type"),
+ $this->get_var_sql_forminc__sql("demande_type_by_id"),
+ false
+ );
+ // dossier_instruction_type
+ $this->init_select(
+ $form,
+ $this->f->db,
+ $maj,
+ null,
+ "dossier_instruction_type",
+ $this->get_var_sql_forminc__sql("dossier_instruction_type"),
+ $this->get_var_sql_forminc__sql("dossier_instruction_type_by_id"),
+ false
+ );
+ }
+
+
+ //==================================
+ // sous Formulaire
+ //==================================
+
+
+ function setValsousformulaire(&$form, $maj, $validation, $idxformulaire, $retourformulaire, $typeformulaire, &$dnu1 = null, $dnu2 = null) {
+ $this->retourformulaire = $retourformulaire;
+ if($validation == 0) {
+ if($this->is_in_context_of_foreign_key('demande_type', $this->retourformulaire))
+ $form->setVal('demande_type', $idxformulaire);
+ if($this->is_in_context_of_foreign_key('dossier_instruction_type', $this->retourformulaire))
+ $form->setVal('dossier_instruction_type', $idxformulaire);
+ }// fin validation
+ $this->set_form_default_values($form, $maj, $validation);
+ }// fin setValsousformulaire
+
+ //==================================
+ // cle secondaire
+ //==================================
+
+
+}


Property changes on: branches/4.9.0-dossiers-parallele/gen/obj/lien_demande_type_dossier_instruction_type.class.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: branches/4.9.0-dossiers-parallele/gen/sql/pgsql/demande_type.inc.php
===================================================================
--- branches/4.9.0-dossiers-parallele/gen/sql/pgsql/demande_type.inc.php 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/gen/sql/pgsql/demande_type.inc.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 29/10/2018 15:37
+//gen openMairie le 15/11/2018 16:09

$DEBUG=0;
$serie=15;
@@ -103,7 +103,7 @@
*/
$sousformulaire = array(
'demande',
- 'lien_demande_type_dossier',
+ 'lien_demande_type_dossier_instruction_type',
'lien_demande_type_etat',
);


Modified: branches/4.9.0-dossiers-parallele/gen/sql/pgsql/dossier_instruction_type.inc.php
===================================================================
--- branches/4.9.0-dossiers-parallele/gen/sql/pgsql/dossier_instruction_type.inc.php 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/gen/sql/pgsql/dossier_instruction_type.inc.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 29/10/2018 15:49
+//gen openMairie le 15/11/2018 16:09

$DEBUG=0;
$serie=15;
@@ -75,7 +75,7 @@
$sousformulaire = array(
'demande_type',
'dossier',
- 'lien_demande_type_dossier',
+ 'lien_demande_type_dossier_instruction_type',
'lien_dossier_instruction_type_evenement',
);


Deleted: branches/4.9.0-dossiers-parallele/gen/sql/pgsql/lien_demande_type_dossier.inc.php
===================================================================
--- branches/4.9.0-dossiers-parallele/gen/sql/pgsql/lien_demande_type_dossier.inc.php 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/gen/sql/pgsql/lien_demande_type_dossier.inc.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -1,63 +0,0 @@
-<?php
-//$Id$
-//gen openMairie le 29/10/2018 15:37
-
-$DEBUG=0;
-$serie=15;
-$ent = __("application")." -> ".__("lien_demande_type_dossier");
-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."lien_demande_type_dossier
- LEFT JOIN ".DB_PREFIXE."demande_type
- ON lien_demande_type_dossier.demande_type=demande_type.demande_type
- LEFT JOIN ".DB_PREFIXE."dossier_instruction_type
- ON lien_demande_type_dossier.dossier_instruction_type=dossier_instruction_type.dossier_instruction_type ";
-// SELECT
-$champAffiche = array(
- 'lien_demande_type_dossier.lien_demande_type_dossier as "'.__("lien_demande_type_dossier").'"',
- 'demande_type.libelle as "'.__("demande_type").'"',
- 'dossier_instruction_type.libelle as "'.__("dossier_instruction_type").'"',
- );
-//
-$champNonAffiche = array(
- );
-//
-$champRecherche = array(
- 'lien_demande_type_dossier.lien_demande_type_dossier as "'.__("lien_demande_type_dossier").'"',
- 'demande_type.libelle as "'.__("demande_type").'"',
- 'dossier_instruction_type.libelle as "'.__("dossier_instruction_type").'"',
- );
-$tri="ORDER BY demande_type.libelle ASC NULLS LAST";
-$edition="lien_demande_type_dossier";
-/**
- * Gestion de la clause WHERE => $selection
- */
-// Filtre listing standard
-$selection = "";
-// Liste des clés étrangères avec leurs éventuelles surcharges
-$foreign_keys_extended = array(
- "demande_type" => array("demande_type", ),
- "dossier_instruction_type" => array("dossier_instruction_type", ),
-);
-// Filtre listing sous formulaire - demande_type
-if (in_array($retourformulaire, $foreign_keys_extended["demande_type"])) {
- $selection = " WHERE (lien_demande_type_dossier.demande_type = ".intval($idxformulaire).") ";
-}
-// Filtre listing sous formulaire - dossier_instruction_type
-if (in_array($retourformulaire, $foreign_keys_extended["dossier_instruction_type"])) {
- $selection = " WHERE (lien_demande_type_dossier.dossier_instruction_type = ".intval($idxformulaire).") ";
-}
-

Added: branches/4.9.0-dossiers-parallele/gen/sql/pgsql/lien_demande_type_dossier_instruction_type.inc.php
===================================================================
--- branches/4.9.0-dossiers-parallele/gen/sql/pgsql/lien_demande_type_dossier_instruction_type.inc.php (rev 0)
+++ branches/4.9.0-dossiers-parallele/gen/sql/pgsql/lien_demande_type_dossier_instruction_type.inc.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -0,0 +1,63 @@
+<?php
+//$Id$
+//gen openMairie le 15/11/2018 16:09
+
+$DEBUG=0;
+$serie=15;
+$ent = __("application")." -> ".__("lien_demande_type_dossier_instruction_type");
+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."lien_demande_type_dossier_instruction_type
+ LEFT JOIN ".DB_PREFIXE."demande_type
+ ON lien_demande_type_dossier_instruction_type.demande_type=demande_type.demande_type
+ LEFT JOIN ".DB_PREFIXE."dossier_instruction_type
+ ON lien_demande_type_dossier_instruction_type.dossier_instruction_type=dossier_instruction_type.dossier_instruction_type ";
+// SELECT
+$champAffiche = array(
+ 'lien_demande_type_dossier_instruction_type.lien_demande_type_dossier_instruction_type as "'.__("lien_demande_type_dossier_instruction_type").'"',
+ 'demande_type.libelle as "'.__("demande_type").'"',
+ 'dossier_instruction_type.libelle as "'.__("dossier_instruction_type").'"',
+ );
+//
+$champNonAffiche = array(
+ );
+//
+$champRecherche = array(
+ 'lien_demande_type_dossier_instruction_type.lien_demande_type_dossier_instruction_type as "'.__("lien_demande_type_dossier_instruction_type").'"',
+ 'demande_type.libelle as "'.__("demande_type").'"',
+ 'dossier_instruction_type.libelle as "'.__("dossier_instruction_type").'"',
+ );
+$tri="ORDER BY demande_type.libelle ASC NULLS LAST";
+$edition="lien_demande_type_dossier_instruction_type";
+/**
+ * Gestion de la clause WHERE => $selection
+ */
+// Filtre listing standard
+$selection = "";
+// Liste des clés étrangères avec leurs éventuelles surcharges
+$foreign_keys_extended = array(
+ "demande_type" => array("demande_type", ),
+ "dossier_instruction_type" => array("dossier_instruction_type", ),
+);
+// Filtre listing sous formulaire - demande_type
+if (in_array($retourformulaire, $foreign_keys_extended["demande_type"])) {
+ $selection = " WHERE (lien_demande_type_dossier_instruction_type.demande_type = ".intval($idxformulaire).") ";
+}
+// Filtre listing sous formulaire - dossier_instruction_type
+if (in_array($retourformulaire, $foreign_keys_extended["dossier_instruction_type"])) {
+ $selection = " WHERE (lien_demande_type_dossier_instruction_type.dossier_instruction_type = ".intval($idxformulaire).") ";
+}
+


Property changes on: branches/4.9.0-dossiers-parallele/gen/sql/pgsql/lien_demande_type_dossier_instruction_type.inc.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: branches/4.9.0-dossiers-parallele/obj/demande_type.class.php
===================================================================
--- branches/4.9.0-dossiers-parallele/obj/demande_type.class.php 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/obj/demande_type.class.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -78,6 +78,9 @@
$form->setLib("etats_autorises", _("etats du dernier dossier d'instruction"));
$form->setLib("regeneration_cle_citoyen", _("regénérer la clé d'accès au portail citoyen"));
$form->setLib('dossier_autorisation_type_detaille', $this->lib_dossier_autorisation_type_detaille);
+
+ //
+ $form->setLib("dossier_instruction_type_compatible", _("Type de dossiers d’instruction compatibles"));
}

function setLayout(&$form, $maj) {
@@ -105,10 +108,12 @@
if ($maj < 2 ) {
$form->setType("contraintes","select");
$form->setType("etats_autorises","select_multiple");
+ $form->setType("dossier_instruction_type_compatible","select_multiple");
}
if ($maj >= 2) {
$form->setType("contraintes","selecthiddenstatic");
$form->setType("etats_autorises","select_multiple_static");
+ $form->setType("dossier_instruction_type_compatible","select_multiple_static");
}
}

@@ -136,7 +141,10 @@
if ($maj < 2) {
// Initialise les select en fonction de la valeur d'un autre champ
$form->setSelect('dossier_autorisation_type_detaille', $this->loadSelect_dossier_autorisation_type_detaille($form, $maj, $db, $debug, "groupe"));
- $form->setSelect('dossier_instruction_type', $this->loadSelect_dossier_instruction_type($form, $maj, $db, $debug, "dossier_autorisation_type_detaille"));
+ $form->setSelect('dossier_instruction_type', $this->loadSelect_dossier_instruction_type($form,
+ $maj, $db, $debug, "dossier_autorisation_type_detaille"));
+ $form->setSelect('dossier_instruction_type_compatible', $this->loadSelect_dossier_instruction_type($form,
+ $maj, $db, $debug, "dossier_autorisation_type_detaille"));
}
}

@@ -150,7 +158,7 @@

//Au changement sur le champ groupe, réinitilisation des champs dossier_autorisation_type_detaille et dossier_instruction_type
$form->setOnchange('groupe', 'filterSelect(this.value, \'dossier_autorisation_type_detaille\', \'groupe\', \'demande_type\'), filterSelect(dossier_autorisation_type_detaille.value, \'dossier_instruction_type\', \'dossier_autorisation_type_detaille\', \'demande_type\')');
- $form->setOnchange('dossier_autorisation_type_detaille', 'filterSelect(this.value, \'dossier_instruction_type\', \'dossier_autorisation_type_detaille\', \'demande_type\')');
+ $form->setOnchange('dossier_autorisation_type_detaille', 'filterSelect(this.value, \'dossier_instruction_type\', \'dossier_autorisation_type_detaille\', \'demande_type\');filterSelect(this.value, \'dossier_instruction_type_compatible\', \'dossier_autorisation_type_detaille\', \'demande_type\')');
$form->setOnchange("demande_nature", "VerifNum(this);required_fields_demande_type(this.value, '".addslashes($this->lib_dossier_autorisation_type_detaille)."', '".addslashes($this->lib_dossier_instruction_type)."');");

}

Modified: branches/4.9.0-dossiers-parallele/obj/dossier_instruction_type.class.php
===================================================================
--- branches/4.9.0-dossiers-parallele/obj/dossier_instruction_type.class.php 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/obj/dossier_instruction_type.class.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -50,7 +50,7 @@
$form->setBloc('mouvement_sitadel','F');
$form->setFieldset('mouvement_sitadel','F','');

- $form->setFieldset('maj_da_localisation','D',_('Modification des données du dossier d\'autorisation'));
+ $form->setFieldset('maj_da_localisation', 'D', _("Modification des données du dossier d'autorisation"));
$form->setBloc('maj_da_localisation','D',"","col_12");
$form->setBloc('maj_da_dt','F');
$form->setFieldset('maj_da_dt','F','');

Modified: branches/4.9.0-dossiers-parallele/sql/pgsql/demande_type.form.inc.php
===================================================================
--- branches/4.9.0-dossiers-parallele/sql/pgsql/demande_type.form.inc.php 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/sql/pgsql/demande_type.form.inc.php 2018-11-15 17:30:44 UTC (rev 8341)
@@ -29,7 +29,9 @@
"demande_type.dossier_autorisation_type_detaille",
"demande_type.demande_nature",
"array_to_string(array_agg(lien_demande_type_etat.etat
- ORDER BY etat.libelle), ';') as etats_autorises",
+ ORDER BY etat.libelle), ';') as etats_autorises",
+ "array_to_string(array_agg(lien_demande_type_dossier_instruction_type.dossier_instruction_type
+ ORDER BY dossier_instruction_type.libelle), ';') as dossier_instruction_type_compatible",
"demande_type.contraintes",
"demande_type.dossier_instruction_type",
"demande_type.qualification",
@@ -40,11 +42,15 @@

//
$tableSelect = "
-".DB_PREFIXE."demande_type
- LEFT JOIN ".DB_PREFIXE."lien_demande_type_etat
- ON lien_demande_type_etat.demande_type=demande_type.demande_type
- LEFT JOIN ".DB_PREFIXE."etat
- ON lien_demande_type_etat.etat=etat.etat";
+ ".DB_PREFIXE."demande_type
+ LEFT JOIN ".DB_PREFIXE."lien_demande_type_etat
+ ON lien_demande_type_etat.demande_type=demande_type.demande_type
+ LEFT JOIN ".DB_PREFIXE."etat
+ ON lien_demande_type_etat.etat=etat.etat
+ LEFT JOIN ".DB_PREFIXE."lien_demande_type_dossier_instruction_type
+ ON lien_demande_type_dossier_instruction_type.demande_type = demande_type.demande_type
+ LEFT JOIN ".DB_PREFIXE."dossier_instruction_type
+ ON lien_demande_type_dossier_instruction_type.dossier_instruction_type = dossier_instruction_type.dossier_instruction_type";
//
$selection = " GROUP BY demande_type.demande_type, demande_type.libelle ";

@@ -102,7 +108,7 @@
$sql_dossier_instruction_type_by_dossier_autorisation_type_detaille = "
SELECT
dossier_instruction_type.dossier_instruction_type,
- (dossier_autorisation_type_detaille.code||' - '||dossier_instruction_type.libelle) as lib
+ CONCAT_WS(' - ', dossier_autorisation_type_detaille.code, dossier_instruction_type.libelle) as lib
FROM ".DB_PREFIXE."dossier_instruction_type
LEFT JOIN ".DB_PREFIXE."dossier_autorisation_type_detaille
ON dossier_instruction_type.dossier_autorisation_type_detaille = dossier_autorisation_type_detaille.dossier_autorisation_type_detaille

Modified: branches/4.9.0-dossiers-parallele/tests/resources/app/gen/gen_resources.robot
===================================================================
--- branches/4.9.0-dossiers-parallele/tests/resources/app/gen/gen_resources.robot 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/tests/resources/app/gen/gen_resources.robot 2018-11-15 17:30:44 UTC (rev 8341)
@@ -2,7 +2,7 @@
Documentation Ressources de mots-clefs générés
... @author generated
... @package openADS
-... @version 29/10/2018 15:10
+... @version 15/11/2018 16:11

Resource action.robot
Resource affectation_automatique.robot
@@ -49,7 +49,7 @@
Resource instructeur_qualite.robot
Resource instruction.robot
Resource lien_demande_demandeur.robot
-Resource lien_demande_type_dossier.robot
+Resource lien_demande_type_dossier_instruction_type.robot
Resource lien_demande_type_etat.robot
Resource lien_document_numerise_type_instructeur_qualite.robot
Resource lien_donnees_techniques_moyen_retenu_juge.robot

Deleted: branches/4.9.0-dossiers-parallele/tests/resources/app/gen/lien_demande_type_dossier.robot
===================================================================
--- branches/4.9.0-dossiers-parallele/tests/resources/app/gen/lien_demande_type_dossier.robot 2018-11-15 14:19:24 UTC (rev 8340)
+++ branches/4.9.0-dossiers-parallele/tests/resources/app/gen/lien_demande_type_dossier.robot 2018-11-15 17:30:44 UTC (rev 8341)
@@ -1,68 +0,0 @@
-*** Settings ***
-Documentation CRUD de la table lien_demande_type_dossier
-... @author generated
-... @package openADS
-... @version 29/10/2018 15:10
-
-*** Keywords ***
-
-Depuis le contexte lien_demande_type_dossier
- [Documentation] Accède au formulaire
- [Arguments] ${lien_demande_type_dossier}
-
- # On accède au tableau
- Go To Tab lien_demande_type_dossier
- # On recherche l'enregistrement
- Use Simple Search lien_demande_type_dossier ${lien_demande_type_dossier}
- # On clique sur le résultat
- Click On Link ${lien_demande_type_dossier}
- # On vérifie qu'il n'y a pas d'erreur
- Page Should Not Contain Errors
-
-Ajouter lien_demande_type_dossier
- [Documentation] Crée l'enregistrement
- [Arguments] ${values}
-
- # On accède au tableau
- Go To Tab lien_demande_type_dossier
- # On clique sur le bouton ajouter
- Click On Add Button
- # On saisit des valeurs
- Saisir lien_demande_type_dossier ${values}
- # On valide le formulaire
- Click On Submit Button
- # On récupère l'ID du nouvel enregistrement
- ${lien_demande_type_dossier} = Get Text css=div.form-content span#lien_demande_type_dossier
- # On le retourne
- [Return] ${lien_demande_type_dossier}
-
-Modifier lien_demande_type_dossier
- [Documentation] Modifie l'enregistrement
- [Arguments] ${lien_demande_type_dossier} ${values}
-
- # On accède à l'enregistrement
- Depuis le contexte lien_demande_type_dossier ${lien_demande_type_dossier}
- # On clique sur le bouton modifier
- Click On Form Portlet Action lien_demande_type_dossier modifier
- # On saisit des valeurs
- Saisir lien_demande_type_dossier ${values}
- # On valide le formulaire
- Click On Submit Button
-
-Supprimer lien_demande_type_dossier
- [Documentation] Supprime l'enregistrement
- [Arguments] ${lien_demande_type_dossier}
-
- # On accède à l'enregistrement
- Depuis le contexte lien_demande_type_dossier ${lien_demande_type_dossier}
- # On clique sur le bouton supprimer
- Click On Form Portlet Action lien_demande_type_dossier supprimer
- # On valide le formulaire
- Click On Submit Button
-
-Saisir lien_demande_type_dossier
- [Documentation] Remplit le formulaire
- [Arguments] ${values}
-
- Si "demande_type" existe dans "${values}" on execute "Select From List By Label" dans le formulaire
- Si "dossier_instruction_type" existe dans "${values}" on execute "Select From List By Label" dans le formulaire
\ No newline at end of file

Added: branches/4.9.0-dossiers-parallele/tests/resources/app/gen/lien_demande_type_dossier_instruction_type.robot
===================================================================
--- branches/4.9.0-dossiers-parallele/tests/resources/app/gen/lien_demande_type_dossier_instruction_type.robot (rev 0)
+++ branches/4.9.0-dossiers-parallele/tests/resources/app/gen/lien_demande_type_dossier_instruction_type.robot 2018-11-15 17:30:44 UTC (rev 8341)
@@ -0,0 +1,68 @@
+*** Settings ***
+Documentation CRUD de la table lien_demande_type_dossier_instruction_type
+... @author generated
+... @package openADS
+... @version 15/11/2018 16:11
+
+*** Keywords ***
+
+Depuis le contexte lien_demande_type_dossier_instruction_type
+ [Documentation] Accède au formulaire
+ [Arguments] ${lien_demande_type_dossier_instruction_type}
+
+ # On accède au tableau
+ Go To Tab lien_demande_type_dossier_instruction_type
+ # On recherche l'enregistrement
+ Use Simple Search lien_demande_type_dossier_instruction_type ${lien_demande_type_dossier_instruction_type}
+ # On clique sur le résultat
+ Click On Link ${lien_demande_type_dossier_instruction_type}
+ # On vérifie qu'il n'y a pas d'erreur
+ Page Should Not Contain Errors
+
+Ajouter lien_demande_type_dossier_instruction_type
+ [Documentation] Crée l'enregistrement
+ [Arguments] ${values}
+
+ # On accède au tableau
+ Go To Tab lien_demande_type_dossier_instruction_type
+ # On clique sur le bouton ajouter
+ Click On Add Button
+ # On saisit des valeurs
+ Saisir lien_demande_type_dossier_instruction_type ${values}
+ # On valide le formulaire
+ Click On Submit Button
+ # On récupère l'ID du nouvel enregistrement
+ ${lien_demande_type_dossier_instruction_type} = Get Text css=div.form-content span#lien_demande_type_dossier_instruction_type
+ # On le retourne
+ [Return] ${lien_demande_type_dossier_instruction_type}
+
+Modifier lien_demande_type_dossier_instruction_type
+ [Documentation] Modifie l'enregistrement
+ [Arguments] ${lien_demande_type_dossier_instruction_type} ${values}
+
+ # On accède à l'enregistrement
+ Depuis le contexte lien_demande_type_dossier_instruction_type ${lien_demande_type_dossier_instruction_type}
+ # On clique sur le bouton modifier
+ Click On Form Portlet Action lien_demande_type_dossier_instruction_type modifier
+ # On saisit des valeurs
+ Saisir lien_demande_type_dossier_instruction_type ${values}
+ # On valide le formulaire
+ Click On Submit Button
+
+Supprimer lien_demande_type_dossier_instruction_type
+ [Documentation] Supprime l'enregistrement
+ [Arguments] ${lien_demande_type_dossier_instruction_type}
+
+ # On accède à l'enregistrement
+ Depuis le contexte lien_demande_type_dossier_instruction_type ${lien_demande_type_dossier_instruction_type}
+ # On clique sur le bouton supprimer
+ Click On Form Portlet Action lien_demande_type_dossier_instruction_type supprimer
+ # On valide le formulaire
+ Click On Submit Button
+
+Saisir lien_demande_type_dossier_instruction_type
+ [Documentation] Remplit le formulaire
+ [Arguments] ${values}
+
+ Si "demande_type" existe dans "${values}" on execute "Select From List By Label" dans le formulaire
+ Si "dossier_instruction_type" existe dans "${values}" on execute "Select From List By Label" dans le formulaire
\ No newline at end of file


Property changes on: branches/4.9.0-dossiers-parallele/tests/resources/app/gen/lien_demande_type_dossier_instruction_type.robot
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property