wait #7923 @0.25

diff --git a/app/Jobs/ProcessTotals.php b/app/Jobs/ProcessTotals.php
index 2782e28034a43561758b4aa1f889755528af8e54..0728b1c17addedb31c5f9776c66c94d8810a660b 100644 (file)
--- a/app/Jobs/ProcessTotals.php
+++ b/app/Jobs/ProcessTotals.php
@@ -49,8 +49,8 @@ class ProcessTotals extends Base
                 'years' => $this->totalYears,
                 'months' => $this->totalMonths,
                 'quarters' => $this->totalQuarters,
-                'currentYear' => $this->totalYears[date('Y')],
-                'currentYearProjection' => $this->totalYears[date('Y')] + $this->pendingProjects,
+                'currentYear' => $this->totalYears[date('Y')] ?? 0,
+                'currentYearProjection' => ($this->totalYears[date('Y')] ?? 0) + $this->pendingProjects,
                 'unpaid' => $this->unpaidTotals,
                 'categories' => $this->totalCategories,
             ]

diff --git a/resources/views/extranet/totals.blade.php b/resources/views/extranet/totals.blade.php
index 4b5a630618780513847b811ad2c66dce3ab0bc17..3b0b8c28e0132a50393fe61d390c68730ae1babf 100644 (file)
--- a/resources/views/extranet/totals.blade.php
+++ b/resources/views/extranet/totals.blade.php
@@ -79,7 +79,7 @@
                 @for($i=1;$i<=4;$i++)
                     <td>{{format_ke($data['quarters'][$y.'-Q'.$i]??0)}}</td>
                 @endfor
-                <td><em>{{format_ke($data['years'][$y])}}</em></td>
+                <td><em>{{format_ke($data['years'][$y]??0)}}</em></td>
                 <td></td>
             </tr>
         @endfor
@@ -117,7 +117,7 @@
                 @for($i=1;$i<=12;$i++)
                     <td>{{format_ke($data['months'][$y.'-'.($i>=10?$i:'0'.$i)]??0)}}</td>
                 @endfor
-                <td><em>{{format_ke($data['years'][$y])}}</em></td>
+                <td><em>{{format_ke($data['years'][$y]??0)}}</em></td>
             </tr>
         @endfor
         </tbody>
@@ -143,7 +143,8 @@
                 <td></td>
                 <td><strong>{{$label}}</strong></td>
                 @for($y=$currentYear-11;$y<=$currentYear;$y++)
-                    <td>{{format_ke($data['categories'][$c]['years'][$y]['amount']??0)}}<br>{{format_pct($data['categories'][$c]['years'][$y]['ratio']??0)}}</td>
+                    <td>{{format_ke($data['categories'][$c]['years'][$y]['amount']??0)}}
+                        <br>{{format_pct($data['categories'][$c]['years'][$y]['ratio']??0)}}</td>
                 @endfor
                 <td>{{format_ke($data['categories'][$c]['total']??0)}}</td>
                 <td></td>