verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

5334-editDepartment #1521

Merged
carlossa merged 84 commits from 5334-editDepartment into dev 2023-07-06 07:09:06 +00:00
Conversation 0 Commits 84 Files Changed 33 +89 -74
5 changed files with 89 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3dcdbe0223 - Show all commits

88
modules/worker/front/department/basic-data/index.html
View File

@ -1,7 +1,7 @@
<mg-ajax path="Workers/{{patch.params.id}}" options="vnPatch"></mg-ajax>
<mg-ajax path="Departments/{{patch.params.id}}" options="vnPatch"></mg-ajax>
<vn-watcher
vn-id="watcher"
data="$ctrl.worker"
data="$ctrl.department"
form="form"
save="patch">
</vn-watcher>
@ -12,78 +12,62 @@
<vn-textfield
vn-one
label="Name"
ng-model="$ctrl.worker.firstName"
ng-model="$ctrl.department.name"
rule>
</vn-textfield>
<vn-textfield
vn-one
label="Last name"
ng-model="$ctrl.worker.lastName"
label="Code"
ng-model="$ctrl.department.code"
rule>
</vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield
vn-one
label="Business phone"
ng-model="$ctrl.worker.phone"
label="Chat"
ng-model="$ctrl.department.chatName"
rule>
</vn-textfield>
<vn-textfield
vn-one
label="Mobile extension"
ng-model="$ctrl.worker.mobileExtension"
label="Email"
ng-model="$ctrl.department.notificationEmail"
rule>
</vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-autocomplete
ng-model="$ctrl.worker.bossFk"
url="Workers/activeWithInheritedRole"
show-field="nickname"
search-function="{firstName: $search}"
where="{role: 'employee'}"
label="Boss">
</vn-autocomplete>
<vn-autocomplete
label="Marital status"
data="$ctrl.maritalStatus"
show-field="name"
value-field="code"
ng-model="$ctrl.worker.maritalStatus">
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal>
<vn-autocomplete
ng-model="$ctrl.worker.originCountryFk"
url="Countries"
fields="['id', 'country', 'code']"
show-field="country"
value-field="id"
label="Origin country">
</vn-autocomplete>
<vn-autocomplete
ng-model="$ctrl.worker.educationLevelFk"
url="EducationLevels"
fields="['id', 'name']"
show-field="name"
value-field="id"
label="Education level">
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal>
carlossa marked this conversation as resolved Outdated
alexm commented 2023-06-01 06:09:18 +00:00
Outdated
Review
Copy Link

Deberia ser Autocomplete

Deberia ser Autocomplete
<vn-textfield
vn-one
label="SSN"
ng-model="$ctrl.worker.SSN"
rule>
label="Boss department"
ng-model="$ctrl.department.workerFk">
</vn-textfield>
alexm commented 2023-06-01 06:09:25 +00:00
Outdated
Review
Copy Link

Deberia ser Autocomplete

Deberia ser Autocomplete
<vn-textfield
vn-one
label="Self-consumption customer"
ng-model="$ctrl.department.clientFk">
</vn-textfield>
<vn-input-number
min="0"
label="Locker"
ng-model="$ctrl.worker.locker">
</vn-input-number>
</vn-horizontal>
<vn-check
label="Telecommutes"
ng-model="$ctrl.department.isTeleworking">
</vn-check>
<vn-check
label="Notificate errors"
ng-model="$ctrl.department.hasToMistake">
</vn-check>
<vn-check
label="Is on production"
carlossa marked this conversation as resolved Outdated
jgallego commented 2023-06-28 06:33:20 +00:00
Outdated
Review
Copy Link

jo posaria teleworking es mes intuitiu per a la gent

No, the term "teleworking" is not incorrect. In fact, "teleworking" and "telecommuting" are often used interchangeably to refer to the practice of working remotely. Both terms describe the same concept of performing work duties from a location outside of a traditional office environment.

While "telecommuting" is more commonly used in North America, "teleworking" is a term that is more prevalent in Europe and other parts of the world. The choice between the two terms may vary depending on regional preferences and cultural norms.

jo posaria teleworking es mes intuitiu per a la gent No, the term "teleworking" is not incorrect. In fact, "teleworking" and "telecommuting" are often used interchangeably to refer to the practice of working remotely. Both terms describe the same concept of performing work duties from a location outside of a traditional office environment. While "telecommuting" is more commonly used in North America, "teleworking" is a term that is more prevalent in Europe and other parts of the world. The choice between the two terms may vary depending on regional preferences and cultural norms.
jgallego commented 2023-06-29 06:58:47 +00:00
Outdated
Review
Copy Link

Consistencia en la terminología: Asegúrate de que estás utilizando terminología consistente en todas tus etiquetas. Por ejemplo, en una etiqueta usas "Teleworking" y en otra "check-ins". Sería más consistente si usas "Telework" y "Check-ins" o "Teleworking" y "Checking in", según corresponda.

agafem telework

Consistencia en la terminología: Asegúrate de que estás utilizando terminología consistente en todas tus etiquetas. Por ejemplo, en una etiqueta usas "Teleworking" y en otra "check-ins". Sería más consistente si usas "Telework" y "Check-ins" o "Teleworking" y "Checking in", según corresponda. agafem telework
ng-model="$ctrl.department.isProduction">
</vn-check>
<vn-check
label="Fill in days without physical check-ins"
ng-model="$ctrl.department.hasToRefill">
</vn-check>
<vn-check
label="Send check-ins by email"
carlossa marked this conversation as resolved Outdated
jgallego commented 2023-06-29 06:58:08 +00:00
Outdated
Review
Copy Link

