v20210319

diff --git a/app/lib/POT/Report.php b/app/lib/POT/Report.php
index 9ed41c4..6c90a08 100644 (file)
--- a/app/lib/POT/Report.php
+++ b/app/lib/POT/Report.php
@@ -237,7 +237,7 @@ public function  printPOTFooter($schema,$outfile){
     $pdata = $this->getPeriodDays($schema,$data["id_staff"],$data["startdate"],$data["enddate"]);
     $wsums = $this->getPeriodWeekSums($schema,$data["id_staff"],$data["startdate"],$data["enddate"]);
     error_log(print_r($wsums,true));
-    $pagehead = "<h4>".$data["surname"]." ".$data["prename"]." ".(($data["matricule"] != "")?"(".$data["matricule"].")":"")."</h4>";
+    $pagehead = $data["surname"]." ".$data["prename"]." ".(($data["matricule"] != "")?"(".$data["matricule"].")":"");
     $tblhead = "<table><thead><tr>
         <th rowspan=\"2\" style=\"width: 30mm;background-color: #e6e6e6;\">Date</th>
         <th rowspan=\"2\" style=\"background-color: #e6e6e6;\">Heures de travail</th>
@@ -254,30 +254,17 @@ public function  printPOTFooter($schema,$outfile){
     $cmonth = $pdata[$cdate]["cmonth"];
     $cweek = $pdata[$cdate]["weekstart"];
     
-    $dspmonth = '<h4>'.date('F Y',strtotime($cdate)).'</h4>';
-    $txtpage = $pagehead.$dspmonth.$tblhead;
+    $dspmonth = date('F Y',strtotime($cdate));
+    $txtpage = "<h4>".$dspmonth." / ".$pagehead."</h4>".$tblhead;
 
     foreach ($dateseries as $ds){
       $cdate = $ds["daydate"];
-      if ($cweek != $pdata[$cdate]["weekstart"]){
-        $cweek = $pdata[$cdate]["weekstart"];
-        //$wst = $pdata[$cdate]['weekstart'];
-        error_log("WST".$wst);
-        $txtpage .= "<tr>
-        <td style=\"vertical-align: middle;width: 25mm;height: 7mm;background-color: #f6f6f6;\">".$pdata[$cdate]["dspweekshort"]."</td>
-        <td colspan=\"2\" style=\"vertical-align: middle;font-size: 10pt;width: 55mm;background-color: #f6f6f6;\">Totaux Semaine</td>
-        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["vacancyhours"]."</td>
-        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["vacillhours"]."</td>
-        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["vacextrahours"]."</td>
-        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["recuperationhours"]."</td>
-        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["partunemplhours"]."</td>
-        <td style=\"vertical-align: middle;width: 18mm; font-weight: bold;background-color: #f6f6f6;\">".$wsums[$wst]["totalhours"]."</td>
-        </tr>";
-      }
+      //error_log($cdate." -> ".$cweek." -> ".$pdata[$cdate]["weekstart"]." -> ".$pdata[$cdate]["dspweekshort"]);
+      
       if ($pdata[$cdate]["cmonth"] != $cmonth){
         $cmonth = $pdata[$cdate]["cmonth"];
-        $dspmonth = '<h4>'.date('F Y',strtotime($cdate)).'</h4>';
-        $txtpage .= $tblfoot.$pagebreak.$pagehead.$dspmonth.$tblhead;
+        $dspmonth = date('F Y',strtotime($cdate));
+        $txtpage .= $tblfoot.$pagebreak."<h4>".$dspmonth." / ".$pagehead."</h4>".$tblhead;
       }
       if ($pdata[$cdate]){
         $txtpage .= "<tr>
@@ -307,9 +294,37 @@ public function  printPOTFooter($schema,$outfile){
         <td style=\"vertical-align: middle;width: 18mm; font-weight: bold;\">&nbsp;</td>
         </tr>";
       }
+      if ($ds["weekday"] == "7"){
+        //$cweek != $pdata[$cdate]["weekstart"]
+        
+        //$cweek = $pdata[$cdate]["weekstart"];
+        $wst = $pdata[$cdate]['weekstart'];
+        //error_log("WST".$wst);
+        $txtpage .= "<tr>
+        <td style=\"vertical-align: middle;width: 25mm;height: 7mm;background-color: #f6f6f6;\">".$pdata[$cdate]["dspweekshort"]."</td>
+        <td colspan=\"2\" style=\"vertical-align: middle;font-size: 10pt;width: 55mm;background-color: #f6f6f6;\">Totaux Semaine</td>
+        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["vacancyhours"]."</td>
+        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["vacillhours"]."</td>
+        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["vacextrahours"]."</td>
+        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["recuperationhours"]."</td>
+        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["partunemplhours"]."</td>
+        <td style=\"vertical-align: middle;width: 18mm; font-weight: bold;background-color: #f6f6f6;\">".$wsums[$wst]["totalhours"]."</td>
+        </tr>";
+      }
       
     }
-    
+    $wst = $pdata[$cdate]['weekstart'];
+        //error_log("WST".$wst);
+        $txtpage .= "<tr>
+        <td style=\"vertical-align: middle;width: 25mm;height: 7mm;background-color: #f6f6f6;\">".$pdata[$cdate]["dspweekshort"]."</td>
+        <td colspan=\"2\" style=\"vertical-align: middle;font-size: 10pt;width: 55mm;background-color: #f6f6f6;\">Totaux Semaine</td>
+        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["vacancyhours"]."</td>
+        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["vacillhours"]."</td>
+        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["vacextrahours"]."</td>
+        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["recuperationhours"]."</td>
+        <td style=\"vertical-align: middle;width: 18mm;background-color: #f6f6f6;\">".$wsums[$wst]["partunemplhours"]."</td>
+        <td style=\"vertical-align: middle;width: 18mm; font-weight: bold;background-color: #f6f6f6;\">".$wsums[$wst]["totalhours"]."</td>
+        </tr>";
     $txtpage .= $tblfoot;
   $txtpage .= "<div style = \"display:block; clear:both; page-break-after:always;\"></div>";