[Noalyss-commit] [noalyss] 05/05: Improve Scenario Test

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 9e55774ca3c4a8a4c31249f054f4385193cd9573
Author: Dany De Bontridder <address@hidden>
Date:   Sat Oct 26 16:33:29 2019 +0200

    Improve Scenario Test
---
 html/test.php                      | 17 +++++++++++++++++
 include/class/acc_ledger.class.php | 20 ++++++++++++++------
 include/class/fiche.class.php      |  4 ++--
 scenario/FicheTest.php             |  4 +---
 scenario/historic-card.php         |  3 +++
 scenario/pdf_operation.php         | 10 ++++++----
 6 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/html/test.php b/html/test.php
index ed9a957..d8b890a 100644
--- a/html/test.php
+++ b/html/test.php
@@ -65,6 +65,23 @@ if (!file_exists('authorized_debug'))
 }
 define('ALLOWED', 1);
 html_page_start("Classic");
+/******************************************************************************************************************/
+/*  Utilities 
+/******************************************************************************************************************/
+
+/** 
+ * Return the card this most activities
+ * @return integer (fiche.f_id)
+ */
+function get_card_with_activity() {
+    global $cn;
+    $card_count=$cn->get_array("select count(*),f_id ". 
+        " from jrnx ".
+        " where ". 
+        " f_id is not null ".
+        "group by f_id order by count(*) desc");
+    return $card_count[0]['f_id'];
+}
 
 /*
  * Loading of all scenario
diff --git a/include/class/acc_ledger.class.php 
b/include/class/acc_ledger.class.php
index 4e47505..3b78c74 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -57,7 +57,7 @@ require_once NOALYSS_INCLUDE.'/class/pre_op_ods.class.php';
 /** @brief Class for jrn,  class acc_ledger for manipulating the ledger
  *
  */
-class Acc_Ledger extends jrn_def_sql
+class Acc_Ledger  extends jrn_def_sql
 {
 
     var $id;   /*     * < jrn_def.jrn_def_id */
@@ -82,7 +82,7 @@ class Acc_Ledger extends jrn_def_sql
         $this->nb=MAX_ARTICLE;
          parent::__construct($p_cn, $p_id);
     }
-
+    
     function get_last_pj()
     {
         if (isNumber($this->id)==0)
@@ -95,7 +95,8 @@ class Acc_Ledger extends jrn_def_sql
             $ret=$this->db->get_array("select last_value,is_called from 
s_jrn_pj".$this->id);
             $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
+             * \note  With PSQL sequence , the last_value column is 1 when 
before   AND after the first call, 
+             * to make the difference between them
              * I have to check whether the sequence has been already called or 
not */
             if ($ret[0]['is_called']=='f')
                 $last--;
@@ -739,8 +740,11 @@ class Acc_Ledger extends jrn_def_sql
         $ret.=tr(td('').td(_('Totaux')).td($total_deb, 
'class="num"').td($total_cred,
                         'class="num"'), 'class="highlight"');
         $ret.="</table>";
-        if ($g_parameter->MY_ANALYTIC!='nu'&&$p_readonly==false)
-            $ret.='<input type="button" class="button" value="'._('verifie 
Imputation Analytique').'" onClick="verify_ca(\'\');">';
+        if ($g_parameter->MY_ANALYTIC!='nu'&&$p_readonly==false) {
+            $ret.='<input type="button" class="button" value="'._('verifie 
Imputation Analytique').
+        '" onClick="verify_ca(\'\');">';
+            
+        }
         return $ret;
     }
 
@@ -983,7 +987,11 @@ class Acc_Ledger extends jrn_def_sql
             $ret.='<tr>';
             
$ret.='<td>'.$quick_code->input().$quick_code->search().$str_add_button.'</td>';
             $ret.='<td>'.$poste->input().
-                    '<script> 
document.getElementById(\'poste'.$i.'\').onblur=function(){ if 
(trim(this.value) !=\'\') 
{document.getElementById(\'qc_'.$i.'\').value="";}}</script>'.
+                    '<script> '.
+                    
'document.getElementById(\'poste'.$i.'\').onblur=function(){'.
+                    'if (trim(this.value) !=\'\') '.
+                    '{document.getElementById(\'qc_'.$i.'\').value="";}}'.
+                    '</script>'.
                     '</td>';
             $ret.='<td class="visible_gt800 
visible_gt1155">'.$line_desc->input().'</td>';
             $ret.='<td>'.$amount->input().'</td>';
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 745d3cf..15ebe00 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -1150,8 +1150,8 @@ class Fiche
              where ad_id=1 and f_id=$1";
         $Res=$this->cn->exec_sql($sql,array($this->id));
         $r=Database::fetch_all($Res);
-        if ( sizeof($r) == 0 )
-            return 1;
+        if ( empty($r) )
+            throw new Exception (_("Fiche n'existe pas"), 1000);
         return $r[0]['ad_value'];
     }
 
diff --git a/scenario/FicheTest.php b/scenario/FicheTest.php
index 9267f61..f769c9b 100644
--- a/scenario/FicheTest.php
+++ b/scenario/FicheTest.php
@@ -48,9 +48,7 @@ $card_count=$cn->get_array("select count(*),f_id ".
         " f_id is not null ".
         "group by f_id order by count(*) desc");
 $a=new Fiche($cn,$card_count[0]['f_id']);
-$min=$cn->get_value("select p_id from parm_periode order by p_start asc limit 
1");
-$max=$cn->get_value("select p_id from parm_periode order by p_start desc limit 
1");
-printf ("Max période %s Min période %s",$max,$min);
+
 $result=$a->get_row($min,$max);
 $result_date=$a->get_row_date('01.01.2010','01.01.2090');
 
diff --git a/scenario/historic-card.php b/scenario/historic-card.php
index 6dd7687..17bdbfd 100644
--- a/scenario/historic-card.php
+++ b/scenario/historic-card.php
@@ -13,4 +13,7 @@ $_POST=array (
 $_POST['gDossier']=$gDossierLogInput;
 $_GET['gDossier']=$gDossierLogInput;
  $_REQUEST=array_merge($_GET,$_POST);
+
+
+ put_global([["key"=>'f_id',"value"=>get_card_with_activity()]]);
 include 'ajax_misc.php';
diff --git a/scenario/pdf_operation.php b/scenario/pdf_operation.php
index 9a513f9..b0dcc53 100644
--- a/scenario/pdf_operation.php
+++ b/scenario/pdf_operation.php
@@ -20,15 +20,17 @@
 
 require_once NOALYSS_INCLUDE."/class/pdf_operation.class.php";
 
+$a_operation_id=$cn->get_array("select jr_id from jrn limit 10");
 
-
-$pdf=new PDF_Operation ($cn,61);
+$pdf=new PDF_Operation ($cn,$a_operation_id[0]['jr_id']);
 //$pdf=new PDF_Operation ($cn,47);
 //$pdf=new PDF_Operation ($cn,4638);
 
 $pdf->export_pdf(array("anc","acc"));
 
 $a=$pdf->get_pdf();
-$a->Output("/tmp/t.pdf","F");
+$a->Output("/tmp/t.pdf","S");
+
 
-echo $pdf->get_pdf_filename();
\ No newline at end of file
+echo $pdf->get_pdf_filename();
+echo "File download to /tmp";
\ No newline at end of file