{{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed}}
{{'of' | translate}} {{$ctrl.contractHolidays.totalHolidays || 0}} {{'days' | translate}}
@@ -55,7 +55,7 @@
order="businessFk DESC"
limit="5">
- ID: {{businessFk}}
+ #{{businessFk}}
{{started | date: 'dd/MM/yyyy'}} - {{ended ? (ended | date: 'dd/MM/yyyy') : 'Indef.'}}
diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html
index a333b8585..66d6f282e 100644
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@@ -43,9 +43,16 @@
ng-class="::{'invisible': hour.direction == 'middle'}">
+ on-remove="$ctrl.showDeleteDialog($event, hour)"
+ ng-click="$ctrl.edit($event, hour)"
+ >
+
+
+
+
{{::hour.timed | date: 'HH:mm'}}
@@ -97,10 +104,20 @@
+ required="true">
+
+
@@ -112,4 +129,22 @@
on-accept="$ctrl.deleteTimeEntry()"
message="This time entry will be deleted"
question="Are you sure you want to delete this entry?">
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index bed9e7af3..b980243c9 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -7,6 +7,11 @@ class Controller extends Section {
super($element, $);
this.weekDays = [];
this.weekdayNames = vnWeekDays.locales;
+ this.entryDirections = [
+ {code: 'in', description: this.$t('In')},
+ {code: 'middle', description: this.$t('Intermediate')},
+ {code: 'out', description: this.$t('Out')}
+ ];
}
$postLink() {
@@ -241,21 +246,34 @@ class Controller extends Section {
const timed = new Date(weekday.dated.getTime());
timed.setHours(0, 0, 0, 0);
- this.newTime = timed;
+ this.newTimeEntry = {
+ workerFk: this.$params.id,
+ timed: timed
+ };
this.selectedWeekday = weekday;
this.$.addTimeDialog.show();
}
addTime() {
- let data = {
- workerFk: this.$params.id,
- timed: this.newTime
- };
- this.$http.post(`WorkerTimeControls/addTimeEntry`, data)
- .then(() => this.fetchHours());
+ try {
+ const entry = this.newTimeEntry;
+ if (!entry.direction)
+ throw new Error(`The entry type can't be empty`);
+
+ const query = `WorkerTimeControls/${this.worker.id}/addTimeEntry`;
+ this.$http.post(query, entry)
+ .then(() => this.fetchHours());
+ } catch (e) {
+ this.vnApp.showError(this.$t(e.message));
+ return false;
+ }
+
+ return true;
}
- showDeleteDialog(hour) {
+ showDeleteDialog($event, hour) {
+ $event.preventDefault();
+
this.timeEntryToDelete = hour;
this.$.deleteEntryDialog.show();
}
@@ -268,6 +286,29 @@ class Controller extends Section {
this.vnApp.showSuccess(this.$t('Entry removed'));
});
}
+
+ edit($event, hour) {
+ if ($event.defaultPrevented) return;
+
+ this.selectedRow = hour;
+ this.$.editEntry.show($event);
+ }
+
+ save() {
+ try {
+ const entry = this.selectedRow;
+ if (!entry.direction)
+ throw new Error(`The entry type can't be empty`);
+
+ const query = `WorkerTimeControls/${entry.id}/updateTimeEntry`;
+ this.$http.post(query, {direction: entry.direction})
+ .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
+ .then(() => this.$.editEntry.hide())
+ .then(() => this.fetchHours());
+ } catch (e) {
+ this.vnApp.showError(this.$t(e.message));
+ }
+ }
}
Controller.$inject = ['$element', '$scope', 'vnWeekDays'];
diff --git a/modules/worker/front/time-control/index.spec.js b/modules/worker/front/time-control/index.spec.js
index 4e9730d9c..920f13e7c 100644
--- a/modules/worker/front/time-control/index.spec.js
+++ b/modules/worker/front/time-control/index.spec.js
@@ -113,5 +113,21 @@ describe('Component vnWorkerTimeControl', () => {
expect(result).toEqual('01:00');
});
});
+
+ describe('save() ', () => {
+ it(`should make a query an then call to the fetchHours() method`, () => {
+ controller.fetchHours = jest.fn();
+ controller.selectedRow = {id: 1, timed: new Date(), direction: 'in'};
+ controller.$.editEntry = {
+ hide: () => {}
+ };
+ const expectedParams = {direction: 'in'};
+ $httpBackend.expect('POST', 'WorkerTimeControls/1/updateTimeEntry', expectedParams).respond(200);
+ controller.save();
+ $httpBackend.flush();
+
+ expect(controller.fetchHours).toHaveBeenCalledWith();
+ });
+ });
});
});
diff --git a/modules/worker/front/time-control/locale/es.yml b/modules/worker/front/time-control/locale/es.yml
index 1d28b0e2b..8b2486f05 100644
--- a/modules/worker/front/time-control/locale/es.yml
+++ b/modules/worker/front/time-control/locale/es.yml
@@ -1,5 +1,6 @@
In: Entrada
Out: Salida
+Intermediate: Intermedio
Hour: Hora
Hours: Horas
Add time: Añadir hora
@@ -8,4 +9,5 @@ Current week: Semana actual
This time entry will be deleted: Se eliminará la hora fichada
Are you sure you want to delete this entry?: ¿Seguro que quieres eliminarla?
Finish at: Termina a las
-Entry removed: Fichada borrada
\ No newline at end of file
+Entry removed: Fichada borrada
+The entry type can't be empty: El tipo de fichada no puede quedar vacía
\ 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 99a21883f..6a46921a7 100644
--- a/modules/worker/front/time-control/style.scss
+++ b/modules/worker/front/time-control/style.scss
@@ -24,4 +24,8 @@ vn-worker-time-control {
.totalBox {
max-width: none
}
+}
+
+.edit-time-entry {
+ width: 200px
}
\ No newline at end of file