Fix #8826 - Fix totals in Report PDF

Restyle total to work with pdf

Author: mattlorimer

modules/AOR_Reports/AOR_Report.php

@@ -955,43 +955,21 @@ public function getTotalHTML($fields, $totals)
         $currency->retrieve($GLOBALS['current_user']->getPreference('currency'));
 
         $showTotal = false;
-        $html = "<thead class='fc-head'>";
-        $html .= "<tr>";
         foreach ($fields as $label => $field) {
             if (!$field['display']) {
                 continue;
             }
 
-            $fieldTotal = null;
-            if (!isset($field['total'])) {
-                LoggerManager::getLogger()->warn('AOR_Report problem: field[total] is not set for getTotalHTML()');
-            } else {
-                $fieldTotal = $field['total'];
-            }
-
-            $appListStringsAorTotalOptionsFieldTotal = null;
-            if (!isset($app_list_strings['aor_total_options'][$fieldTotal])) {
-                LoggerManager::getLogger()->warn('AOR_Report problem: app_list_strings[aor_total_options][fieldTotal] is not set for getTotalHTML()');
-            } else {
-                $appListStringsAorTotalOptionsFieldTotal = $app_list_strings['aor_total_options'][$fieldTotal];
-            }
-
-
-            if ($fieldTotal) {
+            if (!empty($field['total'])) {
                 $showTotal = true;
-                $totalLabel = $field['label'] . ' ' . $appListStringsAorTotalOptionsFieldTotal;
-                $html .= "<th>{$totalLabel}</th>";
-            } else {
-                $html .= '<th></th>';
             }
         }
-        $html .= '</tr></thead>';
 
         if (!$showTotal) {
             return '';
         }
 
-        $html .= "<tbody><tr class='oddListRowS1'>";
+        $html = "<tr class='totalReportRow oddListRowS1'>";
         foreach ($fields as $label => $field) {
             if (!$field['display']) {
                 continue;
@@ -1023,7 +1001,6 @@ public function getTotalHTML($fields, $totals)
             }
         }
         $html .= '</tr>';
-        $html .= '</tbody>';
 
         return $html;
     }

modules/AOR_Reports/controller.php

@@ -256,12 +256,12 @@ protected function action_downloadPDF()
         try {
             $pdf = new mPDF('en', 'A4', '', 'DejaVuSansCondensed');
             $pdf->SetAutoFont();
+            $pdf->setFooter('{PAGENO}');
             $pdf->WriteHTML($stylesheet, 1);
             $pdf->SetDefaultBodyCSS('background-color', '#FFFFFF');
             unset($pdf->cssmgr->CSS['INPUT']['FONT-SIZE']);
             $pdf->WriteHTML($head, 2);
             $pdf->WriteHTML($printable, 3);
-            $pdf->setFooter('{PAGENO}');
             $pdf->Output($this->bean->name . '.pdf', "D");
         } catch (mPDF_exception $e) {
             echo $e;

themes/SuiteP/css/Dawn/variables.scss

@@ -1249,6 +1249,7 @@ $scheduler-busy-color: $color-70;
 
 // AOR
 $aor-droparea: $color-75;
+$aor-total: $main-bg;
 
 // Line Items
 $line-item-group-width: 100%;

themes/SuiteP/css/Day/variables.scss

@@ -1248,6 +1248,7 @@ $scheduler-busy-color: $color-70;
 
 // AOR
 $aor-droparea: $color-75;
+$aor-total: $main-bg;
 
 // Line Items
 $line-item-group-width: 100%;

themes/SuiteP/css/Dusk/variables.scss

@@ -1253,6 +1253,7 @@ $scheduler-busy-color: $color-70;
 
 // AOR
 $aor-droparea: $color-75;
+$aor-total: $main-bg;
 
 // Line Items
 $line-item-group-width: 100%;

themes/SuiteP/css/Night/variables.scss

@@ -1248,6 +1248,7 @@ $scheduler-busy-color: $color-70;
 
 // AOR
 $aor-droparea: $color-75;
+$aor-total: $color-54;
 
 // Line Items
 $line-item-group-width: 100%;

themes/SuiteP/css/suitep-base/aor.scss

@@ -254,4 +254,20 @@
   .list-view-rounded-corners > table th:last-of-type {
     border-top-right-radius: 0;
   }
-}
+
+  .table-responsive {
+    border-collapse: collapse;
+  }
+
+  .totalReportRow {
+    border-top: 1px solid $list-view-header-bg;
+    border-bottom: 1px solid $list-view-header-bg;
+  }
+
+  .totalReportRow td {
+    padding: 5px 5px;
+    font-size: 13px;
+    font-weight: bold;
+    background-color: $aor-total;
+  }
+}