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

diveren. mail peter 16-02-2020

Browse Source
This commit is contained in:
Theo Weijmer
2020-02-21 11:52:59 +01:00
parent 8bcb01c902
commit 4bdf52a34a
7 changed files with 229 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/css/dashboard.css
+62 -1
View File
@@ -9,12 +9,28 @@
padding: 5px;
/*border: 1px solid #333;*/
color: #fff;
position: relative;
}
.conceal-panel {
position: absolute;
height: 96%;
border-radius: 5px;
width: 99%;
top: 5px;
left: 0;
background-color: #000;
/*opacity: .97;*/
z-index: 10;
}
.conceal-panel > h3 {
text-align: center;
margin-top: 100px;
}
.db-panel-holder {
padding: 15px;
border-radius: 5px;
box-shadow: 5px 5px 10px #aaa;
height: 270px;
height: 300px;
}
.db-panel-success {
background-color: #616236;
@@ -60,4 +76,49 @@
top: -40px;
border: 2px solid #000;
border-radius: 20px;
}
.dashboard-info {
width: 15px;
height: 15px;
font-size: .6em;
background-color: #444;
display: inline-block;
border-radius: 50%;
text-align: center;
position: relative;
top: -3px;
box-shadow: 0px 3px 5px #444;
margin-left: 5px;
cursor: pointer;
}
.dashboard-info > label {
position: absolute;
top: 2px;
left: 5px;
color: #fff;
}
.my-tooltip {
position: absolute;
width: 230px;
background-color: #fff;
/*display: inline-block;*/
color:#000;
top:0px;
left: -240px;
box-shadow: 2px 2px 5px #222;
border-radius: 5px;
}
.my-tooltip > h5 {
background-color: #ccc;
font-weight: bold;
text-align: left;
padding: 5px;
margin-top: 0;
border-radius: 5px 5px 0 0 ;
}
.my-tooltip > p {
margin: 0;
text-align: left;
padding: 0px 5px;
color: #333;
}
public/js/lib/modules/dashboard/dashboardModule.js
+79 -58
View File
@@ -7,103 +7,124 @@
dbo.dashboardInit = function () {
if (dbo.dashboardModel !== undefined) {
if ( dbo.dashboardModel !== undefined ) {
dbo.dashboardModel.init()
} else {
dbo.dashboardModel = {
owpThisYear : ko.observable(null),
owpNextYear : ko.observable(null),
owpTotal : ko.observable(null),
revenuesNextyear : ko.observable(null),
totalRevenues : ko.observable(null),
outstanding : ko.observable(null),
toInvoice : ko.observable(null),
openCosts : ko.observable(null),
revenues : ko.observable(null),
revenues : ko.observable(null),
revenueCurrentYear : ko.observable(null),
revenuesThisYear : ko.observable(null),
billingOverview : ko.observableArray([]),
showInvoiceOverview: ko.observable(false),
openInvoices : ko.observable(null),
invoiced : ko.observable(null),
minimumRevenues : ko.observable(null),
totalChance : ko.observable(null),
owpThisYear : ko.observable( null ),
owpNextYear : ko.observable( null ),
owpTotal : ko.observable( null ),
revenuesNextyear : ko.observable( null ),
totalRevenues : ko.observable( null ),
outstanding : ko.observable( null ),
toInvoice : ko.observable( null ),
openCosts : ko.observable( null ),
payments : ko.observable( null ),
revenues : ko.observable( null ),
revenueCurrentYear : ko.observable( null ),
revenuesThisYear : ko.observable( null ),
billingOverview : ko.observableArray( [] ),
showInvoiceOverview: ko.observable( false ),
openInvoices : ko.observable( null ),
invoiced : ko.observable( null ),
minimumRevenues : ko.observable( null ),
totalChance : ko.observable( null ),
toolTip1 : ko.observable( false ),
toolTip2 : ko.observable( false ),
toolTip3 : ko.observable( false ),
init: function () {
var self = dbo.dashboardModel
dbo.dashboardDataservice.getOwhp(function (data) {
var outstandings = self.getOutstandingTotal(data.outstandings)
var revCurYear = Number(data.currentFinancialYear) + Number(data.totalOwp)
dbo.dashboardDataservice.getOwhp( function ( data ) {
var outstandings = self.getOutstandingTotal( data.outstandings )
var revCurYear = Number( data.currentFinancialYear ) + Number( data.totalOwp )
self.owpThisYear(dbo.helpers.thousandSeparator(data.currentFinancialYear))
self.owpNextYear(dbo.helpers.thousandSeparator(data.owpNextyear))
self.owpTotal(dbo.helpers.thousandSeparator(data.totalOwp))
self.revenuesNextyear(dbo.helpers.thousandSeparator(data.revenuesNextyear))
self.totalRevenues(dbo.helpers.thousandSeparator(data.totalRevenues))
self.minimumRevenues(dbo.helpers.thousandSeparator(data.currentFinancialYear + data.revenuesThisYear))
self.invoiced(dbo.helpers.thousandSeparator(data.invoiced))
self.openInvoices(dbo.helpers.thousandSeparator(outstandings.openInvoices))
self.toInvoice(dbo.helpers.thousandSeparator(outstandings.toInvoice))
self.totalChance(dbo.helpers.thousandSeparator(data.totalChance))
self.owpThisYear( dbo.helpers.thousandSeparator( data.currentFinancialYear ) )
self.owpNextYear( dbo.helpers.thousandSeparator( data.owpNextyear ) )
self.owpTotal( dbo.helpers.thousandSeparator( data.totalOwp ) )
self.revenuesNextyear( dbo.helpers.thousandSeparator( data.revenuesNextyear ) )
self.totalRevenues( dbo.helpers.thousandSeparator( data.totalRevenues ) )
self.minimumRevenues( dbo.helpers.thousandSeparator( data.currentFinancialYear + data.revenuesThisYear ) )
self.invoiced( dbo.helpers.thousandSeparator( data.invoiced ) )
self.openInvoices( dbo.helpers.thousandSeparator( outstandings.openInvoices ) )
self.toInvoice( dbo.helpers.thousandSeparator( outstandings.toInvoice ) )
self.totalChance( dbo.helpers.thousandSeparator( data.totalChance ) )
self.payments(dbo.helpers.thousandSeparator(data.totalPayment))
self.revenueCurrentYear(dbo.helpers.thousandSeparator(revCurYear))
self.revenuesThisYear(dbo.helpers.thousandSeparator(data.revenuesThisYear))
dbo.reservationsDataservice.getReservations(function (data) {
self.revenueCurrentYear( dbo.helpers.thousandSeparator( revCurYear ) )
self.revenuesThisYear( dbo.helpers.thousandSeparator( data.revenuesThisYear ) )
dbo.reservationsDataservice.getReservations( function ( data ) {
var openCosts = 0
$.each(data, function (i, p) {
openCosts += Number(p.other_revenue) - Number(p.payed)
})
self.openCosts(dbo.helpers.thousandSeparator(openCosts))
$.each( data, function ( i, p ) {
openCosts += Number( p.other_revenue ) - Number( p.payed )
} )
self.openCosts( dbo.helpers.thousandSeparator( openCosts ) )
var revenues = outstandings.openInvoices + outstandings.toInvoice - openCosts
revenues = Math.round(revenues / 1.21)
self.revenues(dbo.helpers.thousandSeparator(revenues))
})
})
var revenues = outstandings.openInvoices + outstandings.toInvoice + openCosts
revenues = Math.round( revenues / 1.21 )
self.revenues( dbo.helpers.thousandSeparator( revenues ) )
} )
} )
},
getOutstandingTotal: function (data) {
getOutstandingTotal: function ( data ) {
var self = dbo.dashboardModel
var openInvoices = 0
var toInvoice = 0
var costs = 0
var openCosts = 0
_.each(data, function (p) {
openInvoices += Number(p.invoiceToPay.replace('.', ''))
toInvoice += Number(p.needInvoice.replace('.', ''))
})
_.each( data, function ( p ) {
openInvoices += Number( p.invoiceToPay.replace( '.', '' ) )
toInvoice += Number( p.needInvoice.replace( '.', '' ) )
} )
var revenues = (Number(open) + Number(toInvoice) - Number(openCosts)) / 1.21
var revenues = (Number( open ) + Number( toInvoice ) - Number( openCosts )) / 1.21
return {
openInvoices: openInvoices,
toInvoice : toInvoice,
costs : costs,
revenues : Math.round(revenues),
revenues : Math.round( revenues ),
openCosts : openCosts
}
},
invoiceOverview : function () {
var self = dbo.dashboardModel
self.showInvoiceOverview(!self.showInvoiceOverview())
self.showInvoiceOverview( !self.showInvoiceOverview() )
},
Billing : function (data) {
console.log(data)
Billing : function ( data ) {
self.project = data.projectnumber + ' ' + data.projectname
self.invoiced = dbo.helpers.thousandSeparator(data.invoiced)
self.payedcosts = dbo.helpers.thousandSeparator(data.payedcosts)
self.openCosts = dbo.helpers.thousandSeparator(Number(data.invoiced) - Number(data.payedcosts))
self.invoiced = dbo.helpers.thousandSeparator( data.invoiced )
self.payedcosts = dbo.helpers.thousandSeparator( data.payedcosts )
self.openCosts = dbo.helpers.thousandSeparator( Number( data.invoiced ) - Number( data.payedcosts ) )
self.archive = data.archive
},
hideConceals: function () {
$( '.conceal-panel' ).hide( 'slow' );
},
showConceals: function () {
$( '.conceal-panel' ).show( 'slow' );
},
enableDetails: function ( toolTip ) {
var self = dbo.dashboardModel
self[toolTip]( true )
},
disableDetails: function ( toolTip ) {
var self = dbo.dashboardModel
self[toolTip]( false )
}
}
dbo.dashboardModel.init()
ko.applyBindings(dbo.dashboardModel, document.getElementById('DASHBOARD'))
ko.applyBindings( dbo.dashboardModel, document.getElementById( 'DASHBOARD' ) )
}
}