Ammends
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
parent
c622f24b0a
commit
0ff114ff36
|
@ -181,8 +181,6 @@ describe('workerTimeControl add/delete timeEntry()', () => {
|
|||
ctx.args = {direction: 'out'};
|
||||
const updatedTimeEntry = await models.WorkerTimeControl.updateTimeEntry(ctx, createdTimeEntry.id, options);
|
||||
|
||||
// const deletedTimeEntry = await models.WorkerTimeControl.findById(createdTimeEntry.id, null, options);
|
||||
|
||||
expect(updatedTimeEntry.direction).toEqual('out');
|
||||
await tx.rollback();
|
||||
} catch (e) {
|
||||
|
|
|
@ -133,8 +133,8 @@
|
|||
|
||||
<!-- Edit entry Popover -->
|
||||
<vn-popover vn-id="editEntry">
|
||||
<vn-horizontal class="vn-pa-sm edit-entry">
|
||||
<vn-autocomplete class="dense" style="width: 200px"
|
||||
<vn-horizontal class="vn-pa-sm edit-time-entry">
|
||||
<vn-autocomplete class="dense"
|
||||
ng-model="$ctrl.selectedRow.direction"
|
||||
data="$ctrl.entryDirections"
|
||||
select-fields="['code','description']"
|
||||
|
|
|
@ -255,9 +255,20 @@ class Controller extends Section {
|
|||
}
|
||||
|
||||
addTime() {
|
||||
const query = `WorkerTimeControls/${this.worker.id}/addTimeEntry`;
|
||||
this.$http.post(query, this.newTimeEntry)
|
||||
.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($event, hour) {
|
||||
|
@ -284,12 +295,19 @@ class Controller extends Section {
|
|||
}
|
||||
|
||||
save() {
|
||||
const entry = this.selectedRow;
|
||||
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());
|
||||
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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -9,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
|
||||
Entry removed: Fichada borrada
|
||||
The entry type can't be empty: El tipo de fichada no puede quedar vacía
|
|
@ -24,7 +24,8 @@ vn-worker-time-control {
|
|||
.totalBox {
|
||||
max-width: none
|
||||
}
|
||||
.edit-entry {
|
||||
width: 150px
|
||||
}
|
||||
}
|
||||
|
||||
.edit-time-entry {
|
||||
width: 200px
|
||||
}
|
Loading…
Reference in New Issue