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

diuversen opmerkingen 19062018

Browse Source
This commit is contained in:
theo
2018-07-14 16:56:42 +02:00
parent 124be78a85
commit cecbfd83fb
20 changed files with 266 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/autoload.php
+1 -1
View File
@@ -132,4 +132,4 @@ $autoload['language'] = array();
|
| $autoload['model'] = array('first_model' => 'first');
*/
$autoload['model'] = ['beheer/User_model'];
$autoload['model'] = ['beheer/User_model', ];
application/controllers/beheer/AuthorisationController.php
+36
View File
@@ -0,0 +1,36 @@
<?php
/**
* Created by Pensare Software.
* User: Theo Weijmer
* Date: 20/06/2018
* Time: 14:16
*/
class AuthorisationController extends MY_Controller {
public function __construct()
{
parent::__construct();
if( AUTHENTICATED == FALSE ) die('NO ACCES');
$models = [];
$libraries = [];
$this->load->model( $models );
$this->load->library( $libraries );
}
public function index()
{
}
public function getRoleAuthorisations()
{
$roleAuthorisations = Role::getPagesAccessByRole();
return $roleAuthorisations;
}
}
application/controllers/reports/ReportsController.php
+7
View File
@@ -81,4 +81,11 @@ class ReportsController extends MY_Controller {
$this->json( $result );
}
public function saveCurrentFinnacialYear( $projectID )
{
$amount = $this->input->post( 'amount' );
Project::whereId( $projectID )->update( ['current_financial_year' => $amount] );
}
}
application/libraries/reports/Recapprojects.php
+8
View File
@@ -18,6 +18,7 @@ class Recapprojects {
private $employeeBudget;
private $uniqueEmployee;
private $uniqueEmployees;
private $currentFinancialYear;
private $projectEmployeeDetail;
private $projectEmployeeDetails;
@@ -81,6 +82,8 @@ class Recapprojects {
$this->setWorkInProgress();
$this->setCurrentFinancialYear();
$this->index ++;
}
}
@@ -223,6 +226,11 @@ class Recapprojects {
$this->projects[ $this->index ]['workInProgress'] = 0;
}
private function setCurrentFinancialYear()
{
$this->currentFinancialYear = $this->project['current_financial_year'];
}
private function setInvoicedYears()
{
foreach ( $this->projects as $this->project )
application/models/eloquent/Page.php
+9
View File
@@ -44,5 +44,14 @@ class Page extends Eloquent {
return $appPages;
}
public static function getPageAccessByRoleLevel( $roleLevel )
{
self::selectRaw( "
IF(id = page_id, 'MAIN', 'SUB') AS typepage,
IF((SELECT {$roleLevel} & pagelevel ) = 0, 'F', 'T') AS pageaccess" )
->orderByRaw( "id, IF(id = page_id, 0, 1)" )
->get();
}
}
application/models/eloquent/Project.php
+1 -1
View File
@@ -92,7 +92,7 @@ class Project extends BaseModel {
public static function getActiveProjects()
{
$projects = Project::selectRaw( "projects.id, YEAR(projects.startdate) AS instroom, YEAR(projects.enddate) AS uitstroom, projectnumber,
$projects = Project::selectRaw( "projects.id, YEAR(projects.startdate) AS instroom, YEAR(projects.enddate) AS uitstroom, projectnumber, current_financial_year,
projectname, CUS.name, OFF.own_revenue, OFF.other_revenue" )
->join( 'customers AS CUS', 'CUS.id', '=', 'projects.customer_id' )
->join( 'offers AS OFF', 'OFF.project_id', '=', 'projects.id' )
application/models/eloquent/Role.php
+14
View File
@@ -42,5 +42,19 @@ class Role extends BaseModel {
return $roleHierarchy;
}
public static function getPagesAccessByRole()
{
$roles = self::all();
foreach ( $roles as $role )
{
$pageroles[ $role->id ]['rolelevel'] = $role->rolelevel;
$pageroles[ $role->id ]['rolename'] = $role->rolename;
$pageroles[ $role->id ]['pagesAccess'] =
Page::getPageAccessByRoleLevel( $role->rolelevel );
}
}
}
application/views/modals/offer_modal.php
+3 -3
View File
@@ -152,7 +152,7 @@
event:{keyup:validateNumber}">
</div>
<small>
eigen omzet (excl btw)
Eigen tarief omzet (excl btw)
</small>
</div>
<div class="col-md-4">
@@ -167,13 +167,13 @@
event:{keyup:validateNumber}">
</div>
<small>
overige omzet (excl btw)
Overige kosten (excl btw)
</small>
</div>
</div>
<div class="form-group row">
<label class="col-md-3 control-label">
kosten derden
&nbsp
</label>
<div class="col-md-4">
<div class="input-group input-group-icon">
application/views/modals/partials/_projectdashboard.php
+3 -3
View File
@@ -103,21 +103,21 @@
</h3>
</div>
<div class="panel-body panel-body-project">
<label class="col-md-6 col-form-label">eigen omzet(excl.btw)</label>
<label class="col-md-6 col-form-label">Eigen tarief omzet(excl.btw)</label>
<div class="col-md-6">
<h4 class="form-control-label">
<i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:ownRevenue"></span>
</h4>
</div>
<div class="divider"></div>
<label class="col-md-6 col-form-label">overige omzet(excl.btw)</label>
<label class="col-md-6 col-form-label">Overige kosten(excl.btw)</label>
<div class="col-md-6">
<h4 class="form-control-label">
<i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:otherRevenue"></span>
</h4>
</div>
<div class="divider"></div>
<label class="col-md-6 col-form-label">kosten(excl.btw)</label>
<label class="col-md-6 col-form-label">Kosten derden(excl.btw)</label>
<div class="col-md-6">
<h4 class="form-control-label">
<i class="icon fa-euro"> </i><span class="euro-amount" data-bind="text:costs"></span>
application/views/pages/authorisation_view.php
+28
View File
@@ -0,0 +1,28 @@
<div class="AUTHORISATION">
<div class="row">
<div class="col-xs-12">
<table class="table table-condensed">
<thead>
<tr>
<th>rol</th>
<!-- ko foreach:roles -->
<th>
<span data-bind="text:rolename"></span>
</th>
<!-- /ko -->
</tr>
</thead>
<tbody>
<td>
<span data-bind="text:pagename"></span>
</td>
<!-- ko foreach:roles -->
<th>
<span data-bind="text:rolename"></span>
</th>
<!-- /ko -->
</tbody>
</table>
</div>
</div>
</div>
application/views/pages/projects_view.php
+3 -3
View File
@@ -5,9 +5,9 @@
<th class="table-tealish-header">projectleider</th>
<th class="table-tealish-header">klant</th>
<th class="table-tealish-header">start</th>
<th class="table-tealish-header align-right">eigen omzet</th>
<th class="table-tealish-header align-right">overige omzet</th>
<th class="table-tealish-header align-right">kosten</th>
<th class="table-tealish-header align-right">eigen tarief omzet</th>
<th class="table-tealish-header align-right">overige kosten</th>
<th class="table-tealish-header align-right">Kosten derden</th>
<th class="table-tealish-header align-right">totaal</th>
<th class="table-tealish-header">&nbsp;</th>
</tr>
application/views/partials/_js.php
+2
View File
@@ -29,6 +29,7 @@
<script src="js/lib/modules/beheer/customersModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/beheer/externalsModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/beheer/vatModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/beheer/authorisationModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/projects/offersModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/projects/projectsModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/projects/employeehoursModule.js?version=<?= $this->version ?>"></script>
@@ -67,6 +68,7 @@
<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/dataservices/authorisationDataService.js"></script>
<script src="js/lib/services/chartService.js"></script>
application/views/reports/monthlyemployeehours/euro_view.php
+19 -53
View File
@@ -7,9 +7,6 @@
<th class="rotate">
<div><span>instroom</span></div>
</th>
<th class="rotate">
<div><span>uitstroom</span></div>
</th>
<th class="rotate">
<div><span>naam</span></div>
</th>
@@ -39,18 +36,18 @@
<th class="rotate">
<div><span>OWP</span></div>
</th>
<!-- ko foreach: uniqueYears -->
<th class="rotate">
<div><span data-bind="text:year"></span></div>
<div><span>Lopend boekjaar</span></div>
</th>
<th class="rotate">
<div><span>Volgend boekjaar</span></div>
</th>
<!-- /ko -->
</tr>
</thead>
<tbody data-bind="foreach:recap">
<tr>
<td><span data-bind="text:projectnumber"></span></td>
<td><span data-bind="text:instroom"></span></td>
<td><span data-bind="text:uitstroom ? uitstroom : ''"></span></td>
<td><span data-bind="text:projectname"></span></td>
<td><span data-bind="text:name"></span></td>
<!-- ko foreach: employees -->
@@ -70,25 +67,20 @@
<th class="align-right">
<span data-bind="text:owp"></span>
</th>
<!-- <td class="align-right">-->
<!-- <span data-bind="text:externCosts"></span>-->
<!-- </td>-->
<!-- <th class="align-right">-->
<!-- <span data-bind="text:saldo"></span>-->
<!-- </th>-->
<!-- <th class="align-right">-->
<!-- <span data-bind="text:workInProgress"></span>-->
<!-- </th>-->
<!-- ko foreach:invoiced -->
<th class="align-right">
<span data-bind="text:invoiced"></span>
</th>
<!-- /ko -->
<td width="100px">
<input class="form-control form-control-xsm align-right"
data-bind="textInput:currentFinancialYear,
event:{keyup:$root.saveCurrentFinancialYear},
css:{'red-border': ! pristine()}"/>
</td>
<td class="align-right">
<span data-bind="text:nextFinancialYears"></span>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<th class="align-right" colspan="5">totaal</th>
<th class="align-right" colspan="4">totaal</th>
<!-- ko foreach: totalPerEmployee -->
<th class="align-right">
<span data-bind="text:totalRevenue"></span>
@@ -106,39 +98,13 @@
<th class="align-right">
<span data-bind="text:totalOwp"></span>
</th>
<!-- <th class="align-right">-->
<!-- <span data-bind="text:totalCosts"></span>-->
<!-- </th>-->
<!-- <th class="align-right">-->
<!-- <span data-bind="text:totalSaldo"></span>-->
<!-- </th>-->
<!-- <th class="align-right">-->
<!-- <span data-bind="text:totalWorkInProgress"></span>-->
<!-- </th>-->
<!-- ko foreach:totalInvoicedYear -->
<th class="align-right">
<span data-bind="text:totalInvoiced"></span>
<span data-bind="text:totalCurrentFinancialYear"></span>
</th>
<th class="align-right">
<span data-bind="text:totalNextFinancialYear"></span>
</th>
<!-- /ko -->
</tr>
</tfoot>
</table>
<!--<div class="row">-->
<!-- <div class="col-md-3">-->
<!-- <div class="graph-holder" style="min-height:350px">-->
<!-- <canvas id="recap-revenues" width="300px"></canvas>-->
<!-- <div id="recap-revenues-legends"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-md-3">-->
<!-- <div class="graph-holder" style="min-height:350px">-->
<!-- <canvas id="recap-revenues-project" width="300px"></canvas>-->
<!-- <div id="recap-revenues-project-legends"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-md-6">-->
<!-- <div class="graph-holder" style="min-height:350px">-->
<!-- <canvas id="recap-owh" width="300px"></canvas>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->