[Noalyss-commit] [noalyss] 08/46: Cosmetic : add waiting_box when exporting

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 393f88433a2def720cc7eece845fec2708f74359
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Tue Jun 8 18:00:13 2021 +0200

    Cosmetic : add waiting_box when exporting
---
 include/balance.inc.php                    | 18 ++++++++++----
 include/balance_age.inc.php                |  9 +++++--
 include/class/acc_account_ledger.class.php | 12 ++++-----
 include/class/fiche.class.php              | 12 ++++++---
 include/class/tax_summary.class.php        |  8 ++++--
 include/impress_bilan.inc.php              | 10 +++++---
 include/impress_jrn.inc.php                |  5 ++--
 include/impress_rapport.inc.php            | 39 ++++++++++++++++++++----------
 include/template/menu.php                  |  6 ++---
 9 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/include/balance.inc.php b/include/balance.inc.php
index 928d20d..5591fb1 100644
--- a/include/balance.inc.php
+++ b/include/balance.inc.php
@@ -47,7 +47,7 @@ echo '<div class="content">';
 /*
  * Let you change the exercice
  */
-echo '<form method="GET">';
+echo '<form method="GET" onsubmit="return waiting_box()">';
 echo _('Choisissez un autre exercice')." : ";
 $ex=new Exercice($cn);
 
$js=sprintf("updatePeriode(%d,'%s','%s','%s',1)",Dossier::id(),'exercice','from_periode','to_periode');
@@ -226,8 +226,12 @@ if ( isset ($_GET['view']  ) )
 
     echo "<table>";
     echo '<TR>';
-    echo '<TD><form method="GET" ACTION="export.php">'.
-    dossier::hidden().
+    
+    echo '<TD><form method="GET" ACTION="export.php" ';
+    $id=uniqid("export_");
+    printf( 'id="%s"  onsubmit="download_document_form(\'%s\')">',$id,$id);
+
+    echo dossier::hidden().
     HtmlInput::submit('bt_pdf',"Export PDF").
     HtmlInput::hidden("ac",$http->request('ac')).
     HtmlInput::hidden("act","PDF:balance").
@@ -248,8 +252,12 @@ if ( isset ($_GET['view']  ) )
 
     echo "</form></TD>";
 
-    echo '<TD><form method="GET" ACTION="export.php">'.
-    HtmlInput::submit('bt_csv',"Export CSV").
+    echo '<TD><form method="GET" ACTION="export.php" ';
+    $id=uniqid("export_");
+    printf( 'id="%s"  onsubmit="download_document_form(\'%s\')">',$id,$id);
+
+    
+    echo HtmlInput::submit('bt_csv',"Export CSV").
     dossier::hidden().
     HtmlInput::hidden("act","CSV:balance").
     HtmlInput::hidden("from_periode",$from_periode).
