verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 72 Releases Wiki Activity

#7323 fix worker errors #599

Merged
jorgep merged 8 commits from 7323-fixErrors into dev 2024-08-07 13:32:29 +00:00
Conversation 0 Commits 8 Files Changed 8 +32 -34
jorgep commented 2024-08-07 09:58:00 +00:00
Member
Copy Link
No description provided.
jorgep added 1 commit 2024-08-07 09:58:00 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
08ed134b12 fix: refs #7323 wrong css
jorgep added 1 commit 2024-08-07 09:58:46 +00:00
jorgep added 1 commit 2024-08-07 10:19:28 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
017d5382bb fix: refs #7323 data-key & add select
jorgep added 1 commit 2024-08-07 10:29:23 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
98656aa2c8 fix: refs #7323 add department popup
jorgep reviewed 2024-08-07 10:39:31 +00:00
src/components/ui/QCalendarMonthWrapper.vue
@ -75,3 +75,2 @@
// .q-calendar-month__workweek.q-past-day,
.q-calendar-month__week :nth-child(6),
:nth-child(7) {
.q-calendar-month__week :nth-child(n+6):nth-child(-n+7) {
jorgep commented 2024-08-07 10:39:31 +00:00
Author
Member
Copy Link

Rango del hijo 6 al 7

Rango del hijo 6 al 7
alexm marked this conversation as resolved
jorgep reviewed 2024-08-07 10:39:44 +00:00
src/pages/Worker/Card/WorkerBasicData.vue Outdated
@ -139,23 +139,19 @@ const maritalStatus = [
<VnRow>
<VnInput v-model="data.SSN" :label="t('SSN')" clearable />
<VnInput
jorgep commented 2024-08-07 10:39:44 +00:00
Author
Member
Copy Link

Hay una sección aposta

Hay una sección aposta
jorgep commented 2024-08-07 13:18:32 +00:00
Author
Member
Copy Link

Ese campo no existe en la tabla worker y en la tarea original, se acordo quitarlo de basic-data

Ese campo no existe en la tabla worker y en la tarea original, se acordo quitarlo de basic-data
jorgep reviewed 2024-08-07 10:40:19 +00:00
src/pages/Worker/Card/WorkerBasicData.vue
@ -152,3 +143,3 @@
<VnInput v-model="data.sex" :label="t('sex')" clearable />
</VnRow>
<VnRow>
<VnSelect
jorgep commented 2024-08-07 10:40:19 +00:00
Author
Member
Copy Link

No hay ninguna tabla para sacar los generos, pero ,entiendo que para 2 opciones, no hace falta.

No hay ninguna tabla para sacar los generos, pero ,entiendo que para 2 opciones, no hace falta.
alexm marked this conversation as resolved
jorgep changed title from WIP: #7323 wrong css to #7323 wrong css 2024-08-07 10:40:46 +00:00
jorgep changed title from #7323 wrong css to #7323 fix worker Errors 2024-08-07 10:44:14 +00:00
jorgep changed title from #7323 fix worker Errors to #7323 fix worker errors 2024-08-07 10:44:22 +00:00
jorgep added 1 commit 2024-08-07 10:57:04 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
06eac739cd chore: refs #7323 fix test
jorgep added 2 commits 2024-08-07 11:37:03 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
855483cefd fix: refs #7323 css righ menu
jorgep added 1 commit 2024-08-07 11:38:55 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
baf0981233 chore: refs #7323drop commented code
jorgep reviewed 2024-08-07 11:40:20 +00:00
src/components/common/RightMenu.vue
@ -46,7 +46,7 @@ const stateStore = useStateStore();
</div>
</Teleport>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
<QScrollArea class="fit text-grey-8">
jorgep commented 2024-08-07 11:40:20 +00:00
Author
Member
Copy Link

sobreescribia los colores del calendario. He mirado en un filtro normal y no ha roto nada.

sobreescribia los colores del calendario. He mirado en un filtro normal y no ha roto nada.
alexm marked this conversation as resolved
jorgep added the
CR / Tests passed
 label 2024-08-07 11:40:37 +00:00
jorgep requested review from alexm 2024-08-07 11:40:42 +00:00
alexm requested changes 2024-08-07 12:09:50 +00:00
Dismissed
src/pages/Worker/Card/WorkerBasicData.vue
@ -139,23 +139,19 @@ const maritalStatus = [
<VnRow>
<VnInput v-model="data.SSN" :label="t('SSN')" clearable />
<VnInput
alexm commented 2024-08-07 12:09:43 +00:00
Member
Copy Link

Pero te has cargado este campo no?

Pero te has cargado este campo no?
test/cypress/integration/worker/workerLocker.spec.js
@ -3,3 +3,3 @@
const lockerCode = '2F';
const input = '.q-card input';
const thirdOpt = '[role="listbox"] .q-item:nth-child(3)';
const thirdOpt = '[role="listbox"] .q-item:nth-child(1)';
alexm commented 2024-08-07 12:09:49 +00:00
Member
Copy Link

Revisar

Revisar
jorgep commented 2024-08-07 13:20:49 +00:00
Author
Member
Copy Link

Antes se mostraban todas las taquillas debido a que no se estaba cogiendo el sexo desde la store, por culpa de que estaba mal el data-key en WorkerCard. En el test se está poniendo la 2F y solo aparecen las del sexo del trabajador.

Antes se mostraban todas las taquillas debido a que no se estaba cogiendo el sexo desde la store, por culpa de que estaba mal el data-key en WorkerCard. En el test se está poniendo la 2F y solo aparecen las del sexo del trabajador.
jorgep requested review from alexm 2024-08-07 13:21:21 +00:00
alexm approved these changes 2024-08-07 13:23:18 +00:00
jorgep merged commit 50f7b11c65 into dev 2024-08-07 13:32:29 +00:00
jorgep deleted branch 7323-fixErrors 2024-08-07 13:32:29 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
alexm
Labels
Clear labels   
bug

Something is not working

  
CR / Tests passed

CR / Tests passed

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
invalid

Something is wrong

  
Missing Tests

Missing Tests

  
wontfix

This won't be fixed

No Label
bug
CR / Tests passed
duplicate
enhancement
invalid
Missing Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#599
No description provided.
Delete Branch "7323-fixErrors"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?