[openelec-Commits] r1552 - in branches/5.2.0-develop_onglet_piece: data/pgsql gen/dyn gen/obj gen/sql/pgsql obj sql/pgsql tests/resources/app/gen
0 views
Skip to first unread message
gmal...@adullact.net
Jan 21, 2019, 9:43:38 AM1/21/19
to openmairi...@googlegroups.com
Author: gmalvolti
Date: 2019-01-21 15:43:32 +0100 (Mon, 21 Jan 2019)
New Revision: 1552
Added:
branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php
branches/5.2.0-develop_onglet_piece/gen/obj/piece_type.class.php
branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php
branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece_type.inc.php
branches/5.2.0-develop_onglet_piece/obj/piece.class.php
branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece.robot
branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece_type.robot
Modified:
branches/5.2.0-develop_onglet_piece/data/pgsql/init_permissions.sql
branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql
branches/5.2.0-develop_onglet_piece/gen/dyn/gen.inc.php
branches/5.2.0-develop_onglet_piece/gen/dyn/permissions.inc.php
branches/5.2.0-develop_onglet_piece/gen/obj/mouvement.class.php
branches/5.2.0-develop_onglet_piece/gen/obj/om_collectivite.class.php
branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/mouvement.inc.php
branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/om_collectivite.inc.php
branches/5.2.0-develop_onglet_piece/sql/pgsql/inscription.inc.php
branches/5.2.0-develop_onglet_piece/sql/pgsql/modification.inc.php
branches/5.2.0-develop_onglet_piece/sql/pgsql/radiation.inc.php
branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/gen_resources.robot
Log:
Cr?\195?\169ation des tables, ajout de l'onglet pi?\195?\168ce et changement du type de champs de fichier.
Modified: branches/5.2.0-develop_onglet_piece/data/pgsql/init_permissions.sql
===================================================================
--- branches/5.2.0-develop_onglet_piece/data/pgsql/init_permissions.sql 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/data/pgsql/init_permissions.sql 2019-01-21 14:43:32 UTC (rev 1552)
@@ -337,6 +337,18 @@
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'parametrage_nb_jures_supprimer', 'gen');
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'parametrage_nb_jures_tab', 'gen');
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'password', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_ajouter', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_consulter', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_modifier', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_supprimer', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_tab', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type_ajouter', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type_consulter', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type_modifier', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type_supprimer', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type_tab', 'gen');
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'procuration', 'gen');
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'procuration_ajouter', 'gen');
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'procuration_consulter', 'gen');
Modified: branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql
===================================================================
--- branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql 2019-01-21 14:43:32 UTC (rev 1552)
@@ -6,3 +6,67 @@
--
+-- Ticket #??? Gérer les pièces dématérialisées sur les mouvements - Begin
+--
+CREATE TABLE openelec.piece(
+ id integer NOT NULL,
+ libelle character varying(100) NOT NULL,
+ piece_type integer NOT NULL,
+ mouvement integer NOT NULL,
+ fichier character varying(50) NOT NULL,
+ om_collectivite integer NOT NULL
+);
+
+
+CREATE SEQUENCE piece_seq
+START WITH 1
+INCREMENT BY 1
+NO MINVALUE
+NO MAXVALUE
+CACHE 1;
+
+ALTER SEQUENCE piece_seq OWNED BY piece.id;
+
+
+
+CREATE TABLE openelec.piece_type(
+ id integer NOT NULL,
+ libelle character varying(100),
+ code character varying(20),
+ description text,
+ om_validite_debut date,
+ om_validite_fin date
+);
+
+
+CREATE SEQUENCE piece_type_seq
+START WITH 1
+INCREMENT BY 1
+NO MINVALUE
+NO MAXVALUE
+CACHE 1;
+
+ALTER SEQUENCE piece_type_seq OWNED BY piece_type.id;
+
+
+
+
+ALTER TABLE ONLY openelec.piece_type
+ ADD CONSTRAINT piece_type_pkey PRIMARY KEY (id);
+
+ALTER TABLE ONLY openelec.piece
+ ADD CONSTRAINT piece_pkey PRIMARY KEY (id);
+
+
+
+ALTER TABLE ONLY openelec.piece
+ ADD CONSTRAINT piece_piece_type_fkey FOREIGN KEY (piece_type) REFERENCES openelec.piece_type(id);
+
+ALTER TABLE ONLY openelec.piece
+ ADD CONSTRAINT piece_mouvement_fkey FOREIGN KEY (mouvement) REFERENCES openelec.mouvement(id);
+
+ALTER TABLE ONLY openelec.piece
+ ADD CONSTRAINT piece_om_collectivite_fkey FOREIGN KEY (om_collectivite) REFERENCES openelec.om_collectivite(om_collectivite);
+--
+-- Ticket #??? Gérer les pièces dématérialisées sur les mouvements - End
+--
Modified: branches/5.2.0-develop_onglet_piece/gen/dyn/gen.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/dyn/gen.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/dyn/gen.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -15,6 +15,10 @@
$administration_parametrage = "Administration & Paramétrage";
+$tables_to_avoid = array(
+ 'reu_sync_listes'
+);
+
/**
*
*/
Modified: branches/5.2.0-develop_onglet_piece/gen/dyn/permissions.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/dyn/permissions.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/dyn/permissions.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -14,6 +14,7 @@
"openelec.class.php",
"om_gen.class.php",
"om_application_override.class.php",
+ "reu.class.php",
);
$permissions = array(
Modified: branches/5.2.0-develop_onglet_piece/gen/obj/mouvement.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/obj/mouvement.class.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/obj/mouvement.class.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 16/01/2019 14:42
+//gen openMairie le 21/01/2019 14:25
require_once "../obj/om_dbform.class.php";
@@ -946,5 +946,15 @@
// cle secondaire
//==================================
+ /**
+ * Methode clesecondaire
+ */
+ function cleSecondaire($id, &$dnu1 = null, $val = array(), $dnu2 = null) {
+ // On appelle la methode de la classe parent
+ parent::cleSecondaire($id);
+ // Verification de la cle secondaire : piece
+ $this->rechercheTable($this->f->db, "piece", "mouvement", $id);
+ }
+
}
Modified: branches/5.2.0-develop_onglet_piece/gen/obj/om_collectivite.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/obj/om_collectivite.class.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/obj/om_collectivite.class.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 02/01/2019 07:01
+//gen openMairie le 21/01/2019 14:25
require_once "../obj/om_dbform.class.php";
@@ -214,6 +214,8 @@
$this->rechercheTable($this->f->db, "om_utilisateur", "om_collectivite", $id);
// Verification de la cle secondaire : parametrage_nb_jures
$this->rechercheTable($this->f->db, "parametrage_nb_jures", "om_collectivite", $id);
+ // Verification de la cle secondaire : piece
+ $this->rechercheTable($this->f->db, "piece", "om_collectivite", $id);
// Verification de la cle secondaire : voie
$this->rechercheTable($this->f->db, "voie", "om_collectivite", $id);
}
Added: branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php (rev 0)
+++ branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,374 @@
+<?php
+//$Id$
+//gen openMairie le 21/01/2019 15:15
+
+require_once "../obj/om_dbform.class.php";
+
+class piece_gen extends om_dbform {
+
+ protected $_absolute_class_name = "piece";
+
+ var $table = "piece";
+ var $clePrimaire = "id";
+ var $typeCle = "N";
+ var $required_field = array(
+ "fichier",
+ "id",
+ "libelle",
+ "mouvement",
+ "om_collectivite",
+ "piece_type"
+ );
+
+ var $foreign_keys_extended = array(
+ "mouvement" => array("mouvement", ),
+ "om_collectivite" => array("om_collectivite", ),
+ "piece_type" => array("piece_type", ),
+ );
+
+ /**
+ *
+ * @return string
+ */
+ function get_default_libelle() {
+ return $this->getVal($this->clePrimaire)." ".$this->getVal("libelle");
+ }
+
+ /**
+ *
+ * @return array
+ */
+ function get_var_sql_forminc__champs() {
+ return array(
+ "id",
+ "libelle",
+ "piece_type",
+ "mouvement",
+ "fichier",
+ "om_collectivite",
+ );
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_mouvement() {
+ return "SELECT mouvement.id, mouvement.etat FROM ".DB_PREFIXE."mouvement ORDER BY mouvement.etat ASC";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_mouvement_by_id() {
+ return "SELECT mouvement.id, mouvement.etat FROM ".DB_PREFIXE."mouvement WHERE id = <idx>";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_om_collectivite() {
+ return "SELECT om_collectivite.om_collectivite, om_collectivite.libelle FROM ".DB_PREFIXE."om_collectivite ORDER BY om_collectivite.libelle ASC";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_om_collectivite_by_id() {
+ return "SELECT om_collectivite.om_collectivite, om_collectivite.libelle FROM ".DB_PREFIXE."om_collectivite WHERE om_collectivite = <idx>";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_piece_type() {
+ return "SELECT piece_type.id, piece_type.libelle FROM ".DB_PREFIXE."piece_type WHERE ((piece_type.om_validite_debut IS NULL AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE)) OR (piece_type.om_validite_debut <= CURRENT_DATE AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE))) ORDER BY piece_type.libelle ASC";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_piece_type_by_id() {
+ return "SELECT piece_type.id, piece_type.libelle FROM ".DB_PREFIXE."piece_type WHERE id = <idx>";
+ }
+
+
+
+
+ function setvalF($val = array()) {
+ //affectation valeur formulaire
+ if (!is_numeric($val['id'])) {
+ $this->valF['id'] = ""; // -> requis
+ } else {
+ $this->valF['id'] = $val['id'];
+ }
+ $this->valF['libelle'] = $val['libelle'];
+ if (!is_numeric($val['piece_type'])) {
+ $this->valF['piece_type'] = ""; // -> requis
+ } else {
+ $this->valF['piece_type'] = $val['piece_type'];
+ }
+ if (!is_numeric($val['mouvement'])) {
+ $this->valF['mouvement'] = ""; // -> requis
+ } else {
+ $this->valF['mouvement'] = $val['mouvement'];
+ }
+ $this->valF['fichier'] = $val['fichier'];
+ if (!is_numeric($val['om_collectivite'])) {
+ $this->valF['om_collectivite'] = ""; // -> requis
+ } else {
+ if($_SESSION['niveau']==1) {
+ $this->valF['om_collectivite'] = $_SESSION['collectivite'];
+ } else {
+ $this->valF['om_collectivite'] = $val['om_collectivite'];
+ }
+ }
+ }
+
+ //=================================================
+ //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("id", "hidden");
+ $form->setType("libelle", "text");
+ if ($this->is_in_context_of_foreign_key("piece_type", $this->retourformulaire)) {
+ $form->setType("piece_type", "selecthiddenstatic");
+ } else {
+ $form->setType("piece_type", "select");
+ }
+ if ($this->is_in_context_of_foreign_key("mouvement", $this->retourformulaire)) {
+ $form->setType("mouvement", "selecthiddenstatic");
+ } else {
+ $form->setType("mouvement", "select");
+ }
+ $form->setType("fichier", "text");
+ if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "selecthiddenstatic");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ } else {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "select");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ }
+ }
+
+ // MDOE MODIFIER
+ if ($maj == 1 || $crud == 'update') {
+ $form->setType("id", "hiddenstatic");
+ $form->setType("libelle", "text");
+ if ($this->is_in_context_of_foreign_key("piece_type", $this->retourformulaire)) {
+ $form->setType("piece_type", "selecthiddenstatic");
+ } else {
+ $form->setType("piece_type", "select");
+ }
+ if ($this->is_in_context_of_foreign_key("mouvement", $this->retourformulaire)) {
+ $form->setType("mouvement", "selecthiddenstatic");
+ } else {
+ $form->setType("mouvement", "select");
+ }
+ $form->setType("fichier", "text");
+ if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "selecthiddenstatic");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ } else {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "select");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ }
+ }
+
+ // MODE SUPPRIMER
+ if ($maj == 2 || $crud == 'delete') {
+ $form->setType("id", "hiddenstatic");
+ $form->setType("libelle", "hiddenstatic");
+ $form->setType("piece_type", "selectstatic");
+ $form->setType("mouvement", "selectstatic");
+ $form->setType("fichier", "hiddenstatic");
+ if ($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "selectstatic");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ }
+
+ // MODE CONSULTER
+ if ($maj == 3 || $crud == 'read') {
+ $form->setType("id", "static");
+ $form->setType("libelle", "static");
+ $form->setType("piece_type", "selectstatic");
+ $form->setType("mouvement", "selectstatic");
+ $form->setType("fichier", "static");
+ if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "selectstatic");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ } else {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "selectstatic");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ }
+ }
+
+ }
+
+
+ function setOnchange(&$form, $maj) {
+ //javascript controle client
+ $form->setOnchange('id','VerifNum(this)');
+ $form->setOnchange('piece_type','VerifNum(this)');
+ $form->setOnchange('mouvement','VerifNum(this)');
+ $form->setOnchange('om_collectivite','VerifNum(this)');
+ }
+ /**
+ * Methode setTaille
+ */
+ function setTaille(&$form, $maj) {
+ $form->setTaille("id", 11);
+ $form->setTaille("libelle", 30);
+ $form->setTaille("piece_type", 11);
+ $form->setTaille("mouvement", 11);
+ $form->setTaille("fichier", 30);
+ $form->setTaille("om_collectivite", 11);
+ }
+
+ /**
+ * Methode setMax
+ */
+ function setMax(&$form, $maj) {
+ $form->setMax("id", 11);
+ $form->setMax("libelle", 100);
+ $form->setMax("piece_type", 11);
+ $form->setMax("mouvement", 11);
+ $form->setMax("fichier", 50);
+ $form->setMax("om_collectivite", 11);
+ }
+
+
+ function setLib(&$form, $maj) {
+ //libelle des champs
+ $form->setLib('id', __('id'));
+ $form->setLib('libelle', __('libelle'));
+ $form->setLib('piece_type', __('piece_type'));
+ $form->setLib('mouvement', __('mouvement'));
+ $form->setLib('fichier', __('fichier'));
+ $form->setLib('om_collectivite', __('om_collectivite'));
+ }
+ /**
+ *
+ */
+ function setSelect(&$form, $maj, &$dnu1 = null, $dnu2 = null) {
+
+ // mouvement
+ $this->init_select(
+ $form,
+ $this->f->db,
+ $maj,
+ null,
+ "mouvement",
+ $this->get_var_sql_forminc__sql("mouvement"),
+ $this->get_var_sql_forminc__sql("mouvement_by_id"),
+ false
+ );
+ // om_collectivite
+ $this->init_select(
+ $form,
+ $this->f->db,
+ $maj,
+ null,
+ "om_collectivite",
+ $this->get_var_sql_forminc__sql("om_collectivite"),
+ $this->get_var_sql_forminc__sql("om_collectivite_by_id"),
+ false
+ );
+ // piece_type
+ $this->init_select(
+ $form,
+ $this->f->db,
+ $maj,
+ null,
+ "piece_type",
+ $this->get_var_sql_forminc__sql("piece_type"),
+ $this->get_var_sql_forminc__sql("piece_type_by_id"),
+ true
+ );
+ }
+
+
+ function setVal(&$form, $maj, $validation, &$dnu1 = null, $dnu2 = null) {
+ if($validation==0 and $maj==0 and $_SESSION['niveau']==1) {
+ $form->setVal('om_collectivite', $_SESSION['collectivite']);
+ }// fin validation
+ $this->set_form_default_values($form, $maj, $validation);
+ }// fin setVal
+
+ //==================================
+ // sous Formulaire
+ //==================================
+
+
+ function setValsousformulaire(&$form, $maj, $validation, $idxformulaire, $retourformulaire, $typeformulaire, &$dnu1 = null, $dnu2 = null) {
+ $this->retourformulaire = $retourformulaire;
+ if($validation==0 and $maj==0 and $_SESSION['niveau']==1) {
+ $form->setVal('om_collectivite', $_SESSION['collectivite']);
+ }// fin validation
+ if($validation == 0) {
+ if($this->is_in_context_of_foreign_key('mouvement', $this->retourformulaire))
+ $form->setVal('mouvement', $idxformulaire);
+ if($this->is_in_context_of_foreign_key('om_collectivite', $this->retourformulaire))
+ $form->setVal('om_collectivite', $idxformulaire);
+ if($this->is_in_context_of_foreign_key('piece_type', $this->retourformulaire))
+ $form->setVal('piece_type', $idxformulaire);
+ }// fin validation
+ $this->set_form_default_values($form, $maj, $validation);
+ }// fin setValsousformulaire
+
+ //==================================
+ // cle secondaire
+ //==================================
+
+
+}
Property changes on: branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.2.0-develop_onglet_piece/gen/obj/piece_type.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/obj/piece_type.class.php (rev 0)
+++ branches/5.2.0-develop_onglet_piece/gen/obj/piece_type.class.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,264 @@
+<?php
+//$Id$
+//gen openMairie le 21/01/2019 14:25
+
+require_once "../obj/om_dbform.class.php";
+
+class piece_type_gen extends om_dbform {
+
+ protected $_absolute_class_name = "piece_type";
+
+ var $table = "piece_type";
+ var $clePrimaire = "id";
+ var $typeCle = "N";
+ var $required_field = array(
+ "id"
+ );
+
+ var $foreign_keys_extended = array(
+ );
+
+ /**
+ *
+ * @return string
+ */
+ function get_default_libelle() {
+ return $this->getVal($this->clePrimaire)." ".$this->getVal("libelle");
+ }
+
+ /**
+ *
+ * @return array
+ */
+ function get_var_sql_forminc__champs() {
+ return array(
+ "id",
+ "libelle",
+ "code",
+ "description",
+ "om_validite_debut",
+ "om_validite_fin",
+ );
+ }
+
+
+
+
+ function setvalF($val = array()) {
+ //affectation valeur formulaire
+ if (!is_numeric($val['id'])) {
+ $this->valF['id'] = ""; // -> requis
+ } else {
+ $this->valF['id'] = $val['id'];
+ }
+ if ($val['libelle'] == "") {
+ $this->valF['libelle'] = NULL;
+ } else {
+ $this->valF['libelle'] = $val['libelle'];
+ }
+ if ($val['code'] == "") {
+ $this->valF['code'] = NULL;
+ } else {
+ $this->valF['code'] = $val['code'];
+ }
+ $this->valF['description'] = $val['description'];
+ if ($val['om_validite_debut'] != "") {
+ $this->valF['om_validite_debut'] = $this->dateDB($val['om_validite_debut']);
+ } else {
+ $this->valF['om_validite_debut'] = NULL;
+ }
+ if ($val['om_validite_fin'] != "") {
+ $this->valF['om_validite_fin'] = $this->dateDB($val['om_validite_fin']);
+ } else {
+ $this->valF['om_validite_fin'] = NULL;
+ }
+ }
+
+ //=================================================
+ //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
+ }
+ /**
+ * Methode verifier
+ */
+ function verifier($val = array(), &$dnu1 = null, $dnu2 = null) {
+ // On appelle la methode de la classe parent
+ parent::verifier($val, $this->f->db, null);
+
+ // gestion des dates de validites
+ $date_debut = $this->valF['om_validite_debut'];
+ $date_fin = $this->valF['om_validite_fin'];
+
+ if ($date_debut != '' and $date_fin != '') {
+
+ $date_debut = explode('-', $this->valF['om_validite_debut']);
+ $date_fin = explode('-', $this->valF['om_validite_fin']);
+
+ $time_debut = mktime(0, 0, 0, $date_debut[1], $date_debut[2],
+ $date_debut[0]);
+ $time_fin = mktime(0, 0, 0, $date_fin[1], $date_fin[2],
+ $date_fin[0]);
+
+ if ($time_debut > $time_fin or $time_debut == $time_fin) {
+ $this->correct = false;
+ $this->addToMessage(__('La date de fin de validite doit etre future a la de debut de validite.'));
+ }
+ }
+ }
+
+
+ //==========================
+ // 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("id", "hidden");
+ $form->setType("libelle", "text");
+ $form->setType("code", "text");
+ $form->setType("description", "textarea");
+ if ($this->f->isAccredited(array($this->table."_modifier_validite", $this->table, ))) {
+ $form->setType("om_validite_debut", "date");
+ } else {
+ $form->setType("om_validite_debut", "hiddenstaticdate");
+ }
+ if ($this->f->isAccredited(array($this->table."_modifier_validite", $this->table, ))) {
+ $form->setType("om_validite_fin", "date");
+ } else {
+ $form->setType("om_validite_fin", "hiddenstaticdate");
+ }
+ }
+
+ // MDOE MODIFIER
+ if ($maj == 1 || $crud == 'update') {
+ $form->setType("id", "hiddenstatic");
+ $form->setType("libelle", "text");
+ $form->setType("code", "text");
+ $form->setType("description", "textarea");
+ if ($this->f->isAccredited(array($this->table."_modifier_validite", $this->table, ))) {
+ $form->setType("om_validite_debut", "date");
+ } else {
+ $form->setType("om_validite_debut", "hiddenstaticdate");
+ }
+ if ($this->f->isAccredited(array($this->table."_modifier_validite", $this->table, ))) {
+ $form->setType("om_validite_fin", "date");
+ } else {
+ $form->setType("om_validite_fin", "hiddenstaticdate");
+ }
+ }
+
+ // MODE SUPPRIMER
+ if ($maj == 2 || $crud == 'delete') {
+ $form->setType("id", "hiddenstatic");
+ $form->setType("libelle", "hiddenstatic");
+ $form->setType("code", "hiddenstatic");
+ $form->setType("description", "hiddenstatic");
+ $form->setType("om_validite_debut", "hiddenstatic");
+ $form->setType("om_validite_fin", "hiddenstatic");
+ }
+
+ // MODE CONSULTER
+ if ($maj == 3 || $crud == 'read') {
+ $form->setType("id", "static");
+ $form->setType("libelle", "static");
+ $form->setType("code", "static");
+ $form->setType("description", "textareastatic");
+ $form->setType("om_validite_debut", "datestatic");
+ $form->setType("om_validite_fin", "datestatic");
+ }
+
+ }
+
+
+ function setOnchange(&$form, $maj) {
+ //javascript controle client
+ $form->setOnchange('id','VerifNum(this)');
+ $form->setOnchange('om_validite_debut','fdate(this)');
+ $form->setOnchange('om_validite_fin','fdate(this)');
+ }
+ /**
+ * Methode setTaille
+ */
+ function setTaille(&$form, $maj) {
+ $form->setTaille("id", 11);
+ $form->setTaille("libelle", 30);
+ $form->setTaille("code", 20);
+ $form->setTaille("description", 80);
+ $form->setTaille("om_validite_debut", 12);
+ $form->setTaille("om_validite_fin", 12);
+ }
+
+ /**
+ * Methode setMax
+ */
+ function setMax(&$form, $maj) {
+ $form->setMax("id", 11);
+ $form->setMax("libelle", 100);
+ $form->setMax("code", 20);
+ $form->setMax("description", 6);
+ $form->setMax("om_validite_debut", 12);
+ $form->setMax("om_validite_fin", 12);
+ }
+
+
+ function setLib(&$form, $maj) {
+ //libelle des champs
+ $form->setLib('id', __('id'));
+ $form->setLib('libelle', __('libelle'));
+ $form->setLib('code', __('code'));
+ $form->setLib('description', __('description'));
+ $form->setLib('om_validite_debut', __('om_validite_debut'));
+ $form->setLib('om_validite_fin', __('om_validite_fin'));
+ }
+ /**
+ *
+ */
+ function setSelect(&$form, $maj, &$dnu1 = null, $dnu2 = null) {
+
+ }
+
+
+ //==================================
+ // sous Formulaire
+ //==================================
+
+
+ function setValsousformulaire(&$form, $maj, $validation, $idxformulaire, $retourformulaire, $typeformulaire, &$dnu1 = null, $dnu2 = null) {
+ $this->retourformulaire = $retourformulaire;
+ $this->set_form_default_values($form, $maj, $validation);
+ }// fin setValsousformulaire
+
+ //==================================
+ // cle secondaire
+ //==================================
+
+ /**
+ * Methode clesecondaire
+ */
+ function cleSecondaire($id, &$dnu1 = null, $val = array(), $dnu2 = null) {
+ // On appelle la methode de la classe parent
+ parent::cleSecondaire($id);
+ // Verification de la cle secondaire : piece
+ $this->rechercheTable($this->f->db, "piece", "piece_type", $id);
+ }
+
+
+}
Property changes on: branches/5.2.0-develop_onglet_piece/gen/obj/piece_type.class.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/mouvement.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/mouvement.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/mouvement.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 15/01/2019 10:11
+//gen openMairie le 21/01/2019 14:25
$DEBUG=0;
$serie=15;
@@ -195,3 +195,10 @@
}
}
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'piece',
+);
+
Modified: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/om_collectivite.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/om_collectivite.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/om_collectivite.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 02/01/2019 07:01
+//gen openMairie le 21/01/2019 14:25
$DEBUG=0;
$serie=15;
@@ -71,6 +71,7 @@
//'om_sousetat',
//'om_utilisateur',
//'parametrage_nb_jures',
+ //'piece',
//'voie',
);
Added: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php (rev 0)
+++ branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,107 @@
+<?php
+//$Id$
+//gen openMairie le 21/01/2019 14:25
+
+$DEBUG=0;
+$serie=15;
+$ent = __("application")." -> ".__("piece");
+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."piece
+ LEFT JOIN ".DB_PREFIXE."mouvement
+ ON piece.mouvement=mouvement.id
+ LEFT JOIN ".DB_PREFIXE."om_collectivite
+ ON piece.om_collectivite=om_collectivite.om_collectivite
+ LEFT JOIN ".DB_PREFIXE."piece_type
+ ON piece.piece_type=piece_type.id ";
+// SELECT
+$champAffiche = array(
+ 'piece.id as "'.__("id").'"',
+ 'piece.libelle as "'.__("libelle").'"',
+ 'piece_type.libelle as "'.__("piece_type").'"',
+ 'mouvement.etat as "'.__("mouvement").'"',
+ 'piece.fichier as "'.__("fichier").'"',
+ );
+//
+if ($_SESSION['niveau'] == '2') {
+ array_push($champAffiche, "om_collectivite.libelle as \"".__("collectivite")."\"");
+}
+//
+$champNonAffiche = array(
+ 'piece.om_collectivite as "'.__("om_collectivite").'"',
+ );
+//
+$champRecherche = array(
+ 'piece.id as "'.__("id").'"',
+ 'piece.libelle as "'.__("libelle").'"',
+ 'piece_type.libelle as "'.__("piece_type").'"',
+ 'mouvement.etat as "'.__("mouvement").'"',
+ 'piece.fichier as "'.__("fichier").'"',
+ );
+//
+if ($_SESSION['niveau'] == '2') {
+ array_push($champRecherche, "om_collectivite.libelle as \"".__("collectivite")."\"");
+}
+$tri="ORDER BY piece.libelle ASC NULLS LAST";
+$edition="piece";
+/**
+ * Gestion de la clause WHERE => $selection
+ */
+// Filtre listing standard
+if ($_SESSION["niveau"] == "2") {
+ // Filtre MULTI
+ $selection = "";
+} else {
+ // Filtre MONO
+ $selection = " WHERE (piece.om_collectivite = '".$_SESSION["collectivite"]."') ";
+}
+// Liste des clés étrangères avec leurs éventuelles surcharges
+$foreign_keys_extended = array(
+ "mouvement" => array("mouvement", ),
+ "om_collectivite" => array("om_collectivite", ),
+ "piece_type" => array("piece_type", ),
+);
+// Filtre listing sous formulaire - mouvement
+if (in_array($retourformulaire, $foreign_keys_extended["mouvement"])) {
+ if ($_SESSION["niveau"] == "2") {
+ // Filtre MULTI
+ $selection = " WHERE (piece.mouvement = ".intval($idxformulaire).") ";
+ } else {
+ // Filtre MONO
+ $selection = " WHERE (piece.om_collectivite = '".$_SESSION["collectivite"]."') AND (piece.mouvement = ".intval($idxformulaire).") ";
+ }
+}
+// Filtre listing sous formulaire - om_collectivite
+if (in_array($retourformulaire, $foreign_keys_extended["om_collectivite"])) {
+ if ($_SESSION["niveau"] == "2") {
+ // Filtre MULTI
+ $selection = " WHERE (piece.om_collectivite = ".intval($idxformulaire).") ";
+ } else {
+ // Filtre MONO
+ $selection = " WHERE (piece.om_collectivite = '".$_SESSION["collectivite"]."') AND (piece.om_collectivite = ".intval($idxformulaire).") ";
+ }
+}
+// Filtre listing sous formulaire - piece_type
+if (in_array($retourformulaire, $foreign_keys_extended["piece_type"])) {
+ if ($_SESSION["niveau"] == "2") {
+ // Filtre MULTI
+ $selection = " WHERE (piece.piece_type = ".intval($idxformulaire).") ";
+ } else {
+ // Filtre MONO
+ $selection = " WHERE (piece.om_collectivite = '".$_SESSION["collectivite"]."') AND (piece.piece_type = ".intval($idxformulaire).") ";
+ }
+}
+
Property changes on: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece_type.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece_type.inc.php (rev 0)
+++ branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece_type.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,69 @@
+<?php
+//$Id$
+//gen openMairie le 21/01/2019 14:25
+
+$DEBUG=0;
+$serie=15;
+$ent = __("application")." -> ".__("piece_type");
+$om_validite = true;
+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."piece_type";
+// SELECT
+$champAffiche = array(
+ 'piece_type.id as "'.__("id").'"',
+ 'piece_type.libelle as "'.__("libelle").'"',
+ 'piece_type.code as "'.__("code").'"',
+ 'to_char(piece_type.om_validite_debut ,\'DD/MM/YYYY\') as "'.__("om_validite_debut").'"',
+ 'to_char(piece_type.om_validite_fin ,\'DD/MM/YYYY\') as "'.__("om_validite_fin").'"',
+ );
+//
+$champNonAffiche = array(
+ 'piece_type.description as "'.__("description").'"',
+ );
+//
+$champRecherche = array(
+ 'piece_type.id as "'.__("id").'"',
+ 'piece_type.libelle as "'.__("libelle").'"',
+ 'piece_type.code as "'.__("code").'"',
+ );
+$tri="ORDER BY piece_type.libelle ASC NULLS LAST";
+$edition="piece_type";
+/**
+ * Gestion de la clause WHERE => $selection
+ */
+// Filtre listing standard
+$selection = " WHERE ((piece_type.om_validite_debut IS NULL AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE)) OR (piece_type.om_validite_debut <= CURRENT_DATE AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE)))";
+$where_om_validite = " WHERE ((piece_type.om_validite_debut IS NULL AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE)) OR (piece_type.om_validite_debut <= CURRENT_DATE AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE)))";
+// Gestion OMValidité - Suppression du filtre si paramètre
+if (isset($_GET["valide"]) and $_GET["valide"] == "false") {
+ if (!isset($where_om_validite)
+ or (isset($where_om_validite) and $where_om_validite == "")) {
+ if (trim($selection) != "") {
+ $selection = "";
+ }
+ } else {
+ $selection = trim(str_replace($where_om_validite, "", $selection));
+ }
+}
+
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'piece',
+);
+
Property changes on: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece_type.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.2.0-develop_onglet_piece/obj/piece.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/obj/piece.class.php (rev 0)
+++ branches/5.2.0-develop_onglet_piece/obj/piece.class.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,54 @@
+<?php
+//$Id$
+//gen openMairie le 21/01/2019 14:41
+
+require_once "../gen/obj/piece.class.php";
+
+class piece extends piece_gen {
+
+ /**
+ * On définit le type global de champs spécifiques.
+ */
+ var $abstract_type = array(
+ "fichier" => "file",
+ );
+
+ function setType(&$form, $maj) {
+ parent::setType($form, $maj);
+ // Récupération du mode de l'action
+ $crud = $this->get_action_crud($maj);
+
+ // MODE AJOUTER
+ if ($maj == 0 || $crud == 'create') {
+ if ($this->retourformulaire == "") {
+ $form->setType("fichier", "upload");
+ } else {
+ $form->setType("fichier", "upload2");
+ }
+ }
+
+ // MDOE MODIFIER
+ if ($maj == 1 || $crud == 'update') {
+ if ($this->retourformulaire == "") {
+ $form->setType("fichier", "upload");
+ } else {
+ $form->setType("fichier", "upload2");
+ }
+ }
+
+ if ($this->is_in_context_of_foreign_key("etablissement", $this->retourformulaire)) {
+ $form->setType("etablissement", "hidden");
+ }
+ }
+
+
+ /**
+ * @return string
+ */
+ function getSubFormTitle($ent) {
+ if ($this->getParameter("maj") == 0) {
+ return "-> ".__("piece");
+ }
+ return "-> ".__("piece")." -> ".$this->get_default_libelle();
+ }
+}
Property changes on: branches/5.2.0-develop_onglet_piece/obj/piece.class.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/5.2.0-develop_onglet_piece/sql/pgsql/inscription.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/sql/pgsql/inscription.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/sql/pgsql/inscription.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -120,3 +120,10 @@
"exact" => $exact,
);
}
+
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'piece',
+);
\ No newline at end of file
Modified: branches/5.2.0-develop_onglet_piece/sql/pgsql/modification.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/sql/pgsql/modification.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/sql/pgsql/modification.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -96,3 +96,10 @@
),
);
array_push($options, $option);
+
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'piece',
+);
\ No newline at end of file
Modified: branches/5.2.0-develop_onglet_piece/sql/pgsql/radiation.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/sql/pgsql/radiation.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/sql/pgsql/radiation.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -97,3 +97,10 @@
),
);
array_push($options, $option);
+
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'piece',
+);
\ No newline at end of file
Modified: branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/gen_resources.robot
===================================================================
--- branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/gen_resources.robot 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/gen_resources.robot 2019-01-21 14:43:32 UTC (rev 1552)
@@ -2,7 +2,7 @@
Documentation Ressources de mots-clefs générés
... @author generated
... @package openElec
-... @version 11/01/2019 15:01
+... @version 21/01/2019 13:01
Resource archive.robot
Resource bureau.robot
@@ -23,7 +23,8 @@
Resource numeroliste.robot
Resource param_mouvement.robot
Resource parametrage_nb_jures.robot
+Resource piece.robot
+Resource piece_type.robot
Resource procuration.robot
-Resource reu_sync_listes.robot
Resource revision.robot
Resource voie.robot
\ No newline at end of file
Added: branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece.robot
===================================================================
--- branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece.robot (rev 0)
+++ branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece.robot 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,71 @@
+*** Settings ***
+Documentation CRUD de la table piece
+... @author generated
+... @package openElec
+... @version 21/01/2019 12:01
+
+*** Keywords ***
+
+Depuis le contexte piece
+ [Documentation] Accède au formulaire
+ [Arguments] ${id}
+
+ # On accède au tableau
+ Go To Tab piece
+ # On recherche l'enregistrement
+ Use Simple Search identifiant ${id}
+ # On clique sur le résultat
+ Click On Link ${id}
+ # On vérifie qu'il n'y a pas d'erreur
+ Page Should Not Contain Errors
+
+Ajouter piece
+ [Documentation] Crée l'enregistrement
+ [Arguments] ${values}
+
+ # On accède au tableau
+ Go To Tab piece
+ # On clique sur le bouton ajouter
+ Click On Add Button
+ # On saisit des valeurs
+ Saisir piece ${values}
+ # On valide le formulaire
+ Click On Submit Button
+ # On récupère l'ID du nouvel enregistrement
+ ${id} = Get Text css=div.form-content span#id
+ # On le retourne
+ [Return] ${id}
+
+Modifier piece
+ [Documentation] Modifie l'enregistrement
+ [Arguments] ${id} ${values}
+
+ # On accède à l'enregistrement
+ Depuis le contexte piece ${id}
+ # On clique sur le bouton modifier
+ Click On Form Portlet Action piece modifier
+ # On saisit des valeurs
+ Saisir piece ${values}
+ # On valide le formulaire
+ Click On Submit Button
+
+Supprimer piece
+ [Documentation] Supprime l'enregistrement
+ [Arguments] ${id}
+
+ # On accède à l'enregistrement
+ Depuis le contexte piece ${piece}
+ # On clique sur le bouton supprimer
+ Click On Form Portlet Action id supprimer
+ # On valide le formulaire
+ Click On Submit Button
+
+Saisir piece
+ [Documentation] Remplit le formulaire
+ [Arguments] ${values}
+
+ Si "libelle" existe dans "${values}" on execute "Input Text" dans le formulaire
+ Si "piece_type" existe dans "${values}" on execute "Select From List By Label" dans le formulaire
+ Si "mouvement" existe dans "${values}" on execute "Select From List By Label" dans le formulaire
+ Si "fichier" existe dans "${values}" on execute "Input Text" dans le formulaire
+ Si "om_collectivite" existe dans "${values}" on execute "Select From List By Label" dans le formulaire
\ No newline at end of file
Property changes on: branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece.robot
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece_type.robot
===================================================================
--- branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece_type.robot (rev 0)
+++ branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece_type.robot 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,71 @@
+*** Settings ***
+Documentation CRUD de la table piece_type
+... @author generated
+... @package openElec
+... @version 21/01/2019 12:01
+
+*** Keywords ***
+
+Depuis le contexte piece_type
+ [Documentation] Accède au formulaire
+ [Arguments] ${id}
+
+ # On accède au tableau
+ Go To Tab piece_type
+ # On recherche l'enregistrement
+ Use Simple Search identifiant ${id}
+ # On clique sur le résultat
+ Click On Link ${id}
+ # On vérifie qu'il n'y a pas d'erreur
+ Page Should Not Contain Errors
+
+Ajouter piece_type
+ [Documentation] Crée l'enregistrement
+ [Arguments] ${values}
+
+ # On accède au tableau
+ Go To Tab piece_type
+ # On clique sur le bouton ajouter
+ Click On Add Button
+ # On saisit des valeurs
+ Saisir piece_type ${values}
+ # On valide le formulaire
+ Click On Submit Button
+ # On récupère l'ID du nouvel enregistrement
+ ${id} = Get Text css=div.form-content span#id
+ # On le retourne
+ [Return] ${id}
+
+Modifier piece_type
+ [Documentation] Modifie l'enregistrement
+ [Arguments] ${id} ${values}
+
+ # On accède à l'enregistrement
+ Depuis le contexte piece_type ${id}
+ # On clique sur le bouton modifier
+ Click On Form Portlet Action piece_type modifier
+ # On saisit des valeurs
+ Saisir piece_type ${values}
+ # On valide le formulaire
+ Click On Submit Button
+
+Supprimer piece_type
+ [Documentation] Supprime l'enregistrement
+ [Arguments] ${id}
+
+ # On accède à l'enregistrement
+ Depuis le contexte piece_type ${piece_type}
+ # On clique sur le bouton supprimer
+ Click On Form Portlet Action id supprimer
+ # On valide le formulaire
+ Click On Submit Button
+
+Saisir piece_type
+ [Documentation] Remplit le formulaire
+ [Arguments] ${values}
+
+ Si "libelle" existe dans "${values}" on execute "Input Text" dans le formulaire
+ Si "code" existe dans "${values}" on execute "Input Text" dans le formulaire
+ Si "description" existe dans "${values}" on execute "Input Text" dans le formulaire
+ Si "om_validite_debut" existe dans "${values}" on execute "Input Datepicker" dans le formulaire
+ Si "om_validite_fin" existe dans "${values}" on execute "Input Datepicker" dans le formulaire
\ No newline at end of file
Property changes on: branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece_type.robot
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Date: 2019-01-21 15:43:32 +0100 (Mon, 21 Jan 2019)
New Revision: 1552
Added:
branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php
branches/5.2.0-develop_onglet_piece/gen/obj/piece_type.class.php
branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php
branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece_type.inc.php
branches/5.2.0-develop_onglet_piece/obj/piece.class.php
branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece.robot
branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece_type.robot
Modified:
branches/5.2.0-develop_onglet_piece/data/pgsql/init_permissions.sql
branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql
branches/5.2.0-develop_onglet_piece/gen/dyn/gen.inc.php
branches/5.2.0-develop_onglet_piece/gen/dyn/permissions.inc.php
branches/5.2.0-develop_onglet_piece/gen/obj/mouvement.class.php
branches/5.2.0-develop_onglet_piece/gen/obj/om_collectivite.class.php
branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/mouvement.inc.php
branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/om_collectivite.inc.php
branches/5.2.0-develop_onglet_piece/sql/pgsql/inscription.inc.php
branches/5.2.0-develop_onglet_piece/sql/pgsql/modification.inc.php
branches/5.2.0-develop_onglet_piece/sql/pgsql/radiation.inc.php
branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/gen_resources.robot
Log:
Cr?\195?\169ation des tables, ajout de l'onglet pi?\195?\168ce et changement du type de champs de fichier.
Modified: branches/5.2.0-develop_onglet_piece/data/pgsql/init_permissions.sql
===================================================================
--- branches/5.2.0-develop_onglet_piece/data/pgsql/init_permissions.sql 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/data/pgsql/init_permissions.sql 2019-01-21 14:43:32 UTC (rev 1552)
@@ -337,6 +337,18 @@
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'parametrage_nb_jures_supprimer', 'gen');
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'parametrage_nb_jures_tab', 'gen');
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'password', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_ajouter', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_consulter', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_modifier', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_supprimer', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_tab', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type_ajouter', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type_consulter', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type_modifier', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type_supprimer', 'gen');
+INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'piece_type_tab', 'gen');
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'procuration', 'gen');
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'procuration_ajouter', 'gen');
INSERT INTO om_permission (om_permission, libelle, type) VALUES (nextval('om_permission_seq'), 'procuration_consulter', 'gen');
Modified: branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql
===================================================================
--- branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/data/pgsql/v5.2.0.dev0.sql 2019-01-21 14:43:32 UTC (rev 1552)
@@ -6,3 +6,67 @@
--
+-- Ticket #??? Gérer les pièces dématérialisées sur les mouvements - Begin
+--
+CREATE TABLE openelec.piece(
+ id integer NOT NULL,
+ libelle character varying(100) NOT NULL,
+ piece_type integer NOT NULL,
+ mouvement integer NOT NULL,
+ fichier character varying(50) NOT NULL,
+ om_collectivite integer NOT NULL
+);
+
+
+CREATE SEQUENCE piece_seq
+START WITH 1
+INCREMENT BY 1
+NO MINVALUE
+NO MAXVALUE
+CACHE 1;
+
+ALTER SEQUENCE piece_seq OWNED BY piece.id;
+
+
+
+CREATE TABLE openelec.piece_type(
+ id integer NOT NULL,
+ libelle character varying(100),
+ code character varying(20),
+ description text,
+ om_validite_debut date,
+ om_validite_fin date
+);
+
+
+CREATE SEQUENCE piece_type_seq
+START WITH 1
+INCREMENT BY 1
+NO MINVALUE
+NO MAXVALUE
+CACHE 1;
+
+ALTER SEQUENCE piece_type_seq OWNED BY piece_type.id;
+
+
+
+
+ALTER TABLE ONLY openelec.piece_type
+ ADD CONSTRAINT piece_type_pkey PRIMARY KEY (id);
+
+ALTER TABLE ONLY openelec.piece
+ ADD CONSTRAINT piece_pkey PRIMARY KEY (id);
+
+
+
+ALTER TABLE ONLY openelec.piece
+ ADD CONSTRAINT piece_piece_type_fkey FOREIGN KEY (piece_type) REFERENCES openelec.piece_type(id);
+
+ALTER TABLE ONLY openelec.piece
+ ADD CONSTRAINT piece_mouvement_fkey FOREIGN KEY (mouvement) REFERENCES openelec.mouvement(id);
+
+ALTER TABLE ONLY openelec.piece
+ ADD CONSTRAINT piece_om_collectivite_fkey FOREIGN KEY (om_collectivite) REFERENCES openelec.om_collectivite(om_collectivite);
+--
+-- Ticket #??? Gérer les pièces dématérialisées sur les mouvements - End
+--
Modified: branches/5.2.0-develop_onglet_piece/gen/dyn/gen.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/dyn/gen.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/dyn/gen.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -15,6 +15,10 @@
$administration_parametrage = "Administration & Paramétrage";
+$tables_to_avoid = array(
+ 'reu_sync_listes'
+);
+
/**
*
*/
Modified: branches/5.2.0-develop_onglet_piece/gen/dyn/permissions.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/dyn/permissions.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/dyn/permissions.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -14,6 +14,7 @@
"openelec.class.php",
"om_gen.class.php",
"om_application_override.class.php",
+ "reu.class.php",
);
$permissions = array(
Modified: branches/5.2.0-develop_onglet_piece/gen/obj/mouvement.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/obj/mouvement.class.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/obj/mouvement.class.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 16/01/2019 14:42
+//gen openMairie le 21/01/2019 14:25
require_once "../obj/om_dbform.class.php";
@@ -946,5 +946,15 @@
// cle secondaire
//==================================
+ /**
+ * Methode clesecondaire
+ */
+ function cleSecondaire($id, &$dnu1 = null, $val = array(), $dnu2 = null) {
+ // On appelle la methode de la classe parent
+ parent::cleSecondaire($id);
+ // Verification de la cle secondaire : piece
+ $this->rechercheTable($this->f->db, "piece", "mouvement", $id);
+ }
+
}
Modified: branches/5.2.0-develop_onglet_piece/gen/obj/om_collectivite.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/obj/om_collectivite.class.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/obj/om_collectivite.class.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 02/01/2019 07:01
+//gen openMairie le 21/01/2019 14:25
require_once "../obj/om_dbform.class.php";
@@ -214,6 +214,8 @@
$this->rechercheTable($this->f->db, "om_utilisateur", "om_collectivite", $id);
// Verification de la cle secondaire : parametrage_nb_jures
$this->rechercheTable($this->f->db, "parametrage_nb_jures", "om_collectivite", $id);
+ // Verification de la cle secondaire : piece
+ $this->rechercheTable($this->f->db, "piece", "om_collectivite", $id);
// Verification de la cle secondaire : voie
$this->rechercheTable($this->f->db, "voie", "om_collectivite", $id);
}
Added: branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php (rev 0)
+++ branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,374 @@
+<?php
+//$Id$
+//gen openMairie le 21/01/2019 15:15
+
+require_once "../obj/om_dbform.class.php";
+
+class piece_gen extends om_dbform {
+
+ protected $_absolute_class_name = "piece";
+
+ var $table = "piece";
+ var $clePrimaire = "id";
+ var $typeCle = "N";
+ var $required_field = array(
+ "fichier",
+ "id",
+ "libelle",
+ "mouvement",
+ "om_collectivite",
+ "piece_type"
+ );
+
+ var $foreign_keys_extended = array(
+ "mouvement" => array("mouvement", ),
+ "om_collectivite" => array("om_collectivite", ),
+ "piece_type" => array("piece_type", ),
+ );
+
+ /**
+ *
+ * @return string
+ */
+ function get_default_libelle() {
+ return $this->getVal($this->clePrimaire)." ".$this->getVal("libelle");
+ }
+
+ /**
+ *
+ * @return array
+ */
+ function get_var_sql_forminc__champs() {
+ return array(
+ "id",
+ "libelle",
+ "piece_type",
+ "mouvement",
+ "fichier",
+ "om_collectivite",
+ );
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_mouvement() {
+ return "SELECT mouvement.id, mouvement.etat FROM ".DB_PREFIXE."mouvement ORDER BY mouvement.etat ASC";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_mouvement_by_id() {
+ return "SELECT mouvement.id, mouvement.etat FROM ".DB_PREFIXE."mouvement WHERE id = <idx>";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_om_collectivite() {
+ return "SELECT om_collectivite.om_collectivite, om_collectivite.libelle FROM ".DB_PREFIXE."om_collectivite ORDER BY om_collectivite.libelle ASC";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_om_collectivite_by_id() {
+ return "SELECT om_collectivite.om_collectivite, om_collectivite.libelle FROM ".DB_PREFIXE."om_collectivite WHERE om_collectivite = <idx>";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_piece_type() {
+ return "SELECT piece_type.id, piece_type.libelle FROM ".DB_PREFIXE."piece_type WHERE ((piece_type.om_validite_debut IS NULL AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE)) OR (piece_type.om_validite_debut <= CURRENT_DATE AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE))) ORDER BY piece_type.libelle ASC";
+ }
+
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_piece_type_by_id() {
+ return "SELECT piece_type.id, piece_type.libelle FROM ".DB_PREFIXE."piece_type WHERE id = <idx>";
+ }
+
+
+
+
+ function setvalF($val = array()) {
+ //affectation valeur formulaire
+ if (!is_numeric($val['id'])) {
+ $this->valF['id'] = ""; // -> requis
+ } else {
+ $this->valF['id'] = $val['id'];
+ }
+ $this->valF['libelle'] = $val['libelle'];
+ if (!is_numeric($val['piece_type'])) {
+ $this->valF['piece_type'] = ""; // -> requis
+ } else {
+ $this->valF['piece_type'] = $val['piece_type'];
+ }
+ if (!is_numeric($val['mouvement'])) {
+ $this->valF['mouvement'] = ""; // -> requis
+ } else {
+ $this->valF['mouvement'] = $val['mouvement'];
+ }
+ $this->valF['fichier'] = $val['fichier'];
+ if (!is_numeric($val['om_collectivite'])) {
+ $this->valF['om_collectivite'] = ""; // -> requis
+ } else {
+ if($_SESSION['niveau']==1) {
+ $this->valF['om_collectivite'] = $_SESSION['collectivite'];
+ } else {
+ $this->valF['om_collectivite'] = $val['om_collectivite'];
+ }
+ }
+ }
+
+ //=================================================
+ //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("id", "hidden");
+ $form->setType("libelle", "text");
+ if ($this->is_in_context_of_foreign_key("piece_type", $this->retourformulaire)) {
+ $form->setType("piece_type", "selecthiddenstatic");
+ } else {
+ $form->setType("piece_type", "select");
+ }
+ if ($this->is_in_context_of_foreign_key("mouvement", $this->retourformulaire)) {
+ $form->setType("mouvement", "selecthiddenstatic");
+ } else {
+ $form->setType("mouvement", "select");
+ }
+ $form->setType("fichier", "text");
+ if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "selecthiddenstatic");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ } else {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "select");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ }
+ }
+
+ // MDOE MODIFIER
+ if ($maj == 1 || $crud == 'update') {
+ $form->setType("id", "hiddenstatic");
+ $form->setType("libelle", "text");
+ if ($this->is_in_context_of_foreign_key("piece_type", $this->retourformulaire)) {
+ $form->setType("piece_type", "selecthiddenstatic");
+ } else {
+ $form->setType("piece_type", "select");
+ }
+ if ($this->is_in_context_of_foreign_key("mouvement", $this->retourformulaire)) {
+ $form->setType("mouvement", "selecthiddenstatic");
+ } else {
+ $form->setType("mouvement", "select");
+ }
+ $form->setType("fichier", "text");
+ if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "selecthiddenstatic");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ } else {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "select");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ }
+ }
+
+ // MODE SUPPRIMER
+ if ($maj == 2 || $crud == 'delete') {
+ $form->setType("id", "hiddenstatic");
+ $form->setType("libelle", "hiddenstatic");
+ $form->setType("piece_type", "selectstatic");
+ $form->setType("mouvement", "selectstatic");
+ $form->setType("fichier", "hiddenstatic");
+ if ($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "selectstatic");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ }
+
+ // MODE CONSULTER
+ if ($maj == 3 || $crud == 'read') {
+ $form->setType("id", "static");
+ $form->setType("libelle", "static");
+ $form->setType("piece_type", "selectstatic");
+ $form->setType("mouvement", "selectstatic");
+ $form->setType("fichier", "static");
+ if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "selectstatic");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ } else {
+ if($_SESSION["niveau"] == 2) {
+ $form->setType("om_collectivite", "selectstatic");
+ } else {
+ $form->setType("om_collectivite", "hidden");
+ }
+ }
+ }
+
+ }
+
+
+ function setOnchange(&$form, $maj) {
+ //javascript controle client
+ $form->setOnchange('id','VerifNum(this)');
+ $form->setOnchange('piece_type','VerifNum(this)');
+ $form->setOnchange('mouvement','VerifNum(this)');
+ $form->setOnchange('om_collectivite','VerifNum(this)');
+ }
+ /**
+ * Methode setTaille
+ */
+ function setTaille(&$form, $maj) {
+ $form->setTaille("id", 11);
+ $form->setTaille("libelle", 30);
+ $form->setTaille("piece_type", 11);
+ $form->setTaille("mouvement", 11);
+ $form->setTaille("fichier", 30);
+ $form->setTaille("om_collectivite", 11);
+ }
+
+ /**
+ * Methode setMax
+ */
+ function setMax(&$form, $maj) {
+ $form->setMax("id", 11);
+ $form->setMax("libelle", 100);
+ $form->setMax("piece_type", 11);
+ $form->setMax("mouvement", 11);
+ $form->setMax("fichier", 50);
+ $form->setMax("om_collectivite", 11);
+ }
+
+
+ function setLib(&$form, $maj) {
+ //libelle des champs
+ $form->setLib('id', __('id'));
+ $form->setLib('libelle', __('libelle'));
+ $form->setLib('piece_type', __('piece_type'));
+ $form->setLib('mouvement', __('mouvement'));
+ $form->setLib('fichier', __('fichier'));
+ $form->setLib('om_collectivite', __('om_collectivite'));
+ }
+ /**
+ *
+ */
+ function setSelect(&$form, $maj, &$dnu1 = null, $dnu2 = null) {
+
+ // mouvement
+ $this->init_select(
+ $form,
+ $this->f->db,
+ $maj,
+ null,
+ "mouvement",
+ $this->get_var_sql_forminc__sql("mouvement"),
+ $this->get_var_sql_forminc__sql("mouvement_by_id"),
+ false
+ );
+ // om_collectivite
+ $this->init_select(
+ $form,
+ $this->f->db,
+ $maj,
+ null,
+ "om_collectivite",
+ $this->get_var_sql_forminc__sql("om_collectivite"),
+ $this->get_var_sql_forminc__sql("om_collectivite_by_id"),
+ false
+ );
+ // piece_type
+ $this->init_select(
+ $form,
+ $this->f->db,
+ $maj,
+ null,
+ "piece_type",
+ $this->get_var_sql_forminc__sql("piece_type"),
+ $this->get_var_sql_forminc__sql("piece_type_by_id"),
+ true
+ );
+ }
+
+
+ function setVal(&$form, $maj, $validation, &$dnu1 = null, $dnu2 = null) {
+ if($validation==0 and $maj==0 and $_SESSION['niveau']==1) {
+ $form->setVal('om_collectivite', $_SESSION['collectivite']);
+ }// fin validation
+ $this->set_form_default_values($form, $maj, $validation);
+ }// fin setVal
+
+ //==================================
+ // sous Formulaire
+ //==================================
+
+
+ function setValsousformulaire(&$form, $maj, $validation, $idxformulaire, $retourformulaire, $typeformulaire, &$dnu1 = null, $dnu2 = null) {
+ $this->retourformulaire = $retourformulaire;
+ if($validation==0 and $maj==0 and $_SESSION['niveau']==1) {
+ $form->setVal('om_collectivite', $_SESSION['collectivite']);
+ }// fin validation
+ if($validation == 0) {
+ if($this->is_in_context_of_foreign_key('mouvement', $this->retourformulaire))
+ $form->setVal('mouvement', $idxformulaire);
+ if($this->is_in_context_of_foreign_key('om_collectivite', $this->retourformulaire))
+ $form->setVal('om_collectivite', $idxformulaire);
+ if($this->is_in_context_of_foreign_key('piece_type', $this->retourformulaire))
+ $form->setVal('piece_type', $idxformulaire);
+ }// fin validation
+ $this->set_form_default_values($form, $maj, $validation);
+ }// fin setValsousformulaire
+
+ //==================================
+ // cle secondaire
+ //==================================
+
+
+}
Property changes on: branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.2.0-develop_onglet_piece/gen/obj/piece_type.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/obj/piece_type.class.php (rev 0)
+++ branches/5.2.0-develop_onglet_piece/gen/obj/piece_type.class.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,264 @@
+<?php
+//$Id$
+//gen openMairie le 21/01/2019 14:25
+
+require_once "../obj/om_dbform.class.php";
+
+class piece_type_gen extends om_dbform {
+
+ protected $_absolute_class_name = "piece_type";
+
+ var $table = "piece_type";
+ var $clePrimaire = "id";
+ var $typeCle = "N";
+ var $required_field = array(
+ "id"
+ );
+
+ var $foreign_keys_extended = array(
+ );
+
+ /**
+ *
+ * @return string
+ */
+ function get_default_libelle() {
+ return $this->getVal($this->clePrimaire)." ".$this->getVal("libelle");
+ }
+
+ /**
+ *
+ * @return array
+ */
+ function get_var_sql_forminc__champs() {
+ return array(
+ "id",
+ "libelle",
+ "code",
+ "description",
+ "om_validite_debut",
+ "om_validite_fin",
+ );
+ }
+
+
+
+
+ function setvalF($val = array()) {
+ //affectation valeur formulaire
+ if (!is_numeric($val['id'])) {
+ $this->valF['id'] = ""; // -> requis
+ } else {
+ $this->valF['id'] = $val['id'];
+ }
+ if ($val['libelle'] == "") {
+ $this->valF['libelle'] = NULL;
+ } else {
+ $this->valF['libelle'] = $val['libelle'];
+ }
+ if ($val['code'] == "") {
+ $this->valF['code'] = NULL;
+ } else {
+ $this->valF['code'] = $val['code'];
+ }
+ $this->valF['description'] = $val['description'];
+ if ($val['om_validite_debut'] != "") {
+ $this->valF['om_validite_debut'] = $this->dateDB($val['om_validite_debut']);
+ } else {
+ $this->valF['om_validite_debut'] = NULL;
+ }
+ if ($val['om_validite_fin'] != "") {
+ $this->valF['om_validite_fin'] = $this->dateDB($val['om_validite_fin']);
+ } else {
+ $this->valF['om_validite_fin'] = NULL;
+ }
+ }
+
+ //=================================================
+ //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
+ }
+ /**
+ * Methode verifier
+ */
+ function verifier($val = array(), &$dnu1 = null, $dnu2 = null) {
+ // On appelle la methode de la classe parent
+ parent::verifier($val, $this->f->db, null);
+
+ // gestion des dates de validites
+ $date_debut = $this->valF['om_validite_debut'];
+ $date_fin = $this->valF['om_validite_fin'];
+
+ if ($date_debut != '' and $date_fin != '') {
+
+ $date_debut = explode('-', $this->valF['om_validite_debut']);
+ $date_fin = explode('-', $this->valF['om_validite_fin']);
+
+ $time_debut = mktime(0, 0, 0, $date_debut[1], $date_debut[2],
+ $date_debut[0]);
+ $time_fin = mktime(0, 0, 0, $date_fin[1], $date_fin[2],
+ $date_fin[0]);
+
+ if ($time_debut > $time_fin or $time_debut == $time_fin) {
+ $this->correct = false;
+ $this->addToMessage(__('La date de fin de validite doit etre future a la de debut de validite.'));
+ }
+ }
+ }
+
+
+ //==========================
+ // 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("id", "hidden");
+ $form->setType("libelle", "text");
+ $form->setType("code", "text");
+ $form->setType("description", "textarea");
+ if ($this->f->isAccredited(array($this->table."_modifier_validite", $this->table, ))) {
+ $form->setType("om_validite_debut", "date");
+ } else {
+ $form->setType("om_validite_debut", "hiddenstaticdate");
+ }
+ if ($this->f->isAccredited(array($this->table."_modifier_validite", $this->table, ))) {
+ $form->setType("om_validite_fin", "date");
+ } else {
+ $form->setType("om_validite_fin", "hiddenstaticdate");
+ }
+ }
+
+ // MDOE MODIFIER
+ if ($maj == 1 || $crud == 'update') {
+ $form->setType("id", "hiddenstatic");
+ $form->setType("libelle", "text");
+ $form->setType("code", "text");
+ $form->setType("description", "textarea");
+ if ($this->f->isAccredited(array($this->table."_modifier_validite", $this->table, ))) {
+ $form->setType("om_validite_debut", "date");
+ } else {
+ $form->setType("om_validite_debut", "hiddenstaticdate");
+ }
+ if ($this->f->isAccredited(array($this->table."_modifier_validite", $this->table, ))) {
+ $form->setType("om_validite_fin", "date");
+ } else {
+ $form->setType("om_validite_fin", "hiddenstaticdate");
+ }
+ }
+
+ // MODE SUPPRIMER
+ if ($maj == 2 || $crud == 'delete') {
+ $form->setType("id", "hiddenstatic");
+ $form->setType("libelle", "hiddenstatic");
+ $form->setType("code", "hiddenstatic");
+ $form->setType("description", "hiddenstatic");
+ $form->setType("om_validite_debut", "hiddenstatic");
+ $form->setType("om_validite_fin", "hiddenstatic");
+ }
+
+ // MODE CONSULTER
+ if ($maj == 3 || $crud == 'read') {
+ $form->setType("id", "static");
+ $form->setType("libelle", "static");
+ $form->setType("code", "static");
+ $form->setType("description", "textareastatic");
+ $form->setType("om_validite_debut", "datestatic");
+ $form->setType("om_validite_fin", "datestatic");
+ }
+
+ }
+
+
+ function setOnchange(&$form, $maj) {
+ //javascript controle client
+ $form->setOnchange('id','VerifNum(this)');
+ $form->setOnchange('om_validite_debut','fdate(this)');
+ $form->setOnchange('om_validite_fin','fdate(this)');
+ }
+ /**
+ * Methode setTaille
+ */
+ function setTaille(&$form, $maj) {
+ $form->setTaille("id", 11);
+ $form->setTaille("libelle", 30);
+ $form->setTaille("code", 20);
+ $form->setTaille("description", 80);
+ $form->setTaille("om_validite_debut", 12);
+ $form->setTaille("om_validite_fin", 12);
+ }
+
+ /**
+ * Methode setMax
+ */
+ function setMax(&$form, $maj) {
+ $form->setMax("id", 11);
+ $form->setMax("libelle", 100);
+ $form->setMax("code", 20);
+ $form->setMax("description", 6);
+ $form->setMax("om_validite_debut", 12);
+ $form->setMax("om_validite_fin", 12);
+ }
+
+
+ function setLib(&$form, $maj) {
+ //libelle des champs
+ $form->setLib('id', __('id'));
+ $form->setLib('libelle', __('libelle'));
+ $form->setLib('code', __('code'));
+ $form->setLib('description', __('description'));
+ $form->setLib('om_validite_debut', __('om_validite_debut'));
+ $form->setLib('om_validite_fin', __('om_validite_fin'));
+ }
+ /**
+ *
+ */
+ function setSelect(&$form, $maj, &$dnu1 = null, $dnu2 = null) {
+
+ }
+
+
+ //==================================
+ // sous Formulaire
+ //==================================
+
+
+ function setValsousformulaire(&$form, $maj, $validation, $idxformulaire, $retourformulaire, $typeformulaire, &$dnu1 = null, $dnu2 = null) {
+ $this->retourformulaire = $retourformulaire;
+ $this->set_form_default_values($form, $maj, $validation);
+ }// fin setValsousformulaire
+
+ //==================================
+ // cle secondaire
+ //==================================
+
+ /**
+ * Methode clesecondaire
+ */
+ function cleSecondaire($id, &$dnu1 = null, $val = array(), $dnu2 = null) {
+ // On appelle la methode de la classe parent
+ parent::cleSecondaire($id);
+ // Verification de la cle secondaire : piece
+ $this->rechercheTable($this->f->db, "piece", "piece_type", $id);
+ }
+
+
+}
Property changes on: branches/5.2.0-develop_onglet_piece/gen/obj/piece_type.class.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/mouvement.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/mouvement.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/mouvement.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 15/01/2019 10:11
+//gen openMairie le 21/01/2019 14:25
$DEBUG=0;
$serie=15;
@@ -195,3 +195,10 @@
}
}
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'piece',
+);
+
Modified: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/om_collectivite.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/om_collectivite.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/om_collectivite.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 02/01/2019 07:01
+//gen openMairie le 21/01/2019 14:25
$DEBUG=0;
$serie=15;
@@ -71,6 +71,7 @@
//'om_sousetat',
//'om_utilisateur',
//'parametrage_nb_jures',
+ //'piece',
//'voie',
);
Added: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php (rev 0)
+++ branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,107 @@
+<?php
+//$Id$
+//gen openMairie le 21/01/2019 14:25
+
+$DEBUG=0;
+$serie=15;
+$ent = __("application")." -> ".__("piece");
+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."piece
+ LEFT JOIN ".DB_PREFIXE."mouvement
+ ON piece.mouvement=mouvement.id
+ LEFT JOIN ".DB_PREFIXE."om_collectivite
+ ON piece.om_collectivite=om_collectivite.om_collectivite
+ LEFT JOIN ".DB_PREFIXE."piece_type
+ ON piece.piece_type=piece_type.id ";
+// SELECT
+$champAffiche = array(
+ 'piece.id as "'.__("id").'"',
+ 'piece.libelle as "'.__("libelle").'"',
+ 'piece_type.libelle as "'.__("piece_type").'"',
+ 'mouvement.etat as "'.__("mouvement").'"',
+ 'piece.fichier as "'.__("fichier").'"',
+ );
+//
+if ($_SESSION['niveau'] == '2') {
+ array_push($champAffiche, "om_collectivite.libelle as \"".__("collectivite")."\"");
+}
+//
+$champNonAffiche = array(
+ 'piece.om_collectivite as "'.__("om_collectivite").'"',
+ );
+//
+$champRecherche = array(
+ 'piece.id as "'.__("id").'"',
+ 'piece.libelle as "'.__("libelle").'"',
+ 'piece_type.libelle as "'.__("piece_type").'"',
+ 'mouvement.etat as "'.__("mouvement").'"',
+ 'piece.fichier as "'.__("fichier").'"',
+ );
+//
+if ($_SESSION['niveau'] == '2') {
+ array_push($champRecherche, "om_collectivite.libelle as \"".__("collectivite")."\"");
+}
+$tri="ORDER BY piece.libelle ASC NULLS LAST";
+$edition="piece";
+/**
+ * Gestion de la clause WHERE => $selection
+ */
+// Filtre listing standard
+if ($_SESSION["niveau"] == "2") {
+ // Filtre MULTI
+ $selection = "";
+} else {
+ // Filtre MONO
+ $selection = " WHERE (piece.om_collectivite = '".$_SESSION["collectivite"]."') ";
+}
+// Liste des clés étrangères avec leurs éventuelles surcharges
+$foreign_keys_extended = array(
+ "mouvement" => array("mouvement", ),
+ "om_collectivite" => array("om_collectivite", ),
+ "piece_type" => array("piece_type", ),
+);
+// Filtre listing sous formulaire - mouvement
+if (in_array($retourformulaire, $foreign_keys_extended["mouvement"])) {
+ if ($_SESSION["niveau"] == "2") {
+ // Filtre MULTI
+ $selection = " WHERE (piece.mouvement = ".intval($idxformulaire).") ";
+ } else {
+ // Filtre MONO
+ $selection = " WHERE (piece.om_collectivite = '".$_SESSION["collectivite"]."') AND (piece.mouvement = ".intval($idxformulaire).") ";
+ }
+}
+// Filtre listing sous formulaire - om_collectivite
+if (in_array($retourformulaire, $foreign_keys_extended["om_collectivite"])) {
+ if ($_SESSION["niveau"] == "2") {
+ // Filtre MULTI
+ $selection = " WHERE (piece.om_collectivite = ".intval($idxformulaire).") ";
+ } else {
+ // Filtre MONO
+ $selection = " WHERE (piece.om_collectivite = '".$_SESSION["collectivite"]."') AND (piece.om_collectivite = ".intval($idxformulaire).") ";
+ }
+}
+// Filtre listing sous formulaire - piece_type
+if (in_array($retourformulaire, $foreign_keys_extended["piece_type"])) {
+ if ($_SESSION["niveau"] == "2") {
+ // Filtre MULTI
+ $selection = " WHERE (piece.piece_type = ".intval($idxformulaire).") ";
+ } else {
+ // Filtre MONO
+ $selection = " WHERE (piece.om_collectivite = '".$_SESSION["collectivite"]."') AND (piece.piece_type = ".intval($idxformulaire).") ";
+ }
+}
+
Property changes on: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece_type.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece_type.inc.php (rev 0)
+++ branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece_type.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,69 @@
+<?php
+//$Id$
+//gen openMairie le 21/01/2019 14:25
+
+$DEBUG=0;
+$serie=15;
+$ent = __("application")." -> ".__("piece_type");
+$om_validite = true;
+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."piece_type";
+// SELECT
+$champAffiche = array(
+ 'piece_type.id as "'.__("id").'"',
+ 'piece_type.libelle as "'.__("libelle").'"',
+ 'piece_type.code as "'.__("code").'"',
+ 'to_char(piece_type.om_validite_debut ,\'DD/MM/YYYY\') as "'.__("om_validite_debut").'"',
+ 'to_char(piece_type.om_validite_fin ,\'DD/MM/YYYY\') as "'.__("om_validite_fin").'"',
+ );
+//
+$champNonAffiche = array(
+ 'piece_type.description as "'.__("description").'"',
+ );
+//
+$champRecherche = array(
+ 'piece_type.id as "'.__("id").'"',
+ 'piece_type.libelle as "'.__("libelle").'"',
+ 'piece_type.code as "'.__("code").'"',
+ );
+$tri="ORDER BY piece_type.libelle ASC NULLS LAST";
+$edition="piece_type";
+/**
+ * Gestion de la clause WHERE => $selection
+ */
+// Filtre listing standard
+$selection = " WHERE ((piece_type.om_validite_debut IS NULL AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE)) OR (piece_type.om_validite_debut <= CURRENT_DATE AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE)))";
+$where_om_validite = " WHERE ((piece_type.om_validite_debut IS NULL AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE)) OR (piece_type.om_validite_debut <= CURRENT_DATE AND (piece_type.om_validite_fin IS NULL OR piece_type.om_validite_fin > CURRENT_DATE)))";
+// Gestion OMValidité - Suppression du filtre si paramètre
+if (isset($_GET["valide"]) and $_GET["valide"] == "false") {
+ if (!isset($where_om_validite)
+ or (isset($where_om_validite) and $where_om_validite == "")) {
+ if (trim($selection) != "") {
+ $selection = "";
+ }
+ } else {
+ $selection = trim(str_replace($where_om_validite, "", $selection));
+ }
+}
+
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'piece',
+);
+
Property changes on: branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece_type.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.2.0-develop_onglet_piece/obj/piece.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/obj/piece.class.php (rev 0)
+++ branches/5.2.0-develop_onglet_piece/obj/piece.class.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,54 @@
+<?php
+//$Id$
+//gen openMairie le 21/01/2019 14:41
+
+require_once "../gen/obj/piece.class.php";
+
+class piece extends piece_gen {
+
+ /**
+ * On définit le type global de champs spécifiques.
+ */
+ var $abstract_type = array(
+ "fichier" => "file",
+ );
+
+ function setType(&$form, $maj) {
+ parent::setType($form, $maj);
+ // Récupération du mode de l'action
+ $crud = $this->get_action_crud($maj);
+
+ // MODE AJOUTER
+ if ($maj == 0 || $crud == 'create') {
+ if ($this->retourformulaire == "") {
+ $form->setType("fichier", "upload");
+ } else {
+ $form->setType("fichier", "upload2");
+ }
+ }
+
+ // MDOE MODIFIER
+ if ($maj == 1 || $crud == 'update') {
+ if ($this->retourformulaire == "") {
+ $form->setType("fichier", "upload");
+ } else {
+ $form->setType("fichier", "upload2");
+ }
+ }
+
+ if ($this->is_in_context_of_foreign_key("etablissement", $this->retourformulaire)) {
+ $form->setType("etablissement", "hidden");
+ }
+ }
+
+
+ /**
+ * @return string
+ */
+ function getSubFormTitle($ent) {
+ if ($this->getParameter("maj") == 0) {
+ return "-> ".__("piece");
+ }
+ return "-> ".__("piece")." -> ".$this->get_default_libelle();
+ }
+}
Property changes on: branches/5.2.0-develop_onglet_piece/obj/piece.class.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/5.2.0-develop_onglet_piece/sql/pgsql/inscription.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/sql/pgsql/inscription.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/sql/pgsql/inscription.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -120,3 +120,10 @@
"exact" => $exact,
);
}
+
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'piece',
+);
\ No newline at end of file
Modified: branches/5.2.0-develop_onglet_piece/sql/pgsql/modification.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/sql/pgsql/modification.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/sql/pgsql/modification.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -96,3 +96,10 @@
),
);
array_push($options, $option);
+
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'piece',
+);
\ No newline at end of file
Modified: branches/5.2.0-develop_onglet_piece/sql/pgsql/radiation.inc.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/sql/pgsql/radiation.inc.php 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/sql/pgsql/radiation.inc.php 2019-01-21 14:43:32 UTC (rev 1552)
@@ -97,3 +97,10 @@
),
);
array_push($options, $option);
+
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'piece',
+);
\ No newline at end of file
Modified: branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/gen_resources.robot
===================================================================
--- branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/gen_resources.robot 2019-01-21 09:25:40 UTC (rev 1551)
+++ branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/gen_resources.robot 2019-01-21 14:43:32 UTC (rev 1552)
@@ -2,7 +2,7 @@
Documentation Ressources de mots-clefs générés
... @author generated
... @package openElec
-... @version 11/01/2019 15:01
+... @version 21/01/2019 13:01
Resource archive.robot
Resource bureau.robot
@@ -23,7 +23,8 @@
Resource numeroliste.robot
Resource param_mouvement.robot
Resource parametrage_nb_jures.robot
+Resource piece.robot
+Resource piece_type.robot
Resource procuration.robot
-Resource reu_sync_listes.robot
Resource revision.robot
Resource voie.robot
\ No newline at end of file
Added: branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece.robot
===================================================================
--- branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece.robot (rev 0)
+++ branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece.robot 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,71 @@
+*** Settings ***
+Documentation CRUD de la table piece
+... @author generated
+... @package openElec
+... @version 21/01/2019 12:01
+
+*** Keywords ***
+
+Depuis le contexte piece
+ [Documentation] Accède au formulaire
+ [Arguments] ${id}
+
+ # On accède au tableau
+ Go To Tab piece
+ # On recherche l'enregistrement
+ Use Simple Search identifiant ${id}
+ # On clique sur le résultat
+ Click On Link ${id}
+ # On vérifie qu'il n'y a pas d'erreur
+ Page Should Not Contain Errors
+
+Ajouter piece
+ [Documentation] Crée l'enregistrement
+ [Arguments] ${values}
+
+ # On accède au tableau
+ Go To Tab piece
+ # On clique sur le bouton ajouter
+ Click On Add Button
+ # On saisit des valeurs
+ Saisir piece ${values}
+ # On valide le formulaire
+ Click On Submit Button
+ # On récupère l'ID du nouvel enregistrement
+ ${id} = Get Text css=div.form-content span#id
+ # On le retourne
+ [Return] ${id}
+
+Modifier piece
+ [Documentation] Modifie l'enregistrement
+ [Arguments] ${id} ${values}
+
+ # On accède à l'enregistrement
+ Depuis le contexte piece ${id}
+ # On clique sur le bouton modifier
+ Click On Form Portlet Action piece modifier
+ # On saisit des valeurs
+ Saisir piece ${values}
+ # On valide le formulaire
+ Click On Submit Button
+
+Supprimer piece
+ [Documentation] Supprime l'enregistrement
+ [Arguments] ${id}
+
+ # On accède à l'enregistrement
+ Depuis le contexte piece ${piece}
+ # On clique sur le bouton supprimer
+ Click On Form Portlet Action id supprimer
+ # On valide le formulaire
+ Click On Submit Button
+
+Saisir piece
+ [Documentation] Remplit le formulaire
+ [Arguments] ${values}
+
+ Si "libelle" existe dans "${values}" on execute "Input Text" dans le formulaire
+ Si "piece_type" existe dans "${values}" on execute "Select From List By Label" dans le formulaire
+ Si "mouvement" existe dans "${values}" on execute "Select From List By Label" dans le formulaire
+ Si "fichier" existe dans "${values}" on execute "Input Text" dans le formulaire
+ Si "om_collectivite" existe dans "${values}" on execute "Select From List By Label" dans le formulaire
\ No newline at end of file
Property changes on: branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece.robot
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece_type.robot
===================================================================
--- branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece_type.robot (rev 0)
+++ branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece_type.robot 2019-01-21 14:43:32 UTC (rev 1552)
@@ -0,0 +1,71 @@
+*** Settings ***
+Documentation CRUD de la table piece_type
+... @author generated
+... @package openElec
+... @version 21/01/2019 12:01
+
+*** Keywords ***
+
+Depuis le contexte piece_type
+ [Documentation] Accède au formulaire
+ [Arguments] ${id}
+
+ # On accède au tableau
+ Go To Tab piece_type
+ # On recherche l'enregistrement
+ Use Simple Search identifiant ${id}
+ # On clique sur le résultat
+ Click On Link ${id}
+ # On vérifie qu'il n'y a pas d'erreur
+ Page Should Not Contain Errors
+
+Ajouter piece_type
+ [Documentation] Crée l'enregistrement
+ [Arguments] ${values}
+
+ # On accède au tableau
+ Go To Tab piece_type
+ # On clique sur le bouton ajouter
+ Click On Add Button
+ # On saisit des valeurs
+ Saisir piece_type ${values}
+ # On valide le formulaire
+ Click On Submit Button
+ # On récupère l'ID du nouvel enregistrement
+ ${id} = Get Text css=div.form-content span#id
+ # On le retourne
+ [Return] ${id}
+
+Modifier piece_type
+ [Documentation] Modifie l'enregistrement
+ [Arguments] ${id} ${values}
+
+ # On accède à l'enregistrement
+ Depuis le contexte piece_type ${id}
+ # On clique sur le bouton modifier
+ Click On Form Portlet Action piece_type modifier
+ # On saisit des valeurs
+ Saisir piece_type ${values}
+ # On valide le formulaire
+ Click On Submit Button
+
+Supprimer piece_type
+ [Documentation] Supprime l'enregistrement
+ [Arguments] ${id}
+
+ # On accède à l'enregistrement
+ Depuis le contexte piece_type ${piece_type}
+ # On clique sur le bouton supprimer
+ Click On Form Portlet Action id supprimer
+ # On valide le formulaire
+ Click On Submit Button
+
+Saisir piece_type
+ [Documentation] Remplit le formulaire
+ [Arguments] ${values}
+
+ Si "libelle" existe dans "${values}" on execute "Input Text" dans le formulaire
+ Si "code" existe dans "${values}" on execute "Input Text" dans le formulaire
+ Si "description" existe dans "${values}" on execute "Input Text" dans le formulaire
+ Si "om_validite_debut" existe dans "${values}" on execute "Input Datepicker" dans le formulaire
+ Si "om_validite_fin" existe dans "${values}" on execute "Input Datepicker" dans le formulaire
\ No newline at end of file
Property changes on: branches/5.2.0-develop_onglet_piece/tests/resources/app/gen/piece_type.robot
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Reply all
Reply to author
Forward
0 new messages