diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index 9bb04ac03..622ecd16e 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -2,155 +2,91 @@ import ngModule from '../module';
import './style.scss';
class Controller {
- constructor($scope, $http, $stateParams, $element) {
+ constructor($scope, $http, $stateParams, $element, vnWeekDays) {
this.$stateParams = $stateParams;
this.$ = $scope;
this.$http = $http;
this.$element = $element;
- this.defaultDate = new Date();
- this.currentWeek = [];
this.weekDays = [];
- this.weekdayNames = [
- {name: 'Monday'},
- {name: 'Tuesday'},
- {name: 'Wednesday'},
- {name: 'Thursday'},
- {name: 'Friday'},
- {name: 'Saturday'},
- {name: 'Sunday'}
- ];
+ this.weekdayNames = vnWeekDays.locales;
}
+ $postLink() {
+ this.date = new Date();
+ }
/**
- * Gets worker data
+ * The current selected date
*/
- get worker() {
- return this._worker;
+ get date() {
+ return this._date;
+ }
+
+ set date(value) {
+ this._date = value;
+ value.setHours(0, 0, 0, 0);
+
+ let weekOffset = value.getDay() - 1;
+ if (weekOffset < 0) weekOffset = 6;
+
+ let started = new Date(value.getTime());
+ started.setDate(started.getDate() - weekOffset);
+ this.started = started;
+
+ let ended = new Date(started.getTime());
+ ended.setDate(ended.getDate() + 7);
+ this.ended = ended;
+
+ this.fetchHours();
}
/**
- * Sets worker data and retrieves
- * worker hours
- *
- * @param {Object} value - Worker data
- */
- set worker(value) {
- this._worker = value;
-
- if (value) {
- this.$.$applyAsync(() => {
- this.getHours();
- });
- }
- }
-
- /**
- * Gets worker hours data
- *
+ * Worker hours data
*/
get hours() {
return this._hours;
}
- /**
- * Gets worker hours data
- *
- * @param {Object} value - Hours data
- */
set hours(value) {
this._hours = value;
- if (value) this.build();
+ this.weekDays = [];
+ if (!this.hours) return;
+
+ let dayIndex = new Date(this.started.getTime());
+
+ while (dayIndex < this.ended) {
+ let weekDay = dayIndex.getDay();
+
+ let hours = this.hours
+ .filter(hour => new Date(hour.timed).getDay() == weekDay)
+ .sort((a, b) => new Date(a.timed) - new Date(b.timed));
+
+ this.weekDays.push({
+ dated: new Date(dayIndex.getTime()),
+ hours
+ });
+ dayIndex.setDate(dayIndex.getDate() + 1);
+ }
}
- getHours() {
- const params = {workerFk: this.worker.id};
+ fetchHours() {
+ const params = {workerFk: this.$stateParams.id};
const filter = {
- where: {
- timed: {between: [this.started, this.ended]}
- }
+ where: {and: [
+ {timed: {gte: this.started}},
+ {timed: {lt: this.ended}}
+ ]}
};
- return this.$.model.applyFilter(filter, params);
+ this.$.model.applyFilter(filter, params);
}
- refresh() {
- this.getHours().then(() => this.build());
- }
-
- build() {
- let weekdays = new Array(7);
- const currentWeek = [];
-
- for (let i = 0; i < weekdays.length; i++) {
- const dated = new Date();
- dated.setHours(23, 59, 0, 0);
- dated.setMonth(this.started.getMonth());
- dated.setDate(this.started.getDate() + i);
-
- const hours = this.hours.filter(hour => {
- const timed = new Date(hour.timed);
- const weekDay = timed.getDay() == 0 ? 7 : timed.getDay();
- return weekDay == (i + 1);
- });
-
- const sortedHours = hours.sort((a, b) => {
- return new Date(a.timed) - new Date(b.timed);
- });
-
- weekdays[i] = {dated, hours: sortedHours};
-
- currentWeek.push({
- dated: dated,
- className: 'orange-circle',
- title: 'Current week',
- isRemovable: false
- });
- }
-
- this.currentWeek = currentWeek;
- this.weekDays = weekdays;
+ hasEvents(day) {
+ return day >= this.started && day < this.ended;
}
hourColor(weekDay) {
- if (weekDay.manual)
- return 'alert';
-
- return 'warning';
- }
- get weekOffset() {
- const timed = this.defaultDate;
- const weekDay = timed.getDay() == 0 ? 7 : timed.getDay();
-
- return weekDay - 1;
- }
-
- /**
- * Returns week start date
- * from current selected week
- */
- get started() {
- const started = new Date();
- const offset = this.weekOffset;
-
- started.setMonth(this.defaultDate.getMonth());
- started.setDate(this.defaultDate.getDate() - offset);
- started.setHours(0, 0, 0, 0);
-
- return started;
- }
-
- /**
- * Returns week end date
- * from current selected week
- */
- get ended() {
- const ended = new Date();
- ended.setHours(0, 0, 0, 0);
- ended.setMonth(this.started.getMonth());
- ended.setDate(this.started.getDate() + 7);
-
- return ended;
+ return weekDay.manual ? 'alert' : 'warning';
}
getWeekdayTotalHours(weekday) {
@@ -200,20 +136,6 @@ class Controller {
return `${hour}:${min}`;
}
- onMoveNext() {
- this.refresh();
- }
-
- onMovePrevious() {
- this.refresh();
- }
-
- onSelection($days) {
- this.defaultDate.setMonth($days[0].getMonth());
- this.defaultDate.setDate($days[0].getDate());
- this.refresh();
- }
-
showAddTimeDialog(weekday) {
const timed = new Date(weekday.dated);
const now = new Date();
@@ -226,26 +148,25 @@ class Controller {
this.selectedWeekday = weekday;
this.$.addTimeDialog.show();
- const selector = 'vn-dialog[vn-id="addTimeDialog"] input[type="time"]';
+ const selector = '[vn-id=addTimeDialog] input[type=time]';
const input = this.$element[0].querySelector(selector);
input.focus();
}
addTime(response) {
- if (response === 'ACCEPT') {
- let data = {workerFk: this.worker.id, timed: this.newTime};
- let query = `/api/WorkerTimeControls/addTime`;
- this.$http.post(query, data).then(() => this.refresh());
- }
+ if (response !== 'ACCEPT') return;
+ let data = {
+ workerFk: this.$stateParams.id,
+ timed: this.newTime
+ };
+ this.$http.post(`api/WorkerTimeControls/addTime`, data)
+ .then(() => this.fetchHours());
}
}
-Controller.$inject = ['$scope', '$http', '$stateParams', '$element'];
+Controller.$inject = ['$scope', '$http', '$stateParams', '$element', 'vnWeekDays'];
ngModule.component('vnWorkerTimeControl', {
template: require('./index.html'),
- controller: Controller,
- bindings: {
- worker: '<'
- }
+ controller: Controller
});
diff --git a/modules/worker/front/time-control/index.spec.js b/modules/worker/front/time-control/index.spec.js
index 1e5ae5e97..550db10f9 100644
--- a/modules/worker/front/time-control/index.spec.js
+++ b/modules/worker/front/time-control/index.spec.js
@@ -2,37 +2,56 @@ import './index.js';
describe('Worker', () => {
describe('Component vnWorkerTimeControl', () => {
+ let $httpBackend;
let $scope;
- let controller;
let $element;
+ let controller;
beforeEach(angular.mock.module('worker', $translateProvider => {
$translateProvider.translations('en', {});
}));
- beforeEach(angular.mock.inject(($componentController, $rootScope) => {
+ beforeEach(angular.mock.inject(($compile, $rootScope, $stateParams, _$httpBackend_) => {
+ $stateParams.id = 1;
+ $httpBackend = _$httpBackend_;
$scope = $rootScope.$new();
- $element = angular.element('');
- controller = $componentController('vnWorkerTimeControl', {$scope, $element});
+ $element = $compile('')($scope);
+ controller = $element.controller('vnWorkerTimeControl');
}));
- describe('worker() setter', () => {
- it(`should set worker data and then call getHours() method`, () => {
- spyOn(controller, 'getHours');
- controller.worker = {id: 106};
- $scope.$apply();
-
- expect(controller.getHours).toHaveBeenCalledWith();
- });
+ afterEach(() => {
+ $scope.$destroy();
+ $element.remove();
});
describe('hours() setter', () => {
- it(`should set hours data and then call build() method`, () => {
- spyOn(controller, 'build');
- controller.hours = [{id: 1}, {id: 2}];
- $scope.$apply();
+ it(`should set hours data at it's corresponding week day`, () => {
+ let wednesday = new Date(controller.started.getTime());
+ wednesday.setDate(wednesday.getDate() + 2);
- expect(controller.build).toHaveBeenCalledWith();
+ let path = `api/WorkerTimeControls/filter`;
+ $httpBackend.whenGET(url => url.startsWith(path))
+ .respond([
+ {
+ id: 1,
+ timed: controller.started.toJSON(),
+ userFk: 1
+ }, {
+ id: 2,
+ timed: wednesday.toJSON(),
+ userFk: 1
+ }, {
+ id: 3,
+ timed: wednesday.toJSON(),
+ userFk: 1
+ }
+ ]);
+
+ $httpBackend.flush();
+
+ expect(controller.weekDays.length).toEqual(7);
+ expect(controller.weekDays[0].hours.length).toEqual(1);
+ expect(controller.weekDays[2].hours.length).toEqual(2);
});
});
diff --git a/modules/worker/front/time-control/locale/es.yml b/modules/worker/front/time-control/locale/es.yml
index cfb0239a6..9a3484fc6 100644
--- a/modules/worker/front/time-control/locale/es.yml
+++ b/modules/worker/front/time-control/locale/es.yml
@@ -3,5 +3,5 @@ Out: Salida
Hour: Hora
Hours: Horas
Add time: Añadir hora
-Week total: Total por semana
+Week total: Total semana
Current week: Semana actual
\ No newline at end of file
diff --git a/modules/worker/front/time-control/style.scss b/modules/worker/front/time-control/style.scss
index 9917fa3fb..978a600a2 100644
--- a/modules/worker/front/time-control/style.scss
+++ b/modules/worker/front/time-control/style.scss
@@ -5,23 +5,20 @@ vn-worker-time-control {
margin-bottom: 5px;
color: $color-main
}
-
vn-td.hours {
vertical-align: top;
& > section {
- position: relative;
- padding: .6em 0;
+ display: flex;
+ align-items: center;
+ padding: .3em 0;
& > vn-icon {
- position: absolute;
- margin-left: -1.3em;
- margin-top: -3px;
color: $color-font-secondary;
+ padding-right: .1em;
}
}
}
-
.totalBox {
max-width: none
}
diff --git a/webpack.config.js b/webpack.config.js
index 1efcf5f01..66f2179a9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -103,6 +103,9 @@ let baseConfig = {
favicon: 'front/salix/favicon.ico',
filename: 'index.html',
chunks: ['salix']
+ }),
+ new webpack.DefinePlugin({
+ 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
})
],
devtool: 'source-map',