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

#6917 - inputDate_inpuTime #498

Merged
alexm merged 16 commits from 6917-inputDate_inpuTime into dev 2024-07-03 06:52:47 +00:00
Conversation 0 Commits 16 Files Changed 10 +198 -228
alexm commented 2024-06-28 14:33:48 +00:00
Member
Copy Link
No description provided.
alexm added 4 commits 2024-06-28 14:33:49 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
52d6eeb976 fix: vnSearchBar e2e
alexm added 2 commits 2024-06-28 15:48:15 +00:00
alexm added 1 commit 2024-07-01 07:01:03 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
f4975d1f15 fix: ticketFilter adapt VnInputDate
alexm added 1 commit 2024-07-01 07:30:37 +00:00
alexm added 1 commit 2024-07-02 06:06:42 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
cb5c33dcc9 feat: rework VnInputTime and fix VnInputDate bugs
alexm reviewed 2024-07-02 06:15:43 +00:00
src/components/common/VnInputDate.vue Outdated
@ -1,17 +1,10 @@
<script setup>
alexm commented 2024-07-02 06:15:43 +00:00
Author
Member
Copy Link

Lo he rehecho desde 0, no me fijaria en lo que había

Lo he rehecho desde 0, no me fijaria en lo que había
👍 1
alexm reviewed 2024-07-02 06:15:51 +00:00
src/components/common/VnInputTime.vue Outdated
@ -1,14 +1,11 @@
<script setup>
alexm commented 2024-07-02 06:15:51 +00:00
Author
Member
Copy Link

Lo he rehecho desde 0, no me fijaria en lo que habia

Lo he rehecho desde 0, no me fijaria en lo que habia
👍 1
alexm reviewed 2024-07-02 06:16:23 +00:00
src/pages/Ticket/TicketFilter.vue Outdated
@ -17,15 +17,6 @@ const props = defineProps({
},
});
const from = Date.vnNew();
alexm commented 2024-07-02 06:16:23 +00:00
Author
Member
Copy Link

Estos filtros ya están en TicketList, no creo que haga falta que estén duplicados

Estos filtros ya están en TicketList, no creo que haga falta que estén duplicados
alexm reviewed 2024-07-02 06:16:35 +00:00
src/pages/Ticket/TicketList.vue Outdated
@ -26,8 +26,8 @@ const to = Date.vnNew();
to.setDate(to.getDate() + 1);
const userParams = {
alexm commented 2024-07-02 06:16:35 +00:00
Author
Member
Copy Link

(Aquí)

(Aquí)
alexm reviewed 2024-07-02 06:17:00 +00:00
src/pages/Zone/Card/ZoneBasicData.vue
@ -74,7 +74,7 @@ const agencyOptions = ref([]);
type="number"
min="0"
/>
<VnInputTime v-model="data.hour" :label="t('Closing')" clearable />
alexm commented 2024-07-02 06:17:00 +00:00
Author
Member
Copy Link

Ahora el componente por defecto es clearable

Ahora el componente por defecto es clearable
alexm reviewed 2024-07-02 06:17:47 +00:00
src/components/FormModel.vue
@ -206,11 +206,11 @@ async function save() {
updateAndEmit('onDataSaved', formData.value, response?.data);
if ($props.reload) await arrayData.fetch({});
hasChanges.value = false;
alexm commented 2024-07-02 06:17:47 +00:00
Author
Member
Copy Link

Sino al fallar te dice que no tienes cambios, cuando realmente si hay. (Te deshabilitaba los botones)

Sino al fallar te dice que no tienes cambios, cuando realmente si hay. (Te deshabilitaba los botones)
👍 1
alexm changed title from WIP: 6917-inputDate_inpuTime to 6917-inputDate_inpuTime 2024-07-02 08:03:10 +00:00
alexm requested review from jsegarra 2024-07-02 08:03:19 +00:00
alexm added 1 commit 2024-07-02 08:04:02 +00:00
jsegarra changed title from 6917-inputDate_inpuTime to #6917 - inputDate_inpuTime 2024-07-02 08:22:27 +00:00
jsegarra requested changes 2024-07-02 08:30:14 +00:00
Dismissed
src/pages/Zone/Card/ZoneBasicData.vue
@ -75,3 +75,3 @@
min="0"
/>
<VnInputTime v-model="data.hour" :label="t('Closing')" clearable />
<VnInputTime v-model="data.hour" :label="t('Closing')" />
jsegarra commented 2024-07-02 08:30:12 +00:00
Member
Copy Link

Teniendo valor en el VnInputTime, no aparece la X de clearable

Teniendo valor en el VnInputTime, no aparece la X de clearable
alexm marked this conversation as resolved
jsegarra requested changes 2024-07-02 09:56:01 +00:00
Dismissed
src/components/common/VnInputDate.vue Outdated
@ -98,3 +95,3 @@
:class="{ required: $attrs.required }"
:rules="$attrs.required ? [requiredFieldRule] : null"
@click="isPopupOpen = true"
:clearable="false"
jsegarra commented 2024-07-02 08:35:50 +00:00
Member
Copy Link

PAra que en TicketCreate.vue quiero que el campo sea clearable tengo que poner la propiedad a mano

PAra que en TicketCreate.vue quiero que el campo sea clearable tengo que poner la propiedad a mano
alexm marked this conversation as resolved
src/components/common/VnInputTime.vue Outdated
@ -123,4 +113,2 @@
</style>
<i18n>
es:
jsegarra commented 2024-07-02 08:31:47 +00:00
Member
Copy Link

Quitar, no se usa

Quitar, no se usa
alexm marked this conversation as resolved
alexm added 2 commits 2024-07-02 11:49:35 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
739be5fe7c fix(VnInputDate & VnInputTime): fix clearable
alexm added 1 commit 2024-07-02 11:51:39 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
249aedeaf5 remove unnecessary translation
alexm requested review from jsegarra 2024-07-02 11:52:11 +00:00
jsegarra added 1 commit 2024-07-02 18:42:31 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
e70162d342 Merge branch 'dev' into 6917-inputDate_inpuTime
jsegarra approved these changes 2024-07-02 18:43:50 +00:00
alexm added 1 commit 2024-07-03 06:49:01 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4272990a7a Merge branch 'dev' into 6917-inputDate_inpuTime
alexm added 1 commit 2024-07-03 06:51:39 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
6ac4649210 Merge branch 'dev' into 6917-inputDate_inpuTime
alexm merged commit 9e042112ff into dev 2024-07-03 06:52:47 +00:00
alexm deleted branch 6917-inputDate_inpuTime 2024-07-03 06:52:47 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jsegarra
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#498
No description provided.
Delete Branch "6917-inputDate_inpuTime"

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?