diff --git a/include/balance_age.inc.php b/include/balance_age.inc.php
index 4f696e4..e0d5ed7 100644
--- a/include/balance_age.inc.php
+++ b/include/balance_age.inc.php
@@ -45,7 +45,7 @@ $w_lettre->value=array(
 $w_lettre->selected=$let;
 
 ?>
-<form method="GET">
+<form method="GET" onsubmit="waiting_box()">
     <?php
         echo HtmlInput::request_to_hidden(array('gDossier','ac'));
     ?>
@@ -60,7 +60,12 @@ $w_lettre->selected=$let;
     return;
     endif;
 ?>
-<form method="get" action="export.php">
+<?php
+        $id=uniqid("export_");
+        $wb=sprintf( 'id="%s"  onsubmit="download_document_form(\'%s\')" 
',$id,$id);
+
+?>
+<form method="get" action="export.php" <?=$wb?> >
     <?php 
         echo 
HtmlInput::request_to_hidden(array('gDossier','ac','p_type','p_let','p_date_start'));
         echo HtmlInput::hidden('act','CSV:balance_age');
diff --git a/include/class/acc_account_ledger.class.php 
b/include/class/acc_account_ledger.class.php
index bea644d..7809fba 100644
--- a/include/class/acc_account_ledger.class.php
+++ b/include/class/acc_account_ledger.class.php
@@ -552,14 +552,15 @@ class Acc_Account_Ledger
         
$str_ople=(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',$_REQUEST['ople']):'';
        if ($actiontarget=='poste')
          {
-           echo '<TD><form method="GET" ACTION="">'.
+           echo '<TD><form method="GET" ACTION="export.php">'.
              dossier::hidden().
              HtmlInput::submit('bt_other',"Autre poste").
              
$hid->input("type","poste").$hid->input('ac',$_REQUEST['ac'])."</form></TD>";
          }
 
-
-        echo '<TD><form method="GET" ACTION="export.php">'.
+        $id=uniqid("pdf_");
+        echo '<TD><form method="GET" ACTION="export.php" '.
+             'id="'.$id.'"  onsubmit="return 
download_document_form(\''.$id.'\')">'.
         dossier::hidden().
         HtmlInput::submit('bt_pdf',"Export PDF").
         HtmlInput::hidden('act',$action_pdf).
@@ -587,8 +588,8 @@ class Acc_Account_Ledger
             echo $hid->input('oper_detail','on');
 
         echo "</form></TD>";
-
-        echo '<TD><form method="GET" ACTION="export.php">'.
+        $id=uniqid("csv_");
+        echo '<TD><form method="GET" ACTION="export.php" id="'.$id.'"  
onsubmit="download_document_form(\''.$id.'\')">'.
         dossier::hidden().
         HtmlInput::submit('bt_csv',"Export CSV").
        HtmlInput::hidden('act',$action_csv).
@@ -616,7 +617,6 @@ class Acc_Account_Ledger
         if (isset($_REQUEST['poste_id'])) echo 
$hid->input("poste_id",$_REQUEST['poste_id']);
 
         echo "</form></TD>";
-       echo "</form></TD>";
        echo '<td style="vertical-align:top">';
        echo HtmlInput::print_window();
        echo '</td>';
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index e44c215..5e9cab1 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -1743,7 +1743,10 @@ class Fiche
             
$hid->input("type","poste").$hid->input('p_action','impress')."</form></TD>";
         
$str_ople=(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',$_REQUEST['ople']):'';
 
-        echo '<TD><form method="GET" ACTION="export.php">'.
+        echo '<TD><form method="GET" ACTION="export.php" ';
+        $id=uniqid("export_");
+        printf( 'id="%s"  onsubmit="download_document_form(\'%s\')">',$id,$id);
+        echo 
             HtmlInput::submit('bt_pdf',_("Export PDF")).
             dossier::hidden().$str_ople.
               HtmlInput::hidden('act','PDF:fichedetail').
@@ -1758,8 +1761,11 @@ class Fiche
 
         echo "</form></TD>";
 
-        echo '<TD><form method="GET" ACTION="export.php">'.
-        HtmlInput::submit('bt_csv',_("Export CSV")).
+        echo '<TD><form method="GET" ACTION="export.php" ';
+        $id=uniqid("export_");
+        printf( 'id="%s"  onsubmit="download_document_form(\'%s\')">',$id,$id);
+
+        echo HtmlInput::submit('bt_csv',_("Export CSV")).
          HtmlInput::hidden('act','CSV:fichedetail').
         dossier::hidden().$str_ople.
         $hid->input("type","poste").
diff --git a/include/class/tax_summary.class.php 
b/include/class/tax_summary.class.php
index e8ed882..74d8027 100644
--- a/include/class/tax_summary.class.php
+++ b/include/class/tax_summary.class.php
@@ -427,7 +427,9 @@ class Tax_Summary
      */
     function form_export_csv()
     {
-        echo '<form method="GET" action="export.php">';
+        $id=uniqid("export_");
+        echo '<form method="GET" action="export.php" ';
+        printf( 'id="%s"  onsubmit="download_document_form(\'%s\')">',$id,$id);
         echo Dossier::hidden();
         echo HtmlInput::hidden("act", 'CSV:printtva');
         echo HtmlInput::hidden("date_start", $this->date_start);
@@ -444,7 +446,9 @@ class Tax_Summary
      */
     function form_export_pdf()
     {
-        echo '<form method="GET" action="export.php">';
+        $id=uniqid("export_");
+        echo '<form method="GET" action="export.php" ';
+        printf( 'id="%s"  onsubmit="download_document_form(\'%s\')">',$id,$id);
         echo Dossier::hidden();
         echo HtmlInput::hidden("act", 'PDF:printtva');
         echo HtmlInput::hidden("date_start", $this->date_start);
diff --git a/include/impress_bilan.inc.php b/include/impress_bilan.inc.php
index 89cca00..6a2d8d1 100644
--- a/include/impress_bilan.inc.php
+++ b/include/impress_bilan.inc.php
@@ -50,7 +50,7 @@ if ( ! isset ($_GET['verif']))
      * Let you change the exercice
      */
     echo '<fieldset><legend>'._('Exercice').'</legend>';;
-    echo '<form method="GET">';
+    echo '<form method="GET" onsubmit="return waiting_box()">';
     echo _('Choisissez un autre exercice');
     $ex=new Exercice($cn);
     $wex=$ex->select('exercice',$exercice,' onchange="submit(this)"');
@@ -61,7 +61,7 @@ if ( ! isset ($_GET['verif']))
     echo '</fieldset>';
 
     $filter_year=" where p_exercice='".sql_string($exercice)."'";
-    echo '<FORM  METHOD="GET">';
+    echo '<FORM  METHOD="GET" onsubmit="waiting_box()">';
     echo HtmlInput::hidden('type','bilan');
     echo dossier::hidden();
 
@@ -96,7 +96,11 @@ if ( isset($_GET['verif']))
     $bilan->verify();
     
$url_verify=http_build_query(array('ac'=>'VERIFBIL','gDossier'=>dossier::id()));
     echo _('Pour une vérification complète, allez dans ').'<a class="line" 
TARGET="_blank" href="?'.$url_verify.'"> VERIFBIL</a>';
-    echo '<FORM METHOD="GET" ACTION="export.php">';
+    $id=uniqid("export_");
+
+    echo '<FORM METHOD="GET" ACTION="export.php" ';
+    printf( 'id="%s"  onsubmit="download_document_form(\'%s\')">',$id,$id);
+    
     echo dossier::hidden();
     echo HtmlInput::get_to_hidden(array('exercice'));
     echo HtmlInput::hidden('b_id',$bilan->b_id);
diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php
index b3c9e7f..68d6ac3 100644
--- a/include/impress_jrn.inc.php
+++ b/include/impress_jrn.inc.php
@@ -189,7 +189,7 @@ if (isset($_REQUEST['bt_html']))
     $jrn_id=$http->get("jrn_id","number");
     echo '<table>';
     echo '<td>';
-    echo '<form method="GET" ACTION="export.php">' . dossier::hidden() .
+    echo '<form method="GET" ACTION="export.php" id="export_pdf_frm" 
onsubmit="download_document_form(\'export_pdf_frm\')">' . dossier::hidden() .
         HtmlInput::submit('bt_pdf', "Export PDF") .
         HtmlInput::hidden('act', 'PDF:ledger') .
         $hid->input("type", "jrn") .
@@ -202,7 +202,8 @@ if (isset($_REQUEST['bt_html']))
         echo "</form>";
     echo '</td>';
 
-    echo '<TD><form method="GET" ACTION="export.php">' . dossier::hidden() .
+    echo '<TD><form method="GET" ACTION="export.php" id="export_csv_frm" 
onsubmit="download_document_form(\'export_csv_frm\')">'
+    . dossier::hidden() .
         HtmlInput::submit('bt_csv', "Export CSV") .
         HtmlInput::hidden('act', 'CSV:ledger') .
         $hid->input("type", "jrn") .
diff --git a/include/impress_rapport.inc.php b/include/impress_rapport.inc.php
index e07ad7f..6ed2dc8 100644
--- a/include/impress_rapport.inc.php
+++ b/include/impress_rapport.inc.php
@@ -118,13 +118,20 @@ if ( isset( $_GET['bt_html'] ) )
     }
     echo '<table >';
     echo '<TR>';
-    echo '<TD><form method="GET" ACTION="?">'.
-    dossier::hidden().
+    $id=uniqid("export_");
+
+    echo '<TD><form method="GET" ACTION="?" ';
+    printf( 'id="%s"  onsubmit="download_document_form(\'%s\')">',$id,$id);
+    
+    echo dossier::hidden().
     HtmlInput::submit('bt_other',"Autre Rapport").
     
$hid->input("type","rapport").$hid->input("ac",$access_code)."</form></TD>";
 
-    echo '<TD><form method="GET" ACTION="export.php">'.
-    HtmlInput::submit('bt_pdf',"Export PDF").
+    echo '<TD><form method="GET" ACTION="export.php" ';
+    $id=uniqid("export_");
+    printf( 'id="%s"  onsubmit="download_document_form(\'%s\')">',$id,$id);
+
+    echo    HtmlInput::submit('bt_pdf',"Export PDF").
       HtmlInput::hidden('act','PDF:report').
     dossier::hidden().
     $hid->input("type","rapport").
@@ -141,13 +148,17 @@ if ( isset( $_GET['bt_html'] ) )
 
 
     echo "</form></TD>";
-    echo '<TD><form method="GET" ACTION="export.php">'.
-      HtmlInput::hidden('act','CSV:report').
-    HtmlInput::submit('bt_csv',"Export CSV").
-    dossier::hidden().
-    $hid->input("type","form").
-    $hid->input("ac",$access_code).
-    $hid->input("form_id",$form_id);
+    
+    echo '<TD><form method="GET" ACTION="export.php" ';
+    $id=uniqid("export_");
+    printf( 'id="%s"  onsubmit="download_document_form(\'%s\')">',$id,$id);
+
+    echo  HtmlInput::hidden('act','CSV:report').
+        HtmlInput::submit('bt_csv',"Export CSV").
+        dossier::hidden().
+        $hid->input("type","form").
+        $hid->input("ac",$access_code).
+        $hid->input("form_id",$form_id);
     if ( isset($from_periode)) echo $hid->input("from_periode",$from_periode);
     if ( isset($to_periode)) echo $hid->input("to_periode",$to_periode);
     if (isset($p_step)) echo $hid->input("p_step",$p_step);
@@ -211,7 +222,9 @@ 
$exercice=$http->get("exercice","number",$g_user->get_exercice());
  * Let you change the exercice
  */
 echo '<fieldset><legend>'._('Exercice').'</legend>';;
-echo '<form method="GET">';
+echo '<form method="GET" ';
+printf( ' onsubmit="waiting_box()">');
+
 echo 'Choisissez un autre exercice :';
 $ex=new Exercice($cn);
 $wex=$ex->select('exercice',$exercice,' onchange="submit(this)"');
@@ -222,7 +235,7 @@ echo '</form>';
 echo '</fieldset>';
 
 
-echo '<FORM METHOD="GET">';
+echo '<FORM METHOD="GET" onsubmit="waiting_box()">';
 $hidden=new IHidden();
 echo $hidden->input("ac",$_GET['ac']);
 echo $hidden->input("type","rapport");
diff --git a/include/template/menu.php b/include/template/menu.php
index 588bc09..a28e62d 100644
--- a/include/template/menu.php
+++ b/include/template/menu.php
@@ -12,12 +12,12 @@ EOF;
 ?><div class="">
     <?php 
   if ($level == 0) {
-      echo '<ul  class="nav nav-pills nav-fill  flex-row" >';
+      echo '<ul  class="nav nav-pills nav-fill  flex-row noprint" >';
   }elseif ($level == 1) {
-      echo '<ul class="nav nav-pills nav-level2 ">';
+      echo '<ul class="nav nav-pills nav-level2 noprint">';
       
   } else {
-      echo '<ul class="nav nav-pills nav-level3 ">';
+      echo '<ul class="nav nav-pills nav-level3 noprint">';
   }
    ?>