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

Fix for double controller name

Browse Source
This commit is contained in:
theo
2018-03-07 19:45:31 +01:00
parent f50dbcabe2
commit 3241cc0c67
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/reports/EmployeeHoursController.php → application/controllers/reports/ReportsController.php
+1 -1
View File
@@ -7,7 +7,7 @@ defined( 'BASEPATH' ) OR exit( 'No direct script access allowed' );
* Date: 08/02/2018 * Date: 08/02/2018
* Time: 15:16 * Time: 15:16
*/ */
class EmployeeHoursController extends MY_Controller { class ReportsController extends MY_Controller {
public function __construct() public function __construct()
{ {
public/js/lib/dataservices/employeehoursDataService.js
+1 -1
View File
@@ -15,7 +15,7 @@ dbo.employeehoursDataService = {
}, },
getMonthlyEmployeehours : function(month, $year, callback){ getMonthlyEmployeehours : function(month, $year, callback){
$.getJSON( 'index.php/reports/employeeHoursController/getMonthlyEmployeehours/' + month + '/' + $year ) $.getJSON( 'index.php/reports/reportsController/getMonthlyEmployeehours/' + month + '/' + $year )
.done( function ( data ) { .done( function ( data ) {
callback( data ); callback( data );
} ); } );
public/js/lib/dataservices/invoiceDataService.js
+2 -11
View File
@@ -9,18 +9,9 @@
dbo.invoiceDataService = { dbo.invoiceDataService = {
getInvoiceOverview: function ( year, callback ) { getInvoiceOverview: function ( year, callback ) {
$.getJSON( 'index.php/reports/employeeHoursController/getInvoiceOverview/' + year ) $.getJSON( 'index.php/reports/reportsController/getInvoiceOverview/' + year )
.done( function ( data ) {
callback( data );
} );
},
getMonthDetails: function ( year, callback ) {
$.getJSON( 'index.php/reports/employeeHoursController/getMonthDetails/' + year )
.done( function ( data ) { .done( function ( data ) {
callback( data ); callback( data );
} ); } );
} }
};
}
public/js/lib/dataservices/reportsDataService.js
+2 -2
View File
@@ -16,14 +16,14 @@ dbo.reportsDataService = {
}, },
getRecapProjects: function(callback){ getRecapProjects: function(callback){
$.getJSON( 'index.php/reports/employeeHoursController/recapProjects' ) $.getJSON( 'index.php/reports/reportsController/recapProjects' )
.done( function ( data ) { .done( function ( data ) {
callback( data ); callback( data );
} ); } );
}, },
getEmployeeHours: function ( employeeID, year, callback ) { getEmployeeHours: function ( employeeID, year, callback ) {
$.getJSON( 'index.php/reports/EmployeeHoursController/getMonthlyEmployeeHoursPerProject/' + employeeID + '/' + year ) $.getJSON( 'index.php/reports/reportsController/getMonthlyEmployeeHoursPerProject/' + employeeID + '/' + year )
.done( function ( data ) { .done( function ( data ) {
callback( data ); callback( data );
} ); } );