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

deadline toegevoegd

Browse Source
This commit is contained in:
theo
2024-11-08 15:43:24 +01:00
parent 013eb15d04
commit a8dfcfae4c
5 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/eloquent/Offer.php
+1
View File
@@ -63,6 +63,7 @@ class Offer extends BaseModel {
$offer['startdate'] = date2mysql( $offer['startdate'] ); $offer['startdate'] = date2mysql( $offer['startdate'] );
$offer['accepteddate'] = date2mysql( $offer['accepteddate'] ); $offer['accepteddate'] = date2mysql( $offer['accepteddate'] );
$offer['rejectdate'] = date2mysql( $offer['rejectdate'] ); $offer['rejectdate'] = date2mysql( $offer['rejectdate'] );
$offer['deadline'] = date2mysql( $offer['deadline'] );
if ( $offerID == 0 ) if ( $offerID == 0 )
{ {
application/views/modals/offer_modal.php
+44 -22
View File
@@ -207,6 +207,28 @@
</small> </small>
</div> </div>
</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"> <div class="form-group row">
<label class="col-md-3 control-label"> <label class="col-md-3 control-label">
acceptatie datum acceptatie datum
@@ -229,27 +251,27 @@
data-bind="visible:accepteddate(), click:resetDate.bind($data, 'accepteddate')"></span> data-bind="visible:accepteddate(), click:resetDate.bind($data, 'accepteddate')"></span>
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 control-label"> <label class="col-md-3 control-label">
afwijsdatum afwijsdatum
</label> </label>
<div class="col-md-5"> <div class="col-md-5">
<div class="input-group input-group-icon"> <div class="input-group input-group-icon">
<span class="input-group-addon"> <span class="input-group-addon">
<i class="icon fa-calendar"></i> <i class="icon fa-calendar"></i>
</span> </span>
<input type="email" <input type="email"
placeholder="afwijsdatum" placeholder="afwijsdatum"
class="form-control" class="form-control"
readonly readonly
data-bind="datepicker:{dateFormat: 'dd-mm-yy' }, value:rejectdate, disable:accepteddate()"> data-bind="datepicker:{dateFormat: 'dd-mm-yy' }, value:rejectdate, disable:accepteddate()">
</div> </div>
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<span class="icon fa-remove redish pointer" <span class="icon fa-remove redish pointer"
data-bind="visible:rejectdate(), click:resetDate.bind($data, 'rejectdate')"></span> data-bind="visible:rejectdate(), click:resetDate.bind($data, 'rejectdate')"></span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -263,4 +285,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
application/views/pages/offers_view.php
+10 -6
View File
@@ -22,9 +22,10 @@
<thead> <thead>
<tr> <tr>
<th width="10%" class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'offernumber')">nummer</th> <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="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, '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 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> <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"> <td data-bind="click:$root.selectOffer" class="pointer">
<span data-bind="text:offername"></span> <span data-bind="text:offername"></span>
</td> </td>
<td data-bind="click:$root.selectOffer" class="pointer"> <td data-bind="click:$root.selectOffer" class="pointer">
<span data-bind="text:startdate"></span> <span data-bind="text:startdate"></span>
</td> </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"> <td data-bind="click:$root.selectOffer" class="pointer align-right">
€ <span data-bind="text:own_revenue"></span> € <span data-bind="text:own_revenue"></span>
</td> </td>
@@ -79,7 +83,7 @@
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<th colspan="4" class="align-right table-tealish-header"> <th colspan="5" class="align-right table-tealish-header">
Totaal Totaal
</th> </th>
<th class="align-right table-tealish-header"> <th class="align-right table-tealish-header">
public/js/lib/modals/offerModal.js
+6 -2
View File
@@ -14,6 +14,7 @@ $( function () {
offername : ko.observable(), offername : ko.observable(),
startdate : ko.observable(), startdate : ko.observable(),
acceptance_chance: ko.observable(), acceptance_chance: ko.observable(),
deadline : ko.observable(),
accepteddate : ko.observable(), accepteddate : ko.observable(),
rejectdate : ko.observable(), rejectdate : ko.observable(),
customer_id : ko.observable(), customer_id : ko.observable(),
@@ -64,6 +65,7 @@ $( function () {
costs : vm.costs(), costs : vm.costs(),
startdate : vm.startdate(), startdate : vm.startdate(),
acceptance_chance: vm.acceptance_chance(), acceptance_chance: vm.acceptance_chance(),
deadline : vm.deadline(),
accepteddate : vm.accepteddate(), accepteddate : vm.accepteddate(),
rejectdate : vm.rejectdate(), rejectdate : vm.rejectdate(),
} }
@@ -120,6 +122,7 @@ $( function () {
}, },
setOffer: function ( offer, projectID, customerID, hasProject ) { setOffer: function ( offer, projectID, customerID, hasProject ) {
console.log( 'INSIDE SETOFFER', offer );
var vm = dbo.editOfferModal; var vm = dbo.editOfferModal;
vm.hasProject( hasProject ); vm.hasProject( hasProject );
@@ -138,7 +141,8 @@ $( function () {
vm.offernumber( offer.offernumber || null ); vm.offernumber( offer.offernumber || null );
vm.startdate( offer.startdate || null ); vm.startdate( offer.startdate || null );
vm.acceptance_chance( offer.acceptance_chance || 0 ); 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.rejectdate( offer.rejectdate || null );
vm.own_revenue( offer.own_revenue || 0 ); vm.own_revenue( offer.own_revenue || 0 );
vm.other_revenue( offer.other_revenue || 0 ); vm.other_revenue( offer.other_revenue || 0 );
@@ -219,4 +223,4 @@ $( function () {
ko.applyBindings( dbo.editOfferModal, document.getElementById( 'offer-modal' ) ); ko.applyBindings( dbo.editOfferModal, document.getElementById( 'offer-modal' ) );
} ); } );
public/js/lib/services/offersService.js
+1
View File
@@ -126,6 +126,7 @@ dbo.offersService = {
this.projectNumber = data.project ? data.project.projectnumber : null; this.projectNumber = data.project ? data.project.projectnumber : null;
this.customerName = data.customer ? data.customer.name : null; this.customerName = data.customer ? data.customer.name : null;
this.customer_id = data.customer_id; 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.startdate = data.startdate ? dbo.helpers.mysql2date( data.startdate ) : null;
this.rejectdate = data.rejectdate ? dbo.helpers.mysql2date( data.rejectdate ) : null; this.rejectdate = data.rejectdate ? dbo.helpers.mysql2date( data.rejectdate ) : null;
this.accepteddate = data.accepteddate ? dbo.helpers.mysql2date( data.accepteddate ) : null; this.accepteddate = data.accepteddate ? dbo.helpers.mysql2date( data.accepteddate ) : null;