5334-editDepartment #1521

Merged
carlossa merged 84 commits from 5334-editDepartment into dev 2023-07-06 07:09:06 +00:00
5 changed files with 16 additions and 4 deletions
Showing only changes of commit 1dcaba1fdc - Show all commits

View File

@ -1,4 +1,4 @@
import ngModule from '../module';
import ngModule from '../../module';
import DescriptorPopover from 'salix/components/descriptor-popover';
class Controller extends DescriptorPopover {}
carlossa marked this conversation as resolved
Review

Aci lo mateix de antes (si te dixa en el cas de antes aci tambe deuria)

Aci lo mateix de antes (si te dixa en el cas de antes aci tambe deuria)

View File

@ -30,7 +30,10 @@
value="{{$ctrl.department.worker.firstName}} {{$ctrl.department.worker.secondName}}">
</vn-label-value>
</div>
</div>
<vn-icon-button vn-anchor="{state: 'worker.index', params: {q: {departmentFk: $ctrl.department.id}}}"
vn-tooltip="Department workers"
icon="icon-ticket">
alexm marked this conversation as resolved Outdated
Outdated
Review

Si pots una indentacio cap a dins

Si pots una indentacio cap a dins

A mi me apareix bé ja que ho tinc tot en la mateixa linea

A mi me apareix bé ja que ho tinc tot en la mateixa linea
</vn-icon-button>
</slot-body>
</vn-descriptor-content>
<vn-popup vn-id="summary">

View File

@ -15,6 +15,14 @@ class Controller extends Descriptor {
this.entity = value;
}
filterDepartments(department, event) {
if (event.defaultPrevented) return;
event.preventDefault();
event.stopPropagation();
this.$state.go(`worker.index`,
{q: JSON.stringify({departmentFk: department.id})});
}
deleteDepartment() {
return this.$http.post(`Departments/${this.id}/setDeleted`)
.then(() => this.reload())

View File

@ -1,4 +1,5 @@
New department: Nuevo departamento
Delete department: Eliminar departamento
Are you sure you want to delete it?: ¿Seguro que quieres eliminarlo?
Name can't be empty: El nombre esta vacio
Name can't be empty: El nombre esta vacio
Department workers: Trabajadores del departamento

View File

@ -31,7 +31,7 @@
<span
ng-click="workerDepartmentDescriptor.show($event, worker.department.department.id)"
class="link">
{{::worker.department.department.name}}
{{worker.department.department.name}}
</span>
</vn-label-value>
<vn-label-value