project

public/css/correction.css

@@ -13,4 +13,20 @@ body{
     position: relative;
     z-index:9999 !important;
 }
+.site-menubar{
+    z-index:1030;
+}
+.panel-project{
+    margin-top:20px;
+}
+.panel-heading-project{
+    padding-top:0 !important;
+    padding-left:10px !important;
+    padding-right:10px !important;
+}
+.panel-body-project{
+    padding-top:0 !important;
+    padding-left:10px !important;
+    padding-right:10px !important;
+}
 

public/css/main.css

@@ -39,8 +39,13 @@
     color: #fff !important;
 }
 
-.table-blueish-header {
-    background-color: #247CF0;
+.table-darkish-header {
+    background-color: #526069;
+    color: #fff !important;
+}
+
+.table-indigoish-header {
+    background-color: #4D64FA;
     color: #fff !important;
 }
 
@@ -191,3 +196,33 @@
     opacity: 0;
 }
 
+/*********project page*************/
+.project-page{
+    position:fixed;
+    top:0;
+    bottom:0;
+    left:0;
+    right:0;
+    width:100%;
+    height:100%;
+    background-color: #CCD5DB;
+    z-index:1035;
+}
+.project-page-header{
+    height:50px;
+    background-color: #3e8ef7;
+    width:110%;
+    float:left;
+    position:relative;
+    left:-30px;
+}
+.project-page-header > h3{
+    color:#fff;
+    margin-top:10px;
+    margin-left:30px;
+}
+.project-page > .container{
+    background-color: #fff;
+}
+
+

public/js/lib/modules/modals/projectModal.js

@@ -6,9 +6,23 @@
  */
 
 $( function () {
-    dbo.editOfferModal = {
+    dbo.editProjectModal = {
+
+        showProject: ko.observable( false ),
+
+        newEditProject: function () {
+            var vm = dbo.editProjectModal;
+
+            vm.showProject( true );
+        },
+
+        closeProject: function(){
+            var vm = dbo.editProjectModal;
+
+            vm.showProject( false );
+        }
     };
 
-    ko.applyBindings( dbo.editOfferModal, document.getElementById( 'project-modal' ) );
+    ko.applyBindings( dbo.editProjectModal, document.getElementById( 'project-modal' ) );
 
 } );

public/js/lib/modules/projects/projectsModule.js

@@ -112,14 +112,56 @@ dbo.projectsInit = function () {
             },
 
             Project: function ( data ) {
-                this.id = data.id;
-                this.projectnumber = data.projectnumber;
-                this.projectleader = data.projectleader.fullname;
-                this.customer = data.customer.name;
-                this.startdate = data.startdate;
-                this.enddate = data.enddate;
-                this.archive = data.archive;
+                var vm = dbo.projectsModel;
+
+                var self = this;
+                self.id = data.id;
+                self.projectnumber = data.projectnumber;
+                self.projectleader = data.projectleader.fullname;
+                self.customer = data.customer.name;
+                self.startdate = data.startdate;
+                self.enddate = data.enddate;
+                self.archive = data.archive;
+
+                self.totalOwnrevenue = 0;
+                self.totalOtherrevenue = 0;
+                self.revenues = ko.observableArray([]);
+                $.each(data.offers, function(i,p){
+                    if( p.accepteddate ){
+                        self.totalOwnrevenue += p.totalOwnrevenue;
+                        self.totalOtherrevenue += p.totalOtherrevenue;
+                    }
+                    self.revenues.push( new vm.Revenue(p));
+                });
             },
+
+            Revenue : function(data){
+                var vm = dbo.projectsModel;
+                var self = this;
+
+                self.id = data.id;
+                self.offernumber = data.offernumber;
+                self.startdate = dbo.helpers.mysql2date(self.startdate);
+                self.accepteddate = dbo.helpers.mysql2date(self.accepteddate);
+                self.rejectdate = dbo.helpers.mysql2date(self.rejectdate);
+                self.own_revenue = data.own_revenue;
+                self.other_revenue = data.other_revenue;
+                self.acceptance_chance = data.acceptance_chance;
+
+                self.payed = 0;
+                self.payments = ko.observableArray([]);
+                $.each(data.payments, function(i, p){
+                    self.payed =+ p.paymentamount;
+
+                    self.payments.push( new vm.Payment(p));
+                });
+            },
+
+            Payment : function(data){
+                self.id = data.id;
+                self.paymentdate = dbo.helpers.mysql2date(self.paymentdate);
+                self.paymentamount = data.paymentamount;
+            }
         };
 
         dbo.projectsModel.init();