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

Diversen debug

Browse Source
This commit is contained in:
theo
2018-07-31 15:15:54 +02:00
parent c520c3386a
commit 26f16ee088
8 changed files with 71 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/css/main.css
+3
View File
@@ -113,6 +113,9 @@ th.rotate > div > span {
border:0;
font-weight: bold;
}
.lighgrey-background{
background-color: #ebebeb;
}
.red-line{
border-bottom: 1px solid red !important;
}
public/js/lib/modals/projectModal.js
+2 -2
View File
@@ -809,7 +809,8 @@ $( function () {
vm.busy = true;
dbo.projectDataService.getProject( vm.projectID, function ( data ) {
var totalRevenuesIncl = Math.round( (data.invoiceDetails.totalrevenue * (Number( data.vat.vatrate ) + 100)) / 100 );
var revenues = Number(data.offer.own_revenue) + Number(data.offer.other_revenue) + Number(data.offer.costs);
var totalRevenuesIncl = Math.round( (revenues * (Number( data.vat.vatrate ) + 100)) / 100 );
vm.id = data.id
vm.projectleaderID( data.projectleader_id );
@@ -832,7 +833,6 @@ $( function () {
vm.ownRevenue( dbo.helpers.numberWithPoints( Math.round( Number( data.offer.own_revenue ) ) ) );
vm.otherRevenue( dbo.helpers.numberWithPoints( Math.round( Number( data.offer.other_revenue ) ) ) );
vm.costs(dbo.helpers.numberWithPoints( Math.round( Number( data.offer.costs ) ) ) );
var revenues = Number(data.offer.own_revenue) + Number(data.offer.other_revenue) + Number(data.offer.costs);
vm.totalRevenues( dbo.helpers.numberWithPoints( Math.round( revenues ) ) );
public/js/lib/modules/reports/reservations.js
+14 -8
View File
@@ -14,14 +14,15 @@ dbo.reservationsInit = function () {
} else {
dbo.reservationsModel = {
projects : ko.observableArray( [] ),
costs : ko.observable(),
reservation : ko.observable(),
payed : ko.observable(),
saldo : ko.observable(),
saldoToPay : ko.observable(),
otherRevenue : ko.observable(),
saldoInvoices: ko.observable(),
projects : ko.observableArray( [] ),
costs : ko.observable(),
reservation : ko.observable(),
payed : ko.observable(),
fromreservation: ko.observable(),
saldo : ko.observable(),
saldoToPay : ko.observable(),
otherRevenue : ko.observable(),
saldoInvoices : ko.observable(),
init: function () {
var vm = dbo.reservationsModel;
@@ -38,6 +39,7 @@ dbo.reservationsInit = function () {
vm.costs( 0 );
vm.reservation( 0 );
vm.payed( 0 );
vm.fromreservation( 0 );
vm.saldo( 0 );
vm.saldoToPay( 0 );
vm.otherRevenue( 0 );
@@ -50,6 +52,7 @@ dbo.reservationsInit = function () {
vm.costs( dbo.helpers.numberWithPoints( vm.costs() ) );
vm.reservation( dbo.helpers.numberWithPoints( vm.reservation() ) );
vm.payed( dbo.helpers.numberWithPoints( vm.payed() ) );
vm.fromreservation( dbo.helpers.numberWithPoints( vm.fromreservation() ) );
vm.saldo( dbo.helpers.numberWithPoints( vm.saldo() ) );
vm.saldoToPay( dbo.helpers.numberWithPoints( vm.saldoToPay() ) );
vm.otherRevenue( dbo.helpers.numberWithPoints( vm.otherRevenue() ) );
@@ -69,6 +72,7 @@ dbo.reservationsInit = function () {
self.costs = dbo.helpers.numberWithPoints( data.costs );
self.reservation = dbo.helpers.numberWithPoints( data.reservation );
self.payed = dbo.helpers.numberWithPoints( data.payed );
self.fromreservation = dbo.helpers.numberWithPoints( data.fromreservation );
self.saldo = dbo.helpers.numberWithPoints( data.saldo );
self.saldoToPay = dbo.helpers.numberWithPoints( data.saldoToPay );
self.otherRevenue = dbo.helpers.numberWithPoints( data.other_revenue );
@@ -78,6 +82,7 @@ dbo.reservationsInit = function () {
vm.costs( Number( vm.costs() ) + Number( data.costs ) );
vm.reservation( Number( vm.reservation() ) + Number( data.reservation ) );
vm.payed( Number( vm.payed() ) + Number( data.payed ) );
vm.fromreservation( Number( vm.fromreservation() ) + Number( data.fromreservation ) );
vm.saldo( Number( vm.saldo() ) + Number( data.saldo ) );
vm.saldoToPay( Number( vm.saldoToPay() ) + Number( data.saldoToPay ) );
vm.otherRevenue( Number( vm.otherRevenue() ) + Number( data.other_revenue ) );
@@ -96,6 +101,7 @@ dbo.reservationsInit = function () {
self.costs = dbo.helpers.numberWithPoints( data.costs );
self.reservation = dbo.helpers.numberWithPoints( data.reservation );
self.payed = dbo.helpers.numberWithPoints( data.payed );
self.fromreservation = dbo.helpers.numberWithPoints( data.fromreservation );
self.saldo = dbo.helpers.numberWithPoints( data.saldo );
self.saldoToPay = dbo.helpers.numberWithPoints( data.saldoToPay );
}