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

diversen opmerkingen

Browse Source
This commit is contained in:
theo
2018-04-21 21:12:09 +02:00
parent 9187742658
commit e49fa05a9a
13 changed files with 303 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/beheer/EmployeeTargetController.php
+34
View File
@@ -0,0 +1,34 @@
<?php
/**
* Created by Pensare Software.
* User: Theo Weijmer
* Date: 21/04/2018
* Time: 20:08
*/
include_once('../application/models/eloquent/Employeetarget.php');
class EmployeeTargetController extends MY_Controller {
public function __construct()
{
parent::__construct();
}
public function index()
{
}
public function getEmployeeTargets( $employeeID )
{
$employeeTargets = Employeetarget::whereUserId( $employeeID )
->orderBy( 'startdate' )
->get();
$this->json( $employeeTargets );
}
}
application/models/eloquent/Employeetarget.php
+18
View File
@@ -0,0 +1,18 @@
<?php
/**
* Created by Pensare Software.
* User: Theo Weijmer
* Date: 21/04/2018
* Time: 19:55
*/
class Employeetarget extends BaseModel {
protected $table = 'employeetargets';
public function user()
{
return $this->belongsTo( 'User' );
}
}
application/models/eloquent/User.php
+5
View File
@@ -16,6 +16,11 @@ class User extends BaseModel {
return $this->hasMany( 'Projectemployee' );
}
public function employeetargets()
{
return $this->hasMany( 'Employeetarget' );
}
public function projectemployee()
{
return $this->hasOne( 'Projectemployee' );
application/views/modals/employeetarget_modal.php
+76
View File
@@ -0,0 +1,76 @@
<div class="modal modal-fade-in-scale-up modal-primary" tabindex="-1" id="employee-target-modal">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">toevoegen / wijzigen medewerker uren
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</h5>
</div>
<div class="modal-body">
<div class="row">
<div class="col-md-10 col-md-offset-1">
<table class="table table-condensed">
<thead>
<tr>
<th>start</th>
<th>eind</th>
<th>target per maand</th>
</tr>
</thead>
<tbody>
<!-- ko foreach:employeeTargets -->
<tr>
<td>
<input type="text"
placeholder="startdatum"
class="form-control"
readonly
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
value:startdate">
</td>
<td>
<input type="text"
placeholder="einddatum"
class="form-control"
readonly
data-bind="datepicker:{dateFormat: 'dd-mm-yy' },
value:enddate">
</td>
<td>
<input type="text"
class="form-control"
data-bind="textInput:target">
</td>
<td>
<button class="btn btn-success"
data-bind="disable: ! validTarget()">
opslaan
</button>
</td>
</tr>
<!-- /ko -->
</tbody>
<tfoot>
<tr>
<th colspan="4">
<i class="icon fa-plus-square-o pull-right pointer"
data-bind="click:addEmployeeTarget"></i>
</th>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-warning"
data-dismiss="modal">
sluiten
</button>
</div>
</div>
</div>
</div>
application/views/pages/employeehoursreport_view.php
+4 -6
View File
@@ -5,12 +5,10 @@
<label>jaar</label>
</div>
<div class="col-md-2">
<select class="form-control form-control-sm"
data-bind="options:years,
optionsText:'year',
optionsValue: 'id',
value:selectedYear,
event:{change:refreshTab}"></select>
<div class="col-md-2">
<input type="text" class="form-control" data-bind="textInput:selectedYear, event:{keyup:checkYear}" >
<div class="invalid-feedback" data-bind="visible: ! validYear()">geen geldig jaar</div>
</div>
</div>
</div>
<div class="row">
application/views/pages/users_view.php
+1
View File
@@ -20,6 +20,7 @@
<td><span data-bind=""></span></td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editUser"></i>
<i class="icon fa-user pointer" title="uren" data-bind="click:$root.editTarget"></i>
<!-- ko if:archive == 'F' -->
<i class="icon fa-archive pointer" title="archiveer"
data-bind="click:$root.archiveUser"></i>
application/views/partials/_js.php
+2
View File
@@ -44,6 +44,7 @@
<script src="js/lib/modals/offerModal.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modals/projectModal.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modals/commentModal.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modals/employeeTargetModal.js?version=<?= $this->version ?>"></script>
<!-- ***********MODALS************* -->
<script src="js/lib/services/offersService.js?version=<?= $this->version ?>"></script>
@@ -64,6 +65,7 @@
<script src="js/lib/dataservices/reportsDataService.js"></script>
<script src="js/lib/dataservices/invoiceDataService.js"></script>
<script src="js/lib/dataservices/reservationsDataService.js"></script>
<script src="js/lib/dataservices/employeeTargetDataService.js"></script>
<script src="js/lib/services/chartService.js"></script>
application/views/partials/_modals.php
+1
View File
@@ -6,6 +6,7 @@ $this->load->view('modals/external_modal');
$this->load->view('modals/offer_modal');
$this->load->view('modals/project_modal');
$this->load->view('modals/comment_modal');
$this->load->view('modals/employeetarget_modal');
$this->load->view('specials/tellme_modal');
$this->load->view('specials/upload_modal');
application/views/reports/employeehours/employeemonthhours_view.php
+19 -19
View File
@@ -49,22 +49,22 @@
</table>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="graph-holder" style="min-height:350px">
<canvas id="hours-per-month" width="300"></canvas>
<div id="hours-per-month-legends"></div>
</div>
</div>
<div class="col-md-3">
<div class="graph-holder" style="min-height:350px">
<canvas id="revenues-per-month" width="300"></canvas>
<div id="revenues-per-month-legends"></div>
</div>
</div>
<div class="col-md-6">
<div class="graph-holder" style="min-height:350px">
<canvas id="average-rate" width="300"></canvas>
</div>
</div>
</div>
<!--<div class="row">-->
<!-- <div class="col-md-3">-->
<!-- <div class="graph-holder" style="min-height:350px">-->
<!-- <canvas id="hours-per-month" width="300"></canvas>-->
<!-- <div id="hours-per-month-legends"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-md-3">-->
<!-- <div class="graph-holder" style="min-height:350px">-->
<!-- <canvas id="revenues-per-month" width="300"></canvas>-->
<!-- <div id="revenues-per-month-legends"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-md-6">-->
<!-- <div class="graph-holder" style="min-height:350px">-->
<!-- <canvas id="average-rate" width="300"></canvas>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->