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['accepteddate'] = date2mysql( $offer['accepteddate'] );
$offer['rejectdate'] = date2mysql( $offer['rejectdate'] );
$offer['deadline'] = date2mysql( $offer['deadline'] );
if ( $offerID == 0 )
{
application/views/modals/offer_modal.php
+44 -22
View File
@@ -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>
</div>
application/views/pages/offers_view.php
+10 -6
View File
@@ -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">