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

nieuwe kolommen bij offertes / employeehours reportable

Browse Source
This commit is contained in:
theo
2019-05-07 21:20:35 +02:00
parent ddea739199
commit 2738f8aa78
3 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+1 -1
View File
@@ -16,7 +16,7 @@ class MY_Controller extends CI_Controller {
{ {
parent::__construct(); parent::__construct();
$this->version = '1.00.05'; $this->version = '1.00.06';
$this->load->library( 'beheer/session/RetrieveUserSession' ); $this->load->library( 'beheer/session/RetrieveUserSession' );
application/models/eloquent/queries/QEmployeeHours.php
+5 -2
View File
@@ -29,8 +29,11 @@ class QEmployeeHours {
0 AS nonprofitablehours, 0 AS nonprofitablehours,
0 AS revenues, 0 AS revenues,
SUM(hours) AS nonprojecthours SUM(hours) AS nonprojecthours
FROM employeehours FROM employeehours EMH
WHERE YEAR(hourdate) = '{$year}' "; JOIN hourtypes HTY
ON HTY.id = EMH.hourtype_id
WHERE YEAR(hourdate) = '{$year}'
AND reportable = 'T' ";
if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' "; if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' ";
$sql .= " $sql .= "
GROUP BY employee_id, MONTH(hourdate) GROUP BY employee_id, MONTH(hourdate)
application/views/pages/offers_view.php
+23 -14
View File
@@ -1,3 +1,4 @@
<div class="row"> <div class="row">
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
@@ -20,14 +21,16 @@
<table class="table table-sm"> <table class="table table-sm">
<thead> <thead>
<tr> <tr>
<th 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 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, 'CUS.name')">klant</th>
<th 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 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 class="table-tealish-header pointer" 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, 'own_revenue')">(eigen) omzet</th>
<th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'accepteddate')">geaccepteerd</th> <th width="10%" class="table-tealish-header pointer align-right" data-bind="click:directionOrderOffers.bind($data, 'acceptance_chance')">kans</th>
<th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'rejectdate')">afgewezen</th> <th width="10%" class="table-tealish-header align-right">(eigen) omzet * kans</th>
<th class="table-tealish-header pointer">&nbsp;</th> <!-- <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'accepteddate')">geaccepteerd</th>-->
<!-- <th class="table-tealish-header pointer" data-bind="click:directionOrderOffers.bind($data, 'rejectdate')">afgewezen</th>-->
<th width="5%" class="table-tealish-header pointer">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody data-bind="foreach:offers"> <tbody data-bind="foreach:offers">
@@ -44,15 +47,21 @@
<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"> <td data-bind="click:$root.selectOffer" class="pointer align-right">
€ <span data-bind="text:own_revenue"></span>
</td>
<td data-bind="click:$root.selectOffer" class="pointer align-right">
<span data-bind="text:acceptance_chance"></span> % <span data-bind="text:acceptance_chance"></span> %
</td> </td>
<td data-bind="click:$root.selectOffer" class="pointer"> <td data-bind="click:$root.selectOffer" class="pointer align-right">
<span data-bind="text:accepteddate"></span> € <span data-bind="text:Math.round((acceptance_chance * own_revenue) / 100)"></span>
</td>
<td data-bind="click:$root.selectOffer" class="pointer">
<span data-bind="text:rejectdate"></span>
</td> </td>
<!-- <td data-bind="click:$root.selectOffer" class="pointer">-->
<!-- <span data-bind="text:accepteddate"></span>-->
<!-- </td>-->
<!-- <td data-bind="click:$root.selectOffer" class="pointer">-->
<!-- <span data-bind="text:rejectdate"></span>-->
<!-- </td>-->
<td> <td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editOffer"></i> <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editOffer"></i>
<!-- ko if:archive == 'F' --> <!-- ko if:archive == 'F' -->