From 5c46627e34171cca2081e09b55d5cf436b809360 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sun, 4 Jul 2010 02:11:11 +0000 Subject: [PATCH] Start with add attribute --- .../create-file/create_phpclass.py | 8 +- dev/manage-code/create-file/example | 2 +- html/parametre.php | 15 ++- include/card_attr.inc.php | 105 ++++++++++++++++++ sql/upgrade.sql | 8 +- 5 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 include/card_attr.inc.php diff --git a/dev/manage-code/create-file/create_phpclass.py b/dev/manage-code/create-file/create_phpclass.py index a16c114af..8c9ed3afc 100755 --- a/dev/manage-code/create-file/create_phpclass.py +++ b/dev/manage-code/create-file/create_phpclass.py @@ -67,7 +67,7 @@ class @class_name@ @mother_class@ $this->cn=$p_cn; if ( $p_id == 0 ) { /* Initialize an empty object */ - foreach ($this->variable as $key=>$value) $this->$key=''; + foreach ($this->variable as $key=>$value) $this->$value=''; } else { /* load it */ $this->@id@=$p_id; @@ -75,8 +75,8 @@ class @class_name@ @mother_class@ } } public function get_parameter($p_string) { - if ( array_key_exists($p_string,$this->$variable) ) { - $idx=$this->$variable[$p_string]; + if ( array_key_exists($p_string,$this->variable) ) { + $idx=$this->variable[$p_string]; return $this->$idx; } else @@ -90,7 +90,7 @@ class @class_name@ @mother_class@ else throw new Exception (__FILE__.":".__LINE__.$p_string.'Erreur attribut inexistant'); } - public function get_info() { return var_export(self::$variable,true); } + public function get_info() { return var_export($this,true); } public function verify() { // Verify that the elt we want to add is correct /* verify only the datatype */ diff --git a/dev/manage-code/create-file/example b/dev/manage-code/create-file/example index ef6b9011a..8269dcba2 100644 --- a/dev/manage-code/create-file/example +++ b/dev/manage-code/create-file/example @@ -2,5 +2,5 @@ Fiche_Attr attr_def ad_id | integer ad_text | text - ad_type | text + ad_type | numeric diff --git a/html/parametre.php b/html/parametre.php index ab09f7712..b52a972bb 100644 --- a/html/parametre.php +++ b/html/parametre.php @@ -135,7 +135,8 @@ if ( $p_action == 'divers') { array('parametre.php?p_action=divers&sa=tva&'.$s,_('Tva'),_('Taux et poste comptable tva'),4), array('parametre.php?p_action=divers&sa=poste&'.$s,_('Poste Comptable'),_('Poste comptable constant'),7), array('parametre.php?p_action=divers&sa=fiche&'.$s,_('Catégorie de fiche'),_('Modifie les classe de base, les attribut,...'),5), - array('parametre.php?p_action=divers&sa=cdoc&'.$s,_('Catégorie de documents'),_('Ajoute des catégories de documents,...'),6) + array('parametre.php?p_action=divers&sa=cdoc&'.$s,_('Catégorie de documents'),_('Ajoute des catégories de documents,...'),6), + array('parametre.php?p_action=divers&sa=fat&'.$s,_('Attribut de fiche'),_('Modifie les attributs des catégories de fiches'),10) ); $sa=(isset($_REQUEST['sa']))?$_REQUEST['sa']:''; $sb=(isset($_REQUEST['sb']))?$_REQUEST['sb']:''; @@ -156,6 +157,9 @@ if ( $p_action == 'divers') { case 'cdoc': $def=6; break; + case 'fat': + $def=10; + break; } echo '
'; echo ShowItem($array,'H','mtitle','mtitle',$def); @@ -166,7 +170,14 @@ if ( $p_action == 'divers') { require_once('payment_middle.inc.php'); exit; } - + //--------------------------------------------------------------------------- + // Add or remove attribut of card + //--------------------------------------------------------------------------- + if ( $sa=='fat') { + $User->can_request('FICCAT'); + require_once('card_attr.inc.php'); + exit(); + } //----------------------------------------------------- // TVA RATE //----------------------------------------------------- diff --git a/include/card_attr.inc.php b/include/card_attr.inc.php new file mode 100644 index 000000000..87124d012 --- /dev/null +++ b/include/card_attr.inc.php @@ -0,0 +1,105 @@ +start(); + for ($e=0;$eset_parameter('id',$ad_id[$e]); + $fa->set_parameter('desc',$ad_text[$e]); + $fa->set_parameter('type',$ad_type[$e]); + if ( trim($ad_text[$e])!='' && trim($ad_type[$e])!='') + $fa->save(); + } + $cn->commit(); + } + catch (Exception $e) + { $e->getMessage();$cn->rollback();} +} +/* show list of existing */ + +$array=$fa->seek(); + +$select_type=new ISelect('type[]'); +$select_type->table=0; +$desc=new IText('desc[]'); +$desc->size=50; +$select_type->value=array( + array('value'=>'text','label'=>'Texte'), + array('value'=>'numeric','label'=>'Nombre'), + array('value'=>'date','label'=>'Date') + ); +echo '
'; +echo '
'; + +echo HtmlInput::hidden('sa','fat'); +echo HtmlInput::hidden('p_action','divers'); +echo ''; + +for ($e=0;$eget_parameter('id'))); + $select_type->selected=$row->get_parameter('type'); + $desc->value=$row->get_parameter('desc'); + + if ( $row->get_parameter('id')>= 9000) { + $select_type->readOnly=false; + $desc->readOnly=false; + $r.=td($desc->input()); + } else { + $select_type->readOnly=true; + $desc->readOnly=true; + $r.=td($desc->input().HtmlInput::hidden('type[]','')); + } + + + $r.=td($select_type->input()); + + echo tr($r); + +} +$desc->readOnly=false;$select_type->readOnly=false; +$desc->value=''; +$select_type->selected=-1; +$r=td(HtmlInput::hidden('ad_id[]','0')); +$r.=td($desc->input()); +$r.=td($select_type->input()); +echo tr($r); + +echo '
'; +echo HtmlInput::submit('save','Sauver'); +echo '
'; +echo '
'; diff --git a/sql/upgrade.sql b/sql/upgrade.sql index 76e05e071..e09934e0e 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -19,7 +19,13 @@ ALTER TABLE jrn_rapt ON UPDATE cascade ON DELETE cascade; ALTER TABLE jrn_rapt ADD CONSTRAINT jrn_rapt_jra_concerned_fkey FOREIGN KEY (jra_concerned) - REFERENCES jrn (jr_id) MATCH SIMPLE + REFERENCES jrn (jr_id) MATCH SIMPLE ON UPDATE cascade ON DELETE cascade; +ALTER TABLE attr_def ADD COLUMN ad_type text; + +update attr_def set ad_type='text'; +update attr_def set ad_type='numeric' where ad_id in (6,7,8,11,21,22); +update attr_def set ad_type='date' where ad_id in (10); +alter sequence s_attr_def restart with 9001; commit;