diff --git a/app/app.js b/app/app.js
index 14d21b6445dc5566728b5dd335ff2bf34be2c95f..6df4470d3d6ed1b885b827d77fe0f0218cbf7d54 100644
--- a/app/app.js
+++ b/app/app.js
@@ -20,7 +20,7 @@ define(['app'], function (app) {
app.run(['$cookies', function ($cookies) {
- $cookies.put('Token', 'G9V10rwkEHqM6/u/UKOxIM6ocWQwuqEpLBTR6Rda8TB8wYQlBGYVXm4dWdhFmH6sE5UyeSK+V/KoR7VSiVb87nqPjR41BqRaSY1evKrqXTnOsNbOsofsWTbs/qXZEyMmp0AjcUjHcS9cHqrk2GqyvVHw6+qDgIZp23moeo7uM7ODDfUFJe+PUNPo5qsMUAFoPkA8b34tfTARO1KzjiThdEAEkYiRb/BlRnOS3FPMy6w=');
+ $cookies.put('Token', 'T35bWPblvhPQzdsZuy2lTi0jMHoHhOvIutyZwf3CoLI55DX9UfNzhiD1FXq0enI+nAxvf2PLkYYxtpfhLm5NoONBaSMerc+Cyeoy+uqCp4TtW/8Cn8oKk0zyh2yDqbebMD1Yyu4WEsR+rZDTQoBMzgBmQSvADZi65pKhWWtUcKvmvXEAJoJLd6osrTnSpGMiESnDcOLlJ+LcVA8EAk2qBBCFywdmLOVF15881dIdiZo=');
}]);
diff --git a/app/planning/employee/employee.controller.js b/app/planning/employee/employee.controller.js
index 0e67848d268f38e30f48f3c5e0f630f8b5c7bb02..8f754e2a346b8e712286005b317aa848def90708 100644
--- a/app/planning/employee/employee.controller.js
+++ b/app/planning/employee/employee.controller.js
@@ -10,154 +10,105 @@ define(['app', 'PlanningDataServices', 'PlaningEmployeeBindingService'], functio
_vm.planningHtml = '';
//Query data
PlanningData.query(
- 1547398800,
- 1548003599,
- 0,
- {
- "groups": [{
- "group_id": "1",
- "group_name": "Titanplan"
- }, {
- "group_id": "6",
- "group_name": "Management"
- }, {
- "group_id": "7",
- "group_name": "BerkshireCloud"
- }, {
- "group_id": "8",
- "group_name": "RMA CYKEL SERVICE"
- }, {
- "group_id": "2",
- "group_name": "WITT"
- }],
- "string": "1,6,7,8,9,",
- "shift_types": [{
- "shift_type_id": "1",
- "name": "Normal",
- "description": null,
- "abbreviation": null,
- "salary_code_id": null,
- "rate": "100",
- "rate_type": "0",
- "is_off": false,
- "is_can_request": false,
- "color": null,
- "salary_code": null
- }, {
- "shift_type_id": "2",
- "name": "Un-paid Time Off",
- "description": "Un-paid Time Off",
- "abbreviation": "UTO",
- "salary_code_id": null,
- "rate": "0",
- "rate_type": "0",
- "is_off": true,
- "is_can_request": true,
- "color": "#00431e",
- "salary_code": null
- }, {
- "shift_type_id": "3",
- "name": "Paid Time Off",
- "description": "Paid Time Off",
- "abbreviation": "PTO",
- "salary_code_id": null,
- "rate": "100",
- "rate_type": "0",
- "is_off": true,
- "is_can_request": true,
- "color": "#a15a2d",
- "salary_code": null
- }, {
- "shift_type_id": "4",
- "name": "Sick Leave",
- "description": "Paid sick leave",
- "abbreviation": "SL",
- "salary_code_id": null,
- "rate": "50",
- "rate_type": "0",
- "is_off": true,
- "is_can_request": true,
- "color": "#9d3618",
- "salary_code": null
- }, {
- "shift_type_id": "5",
- "name": "Vacation Leave",
- "description": "Paid vacation leave",
- "abbreviation": "VL",
- "salary_code_id": null,
- "rate": "100",
- "rate_type": "0",
- "is_off": true,
- "is_can_request": true,
- "color": "#3b7931",
- "salary_code": null
- }, {
- "shift_type_id": "6",
- "name": "Stand By",
- "description": "Stand By Shift",
- "abbreviation": "STB",
- "salary_code_id": null,
- "rate": "50",
- "rate_type": "0",
- "is_off": true,
- "is_can_request": true,
- "color": "#007390",
- "salary_code": null
- }, {
- "shift_type_id": "8",
- "name": "Sygdom",
- "description": "paid",
- "abbreviation": "SYG",
- "salary_code_id": "123",
- "rate": "0",
- "rate_type": "0",
- "is_off": true,
- "is_can_request": true,
- "color": "#9d3618",
- "salary_code": null
- }, {
- "shift_type_id": "9",
- "name": "Tet holiday",
- "description": "Tet holiday",
- "abbreviation": "TET",
- "salary_code_id": "555",
- "rate": "300",
- "rate_type": "0",
- "is_off": true,
- "is_can_request": true,
- "color": "#00431e",
- "salary_code": null
- }, {
- "shift_type_id": "10",
- "name": "Sygdom",
- "description": null,
- "abbreviation": "SYG",
- "salary_code_id": null,
- "rate": "2",
- "rate_type": "0",
- "is_off": true,
- "is_can_request": true,
- "color": "#0a255f",
- "salary_code": null
- }, {
- "shift_type_id": "11",
- "name": "Tet holiday",
- "description": null,
- "abbreviation": "TET",
- "salary_code_id": null,
- "rate": "310",
- "rate_type": "0",
- "is_off": true,
- "is_can_request": true,
- "color": "#00695f",
- "salary_code": null
- }],
- "deleted": false,
- "get_holiday": false,
- "get_birthday": false,
- "get_event": false,
- "deactivated": false,
- "is_only_scheduled": false
+ 1548003600,
+ 1548608399,
+ 0, {
+ "groups": [{
+ "group_id": "1",
+ "group_name": "SG01"
+ }, {
+ "group_id": "2",
+ "group_name": "SG02"
+ }, {
+ "group_id": "722",
+ "group_name": "Upcoming classes"
+ }, {
+ "group_id": "539",
+ "group_name": "SG01"
+ }, {
+ "group_id": "583",
+ "group_name": "SG02"
+ }],
+ "string": "1,2,722,539,583,",
+ "shift_types": [{
+ "shift_type_id": "1",
+ "name": "Normal",
+ "description": null,
+ "abbreviation": null,
+ "salary_code_id": null,
+ "rate": "100",
+ "rate_type": "0",
+ "is_off": false,
+ "is_can_request": false,
+ "color": null,
+ "salary_code": null
+ }, {
+ "shift_type_id": "2",
+ "name": "Un-paid Time Off",
+ "description": "Un-paid Time Off",
+ "abbreviation": "UTO",
+ "salary_code_id": null,
+ "rate": "0",
+ "rate_type": "0",
+ "is_off": true,
+ "is_can_request": true,
+ "color": "#00431e",
+ "salary_code": null
+ }, {
+ "shift_type_id": "3",
+ "name": "Paid Time Off",
+ "description": "Paid Time Off",
+ "abbreviation": "PTO",
+ "salary_code_id": null,
+ "rate": "100",
+ "rate_type": "0",
+ "is_off": true,
+ "is_can_request": true,
+ "color": "#a15a2d",
+ "salary_code": null
+ }, {
+ "shift_type_id": "4",
+ "name": "Sick Leave",
+ "description": "Paid sick leave",
+ "abbreviation": "SL",
+ "salary_code_id": null,
+ "rate": "50",
+ "rate_type": "0",
+ "is_off": true,
+ "is_can_request": true,
+ "color": "#9d3618",
+ "salary_code": null
+ }, {
+ "shift_type_id": "5",
+ "name": "Vacation Leave",
+ "description": "Paid vacation leave",
+ "abbreviation": "VL",
+ "salary_code_id": null,
+ "rate": "100",
+ "rate_type": "0",
+ "is_off": true,
+ "is_can_request": true,
+ "color": "#3b7931",
+ "salary_code": null
+ }, {
+ "shift_type_id": "6",
+ "name": "Stand By",
+ "description": "Stand By Shift",
+ "abbreviation": "STB",
+ "salary_code_id": null,
+ "rate": "50",
+ "rate_type": "0",
+ "is_off": true,
+ "is_can_request": true,
+ "color": "#007390",
+ "salary_code": null
+ }],
+ "deleted": true,
+ "get_holiday": false,
+ "get_birthday": false,
+ "get_event": false,
+ "deactivated": true,
+ "is_only_scheduled": false
}).then(function (data) {
$scope.$apply(function () {
_vm.planningHtml = $sce.trustAsHtml(PlanningEmployeeBinding.getPlanningHtml(data.data));
diff --git a/dist/app.js b/dist/app.js
index 733ab917dfae1dcdafd42492e6312473914c4c54..616e93a566b74047aea4f215c1bdb946e34750c0 100644
--- a/dist/app.js
+++ b/dist/app.js
@@ -2,4 +2,4 @@
* Titanplan js v1.0
*/
-define(["app"],function(l){return(l=angular.module("webapp",["ui.router","ui.bootstrap","ngSanitize","ngCookies","ngAnimate","ngTouch","pascalprecht.translate","daterangepicker","titan.http.module","titan.data.module","titan.acl.module","titan.time.module","titan.storage.module","titan.translate.module"])).run(["$cookies",function(e){e.put("Token","G9V10rwkEHqM6/u/UKOxIM6ocWQwuqEpLBTR6Rda8TB8wYQlBGYVXm4dWdhFmH6sE5UyeSK+V/KoR7VSiVb87nqPjR41BqRaSY1evKrqXTnOsNbOsofsWTbs/qXZEyMmp0AjcUjHcS9cHqrk2GqyvVHw6+qDgIZp23moeo7uM7ODDfUFJe+PUNPo5qsMUAFoPkA8b34tfTARO1KzjiThdEAEkYiRb/BlRnOS3FPMy6w=")}]),l.config(["$stateProvider","$urlRouterProvider","$controllerProvider","$provide","TimeSettingsProvider",function(e,t,a,n,r){function o(n,e){return Object.assign({},e,{load:["$q","$rootScope",function(e,t){var a=e.defer();return require(n,function(){a.resolve(),t.$apply()}),a.promise}]})}l.register={controller:a.register,factory:n.factory,service:n.service},e.state("app",{url:"",template:"<ui-view></ui-view>",controller:"AppController as appCtrl",abstract:!0,resolve:o(["AppController"],{UserProfile:["$http",function(e){return e.get(BASEURL+"user/getUserProfile").then(function(e){return r.set(e.data.settings),e.data})}],AllDepartment:["$http",function(e){return e.get(BASEURL+"department/getAllDepartment/false/-1/-1").then(function(e){return e.data})}],CompanyInfo:["$http",function(e){return e.get(BASEURL+"company/getCompanyInformation").then(function(e){return e.data})}],ListModules:["$http",function(e){return e.get(BASEURL+"company/getListModule").then(function(e){return e.data})}],ListPermissions:["$http",function(e){return e.get(BASEURL+"company/getListPermission").then(function(e){return e.data})}],GetAllSalaryGroup:["$http",function(e){return e.get(BASEURL+"salary/getListSalaryGroup").then(function(e){return e.data})}]})}).state("app.dashboard",{url:"/dashboard",templateUrl:"/dist/dashboard/dashboard.html",controller:"DashboardController",resolve:o(["DashboardController"])}).state("app.planning",{url:"/planning",templateUrl:"/dist/planning/planning.html",controller:"PlanningController as planCtrl",abstract:!0,resolve:o(["PlanningController"])}).state("app.planning.employee",{url:"/employee",templateUrl:"/dist/planning/employee/employee.html",controller:"PEmployeeController as pEmCtrl",resolve:o(["PEmployeeController"])}).state("app.ui",{url:"/ui",templateUrl:"/dist/ui/ui.html",controller:"UiController as $ui",resolve:o(["UiController"])}),t.otherwise("/dashboard")}]).constant("Config",{name:"titanPlan",name__uppercase:"TitanPlan",title:"Shift and Planning system",colours:["#08b0a0","#119abf","#7a5d92","#be2857","#f59331","#c69c6d","#50953f","#616e75"],shiftType:["#2e383d","#00431e","#3b7931","#546223","#745c3e","#a15a2d","#9d3618","#7f0f36","#671a48","#451f53","#0a255f","#007390","#00695f"],min_age:new Date((new Date).getFullYear()-16+"-12-31"),navs:[{text:"00_01_planning",state:"app.planning.group",active_state:"app.planning",state_sub:"app.planning.group",module:{module_id:1}},{text:"00_01_messenger",state:"app.messenger",active_state:"app.messenger",module:{module_id:17}},{text:"00_01_calendar",state:"app.calendar.mycalendar",active_state:"app.calendar",module:{module_id:18}},{text:"00_01_timesheets",state:"app.timesheets.group",active_state:"app.timesheets",state_sub:"app.timesheets.mine",module:{module_id:2}},{text:"00_01_request",state:'app.request({type: "all"})',active_state:"app.request",state_sub:"app.request",module:{module_id:16}},{text:"00_01_report",state:"app.report",active_state:"app.report",module:{module_id:24}},{text:"00_01_settings",state:"app.settings.index",active_state:"app.settings",state_sub:"app.settings.index",module:{module_id:12}}]}),l.directive("compile",["$compile",function(o){return function(a,n,r){a.$watch(function(){return a.$eval(r.compile)},function(e){n.html(e&&e.toString());var t=a;r.bindHtmlScope&&(t=a.$eval(r.bindHtmlScope)),o(n.contents())(t)})}}]),angular.element(document).ready(function(){angular.bootstrap(document,["webapp"])}),l});
\ No newline at end of file
+define(["app"],function(l){return(l=angular.module("webapp",["ui.router","ui.bootstrap","ngSanitize","ngCookies","ngAnimate","ngTouch","pascalprecht.translate","daterangepicker","titan.http.module","titan.data.module","titan.acl.module","titan.time.module","titan.storage.module","titan.translate.module"])).run(["$cookies",function(e){e.put("Token","T35bWPblvhPQzdsZuy2lTi0jMHoHhOvIutyZwf3CoLI55DX9UfNzhiD1FXq0enI+nAxvf2PLkYYxtpfhLm5NoONBaSMerc+Cyeoy+uqCp4TtW/8Cn8oKk0zyh2yDqbebMD1Yyu4WEsR+rZDTQoBMzgBmQSvADZi65pKhWWtUcKvmvXEAJoJLd6osrTnSpGMiESnDcOLlJ+LcVA8EAk2qBBCFywdmLOVF15881dIdiZo=")}]),l.config(["$stateProvider","$urlRouterProvider","$controllerProvider","$provide","TimeSettingsProvider",function(e,t,n,a,r){function o(a,e){return Object.assign({},e,{load:["$q","$rootScope",function(e,t){var n=e.defer();return require(a,function(){n.resolve(),t.$apply()}),n.promise}]})}l.register={controller:n.register,factory:a.factory,service:a.service},e.state("app",{url:"",template:"<ui-view></ui-view>",controller:"AppController as appCtrl",abstract:!0,resolve:o(["AppController"],{UserProfile:["$http",function(e){return e.get(BASEURL+"user/getUserProfile").then(function(e){return r.set(e.data.settings),e.data})}],AllDepartment:["$http",function(e){return e.get(BASEURL+"department/getAllDepartment/false/-1/-1").then(function(e){return e.data})}],CompanyInfo:["$http",function(e){return e.get(BASEURL+"company/getCompanyInformation").then(function(e){return e.data})}],ListModules:["$http",function(e){return e.get(BASEURL+"company/getListModule").then(function(e){return e.data})}],ListPermissions:["$http",function(e){return e.get(BASEURL+"company/getListPermission").then(function(e){return e.data})}],GetAllSalaryGroup:["$http",function(e){return e.get(BASEURL+"salary/getListSalaryGroup").then(function(e){return e.data})}]})}).state("app.dashboard",{url:"/dashboard",templateUrl:"dist/dashboard/dashboard.html",controller:"DashboardController",resolve:o(["DashboardController"])}).state("app.planning",{url:"/planning",templateUrl:"dist/planning/planning.html",controller:"PlanningController as planCtrl",abstract:!0,resolve:o(["PlanningController"])}).state("app.planning.employee",{url:"/employee",templateUrl:"dist/planning/employee/employee.html",controller:"PEmployeeController as pEmCtrl",resolve:o(["PEmployeeController"])}).state("app.ui",{url:"/ui",templateUrl:"dist/ui/ui.html",controller:"UiController as $ui",resolve:o(["UiController"])}),t.otherwise("/dashboard")}]).constant("Config",{name:"titanPlan",name__uppercase:"TitanPlan",title:"Shift and Planning system",colours:["#08b0a0","#119abf","#7a5d92","#be2857","#f59331","#c69c6d","#50953f","#616e75"],shiftType:["#2e383d","#00431e","#3b7931","#546223","#745c3e","#a15a2d","#9d3618","#7f0f36","#671a48","#451f53","#0a255f","#007390","#00695f"],min_age:new Date((new Date).getFullYear()-16+"-12-31"),navs:[{text:"00_01_planning",state:"app.planning.group",active_state:"app.planning",state_sub:"app.planning.group",module:{module_id:1}},{text:"00_01_messenger",state:"app.messenger",active_state:"app.messenger",module:{module_id:17}},{text:"00_01_calendar",state:"app.calendar.mycalendar",active_state:"app.calendar",module:{module_id:18}},{text:"00_01_timesheets",state:"app.timesheets.group",active_state:"app.timesheets",state_sub:"app.timesheets.mine",module:{module_id:2}},{text:"00_01_request",state:'app.request({type: "all"})',active_state:"app.request",state_sub:"app.request",module:{module_id:16}},{text:"00_01_report",state:"app.report",active_state:"app.report",module:{module_id:24}},{text:"00_01_settings",state:"app.settings.index",active_state:"app.settings",state_sub:"app.settings.index",module:{module_id:12}}]}),l.directive("compile",["$compile",function(o){return function(n,a,r){n.$watch(function(){return n.$eval(r.compile)},function(e){a.html(e&&e.toString());var t=n;r.bindHtmlScope&&(t=n.$eval(r.bindHtmlScope)),o(a.contents())(t)})}}]),angular.element(document).ready(function(){angular.bootstrap(document,["webapp"])}),l});
\ No newline at end of file
diff --git a/dist/app.router.js b/dist/app.router.js
index 93485fbe2a5282bea90ec0a867f4c3318f4a737c..d17567e7b31f27f0aefa0e01577a1c69be95b433 100644
--- a/dist/app.router.js
+++ b/dist/app.router.js
@@ -2,4 +2,4 @@
* Titanplan js v1.0
*/
-define(["app"],function(a){a.config(["$stateProvider","$urlRouterProvider","$controllerProvider","$provide","UserService",function(r,e,o,l,n){function t(l,r){return Object.assign({},r,{load:["$q","$rootScope",function(r,e){var o=r.defer();return require(l,function(){o.resolve(),e.$apply()}),o.promise}]})}a.register={controller:o.register,factory:l.factory},r.state("app",{url:"",template:"<ui-view></ui-view>",controller:"AppController",resolve:t(["AppController"])}).state("app.dashboard",{url:"/dashboard",templateUrl:"/dist/dashboard/dashboard.html",controller:"DashboardController",resolve:t(["DashboardController"])}).state("app.planning",{url:"/planning",templateUrl:"/dist/planning/planning.html",controller:"PlanningController",resolve:t(["PlanningController"])}),e.otherwise("/home")}])});
\ No newline at end of file
+define(["app"],function(a){a.config(["$stateProvider","$urlRouterProvider","$controllerProvider","$provide","UserService",function(r,e,o,l,n){function t(l,r){return Object.assign({},r,{load:["$q","$rootScope",function(r,e){var o=r.defer();return require(l,function(){o.resolve(),e.$apply()}),o.promise}]})}a.register={controller:o.register,factory:l.factory},r.state("app",{url:"",template:"<ui-view></ui-view>",controller:"AppController",resolve:t(["AppController"])}).state("app.dashboard",{url:"/dashboard",templateUrl:"dist/dashboard/dashboard.html",controller:"DashboardController",resolve:t(["DashboardController"])}).state("app.planning",{url:"/planning",templateUrl:"dist/planning/planning.html",controller:"PlanningController",resolve:t(["PlanningController"])}),e.otherwise("/home")}])});
\ No newline at end of file
diff --git a/dist/main.js b/dist/main.js
index 11b5ebf11813c7a34a9ccc82e2d19d828dc0222d..2170adffc336f9079604f2fac390ac5f47bb1ef4 100644
--- a/dist/main.js
+++ b/dist/main.js
@@ -2,4 +2,4 @@
* Titanplan js v1.0
*/
-require.config({baseUrl:"",paths:{ACLModule:"/dist/commons/acl.module",TimeModule:"/dist/commons/time.module",DataModule:"/dist/commons/data.module",HttpModule:"/dist/commons/http.module",StorageModule:"/dist/commons/storage.module",TranslateModule:"/dist/commons/translate.module",DashboardController:"/dist/dashboard/dashboard.controller",PlanningDataServices:"/dist/planning/planning.service",PlaningEmployeeBindingService:"/dist/planning/employee/employee.binding",PlanningController:"/dist/planning/planning.controller",PEmployeeController:"/dist/planning/employee/employee.controller",PlanningShiftModule:"/dist/planning/modal/shift.module",UiController:"/dist/ui/ui.controller",protypes:"/dist/protypes",router:"/dist/app.router",AppController:"/dist/app.controller",app:"/dist/app"},shim:{app:["protypes","ACLModule","TimeModule","DataModule","HttpModule","StorageModule","TranslateModule"]},deps:["app"]});
\ No newline at end of file
+require.config({baseUrl:"",paths:{ACLModule:"dist/commons/acl.module",TimeModule:"dist/commons/time.module",DataModule:"dist/commons/data.module",HttpModule:"dist/commons/http.module",StorageModule:"dist/commons/storage.module",TranslateModule:"dist/commons/translate.module",DashboardController:"dist/dashboard/dashboard.controller",PlanningDataServices:"dist/planning/planning.service",PlaningEmployeeBindingService:"dist/planning/employee/employee.binding",PlanningController:"dist/planning/planning.controller",PEmployeeController:"dist/planning/employee/employee.controller",PlanningShiftModule:"dist/planning/modal/shift.module",UiController:"dist/ui/ui.controller",protypes:"dist/protypes",router:"dist/app.router",AppController:"dist/app.controller",app:"dist/app"},shim:{app:["protypes","ACLModule","TimeModule","DataModule","HttpModule","StorageModule","TranslateModule"]},deps:["app"]});
\ No newline at end of file
diff --git a/dist/planning/employee/employee.controller.js b/dist/planning/employee/employee.controller.js
index 6f3e97ec86d4f608c8ad4844dc977d2b824953d6..87bbd6c1e404189bf56a2d5a0b46ba732a1b6148 100644
--- a/dist/planning/employee/employee.controller.js
+++ b/dist/planning/employee/employee.controller.js
@@ -2,4 +2,4 @@
* Titanplan js v1.0
*/
-define(["app","PlanningDataServices","PlaningEmployeeBindingService"],function(e){var r=angular.injector(["planning.data.module","ng"]);e.register.controller("PEmployeeController",["$scope","$sce","PlanningEmployeeBinding",function(a,i,n){var e=r.get("PlanningFactory"),t=this;t.planningHtml="",e.query(1547398800,1548003599,0,{groups:[{group_id:"1",group_name:"Titanplan"},{group_id:"6",group_name:"Management"},{group_id:"7",group_name:"BerkshireCloud"},{group_id:"8",group_name:"RMA CYKEL SERVICE"},{group_id:"2",group_name:"WITT"}],string:"1,6,7,8,9,",shift_types:[{shift_type_id:"1",name:"Normal",description:null,abbreviation:null,salary_code_id:null,rate:"100",rate_type:"0",is_off:!1,is_can_request:!1,color:null,salary_code:null},{shift_type_id:"2",name:"Un-paid Time Off",description:"Un-paid Time Off",abbreviation:"UTO",salary_code_id:null,rate:"0",rate_type:"0",is_off:!0,is_can_request:!0,color:"#00431e",salary_code:null},{shift_type_id:"3",name:"Paid Time Off",description:"Paid Time Off",abbreviation:"PTO",salary_code_id:null,rate:"100",rate_type:"0",is_off:!0,is_can_request:!0,color:"#a15a2d",salary_code:null},{shift_type_id:"4",name:"Sick Leave",description:"Paid sick leave",abbreviation:"SL",salary_code_id:null,rate:"50",rate_type:"0",is_off:!0,is_can_request:!0,color:"#9d3618",salary_code:null},{shift_type_id:"5",name:"Vacation Leave",description:"Paid vacation leave",abbreviation:"VL",salary_code_id:null,rate:"100",rate_type:"0",is_off:!0,is_can_request:!0,color:"#3b7931",salary_code:null},{shift_type_id:"6",name:"Stand By",description:"Stand By Shift",abbreviation:"STB",salary_code_id:null,rate:"50",rate_type:"0",is_off:!0,is_can_request:!0,color:"#007390",salary_code:null},{shift_type_id:"8",name:"Sygdom",description:"paid",abbreviation:"SYG",salary_code_id:"123",rate:"0",rate_type:"0",is_off:!0,is_can_request:!0,color:"#9d3618",salary_code:null},{shift_type_id:"9",name:"Tet holiday",description:"Tet holiday",abbreviation:"TET",salary_code_id:"555",rate:"300",rate_type:"0",is_off:!0,is_can_request:!0,color:"#00431e",salary_code:null},{shift_type_id:"10",name:"Sygdom",description:null,abbreviation:"SYG",salary_code_id:null,rate:"2",rate_type:"0",is_off:!0,is_can_request:!0,color:"#0a255f",salary_code:null},{shift_type_id:"11",name:"Tet holiday",description:null,abbreviation:"TET",salary_code_id:null,rate:"310",rate_type:"0",is_off:!0,is_can_request:!0,color:"#00695f",salary_code:null}],deleted:!1,get_holiday:!1,get_birthday:!1,get_event:!1,deactivated:!1,is_only_scheduled:!1}).then(function(e){a.$apply(function(){t.planningHtml=i.trustAsHtml(n.getPlanningHtml(e.data))})})}])});
\ No newline at end of file
+define(["app","PlanningDataServices","PlaningEmployeeBindingService"],function(e){var l=angular.injector(["planning.data.module","ng"]);e.register.controller("PEmployeeController",["$scope","$sce","PlanningEmployeeBinding",function(a,i,n){var e=l.get("PlanningFactory"),t=this;t.planningHtml="",e.query(1548003600,1548608399,0,{groups:[{group_id:"1",group_name:"SG01"},{group_id:"2",group_name:"SG02"},{group_id:"722",group_name:"Upcoming classes"},{group_id:"539",group_name:"SG01"},{group_id:"583",group_name:"SG02"}],string:"1,2,722,539,583,",shift_types:[{shift_type_id:"1",name:"Normal",description:null,abbreviation:null,salary_code_id:null,rate:"100",rate_type:"0",is_off:!1,is_can_request:!1,color:null,salary_code:null},{shift_type_id:"2",name:"Un-paid Time Off",description:"Un-paid Time Off",abbreviation:"UTO",salary_code_id:null,rate:"0",rate_type:"0",is_off:!0,is_can_request:!0,color:"#00431e",salary_code:null},{shift_type_id:"3",name:"Paid Time Off",description:"Paid Time Off",abbreviation:"PTO",salary_code_id:null,rate:"100",rate_type:"0",is_off:!0,is_can_request:!0,color:"#a15a2d",salary_code:null},{shift_type_id:"4",name:"Sick Leave",description:"Paid sick leave",abbreviation:"SL",salary_code_id:null,rate:"50",rate_type:"0",is_off:!0,is_can_request:!0,color:"#9d3618",salary_code:null},{shift_type_id:"5",name:"Vacation Leave",description:"Paid vacation leave",abbreviation:"VL",salary_code_id:null,rate:"100",rate_type:"0",is_off:!0,is_can_request:!0,color:"#3b7931",salary_code:null},{shift_type_id:"6",name:"Stand By",description:"Stand By Shift",abbreviation:"STB",salary_code_id:null,rate:"50",rate_type:"0",is_off:!0,is_can_request:!0,color:"#007390",salary_code:null}],deleted:!0,get_holiday:!1,get_birthday:!1,get_event:!1,deactivated:!0,is_only_scheduled:!1}).then(function(e){a.$apply(function(){t.planningHtml=i.trustAsHtml(n.getPlanningHtml(e.data))})})}])});
\ No newline at end of file
diff --git a/dist/planning/modal/shift.module.js b/dist/planning/modal/shift.module.js
index 213d321ddf586324efa12dd2b68a12380d2b88f7..cba1d72759423ec0eac5585c33c3fe944cb889c9 100644
--- a/dist/planning/modal/shift.module.js
+++ b/dist/planning/modal/shift.module.js
@@ -2,4 +2,4 @@
* Titanplan js v1.0
*/
-define(["app"],function(n){angular.module("planning.shift.module",["titan.http.module","ui.bootstrap"]).controller("ShiftFormController",["$uibModalInstance","shiftId",function(n,o){var t=this;t.shiftId=o,t.ok=function(){n.close(t.shiftId)},t.cancel=function(){n.dismiss("cancel")}}]).service("ShiftModal",["$uibModal",function(i){return{open:function(n,o,t){i.open({animation:!0,ariaLabelledBy:"modal-title",ariaDescribedBy:"modal-body",templateUrl:"/dist/planning/modal/shift.form.html",controller:"ShiftFormController",controllerAs:"sFormCtrl",size:"lg",resolve:{shiftId:n}}).result.then(function(n){o(n)},function(){t()})}}}])});
\ No newline at end of file
+define(["app"],function(n){angular.module("planning.shift.module",["titan.http.module","ui.bootstrap"]).controller("ShiftFormController",["$uibModalInstance","shiftId",function(n,o){var t=this;t.shiftId=o,t.ok=function(){n.close(t.shiftId)},t.cancel=function(){n.dismiss("cancel")}}]).service("ShiftModal",["$uibModal",function(i){return{open:function(n,o,t){i.open({animation:!0,ariaLabelledBy:"modal-title",ariaDescribedBy:"modal-body",templateUrl:"dist/planning/modal/shift.form.html",controller:"ShiftFormController",controllerAs:"sFormCtrl",size:"lg",resolve:{shiftId:n}}).result.then(function(n){o(n)},function(){t()})}}}])});
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index ceff95c87e91c3c8038d6ecec8be6ea183665c2a..96ef20aa34094d0a7ecf7baa345aee43a1a3cc66 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -103,7 +103,7 @@ gulp.task('copy-min-app-html', function () {
.pipe(htmlmin({
collapseWhitespace: true
}))
- .pipe(replace('/app/', '/dist/'))
+ .pipe(replace('/app/', 'dist/'))
.pipe(gulp.dest('dist'));
});
@@ -118,7 +118,7 @@ gulp.task('copy-min-app-js', function () {
)
.pipe(ngAnnotate())
.pipe(uglify())
- .pipe(replace('/app/', '/dist/'))
+ .pipe(replace('/app/', 'dist/'))
.pipe(headerComment('Titanplan js v1.0'))
.pipe(gulp.dest('dist'));
});
diff --git a/index.html b/index.html
index ce11aaeada6c56b6860edbafadb96fa4b6fb25d9..e076ec8ecd269880dbba192e3a368ca2b20c188a 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
<script data-main="dist/main.js" src="assets/js/require.js"></script>
<link rel="stylesheet" href="assets/css/app.css" />
<script>
- var BASEURL = 'https://apidev.titanplan.com/api/';
+ var BASEURL = 'https://api.titanplan.com/api/';
var TRANSURL = 'https://backend.titanplan.com/i18n/translate/';
</script>
</head>