-
{{'Contract' | translate}} #{{$ctrl.businessId}}
-
- {{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed || 0}}
- {{'of' | translate}} {{$ctrl.contractHolidays.totalHolidays || 0}} {{'days' | translate}}
+
+
+
+
{{'Contract' | translate}} #{{$ctrl.businessId}}
+
+ {{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed || 0}}
+ {{'of' | translate}} {{$ctrl.contractHolidays.totalHolidays || 0}} {{'days' | translate}}
+
+
+ {{'Spent' | translate}} {{$ctrl.contractHolidays.hoursEnjoyed || 0}}
+ {{'of' | translate}} {{$ctrl.contractHolidays.totalHours || 0}} {{'hours' | translate}}
+
+
+ {{'Paid holidays' | translate}} {{$ctrl.contractHolidays.payedHolidays || 0}} {{'days' | translate}}
+
-
- {{'Spent' | translate}} {{$ctrl.contractHolidays.hoursEnjoyed || 0}}
- {{'of' | translate}} {{$ctrl.contractHolidays.totalHours || 0}} {{'hours' | translate}}
-
-
- {{'Paid holidays' | translate}} {{$ctrl.contractHolidays.payedHolidays || 0}} {{'days' | translate}}
-
-
-
-
{{'Year' | translate}} {{$ctrl.year}}
-
- {{'Used' | translate}} {{$ctrl.yearHolidays.holidaysEnjoyed || 0}}
- {{'of' | translate}} {{$ctrl.yearHolidays.totalHolidays || 0}} {{'days' | translate}}
+
+
{{'Year' | translate}} {{$ctrl.year}}
+
+ {{'Used' | translate}} {{$ctrl.yearHolidays.holidaysEnjoyed || 0}}
+ {{'of' | translate}} {{$ctrl.yearHolidays.totalHolidays || 0}} {{'days' | translate}}
+
+
+ {{'Spent' | translate}} {{$ctrl.yearHolidays.hoursEnjoyed || 0}}
+ {{'of' | translate}} {{$ctrl.yearHolidays.totalHours || 0}} {{'hours' | translate}}
+
-
- {{'Spent' | translate}} {{$ctrl.yearHolidays.hoursEnjoyed || 0}}
- {{'of' | translate}} {{$ctrl.yearHolidays.totalHours || 0}} {{'hours' | translate}}
-
-
-
-
+
-
-
+
+
-
-
-
- {{absenceType.name}}
-
-
-
-
-
-
- Festive
-
-
-
-
- Current day
-
-
+ ng-click="$ctrl.pick(absenceType)">
+
+
+
+ {{absenceType.name}}
+
-
-
-
+
+
+
+
+ Festive
+
+
+
+
+ Current day
+
+
+
+
+
+
+
+
+ Autonomous worker
+
diff --git a/modules/worker/front/calendar/index.js b/modules/worker/front/calendar/index.js
index 87e806cc3..5606ad0ce 100644
--- a/modules/worker/front/calendar/index.js
+++ b/modules/worker/front/calendar/index.js
@@ -31,6 +31,8 @@ class Controller extends Section {
}
set businessId(value) {
+ if (!this.card.hasWorkCenter) return;
+
this._businessId = value;
if (value) {
this.refresh()
@@ -64,7 +66,7 @@ class Controller extends Section {
set worker(value) {
this._worker = value;
- if (value && value.hasWorkCenter) {
+ if (value) {
this.getIsSubordinate();
this.getActiveContract();
}
@@ -293,5 +295,8 @@ ngModule.vnComponent('vnWorkerCalendar', {
controller: Controller,
bindings: {
worker: '<'
+ },
+ require: {
+ card: '^vnWorkerCard'
}
});
diff --git a/modules/worker/front/card/index.js b/modules/worker/front/card/index.js
index 35f331764..0bf9ae5c4 100644
--- a/modules/worker/front/card/index.js
+++ b/modules/worker/front/card/index.js
@@ -3,7 +3,7 @@ import ModuleCard from 'salix/components/module-card';
class Controller extends ModuleCard {
reload() {
- let filter = {
+ const filter = {
include: [
{
relation: 'user',
@@ -32,13 +32,12 @@ class Controller extends ModuleCard {
]
};
- this.$http.get(`Workers/${this.$params.id}`, {filter})
- .then(res => this.worker = res.data)
- .then(() =>
- this.$http.get(`Workers/${this.$params.id}/activeContract`)
- .then(res => {
- if (res.data) this.worker.hasWorkCenter = res.data.workCenterFk;
- }));
+ return Promise.all([
+ this.$http.get(`Workers/${this.$params.id}`, {filter})
+ .then(res => this.worker = res.data),
+ this.$http.get(`Workers/${this.$params.id}/activeContract`)
+ .then(res => this.hasWorkCenter = res.data.workCenterFk)
+ ]);
}
}
diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html
index 5f0855ee6..5d8d2c503 100644
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@@ -4,7 +4,7 @@
filter="::$ctrl.filter"
data="$ctrl.hours">
-
+
Autonomous worker
-
-
-
-
-
Hours
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Are you sure you want to send it?
-
-
-
-
-
-
diff --git a/modules/worker/front/time-control/index.js b/modules/worker/front/time-control/index.js
index 90ec33293..38e6721d6 100644
--- a/modules/worker/front/time-control/index.js
+++ b/modules/worker/front/time-control/index.js
@@ -141,6 +141,8 @@ class Controller extends Section {
]}
};
this.$.model.applyFilter(filter, params).then(() => {
+ if (!this.card.hasWorkCenter) return;
+
this.getWorkedHours(this.started, this.ended);
this.getAbsences();
});
@@ -151,7 +153,6 @@ class Controller extends Section {
}
getAbsences() {
- if (!this.worker.hasWorkerCenter) return;
const fullYear = this.started.getFullYear();
let params = {
workerFk: this.$params.id,
@@ -486,5 +487,8 @@ ngModule.vnComponent('vnWorkerTimeControl', {
controller: Controller,
bindings: {
worker: '<'
+ },
+ require: {
+ card: '^vnWorkerCard'
}
});