chatgpt
dime en ingles una variable para indicar que alguien trabaja en produccion
ChatGPT
La variable para indicar que alguien trabaja en producción podría denominarse worksInProduction.

chatgpt dime en ingles una variable para indicar que alguien trabaja en produccion ChatGPT La variable para indicar que alguien trabaja en producción podría denominarse worksInProduction.
ng-model="$ctrl.department.hasToSendMail">
</vn-check>
</vn-vertical>
</vn-card>
<vn-button-bar>

22
modules/worker/front/department/basic-data/locale/es.yml
View File

@ -1,9 +1,13 @@
Marital status: Estado civil
Origin country: País origen
Education level: Nivel educación
SSN: NSS
Married: Casado/a
Single: Soltero/a
Business phone: Teléfono de empresa
Mobile extension: Extensión móvil
Locker: Taquilla
Name: Nombre
Code: Código
Chat: Chat
Email: Email
Boss department: Jefe del departamento
Self-consumption customer: Cliente autoconsumo
Telecommutes: Teletrabaja
Notificate errors: Notificar errores
Is on production: Pertenece a producción
Fill in days without physical check-ins: Rellenar fichadas
Send check-ins by email: Enviar fichadas por email
Save: Guardar
Undo changes: Deshacer cambios

2
modules/worker/front/department/index/index.html
View File

@ -13,7 +13,7 @@
on-drop="$ctrl.onDrop($dropped, $dragged)"
on-drag-start="$ctrl.onDragStart(item)"
on-drag-end="$ctrl.onDragEnd(item)"
ng-click="department.card.summary($item)">
ng-click="worker.department.card.summary($item)">
{{::item.name}}
</vn-treeview>
</vn-card>

36
modules/worker/front/department/summary/index.html
View File

@ -2,7 +2,7 @@
<h5>
<a ng-if="::$ctrl.department.id"
vn-tooltip="Go to the department"
ui-sref="department.card.summary({id: {{::$ctrl.department.id}}})"
ui-sref="worker.department.card.summary({id: {{::$ctrl.department.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
@ -21,17 +21,17 @@
ng-show="!$ctrl.isHr">
Basic data
</h4>
<vn-label-value label="Nombre:"
<vn-label-value label="Nombre"
value="{{department.name}}">
</vn-label-value>
<vn-label-value label="Code:" no-ellipsize
<vn-label-value label="Code" no-ellipsize
value="{{department.code}}">
</vn-label-value>
<vn-label-value label="Chat:"
<vn-label-value label="Chat"
value="{{department.chat}}">
</vn-label-value>
<vn-label-value
label="Boss:">
label="Boss department">
<span
ng-click="workerDescriptor.show($event, worker.boss.id)"
class="link">
@ -41,11 +41,31 @@
<vn-label-value label="Email:"
value="{{department.notificationEmail}}">
</vn-label-value>
<vn-label-value label="Cliente autoconsumo"
<vn-label-value label="Self-consumption customer"
value="{{department.workerFk}}">
carlossa marked this conversation as resolved Outdated
jgallego commented 2023-06-29 07:03:40 +00:00
Outdated
Review
Copy Link

Notify on errors

Notify on errors
</vn-label-value>
</vn-one>
<vn-one>
<vn-check
label="Telecommutes"
ng-model="$ctrl.department.isTeleworking">
</vn-check>
<vn-check
label="Notificate errors"
ng-model="$ctrl.department.hasToMistake">
</vn-check>
<vn-check
label="Is on production"
ng-model="$ctrl.department.isProduction">
</vn-check>
<vn-check
label="Fill in days without physical check-ins"
ng-model="$ctrl.department.hasToRefill">
</vn-check>
<vn-check
label="Send check-ins by email"
ng-model="$ctrl.department.hasToSendMail">
</vn-check>
<!-- <vn-one>
<h4 translate>User data</h4>
<vn-label-value label="User id"
value="{{worker.userFk}}">
@ -59,7 +79,7 @@
<vn-label-value label="Extension"
value="{{worker.sip.extension}}">
</vn-label-value>
</vn-one>
</vn-one> -->
</vn-horizontal>
</vn-card>
<vn-worker-department-descriptor-popover

15
modules/worker/front/department/summary/locale/es.yml
View File

@ -1,4 +1,11 @@
Business phone: Teléfono de empresa
Personal phone: Teléfono personal
Mobile extension: Extensión móvil
Locker: Taquilla
Name: Nombre
Code: Código
Chat: Chat
Boss department: Jefe de departamento
Email: Email
Self-consumption customer: Cliente autoconsumo
Telecommutes: Teletrabaja
Notificate errors: Notificar errores
Is on production: Pertenece a producción
Fill in days without physical check-ins: Rellenar fichadas
carlossa marked this conversation as resolved Outdated
jgallego commented 2023-06-29 07:04:54 +00:00
Outdated
Review
Copy Link

Completar días sin registros físicos

Completar días sin registros físicos
Send check-ins by email: Enviar fichadas por mail