[openelec-Commits] r1553 - in branches/5.2.0-develop_onglet_piece: gen/dyn gen/obj gen/sql/pgsql obj

[gmal...@adullact.net]

Author: gmalvolti
Date: 2019-01-22 11:06:41 +0100 (Tue, 22 Jan 2019)
New Revision: 1553

Modified:
branches/5.2.0-develop_onglet_piece/gen/dyn/gen.inc.php
branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php
branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php
branches/5.2.0-develop_onglet_piece/obj/piece.class.php
Log:
Modification des champs mouvement et fichier et ajout d'extended class pour mouvement.


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 14:43:32 UTC (rev 1552)
+++ branches/5.2.0-develop_onglet_piece/gen/dyn/gen.inc.php 2019-01-22 10:06:41 UTC (rev 1553)
@@ -63,6 +63,9 @@
"tablename_in_page_title" => "Listes",
"breadcrumb_in_page_title" => array($administration_parametrage, "Métier", ),
),
+ "mouvement" => array(
+ "extended_class" => array("inscription", "modification", "radiation", ),
+ ),
"membre_commission" => array(
//
"tablename_in_page_title" => "Membres de la commission",
@@ -155,4 +158,16 @@
"tablename_in_page_title" => "Voies",
"breadcrumb_in_page_title" => array($administration_parametrage, "Découpage", ),
),
+ "piece" => array(
+ "tablename_in_page_title" => "piece",
+ "breadcrumb_in_page_title" => array(),
+ "displayed_fields_in_tableinc" => array(
+ "libelle", "piece_type", "mouvement", "fichier",
+ ),
+ "specific_config_for_fields" => array(
+ "fichier" => array(
+ "abstract_type" => "file",
+ ),
+ )
+ ),
);

Modified: branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php 2019-01-21 14:43:32 UTC (rev 1552)
+++ branches/5.2.0-develop_onglet_piece/gen/obj/piece.class.php 2019-01-22 10:06:41 UTC (rev 1553)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 21/01/2019 15:15
+//gen openMairie le 22/01/2019 10:48

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

@@ -21,10 +21,13 @@
);

var $foreign_keys_extended = array(
- "mouvement" => array("mouvement", ),
+ "mouvement" => array("mouvement", "inscription", "modification", "radiation", ),
"om_collectivite" => array("om_collectivite", ),
"piece_type" => array("piece_type", ),
);
+ var $abstract_type = array(
+ "fichier" => "file",
+ );

/**
*
@@ -171,7 +174,11 @@
} else {
$form->setType("mouvement", "select");
}
- $form->setType("fichier", "text");
+ if ($this->retourformulaire == "") {
+ $form->setType("fichier", "upload");
+ } else {
+ $form->setType("fichier", "upload2");
+ }
if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
if($_SESSION["niveau"] == 2) {
$form->setType("om_collectivite", "selecthiddenstatic");
@@ -201,7 +208,11 @@
} else {
$form->setType("mouvement", "select");
}
- $form->setType("fichier", "text");
+ if ($this->retourformulaire == "") {
+ $form->setType("fichier", "upload");
+ } else {
+ $form->setType("fichier", "upload2");
+ }
if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
if($_SESSION["niveau"] == 2) {
$form->setType("om_collectivite", "selecthiddenstatic");
@@ -223,7 +234,7 @@
$form->setType("libelle", "hiddenstatic");
$form->setType("piece_type", "selectstatic");
$form->setType("mouvement", "selectstatic");
- $form->setType("fichier", "hiddenstatic");
+ $form->setType("fichier", "filestatic");
if ($_SESSION["niveau"] == 2) {
$form->setType("om_collectivite", "selectstatic");
} else {
@@ -237,7 +248,7 @@
$form->setType("libelle", "static");
$form->setType("piece_type", "selectstatic");
$form->setType("mouvement", "selectstatic");
- $form->setType("fichier", "static");
+ $form->setType("fichier", "file");
if ($this->is_in_context_of_foreign_key("om_collectivite", $this->retourformulaire)) {
if($_SESSION["niveau"] == 2) {
$form->setType("om_collectivite", "selectstatic");

Modified: 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 2019-01-21 14:43:32 UTC (rev 1552)
+++ branches/5.2.0-develop_onglet_piece/gen/sql/pgsql/piece.inc.php 2019-01-22 10:06:41 UTC (rev 1553)
@@ -1,10 +1,10 @@
<?php
//$Id$
-//gen openMairie le 21/01/2019 14:25
+//gen openMairie le 22/01/2019 10:48

$DEBUG=0;
$serie=15;
-$ent = __("application")." -> ".__("piece");
+$ent = __("piece");
if(!isset($premier)) $premier='';
if(!isset($tricolsf)) $tricolsf='';
if(!isset($premiersf)) $premiersf='';
@@ -70,7 +70,7 @@
}
// Liste des clés étrangères avec leurs éventuelles surcharges
$foreign_keys_extended = array(
- "mouvement" => array("mouvement", ),
+ "mouvement" => array("mouvement", "inscription", "modification", "radiation", ),
"om_collectivite" => array("om_collectivite", ),
"piece_type" => array("piece_type", ),
);

Modified: branches/5.2.0-develop_onglet_piece/obj/piece.class.php
===================================================================
--- branches/5.2.0-develop_onglet_piece/obj/piece.class.php 2019-01-21 14:43:32 UTC (rev 1552)
+++ branches/5.2.0-develop_onglet_piece/obj/piece.class.php 2019-01-22 10:06:41 UTC (rev 1553)
@@ -13,32 +13,20 @@
"fichier" => "file",
);

- function setType(&$form, $maj) {
- parent::setType($form, $maj);
- // Récupération du mode de l'action
- $crud = $this->get_action_crud($maj);
+ /**
+ *
+ * @return string
+ */
+ function get_var_sql_forminc__sql_mouvement() {
+ return "SELECT mouvement.id, mouvement.id FROM ".DB_PREFIXE."mouvement ORDER BY mouvement.id ASC";
+ }

- // 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 get_var_sql_forminc__sql_mouvement_by_id() {
+ return "SELECT mouvement.id, mouvement.id FROM ".DB_PREFIXE."mouvement WHERE id = <idx>";
}