Merge pull request 'test' (!92) from test into master

Reviewed-on: verdnatura/salix-front#92

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "23.32.01",
+    "version": "23.36.01",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "23.34.01",
+    "version": "23.36.01",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

src/components/NavBar.vue

@@ -38,7 +38,13 @@ const pinnedModulesRef = ref();
                 </QTooltip>
             </QBtn>
             <RouterLink to="/">
-                <QBtn class="q-ml-xs" color="primary" flat round>
+                <QBtn
+                    class="q-ml-xs"
+                    color="primary"
+                    flat
+                    round
+                    v-if="!quasar.platform.is.mobile"
+                >
                     <QAvatar square size="md">
                         <QImg
                             src="~/assets/logo_icon.svg"
@@ -56,7 +62,7 @@ const pinnedModulesRef = ref();
                 <QBadge label="Beta" align="top" />
             </QToolbarTitle>
             <QSpace />
-            <div id="searchbar"></div>
+            <div id="searchbar" class="searchbar"></div>
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>
@@ -70,13 +76,27 @@ const pinnedModulesRef = ref();
                         {{ t('Go to Salix') }}
                     </QTooltip>
                 </QBtn>
-                <QBtn id="pinnedModules" icon="apps" flat dense rounded>
+                <QBtn
+                    :class="{ 'q-pa-none': quasar.platform.is.mobile }"
+                    id="pinnedModules"
+                    icon="apps"
+                    flat
+                    dense
+                    rounded
+                >
                     <QTooltip bottom>
                         {{ t('globals.pinnedModules') }}
                     </QTooltip>
                     <PinnedModules ref="pinnedModulesRef" />
                 </QBtn>
-                <QBtn rounded dense flat no-wrap id="user">
+                <QBtn
+                    :class="{ 'q-pa-none': quasar.platform.is.mobile }"
+                    rounded
+                    dense
+                    flat
+                    no-wrap
+                    id="user"
+                >
                     <QAvatar size="lg">
                         <QImg
                             :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
@@ -95,6 +115,11 @@ const pinnedModulesRef = ref();
     </QHeader>
 </template>
 
+<style lang="scss" scoped>
+.searchbar {
+    width: max-content;
+}
+</style>
 <i18n>
 en:
     Go to Salix: Go to Salix

src/components/PinnedModules.vue

