[Noalyss-commit] [noalyss] 01/08: cosmetic : improve appearance impress reconciliation

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit d3565b071b469f44204f244c8427b5be78eeb841
Author: Dany De Bontridder <address@hidden>
Date:   Wed Nov 5 21:25:37 2014 +0100

    cosmetic : improve appearance impress reconciliation
---
 include/template/impress_reconciliation.php |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/template/impress_reconciliation.php 
b/include/template/impress_reconciliation.php
index aa5aa22..2091f91 100644
--- a/include/template/impress_reconciliation.php
+++ b/include/template/impress_reconciliation.php
@@ -1,7 +1,7 @@
 <?php
 //This file is part of NOALYSS and is under GPL 
 //see licence.txt
-?><table class="result" style="width:80%;margin-left:10%">
+?><table class="result">
 <tr>
 <th>
 <?php echo _("N°")?>
@@ -24,12 +24,11 @@
 </tr>
 <?php 
 for ($i=0;$i<count($array);$i++) {
-        
+        $tot=$array[$i]['first']['jr_montant'];
        $r='';
        $r.=td($i);
        $r.=td(format_date($array[$i]['first']['jr_date']));
-       $detail=sprintf('<a class="detail" 
href="javascript:modifyOperation(\'%s\',%d)">%s</a>',
-                       
$array[$i]['first']['jr_id'],$gDossier,$array[$i]['first']['jr_internal']);
+        $detail = HtmlInput::detail_op($array[$i]['first']['jr_id'], 
$array[$i]['first']['jr_internal']);
        $r.=td($detail);
        $r.=td($array[$i]['first']['jr_pj_number']);
        $r.=td($array[$i]['first']['jr_comment']);
@@ -40,24 +39,27 @@ for ($i=0;$i<count($array);$i++) {
         $acc_reconciliation->show_detail($ret);
        if ( isset($array[$i]['depend']) )
        {
+            $tot2=0;
                $limit=count($array[$i]['depend'])-1;
                for ($e=0;$e<count($array[$i]['depend']);$e++) {
                        $r='';
                        $r.=td($i);
                        
$r.=td(format_date($array[$i]['depend'][$e]['jr_date']));
-                       $detail=sprintf('<a class="detail" 
href="javascript:modifyOperation(\'%s\',%d)">%s</a>',
-                                       
$array[$i]['depend'][$e]['jr_id'],$gDossier,$array[$i]['depend'][$e]['jr_internal']);
+                        $detail = 
HtmlInput::detail_op($array[$i]['depend'][$e]['jr_id'], 
$array[$i]['depend'][$e]['jr_internal']);
                        $r.=td($detail);
                        $r.=td($array[$i]['depend'][$e]['jr_pj_number']);
                        $r.=td($array[$i]['depend'][$e]['jr_comment']);
                        
$r.=td(nbm($array[$i]['depend'][$e]['jr_montant']),'style="text-align:right"');
+                        
$tot2=bcadd($tot2,$array[$i]['depend'][$e]['jr_montant']);
                        if ( $e==$limit)
-                               echo '<tr style="border-bottom: 1px solid  
#4f4f7d;">'.$r.'</tr>';
+                               echo '<tr>'.$r.'</tr>';
                        else
                                echo tr($r);
                         
$ret=$acc_reconciliation->db->execute('detail_quant',array($array[$i]['depend'][$e]['jr_id']));
                         $acc_reconciliation->show_detail($ret);
                        }
+           echo tr(td(_('Total ')).td('operation 
1').td(nbm($tot)).td('operation 
2').td(nbm($tot2)).td('Delta').td(bcsub($tot,$tot2)));
+           echo tr(td('<hr>',' colspan="6" style="witdh:auto"'));              
          
                          
        }
 }