noalyss-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Noalyss-commit] [noalyss] 221/238: task #0001698: Problème affichage h

From: Dany De Bontridder
Subject: [Noalyss-commit] [noalyss] 221/238: task #0001698: Problème affichage historique fiches Prevent direct use of http_request translation Cosmetic
Date: Sat, 26 Oct 2019 04:41:11 -0400 (EDT) 
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.

commit bbdeaeae063ef91e58a3f04ca6af238cb0b25232
Author: Dany De Bontridder <address@hidden>
Date:   Wed Sep 18 20:36:39 2019 +0200

    task #0001698: Problème affichage historique fiches Prevent direct use of 
http_request translation Cosmetic
---
 html/index.css          |  2 +-
 html/install.php        |  4 ++--
 html/style-classic7.css |  2 +-
 include/fiche.inc.php   | 31 +++++++++++++++++--------------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/html/index.css b/html/index.css
index af71356..5d68784 100644
--- a/html/index.css
+++ b/html/index.css
@@ -261,7 +261,7 @@ BODY {
       width: 148px;
       left: 5px;
       top: 22px;
-      height: 115px;
+      height: 155px;
     }
     #login_frm {
         position:absolute;
diff --git a/html/install.php b/html/install.php
index 286d560..b42c11e 100644
--- a/html/install.php
+++ b/html/install.php
@@ -1,4 +1,4 @@
-<?php
+ <?php
 session_start();
 ?>
 <!doctype html>
@@ -132,7 +132,7 @@ if ( ! isset($_GET['lang'])){
 require_once '../include/constant.php';
 include_once NOALYSS_INCLUDE.'/lib/ac_common.php';
 include_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
-include_once '../lib/function_javascript.php';
+include_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
 load_all_script();
 
 
diff --git a/html/style-classic7.css b/html/style-classic7.css
index 958dfc7..f78f899 100644
--- a/html/style-classic7.css
+++ b/html/style-classic7.css
@@ -837,7 +837,7 @@ div.topmenu {
 .topmenu table {
     border-collapse:collapse;
     border-spacing:1px;
-    
+    width:100%;
 }
 
 @media only screen and (max-width:320px) {
diff --git a/include/fiche.inc.php b/include/fiche.inc.php
index 9e0cd75..7340e9f 100644
--- a/include/fiche.inc.php
+++ b/include/fiche.inc.php
@@ -402,19 +402,21 @@ if ($histo->selected  == 4 || $histo->selected  == 5)
                 echo _('Filtre rapide:').HtmlInput::filter_table($id, '0,1,2', 
'1'); 
                echo '<table class="sortable" id="'.$id.'" class="result" >';
                echo tr(
-                               th('Quick Code') .
-                               th('Libellé') .
-                               '<th>Poste'.Icon_Action::infobulle(27).'</th>'.
-                               th('Débit', 'style="text-align:right"') .
-                               th('Crédit', 'style="text-align:right"') .
-                               th('Solde', 'style="text-align:right"') .
-                               th('D/C', 'style="text-align:right"')
+                               th(_('Quick Code')) .
+                               th(_('Libellé')) .
+                               
'<th>'._('Poste').Icon_Action::infobulle(27).'</th>'.
+                               th(_('Débit'), 'style="text-align:right"') .
+                               th(_('Crédit'), 'style="text-align:right"') .
+                               th(_('Solde'), 'style="text-align:right"') .
+                               th(_('D/C'), 'style="text-align:right"')
                );
                $idx = 0;$sum_deb=0;$sum_cred=0;$sum_solde=0;bcscale(4);
                for ($i = 0; $i < Database::num_row($ret); $i++)
                {
-                       $filter = " (j_date >= to_date('" . $_REQUEST['start'] 
. "','DD.MM.YYYY') " .
-                                       " and  j_date <= to_date('" . 
$_REQUEST['end'] . "','DD.MM.YYYY')) ";
+                    $start=$http->request("start",'date');
+                    $end=$http->request("end",'date');
+                       $filter = " (j_date >= to_date('" . $start. 
"','DD.MM.YYYY') " .
+                                       " and  j_date <= to_date('" . $end . 
"','DD.MM.YYYY')) ";
                        $aCard = Database::fetch_array($ret, $i);
                        $oCard = new Fiche($cn, $aCard['f_id']);
                        $solde = $oCard->get_solde_detail($filter);
@@ -482,6 +484,7 @@ echo $export_csv;
 echo $export_pdf;
 echo $export_print;
 $fiche = new Fiche($cn);
+$histo=$http->get("histo","number");
 for ($e = 0; $e < count($afiche); $e++)
 {
        $array = Fiche::get_fiche_def($cn, $afiche[$e]['fd_id'], 'name_asc');
@@ -494,22 +497,22 @@ for ($e = 0; $e < count($afiche); $e++)
                $letter->set_parameter('start', $periode_start->value );
                $letter->set_parameter('end', $periode_end->value );
                // all
-               if ($_GET['histo'] == 0)
+               if ($histo== 0)
                {
                        $letter->get_all();
                }
 
                // lettered
-               if ($_GET['histo'] == 1)
+               if ($histo == 1)
                {
                        $letter->get_letter();
                }
                // unlettered
-               if ($_GET['histo'] == 2)
+               if ($histo == 2)
                {
                        $letter->get_unletter();
                }
-               if ($_GET['histo'] == 6)
+               if ($histo== 6)
                {
                        $letter->get_letter_diff();
                }
@@ -571,7 +574,7 @@ for ($e = 0; $e < count($afiche); $e++)
                                $prog = bcsub($prog, $row['j_montant']);
                        }
                        $side = "&nbsp;" . $fiche->get_amount_side($prog);
-                       echo td(nbm($prog) . $side, 'style="text-align:right"');
+                       echo td(nbm(abs($prog)) . $side, 
'style="text-align:right"');
                         $html_let="";
                         if ($row['letter']!=-1) {
                             $span_error = "";
reply via email to
[Prev in Thread] Current Thread [Next in Thread]