@@ -35,19 +35,13 @@ async function redirect() {
 <template>
     <QMenu anchor="bottom left" max-width="300px" max-height="400px">
         <div v-if="pinnedModules.length >= 0" class="row justify-around q-pa-md">
-            <QBtn
-                flat
-                stack
-                size="lg"
-                icon="more_up"
-                class="col-5"
-                @click="redirect($route.params.id)"
-            >
-                <div class="text-center button-text">Salix</div>
+            <QBtn flat stack size="lg" icon="more_up" @click="redirect($route.params.id)">
+                <div class="button-text">Salix</div>
             </QBtn>
-            <QBtn flat stack size="lg" icon="home" class="col-5" to="/">
-                <div class="text-center button-text">{{ t('Home') }}</div>
+            <QBtn flat stack size="lg" icon="home" to="/">
+                <div class="button-text">{{ t('Home') }}</div>
             </QBtn>
+
             <div class="row col-12 justify-around q-mt-md">
                 <QBtn
                     flat

src/components/ui/VnAvatar.vue

@@ -0,0 +1,26 @@
+<script setup>
+import { useSession } from 'src/composables/useSession';
+const $props = defineProps({
+    worker: { type: Number, required: true },
+    description: { type: String, default: null },
+});
+const session = useSession();
+const token = session.getToken();
+</script>
+<template>
+    <div class="avatar-picture column items-center">
+        <QAvatar color="orange">
+            <QImg
+                :src="`/api/Images/user/160x160/${$props.worker}/download?access_token=${token}`"
+                spinner-color="white"
+            />
+        </QAvatar>
+        <div class="description">
+            <slot name="description" v-if="$props.description">
+                <p>
+                    {{ $props.description }}
+                </p>
+            </slot>
+        </div>
+    </div>
+</template>

src/components/ui/VnNotes.vue

@@ -0,0 +1,126 @@
+<script setup>
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnAvatar from 'src/components/ui/VnAvatar.vue';
+import { toDateHour } from 'src/filters';
+import { ref } from 'vue';
+import axios from 'axios';
+import { useI18n } from 'vue-i18n';
+import VnPaginate from './VnPaginate.vue';
+
+const $props = defineProps({
+    id: { type: String, required: true },
+    url: { type: String, default: null },
+    filter: { type: Object, default: () => {} },
+    body: { type: Object, default: () => {} },
+    addNote: { type: Boolean, default: false },
+});
+const { t } = useI18n();
+const noteModal = ref(false);
+const newNote = ref('');
+const vnPaginateRef = ref();
+
+async function insert() {
+    const body = $props.body;
+    Object.assign(body, { text: newNote.value });
+    await axios.post($props.url, body);
+    vnPaginateRef.value.fetch();
+}
+</script>
+<template>
+    <div class="column items-center">
+        <VnPaginate
+            :data-key="$props.url"
+            :url="$props.url"
+            order="created DESC"
+            :limit="20"
+            :filter="$props.filter"
+            auto-load
+            ref="vnPaginateRef"
+        >
+            <template #body="{ rows }">
+                <QCard class="q-pa-md q-mb-md" v-for="(note, index) in rows" :key="index">
+                    <QCardSection horizontal>
+                        <slot name="picture">
+                            <VnAvatar :worker="note.workerFk" />
+                        </slot>
+                        <QItem class="full-width justify-between items-start">
+                            <span class="link">
+                                {{ `${note.worker.firstName} ${note.worker.lastName}` }}
+                                <WorkerDescriptorProxy :id="note.worker.id" />
+                            </span>
+                            <slot name="actions">
+                                {{ toDateHour(note.created) }}
+                            </slot>
+                        </QItem>
+                    </QCardSection>
+                    <QCardSection>
+                        <slot name="text">
+                            {{ note.text }}
+                        </slot>
+                    </QCardSection>
+                </QCard>
+            </template>
+        </VnPaginate>
+        <QPageSticky position="bottom-right" :offset="[25, 25]">
+            <QBtn
+                v-if="addNote"
+                color="primary"
+                icon="add"
+                size="lg"
+                round
+                @click="noteModal = true"
+            />
+        </QPageSticky>
+        <QDialog v-model="noteModal" persistent>
+            <QCard>
+                <QCardSection>
+                    <QItem class="q-px-none">
+                        <span class="text-primary text-h6 full-width">
+                            <QIcon name="draft" class="q-mr-xs" />
+                            {{ t('Add note') }}
+                        </span>
+                        <QBtn icon="close" flat round dense v-close-popup />
+                    </QItem>
+                </QCardSection>
+                <QCardSection>
+                    <QInput
+                        autofocus
+                        type="textarea"
+                        :hint="t('Add note here...')"
+                        filled
+                        size="lg"
+                        autogrow
+                        v-model="newNote"
+                    ></QInput>
+                </QCardSection>
+                <QCardActions class="justify-end q-mr-sm">
+                    <QBtn
+                        flat
+                        :label="t('globals.close')"
+                        color="primary"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :label="t('globals.save')"
+                        color="primary"
+                        v-close-popup
+                        @click="insert"
+                    />
+                </QCardActions>
+            </QCard>
+        </QDialog>
+    </div>
+</template>
+<style lang="scss" scoped>
+.q-card {
+    max-width: 80em;
+}
+.q-dialog .q-card {
+    width: 400px;
+}
+</style>
+<i18n>
+    es:
+        Add note here...: Añadir nota aquí...
+        Add note: Añadir nota
+</i18n>

src/components/ui/VnPaginate.vue

@@ -49,6 +49,7 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate']);
+defineExpose({ fetch });
 const isLoading = ref(false);
 const pagination = ref({
     sortBy: props.order,
@@ -82,7 +83,6 @@ async function fetch() {
     if (!arrayData.hasMoreData.value) {
         isLoading.value = false;
     }
-
     emit('onFetch', store.data);
 }
 

src/components/ui/VnSearchbar.vue

@@ -2,6 +2,8 @@
 import { onMounted, ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useArrayData } from 'composables/useArrayData';
+import { useQuasar } from 'quasar';
+const quasar = useQuasar();
 
 const props = defineProps({
     dataKey: {
@@ -93,7 +95,7 @@ async function search() {
             autofocus
         >
             <template #prepend>
-                <QIcon name="search" />
+                <QIcon name="search" v-if="!quasar.platform.is.mobile" />
             </template>
             <template #append>
                 <QIcon
@@ -112,13 +114,9 @@ async function search() {
 </template>
 
 <style lang="scss" scoped>
-.q-field {
-    width: 250px;
-}
-
 @media screen and (min-width: $breakpoint-sm-max) {
     .q-field {
-        width: 400px;
+        width: 450px;
     }
 }
 

src/filters/index.js

@@ -1,6 +1,7 @@
 import toLowerCase from './toLowerCase';
 import toDate from './toDate';
 import toDateString from './toDateString';
+import toDateHour from './toDateHour';
 import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
 import toLowerCamel from './toLowerCamel';
@@ -11,6 +12,7 @@ export {
     toLowerCamel,
     toDate,
     toDateString,
+    toDateHour,
     toCurrency,
     toPercentage,
     dashIfEmpty,

src/filters/toDateHour.js

@@ -0,0 +1,12 @@
+export default function toDateHour(date) {
+    const dateHour = new Date(date).toLocaleDateString('es-ES', {
+        timeZone: 'Europe/Madrid',
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+        second: '2-digit',
+    });
+    return dateHour;
+}

src/i18n/en/index.js

@@ -266,6 +266,7 @@ export default {
             rma: 'RMA',
             photos: 'Photos',
             log: 'Audit logs',
+            notes: 'Notes',
         },
         list: {
             customer: 'Customer',

src/i18n/es/index.js

@@ -265,6 +265,7 @@ export default {
             rma: 'RMA',
             photos: 'Fotos',
             log: 'Registros de auditoría',
+            notes: 'Notas',
         },
         list: {
             customer: 'Cliente',

src/pages/Claim/Card/ClaimCard.vue

@@ -3,11 +3,12 @@ import LeftMenu from 'components/LeftMenu.vue';
 import { getUrl } from 'composables/getUrl';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
-import { computed, onMounted } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import ClaimDescriptor from './ClaimDescriptor.vue';
 
+import { onMounted } from 'vue';
 const stateStore = useStateStore();
 const { t } = useI18n();
 const route = useRoute();
@@ -21,11 +22,6 @@ const $props = defineProps({
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-const claimSections = [
-    { name: 'Notes', url: '/note/index', icon: 'draft' },
-    { name: 'Development', url: '/development', icon: 'vn:traceability' },
-    { name: 'Action', url: '/action', icon: 'vn:actions' },
-];
 
 let salixUrl;
 onMounted(async () => {
@@ -49,17 +45,24 @@ onMounted(async () => {
             <QSeparator />
             <QList>
                 <QItem
-                    v-for="section in claimSections"
-                    :key="section.name"
                     active-class="text-primary"
-                    :href="salixUrl + section.url"
                     clickable
                     v-ripple
+                    :href="`${salixUrl}/development`"
                 >
                     <QItemSection avatar>
-                        <QIcon :name="section.icon" />
+                        <QIcon name="vn:traceability"></QIcon>
                     </QItemSection>
-                    <QItemSection> {{ t(section.name) }} </QItemSection>
+                    <QItemSection>{{ t('Development') }}</QItemSection>
+                </QItem>
+                <QItem
+                    active-class="text-primary"
+                    clickable
+                    v-ripple
+                    :href="`${salixUrl}/action`"
+                >
+                    <QItemSection avatar><QIcon name="vn:actions"></QIcon></QItemSection>
+                    <QItemSection>{{ t('Action') }}</QItemSection>
                 </QItem>
             </QList>
         </QScrollArea>

src/pages/Claim/Card/ClaimNotes.vue

@@ -0,0 +1,37 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useState } from 'src/composables/useState';
+import VnNotes from 'src/components/ui/VnNotes.vue';
+
+const route = useRoute();
+const state = useState();
+const user = state.getUser();
+const id = route.params.id;
+
+const claimFilter = {
+    where: { claimFk: id },
+    fields: ['created', 'workerFk', 'text'],
+    include: {
+        relation: 'worker',
+        scope: {
+            fields: ['id', 'firstName', 'lastName'],
+        },
+    },
+};
+
+const body = {
+    claimFk: id,
+    workerFk: user.value.id,
+};
+</script>
+<template>
+    <div class="col items-center">
+        <VnNotes
+            :add-note="true"
+            :id="id"
+            url="claimObservations"
+            :filter="claimFilter"
+            :body="body"
+        />
+    </div>
+</template>

src/router/modules/claim.js

@@ -11,7 +11,14 @@ export default {
     redirect: { name: 'ClaimMain' },
     menus: {
         main: ['ClaimList', 'ClaimRmaList'],
-        card: ['ClaimBasicData', 'ClaimLines', 'ClaimRma', 'ClaimPhotos', 'ClaimLog'],
+        card: [
+            'ClaimBasicData',
+            'ClaimLines',
+            'ClaimRma',
+            'ClaimPhotos',
+            'ClaimLog',
+            'ClaimNotes',
+        ],
     },
     children: [
         {
@@ -103,6 +110,15 @@ export default {
                     },
                     component: () => import('src/pages/Claim/Card/ClaimLog.vue'),
                 },
+                {
+                    name: 'ClaimNotes',
+                    path: 'notes',
+                    meta: {
+                        title: 'notes',
+                        icon: 'draft',
+                    },
+                    component: () => import('src/pages/Claim/Card/ClaimNotes.vue'),
+                },
             ],
         },
     ],

test/cypress/integration/ClaimNotes.spec.js

@@ -0,0 +1,17 @@
+/// <reference types="cypress" />
+describe('ClaimNotes', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit(`/#/claim/${2}/notes`);
+    });
+
+    it('should add a new note', () => {
+        const message = 'This is a new message.';
+        cy.get('.q-page-sticky button').click();
+        cy.get('.q-dialog .q-card__section:nth-child(2)').type(message);
+        cy.get('.q-card__actions button:nth-child(2)').click();
+        cy.get('.q-card .q-card__section:nth-child(2)')
+            .eq(0)
+            .should('have.text', message);
+    });
+});