diff --git a/application/controllers/reports/EmployeeHoursController.php b/application/controllers/reports/ReportsController.php similarity index 96% rename from application/controllers/reports/EmployeeHoursController.php rename to application/controllers/reports/ReportsController.php index 132bfaa..49404d7 100644 --- a/application/controllers/reports/EmployeeHoursController.php +++ b/application/controllers/reports/ReportsController.php @@ -7,7 +7,7 @@ defined( 'BASEPATH' ) OR exit( 'No direct script access allowed' ); * Date: 08/02/2018 * Time: 15:16 */ -class EmployeeHoursController extends MY_Controller { +class ReportsController extends MY_Controller { public function __construct() { diff --git a/public/js/lib/dataservices/employeehoursDataService.js b/public/js/lib/dataservices/employeehoursDataService.js index b606d5a..a859a76 100644 --- a/public/js/lib/dataservices/employeehoursDataService.js +++ b/public/js/lib/dataservices/employeehoursDataService.js @@ -15,7 +15,7 @@ dbo.employeehoursDataService = { }, getMonthlyEmployeehours : function(month, $year, callback){ - $.getJSON( 'index.php/reports/employeeHoursController/getMonthlyEmployeehours/' + month + '/' + $year ) + $.getJSON( 'index.php/reports/reportsController/getMonthlyEmployeehours/' + month + '/' + $year ) .done( function ( data ) { callback( data ); } ); diff --git a/public/js/lib/dataservices/invoiceDataService.js b/public/js/lib/dataservices/invoiceDataService.js index ca48069..528cde0 100644 --- a/public/js/lib/dataservices/invoiceDataService.js +++ b/public/js/lib/dataservices/invoiceDataService.js @@ -9,18 +9,9 @@ dbo.invoiceDataService = { getInvoiceOverview: function ( year, callback ) { - $.getJSON( 'index.php/reports/employeeHoursController/getInvoiceOverview/' + year ) - .done( function ( data ) { - callback( data ); - } ); - }, - - getMonthDetails: function ( year, callback ) { - $.getJSON( 'index.php/reports/employeeHoursController/getMonthDetails/' + year ) + $.getJSON( 'index.php/reports/reportsController/getInvoiceOverview/' + year ) .done( function ( data ) { callback( data ); } ); } - - -} \ No newline at end of file +}; \ No newline at end of file diff --git a/public/js/lib/dataservices/reportsDataService.js b/public/js/lib/dataservices/reportsDataService.js index 5833cec..417ef57 100644 --- a/public/js/lib/dataservices/reportsDataService.js +++ b/public/js/lib/dataservices/reportsDataService.js @@ -16,14 +16,14 @@ dbo.reportsDataService = { }, getRecapProjects: function(callback){ - $.getJSON( 'index.php/reports/employeeHoursController/recapProjects' ) + $.getJSON( 'index.php/reports/reportsController/recapProjects' ) .done( function ( data ) { callback( data ); } ); }, getEmployeeHours: function ( employeeID, year, callback ) { - $.getJSON( 'index.php/reports/EmployeeHoursController/getMonthlyEmployeeHoursPerProject/' + employeeID + '/' + year ) + $.getJSON( 'index.php/reports/reportsController/getMonthlyEmployeeHoursPerProject/' + employeeID + '/' + year ) .done( function ( data ) { callback( data ); } );