From a8dfcfae4c603516c3fb099f2d3ed19164a12ff5 Mon Sep 17 00:00:00 2001
From: Theo Weijmer <t.weijmer@pensare.nl>
Date: Fri, 8 Nov 2024 15:43:24 +0100
Subject: [PATCH] deadline toegevoegd

---
 application/models/eloquent/Offer.php    |  1 +
 application/views/modals/offer_modal.php | 66 ++++++++++++++++--------
 application/views/pages/offers_view.php  | 16 +++---
 public/js/lib/modals/offerModal.js       |  8 ++-
 public/js/lib/services/offersService.js  |  1 +
 5 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/application/models/eloquent/Offer.php b/application/models/eloquent/Offer.php
index 7f155d9..fe1b1ef 100644
--- a/application/models/eloquent/Offer.php
+++ b/application/models/eloquent/Offer.php
@@ -63,6 +63,7 @@ class Offer extends BaseModel {
 		$offer['startdate'] = date2mysql( $offer['startdate'] );
 		$offer['accepteddate'] = date2mysql( $offer['accepteddate'] );
 		$offer['rejectdate'] = date2mysql( $offer['rejectdate'] );
+		$offer['deadline'] = date2mysql( $offer['deadline'] );
 
 		if ( $offerID == 0 )
 		{
diff --git a/application/views/modals/offer_modal.php b/application/views/modals/offer_modal.php
index 572c64f..503aa4d 100644
--- a/application/views/modals/offer_modal.php
+++ b/application/views/modals/offer_modal.php
@@ -207,6 +207,28 @@
                                     </small>
                                 </div>
                             </div>
+
+							<div class="form-group row">
+								<label class="col-md-3  control-label">
+									deadline
+								</label>
+								<div class="col-md-5">
+									<div class="input-group input-group-icon">
+										<span class="input-group-addon">
+											<i class="icon fa-calendar"></i>
+										</span>
+										<input type="email"
+											   placeholder="deadline"
+											   class="form-control"
+											   readonly
+											   data-bind="datepicker:{dateFormat: 'dd-mm-yy' }, value:deadline, disable:accepteddate()">
+									</div>
+								</div>
+								<div class="col-md-1">
+									<span class="icon fa-remove redish pointer"
+										  data-bind="visible:rejectdate(), click:resetDate.bind($data, 'rejectdate')"></span>
+								</div>
+							</div>
                             <div class="form-group row">
                                 <label class="col-md-3  control-label">
                                     acceptatie datum
@@ -229,27 +251,27 @@
                                           data-bind="visible:accepteddate(), click:resetDate.bind($data, 'accepteddate')"></span>
                                 </div>
                             </div>
-                            <div class="form-group row">
-                                <label class="col-md-3  control-label">
-                                    afwijsdatum
-                                </label>
-                                <div class="col-md-5">
-                                    <div class="input-group input-group-icon">
-                                        <span class="input-group-addon">
-                                            <i class="icon fa-calendar"></i>
-                                        </span>
-                                        <input type="email"
-                                               placeholder="afwijsdatum"
-                                               class="form-control"
-                                               readonly
-                                               data-bind="datepicker:{dateFormat: 'dd-mm-yy' }, value:rejectdate, disable:accepteddate()">
-                                    </div>
-                                </div>
-                                <div class="col-md-1">
-                                    <span class="icon fa-remove redish pointer"
-                                          data-bind="visible:rejectdate(), click:resetDate.bind($data, 'rejectdate')"></span>
-                                </div>
-                            </div>
+							<div class="form-group row">
+								<label class="col-md-3  control-label">
+									afwijsdatum
+								</label>
+								<div class="col-md-5">
+									<div class="input-group input-group-icon">
+										<span class="input-group-addon">
+											<i class="icon fa-calendar"></i>
+										</span>
+										<input type="email"
+											   placeholder="afwijsdatum"
+											   class="form-control"
+											   readonly
+											   data-bind="datepicker:{dateFormat: 'dd-mm-yy' }, value:rejectdate, disable:accepteddate()">
+									</div>
+								</div>
+								<div class="col-md-1">
+									<span class="icon fa-remove redish pointer"
+										  data-bind="visible:rejectdate(), click:resetDate.bind($data, 'rejectdate')"></span>
+								</div>
+							</div>
                         </div>
                     </div>
                 </div>
@@ -263,4 +285,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/application/views/pages/offers_view.php b/application/views/pages/offers_view.php
index 1809be4..46cbe53 100644
--- a/application/views/pages/offers_view.php
+++ b/application/views/pages/offers_view.php
@@ -22,9 +22,10 @@
     <thead>
     <tr>
         <th width="10%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'offernumber')">nummer</th>
-        <th width="25%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'CUS.name')">klant</th>
+        <th width="20%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'CUS.name')">klant</th>
         <th width="25%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'offername')">offertenaam</th>
-        <th width="5%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'startdate')">datum</th>
+		<th width="5%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'startdate')">datum</th>
+		<th width="5%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'deadline')">deadline</th>
         <th width="10%" class="table-tealish-header pointer align-right" data-bind="click:directionOrderOffers.bind($data, 'own_revenue')">(eigen) omzet</th>
         <th width="10%" class="table-tealish-header pointer align-right" data-bind="click:directionOrderOffers.bind($data, 'acceptance_chance')">kans</th>
         <th width="10%" class="table-tealish-header align-right">(eigen) omzet * kans</th>
@@ -44,9 +45,12 @@
         <td data-bind="click:$root.selectOffer" class="pointer">
             <span data-bind="text:offername"></span>
         </td>
-        <td data-bind="click:$root.selectOffer" class="pointer">
-            <span data-bind="text:startdate"></span>
-        </td>
+		<td data-bind="click:$root.selectOffer" class="pointer">
+			<span data-bind="text:startdate"></span>
+		</td>
+		<td data-bind="click:$root.selectOffer" class="pointer">
+			<span data-bind="text:deadline"></span>
+		</td>
         <td data-bind="click:$root.selectOffer" class="pointer align-right">
             € <span data-bind="text:own_revenue"></span>
         </td>
@@ -79,7 +83,7 @@
     </tbody>
     <tfoot>
 	<tr>
-		<th colspan="4" class="align-right table-tealish-header">
+		<th colspan="5" class="align-right table-tealish-header">
 			Totaal
 		</th>
 		<th class="align-right table-tealish-header">
diff --git a/public/js/lib/modals/offerModal.js b/public/js/lib/modals/offerModal.js
index 6591602..8ca1780 100644
--- a/public/js/lib/modals/offerModal.js
+++ b/public/js/lib/modals/offerModal.js
@@ -14,6 +14,7 @@ $( function () {
         offername        : ko.observable(),
         startdate        : ko.observable(),
         acceptance_chance: ko.observable(),
+		deadline		 : ko.observable(),
         accepteddate     : ko.observable(),
         rejectdate       : ko.observable(),
         customer_id      : ko.observable(),
@@ -64,6 +65,7 @@ $( function () {
                 costs            : vm.costs(),
                 startdate        : vm.startdate(),
                 acceptance_chance: vm.acceptance_chance(),
+				deadline		 : vm.deadline(),
                 accepteddate     : vm.accepteddate(),
                 rejectdate       : vm.rejectdate(),
             }
@@ -120,6 +122,7 @@ $( function () {
         },
 
         setOffer: function ( offer, projectID, customerID, hasProject ) {
+			console.log( 'INSIDE SETOFFER', offer );
             var vm = dbo.editOfferModal;
 
             vm.hasProject( hasProject );
@@ -138,7 +141,8 @@ $( function () {
             vm.offernumber( offer.offernumber || null );
             vm.startdate( offer.startdate || null );
             vm.acceptance_chance( offer.acceptance_chance || 0 );
-            vm.accepteddate( offer.accepteddate || null );
+			vm.deadline( offer.deadline || null );
+			vm.accepteddate( offer.accepteddate || null );
             vm.rejectdate( offer.rejectdate || null );
             vm.own_revenue( offer.own_revenue || 0 );
             vm.other_revenue( offer.other_revenue || 0 );
@@ -219,4 +223,4 @@ $( function () {
 
     ko.applyBindings( dbo.editOfferModal, document.getElementById( 'offer-modal' ) );
 
-} );
\ No newline at end of file
+} );
diff --git a/public/js/lib/services/offersService.js b/public/js/lib/services/offersService.js
index ae0bfbe..cfff748 100644
--- a/public/js/lib/services/offersService.js
+++ b/public/js/lib/services/offersService.js
@@ -126,6 +126,7 @@ dbo.offersService = {
 		this.projectNumber = data.project ? data.project.projectnumber : null;
 		this.customerName = data.customer ? data.customer.name : null;
 		this.customer_id = data.customer_id;
+		this.deadline = data.deadline ? dbo.helpers.mysql2date( data.deadline ) : null
 		this.startdate = data.startdate ? dbo.helpers.mysql2date( data.startdate ) : null;
 		this.rejectdate = data.rejectdate ? dbo.helpers.mysql2date( data.rejectdate ) : null;
 		this.accepteddate = data.accepteddate ? dbo.helpers.mysql2date( data.accepteddate ) : null;