[Phpcompta-dev] r4673 - in phpcompta/trunk: doc/developper include

[phpcompta-dev]

Author: danydb
Date: 2012-01-06 17:24:34 +0100 (Fri, 06 Jan 2012)
New Revision: 4673

Modified:
   phpcompta/trunk/doc/developper/Doxyfile
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/constant.php
Log:
fiche_attr add a new attribut = select

Modified: phpcompta/trunk/doc/developper/Doxyfile
===================================================================
--- phpcompta/trunk/doc/developper/Doxyfile     2012-01-06 16:24:03 UTC (rev 
4672)
+++ phpcompta/trunk/doc/developper/Doxyfile     2012-01-06 16:24:34 UTC (rev 
4673)
@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = Version5
+PROJECT_NUMBER         = Version-6
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

Modified: phpcompta/trunk/include/class_fiche.php
===================================================================
--- phpcompta/trunk/include/class_fiche.php     2012-01-06 16:24:03 UTC (rev 
4672)
+++ phpcompta/trunk/include/class_fiche.php     2012-01-06 16:24:34 UTC (rev 
4673)
@@ -533,7 +533,7 @@
 
             }
             $w->table=$table;
-            if ( $attr->ad_type != 'select')            
$w->label=$attr->ad_text;
+            $w->label=$attr->ad_text;
             $w->name="av_text".$attr->ad_id;
 
             $r.="<TR>".td($w->label,' class="input_text" 
').td($w->input())."$msg </TR>";
@@ -557,8 +557,7 @@
         $attr=$this->attribut;
        /* show card type here */
        $type_card=$this->cn->get_value('select fd_label from fiche_def join 
fiche using (fd_id) where f_id=$1',array($this->id));
-       $ret=h2("Type de fiche : ".h($type_card),"");
-
+       $ret=h2("Type de fiche : ".h($type_card)." (id ".$this->id.")","");
         $ret.="<table>";
         if ( empty ($attr) )
         {
@@ -688,9 +687,25 @@
                     $w->table=0;
                 }
             }
+            else
+            {
+                switch($r->ad_type)
+                {
+                    case 'select':
+                        $x=new ISelect();
+                        $x->value=$this->cn->make_array($r->ad_extra);
+                        $x->selected=$r->av_text;
+                        $value=$x->display();
+                        $w->value=$value;
+                        break;
+                    default:
+                        $w->value=$r->av_text;
+                        
+                }
+            }
             
             $w->name="av_text".$r->ad_id;
-            $w->readonly=$p_readonly;
+            $w->readOnly=$p_readonly;
 
 
             $ret.="<TR>".td($r->ad_text.$bulle).td($w->input()).td($msg)." 
</TR>";

Modified: phpcompta/trunk/include/constant.php
===================================================================
--- phpcompta/trunk/include/constant.php        2012-01-06 16:24:03 UTC (rev 
4672)
+++ phpcompta/trunk/include/constant.php        2012-01-06 16:24:34 UTC (rev 
4673)
@@ -35,12 +35,12 @@
 $g_succeed="<span style=\"font-size:18px;color:green\">&#x2713;</span>";  
 /*set to none for production */
 /* uncomment for production */
-// $version_phpcompta=4444;
-//define ("DEBUG",false);
+ $version_phpcompta=4620;
+define ("DEBUG",true);
 
 
-$version_phpcompta=SVNINFO;
-define ("DEBUG",false);
+//$version_phpcompta=SVNINFO;
+//define ("DEBUG",false);