From 393f88433a2def720cc7eece845fec2708f74359 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Tue, 8 Jun 2021 18:00:13 +0200 Subject: [PATCH] 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 928d20d00..5591fb181 100644 --- a/include/balance.inc.php +++ b/include/balance.inc.php @@ -47,7 +47,7 @@ echo '
'; /* * Let you change the exercice */ -echo '
'; +echo ''; 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 ""; echo ''; - echo '"; - echo '"; } - - echo '"; - - echo '"; - echo ""; echo ''; diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php index e44c215f2..5e9cab155 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').""; $str_ople=(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',$_REQUEST['ople']):''; - echo '"; - echo '
'. - dossier::hidden(). + + echo '',$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 "
'. - HtmlInput::submit('bt_csv',"Export CSV"). + echo '
',$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 4f696e4ce..e0d5ed749 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; ?> - + @@ -60,7 +60,12 @@ $w_lettre->selected=$let; return; endif; ?> - + + > '. + echo ''. dossier::hidden(). HtmlInput::submit('bt_other',"Autre poste"). $hid->input("type","poste").$hid->input('ac',$_REQUEST['ac'])."
'. + $id=uniqid("pdf_"); + echo '
'. 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 "
'. + $id=uniqid("csv_"); + echo '
'. 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 "'; echo HtmlInput::print_window(); echo '
'. + echo '
',$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 "
'. - HtmlInput::submit('bt_csv',_("Export CSV")). + echo '
',$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 e8ed8824f..74d8027bd 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 ''; + $id=uniqid("export_"); + echo '',$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 ''; + $id=uniqid("export_"); + echo '',$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 89cca0051..6a2d8d131 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 '
'._('Exercice').'';; - echo ''; + echo ''; 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 '
'; $filter_year=" where p_exercice='".sql_string($exercice)."'"; - echo ''; + echo ''; 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 ').' VERIFBIL'; - echo ''; + $id=uniqid("export_"); + + echo '',$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 b3c9e7fcd..68d6ac3e5 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 ''; echo ''; - echo '
'; - echo '' . dossier::hidden() . + echo '' . 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 ""; echo '
' . dossier::hidden() . + echo '
' + . 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 e07ad7f67..6ed2dc8b2 100644 --- a/include/impress_rapport.inc.php +++ b/include/impress_rapport.inc.php @@ -118,13 +118,20 @@ if ( isset( $_GET['bt_html'] ) ) } echo ''; echo ''; - echo '"; - echo '"; - echo '
'. - dossier::hidden(). + $id=uniqid("export_"); + + echo '',$id,$id); + + echo dossier::hidden(). HtmlInput::submit('bt_other',"Autre Rapport"). $hid->input("type","rapport").$hid->input("ac",$access_code)."
'. - HtmlInput::submit('bt_pdf',"Export PDF"). + echo '
',$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 "
'. - 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 '
',$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 '
'._('Exercice').'';; -echo ''; +echo ''); + echo 'Choisissez un autre exercice :'; $ex=new Exercice($cn); $wex=$ex->select('exercice',$exercice,' onchange="submit(this)"'); @@ -222,7 +235,7 @@ echo ''; echo '
'; -echo '
'; +echo ''; $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 588bc09c7..a28e62d41 100644 --- a/include/template/menu.php +++ b/include/template/menu.php @@ -12,12 +12,12 @@ EOF; ?>
'; + echo '
    '; }elseif ($level == 1) { - echo '
      '; + echo '
        '; } else { - echo '
          '; + echo '
            '; } ?>