refs #6842 isFreelance #348

Merged
carlossa merged 4 commits from 6842-errorCalendar into dev 2024-05-08 10:21:28 +00:00
Member
No description provided.
carlossa added 1 commit 2024-05-03 12:53:41 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
710b45f43a
refs #6842 isFreelance
jsegarra added 1 commit 2024-05-03 13:06:33 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
743faef956
fix: #6842 Not update calendar correctly
carlossa changed title from WIP: refs #6842 isFreelance to refs #6842 isFreelance 2024-05-06 07:16:39 +00:00
carlossa requested review from alexm 2024-05-06 07:16:42 +00:00
alexm requested changes 2024-05-07 06:48:11 +00:00
Dismissed
@ -2,3 +2,3 @@
import { ref, watch } from 'vue';
import { nextTick, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
Member

Habéis duplicado esta linea @jsegarra

Habéis duplicado esta linea @jsegarra
carlossa marked this conversation as resolved
@ -10,10 +10,12 @@ import WorkerCalendarItem from 'pages/Worker/Card/WorkerCalendarItem.vue';
import { useStateStore } from 'stores/useStateStore';
import axios from 'axios';
import { useRouter } from 'vue-router';
Member

Habéis duplicado esta linea @jsegarra

Habéis duplicado esta linea @jsegarra
carlossa marked this conversation as resolved
@ -32,6 +34,12 @@ const onFetchActiveContract = (data) => {
hasWorkCenter.value = Boolean(data?.workCenterFk);
Member

Entonces esta variable ya no se usa

Entonces esta variable ya no se usa
carlossa marked this conversation as resolved
@ -152,2 +170,4 @@
auto-load
/>
<FetchData
:url="`Workers/${route.params.id}`"
Member

Si ya haceis la peticion por JS pq la volveis a hacer en vue?

Si ya haceis la peticion por JS pq la volveis a hacer en vue?
carlossa marked this conversation as resolved
alexm requested changes 2024-05-07 06:59:11 +00:00
Dismissed
@ -11,2 +11,4 @@
import axios from 'axios';
import { useRouter } from 'vue-router';
const router = useRouter();
Member

Habéis duplicado esta linea @jsegarra

Habéis duplicado esta linea @jsegarra
Member

mmm, creo que no.
Hemos añadido useRouter y lo que habia es useRoute
useRouter!==useRoute

mmm, creo que no. Hemos añadido useRouter y lo que habia es useRoute useRouter!==useRoute
carlossa marked this conversation as resolved
@ -13,2 +13,4 @@
import { useRouter } from 'vue-router';
const router = useRouter();
const stateStore = useStateStore();
const route = useRoute();
Member

Habéis duplicado esta linea @jsegarra

Habéis duplicado esta linea @jsegarra
Member

mmm, creo que no.
Hemos añadido useRouter y lo que habia es useRoute
useRouter!==useRoute

mmm, creo que no. Hemos añadido useRouter y lo que habia es useRoute useRouter!==useRoute
carlossa marked this conversation as resolved
carlossa added 1 commit 2024-05-07 08:19:43 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
ac0993aa11
refs #6842 pr changes
carlossa requested review from alexm 2024-05-08 07:52:44 +00:00
alexm approved these changes 2024-05-08 08:08:34 +00:00
Dismissed
carlossa added 1 commit 2024-05-08 08:10:39 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
3d3f72757a
Merge branch 'dev' into 6842-errorCalendar
carlossa dismissed alexm’s review 2024-05-08 08:10:40 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

carlossa requested review from alexm 2024-05-08 08:45:51 +00:00
alexm approved these changes 2024-05-08 10:20:51 +00:00
carlossa merged commit c18d035be5 into dev 2024-05-08 10:21:28 +00:00
carlossa deleted branch 6842-errorCalendar 2024-05-08 10:21:29 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
3 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#348
No description provided.