[Phpcompta-dev] r4551 - in phpcompta/trunk: html/admin/sql/patch html/js include sql

[phpcompta-dev]

Author: danydb
Date: 2011-12-03 22:21:16 +0100 (Sat, 03 Dec 2011)
New Revision: 4551

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade98.sql
   phpcompta/trunk/html/js/card.js
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/class_fiche_def.php
   phpcompta/trunk/include/class_iposte.php
   phpcompta/trunk/sql/upgrade.sql
Log:
size of attribut



Modified: phpcompta/trunk/html/admin/sql/patch/upgrade98.sql
===================================================================
--- phpcompta/trunk/html/admin/sql/patch/upgrade98.sql  2011-12-03 20:33:40 UTC 
(rev 4550)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade98.sql  2011-12-03 21:21:16 UTC 
(rev 4551)
@@ -1,6 +1,9 @@
 begin;
 
-update attr_def set ad_type='numeric' where ad_id=20;
+update attr_def set ad_type='poste' where ad_id=5;
+update attr_def set ad_type='numeric',ad_size=6 where ad_id in (20,31);
+update attr_def set ad_size=17 where ad_type='poste';
+
 insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select 
split_part(tva_poste,',',1),tva_comment,substring(split_part(tva_poste,',',1),1,3),'PAS'
  from tva_rate where split_part(tva_poste,',',1) not in (select pcm_val from 
tmp_pcmn);
 insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select 
split_part(tva_poste,',',2),tva_comment,substring(split_part(tva_poste,',',2),1,3),'ACT'
  from tva_rate where split_part(tva_poste,',',2) not in (select pcm_val from 
tmp_pcmn);
 

Modified: phpcompta/trunk/html/js/card.js
===================================================================
--- phpcompta/trunk/html/js/card.js     2011-12-03 20:33:40 UTC (rev 4550)
+++ phpcompta/trunk/html/js/card.js     2011-12-03 21:21:16 UTC (rev 4551)
@@ -299,7 +299,7 @@
     var content='card_'+card_layer;
     var nTop=posY-40;
     var nLeft=posX-20;
-    var str_style="top:"+nTop+";left:"+nLeft+";width:40em;height:auto";
+    var str_style="top:"+nTop+";left:"+nLeft+";width:45em;height:auto";
 
     var popup={'id':  
content,'cssclass':'inner_box','style':str_style,'html':loading(),'drag':true};
 

Modified: phpcompta/trunk/include/class_fiche.php
===================================================================
--- phpcompta/trunk/include/class_fiche.php     2011-12-03 20:33:40 UTC (rev 
4550)
+++ phpcompta/trunk/include/class_fiche.php     2011-12-03 21:21:16 UTC (rev 
4551)
@@ -643,6 +643,7 @@
                      $w=new IPoste("av_text".$r->ad_id);
                      $w->set_attribute('ipopup','ipop_account');
                      $w->set_attribute('account',"av_text".$r->ad_id);
+                         $w->width=$r->ad_size;
                      $w->table=0;
                      $bulle=HtmlInput::infobulle(14);
                      break;
@@ -651,6 +652,7 @@
                      // filter on frd_id
                      $sql=' select fd_id from fiche_def ';
                      $filter=$this->cn->make_list($sql);
+                         $w->width=$r->ad_size;
                      $w->extra=$filter;
                      $w->extra2=0;
                      $label=new ISpan();

Modified: phpcompta/trunk/include/class_fiche_def.php
===================================================================
--- phpcompta/trunk/include/class_fiche_def.php 2011-12-03 20:33:40 UTC (rev 
4550)
+++ phpcompta/trunk/include/class_fiche_def.php 2011-12-03 21:21:16 UTC (rev 
4551)
@@ -88,7 +88,7 @@
             $t->jnt_order=$row['jnt_order'];
             $t->ad_size=$row['ad_size'];
             $t->ad_type=$row['ad_type'];
-            $this->attribut[$i]=$t;
+            $this->attribut[$i]=clone $t;
         }
         return $this->attribut;
     }

Modified: phpcompta/trunk/include/class_iposte.php
===================================================================
--- phpcompta/trunk/include/class_iposte.php    2011-12-03 20:33:40 UTC (rev 
4550)
+++ phpcompta/trunk/include/class_iposte.php    2011-12-03 21:21:16 UTC (rev 
4551)
@@ -21,8 +21,8 @@
 // Copyright Author Dany De Bontridder address@hidden
 
 /*!\file
- * \brief Html Input 
- * 
+ * \brief Html Input
+ *
  */
 require_once('class_html_input.php');
 require_once('class_itext.php');
@@ -31,7 +31,7 @@
 require_once('function_javascript.php');
 /**
  address@hidden show a button, for selecting a account and a input text for 
manually inserting an account
- * the different value of table are 
+ * the different value of table are
  * - 0 no table, it means no TD tags
  * - 1 the button and the text are separated by TD tags
  * - 2 the button and the text are in the same column (TD)
@@ -63,11 +63,11 @@
  echo js_include('controls.js');
  echo js_include('dragdrop.js');
  echo js_include('accounting_item.js');
- 
- 
+
+
 require_once('class_iposte.php');
 echo IPoste::ipopup('ipop_account');
- 
+
 // In the FORM
 $text=new IPoste();
 $text->name('field');
@@ -76,8 +76,8 @@
 $text->set_attribute('gDossier',Dossier::id());
 $text->set_attribute('jrn',0);
 $text->set_attribute('account','field');
- 
- 
+
+
 \endcode
  */
 class IPoste extends HtmlInput
@@ -88,8 +88,6 @@
         $this->name=$p_name;
         $this->readOnly=false;
         $this->size=10;
-        $this->width=50;
-        $this->heigh=20;
         $this->value=$p_value;
         $this->selected="";
         $this->table=0;
@@ -152,7 +150,7 @@
 
         /* create the text  */
         $itext=new IText($this->name,$this->value);
-
+               $itext->size=$this->size;
         /* create the button */
         $ibutton=$this->dsp_button();
         if ( $this->table==3)

Modified: phpcompta/trunk/sql/upgrade.sql
===================================================================
--- phpcompta/trunk/sql/upgrade.sql     2011-12-03 20:33:40 UTC (rev 4550)
+++ phpcompta/trunk/sql/upgrade.sql     2011-12-03 21:21:16 UTC (rev 4551)
@@ -1,3 +1,6 @@
 update attr_def set ad_type='numeric' where ad_id=20;
 insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select 
split_part(tva_poste,',',1),tva_comment,substring(split_part(tva_poste,',',1),1,3),'PAS'
  from tva_rate where split_part(tva_poste,',',1) not in (select pcm_val from 
tmp_pcmn);
-insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select 
split_part(tva_poste,',',2),tva_comment,substring(split_part(tva_poste,',',2),1,3),'ACT'
  from tva_rate where split_part(tva_poste,',',2) not in (select pcm_val from 
tmp_pcmn);
\ No newline at end of file
+insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent,pcm_type) select 
split_part(tva_poste,',',2),tva_comment,substring(split_part(tva_poste,',',2),1,3),'ACT'
  from tva_rate where split_part(tva_poste,',',2) not in (select pcm_val from 
tmp_pcmn);
+update attr_def set ad_type='numeric',ad_size=6 where ad_id=20;
+update attr_def set ad_type='poste' where ad_id=5;
+update attr_def set ad_size=10 where ad_type='poste';