Overigen/dbois
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debug 4

Browse Source
This commit is contained in:
theo
2018-07-30 16:11:44 +02:00
parent a57fc08400
commit 7121f898b6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/reports/monthlyemployeehours/euro_view.php
+1 -1
View File
@@ -19,7 +19,7 @@
</th> </th>
<!-- /ko --> <!-- /ko -->
<th class="rotate"> <th class="rotate">
<div><span>eigen budget beschikbaar (ex btw)</span></div> <div><span>eigen tarief omzet (ex btw)</span></div>
</th> </th>
<th class="rotate"> <th class="rotate">
<div><span>totaal geschreven omzet</span></div> <div><span>totaal geschreven omzet</span></div>
public/js/lib/modules/reports/invoicereport.js
+4 -2
View File
@@ -95,6 +95,8 @@ dbo.invoicereportInit = function () {
vm.forecastRemaining( 0 ); vm.forecastRemaining( 0 );
vm.totalProjectPayments( 0 ); vm.totalProjectPayments( 0 );
vm.monthTotals.removeAll();
vm.monthPaymentTotals.removeAll();
for ( var i = 1; i <= 12; i++ ) { for ( var i = 1; i <= 12; i++ ) {
vm.monthTotals.push( {monthID: i, forecastamount: ko.observable( 0 )} ); vm.monthTotals.push( {monthID: i, forecastamount: ko.observable( 0 )} );
vm.monthPaymentTotals.push( {monthID: i, paymentamount: ko.observable( 0 )} ); vm.monthPaymentTotals.push( {monthID: i, paymentamount: ko.observable( 0 )} );
@@ -173,7 +175,7 @@ dbo.invoicereportInit = function () {
_.each( data.forecastMonths, function ( p, i ) { _.each( data.forecastMonths, function ( p, i ) {
self.forecastMonths.push( new vm.ForecastMonth( p ) ); self.forecastMonths.push( new vm.ForecastMonth( p ) );
_.each( vm.monthTotals(), function ( q ) { _.each( vm.monthTotals(), function ( q ) {
if ( q.monthID == i ) q.forecastamount( Number( q.forecastamount() ) + p.forecastamount ); if ( q.monthID == i ) q.forecastamount( Number( q.forecastamount() ) + Number(p.forecastamount) );
} ); } );
} ); } );
}, },
@@ -193,7 +195,7 @@ dbo.invoicereportInit = function () {
_.each( data.monthPayments, function ( p, i ) { _.each( data.monthPayments, function ( p, i ) {
self.paymentMonths.push( new vm.PaymentMonth( p ) ); self.paymentMonths.push( new vm.PaymentMonth( p ) );
_.each( vm.monthPaymentTotals(), function ( q ) { _.each( vm.monthPaymentTotals(), function ( q ) {
if ( q.monthID == i ) q.paymentamount( Number( q.paymentamount() ) + p.paymentamount ); if ( q.monthID == i ) q.paymentamount( Number( q.paymentamount() ) + Number(p.paymentamount) );
} ); } );
} ); } );
}, },