[Phpcompta-dev] r4247 - in phpcompta/branches/rel600-dynamic-menu: html include include/template

[phpcompta-dev]

Author: danydb
Date: 2011-10-28 20:04:01 +0200 (Fri, 28 Oct 2011)
New Revision: 4247

Modified:
   phpcompta/branches/rel600-dynamic-menu/html/parametre.php
   phpcompta/branches/rel600-dynamic-menu/include/class_document_modele.php
   phpcompta/branches/rel600-dynamic-menu/include/document_modele.inc.php
   phpcompta/branches/rel600-dynamic-menu/include/template/modele_document.php
Log:
#241 : modularity : parameter  Document

Modified: phpcompta/branches/rel600-dynamic-menu/html/parametre.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/html/parametre.php   2011-10-27 
22:52:13 UTC (rev 4246)
+++ phpcompta/branches/rel600-dynamic-menu/html/parametre.php   2011-10-28 
18:04:01 UTC (rev 4247)
@@ -401,7 +401,7 @@
     $sa=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
     //  echo '<div class="content">';
     if ( $sa == "add")
-        require_once ('param_jrn_add.inc.php');
+        require_once 'param_jrn_add.inc.php';
     elseif ($sa=='detail')
     require_once ('param_jrn_detail.inc.php');
     else

Modified: 
phpcompta/branches/rel600-dynamic-menu/include/class_document_modele.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/class_document_modele.php    
2011-10-27 22:52:13 UTC (rev 4246)
+++ phpcompta/branches/rel600-dynamic-menu/include/class_document_modele.php    
2011-10-28 18:04:01 UTC (rev 4247)
@@ -19,10 +19,10 @@
 /* $Revision$ */
 // Copyright Author Dany De Bontridder address@hidden
 /*! \file
- * \brief Class for the document template 
+ * \brief Class for the document template
  */
 /*!
- * \brief Class for the document template 
+ * \brief Class for the document template
  */
 require_once('class_icheckbox.php');
 require_once('class_ihidden.php');
@@ -59,7 +59,7 @@
         $all=Database::fetch_all($Res);
        $r='';
         if ( Database::num_row($Res) != 0 ) {
-         
+
          $r.='<p><form method="post">';
          $r.=dossier::hidden();
          $r.="<table>";
@@ -109,13 +109,13 @@
         return $r;
     }
     /*!
-     * \brief :  Save a document_modele in the database, 
+     * \brief :  Save a document_modele in the database,
      *       if the document_modele doesn't exist yet it will be
      *       first created (-> insert into document_modele)
      *       in that case the name and the type must be set
      *       set before calling Save, the name will be modified
      *       with FormatString
-     *        
+     *
      */
     function Save()
     {
@@ -194,7 +194,7 @@
         }
     }
     /*!
-     * \brief Remove a template 
+     * \brief Remove a template
      * \return nothing
      */
     function Delete()
@@ -219,17 +219,17 @@
 
     /*!
      * \brief show the form for loading a template
-     * \param p_action for the field action = destination url 
-     * 
+     * \param p_action for the field action = destination url
      *
+     *
      * \return string containing the forms
      */
-    function form($p_action)
+    function form()
     {
         $r='<p class="notice">';
         $r.='Veuillez introduire les mod&egrave;les servant à 
g&eacute;n&eacute;rer vos documents';
         $r.='</p>';
-        $r.='<form enctype="multipart/form-data"  action="'.$p_action.'" 
method="post">';
+        $r.='<form enctype="multipart/form-data"  method="post">';
         $r.=dossier::hidden();
         // we need to add the sub action as hidden
         $h=new IHidden();
@@ -294,7 +294,7 @@
         }
     }
     /*!
-     * \brief :  update a document_modele in the database, 
+     * \brief :  update a document_modele in the database,
      */
     function update($p_array)
     {
@@ -315,7 +315,7 @@
                                           ));
            if ( $p_array['seq'] != 0 )
              
$this->cn->alter_seq('seq_doc_type_'.$p_array['md_type'],$p_array['seq']);
-                                          
+
             // Save the file
             $new_name=tempnam($_ENV['TMP'],'document_');
             if ( strlen ($_FILES['doc']['tmp_name']) != 0 )

Modified: phpcompta/branches/rel600-dynamic-menu/include/document_modele.inc.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/document_modele.inc.php      
2011-10-27 22:52:13 UTC (rev 4246)
+++ phpcompta/branches/rel600-dynamic-menu/include/document_modele.inc.php      
2011-10-28 18:04:01 UTC (rev 4247)
@@ -78,7 +78,7 @@
 //-----------------------------------------------------
 echo $doc->myList();
 echo '<div id="add_modele" style="display:none">';
-echo $doc->form('parametre.php?p_action=document');
+echo $doc->form('');
 echo '</div>';
 
 ?>
\ No newline at end of file

Modified: 
phpcompta/branches/rel600-dynamic-menu/include/template/modele_document.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/template/modele_document.php 
2011-10-27 22:52:13 UTC (rev 4246)
+++ phpcompta/branches/rel600-dynamic-menu/include/template/modele_document.php 
2011-10-28 18:04:01 UTC (rev 4247)
@@ -1,8 +1,8 @@
 <div style="float:right">
-<A style="background-color:blue;color:white;text-decoration:none" 
HREF="javascript:void(0)" onclick="removeDiv('mod_doc');">Fermer</A> 
+<A style="background-color:blue;color:white;text-decoration:none" 
HREF="javascript:void(0)" onclick="removeDiv('mod_doc');">Fermer</A>
 </div>
 <h2 class="info">Modèle de document</h2>
-<form action="parametre.php" method="post" enctype="multipart/form-data">
+<form  method="post" enctype="multipart/form-data">
 <table>
 
 <tr>
@@ -84,7 +84,7 @@
          if ( $cn->exist_sequence("seq_doc_type_".$doc->md_type) )
          {
              $ret= $cn->get_array("select last_value,is_called from 
seq_doc_type_".$doc->md_type) ;
-             
+
              $last=$ret[0]['last_value'];
              /*!
                   *\note  With PSQL sequence , the last_value column is 1 when 
before   AND after the first call, to make the difference between them