surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- miglioramenti ricerca titoli e modifica del trafiletto

Browse Source 
- miglior visualizzazione delle liste
This commit is contained in:
Surya Paolo
2025-04-30 13:27:47 +02:00
parent 493ebf51f3
commit 358f0d6816
40 changed files with 1093 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/shared_vuejs.ts
View File

@@ -2403,11 +2403,12 @@ export const shared_consts = {
{ label: 'Totale Fatturati', value: 'totFat' },
{ label: 'Venduti Ultimi 3 Mesi', value: 'vLast3M' },
{ label: 'Venduti Ultimi 6 Mesi', value: 'vLast6M' },
{ label: 'Venduti Ultimo Anno', value: 'vLastY' },
{ label: 'Venduti Ultimo Anno', value: 'vLast1Y' },
{ label: 'Venduti Ultimi 2 Anni', value: 'vLast2Y' },
{ label: 'Fatturati Ultimi 3 Mesi', value: 'fatLast3M' },
{ label: 'Fatturati Ultimi 6 Mesi', value: 'fatLast6M' },
{ label: 'Fatturati Ultimo Anno', value: 'fatLast1Y' },
{ label: 'Fatturati Ultimi 2 Anno', value: 'fatLast2Y' },
{ label: 'Data Ultimo Ordine', value: 'dataUltimoOrdine' },
],

5
src/components/CCatalogoCard/CCatalogoCard.ts
View File

@@ -14,6 +14,7 @@ import { CPrice } from '../CPrice'
import { CText } from '../CText'
import { CLabel } from '@src/components/CLabel'
import { CSchedaProdotto } from '@src/components/CSchedaProdotto'
import { CModifTrafiletto } from '@src/components/CModifTrafiletto'
import { CBarCode } from '../CBarCode'
import { CTableCupleLabelValue } from '../CTableCupleLabelValue'
@@ -89,7 +90,7 @@ export default defineComponent({
},
components: {
CTitleBanner, CCardState, CCopyBtn, CMyValueDb, VuePdfApp, CPrice, CBarCode, CLabel,
CText, CViewTable, CTableCupleLabelValue, CSchedaProdotto
CText, CViewTable, CTableCupleLabelValue, CSchedaProdotto, CModifTrafiletto
},
setup(props, { emit }) {
const $q = useQuasar()
@@ -163,6 +164,7 @@ export default defineComponent({
const storeSelected = ref('')
const arrordersCart = ref(<IOrderCart[]>[])
const modifOn = ref(false)
const modifTrafiletto = ref(false)
const modifProd = ref(false)
const timerInterval = ref(<any>null)
@@ -788,6 +790,7 @@ export default defineComponent({
// refreshAllDataBookFromGM,
refreshSingleBookFromGM,
loading,
modifTrafiletto,
}
}
})

41
src/components/CCatalogoCard/CCatalogoCard.vue
View File

@@ -137,6 +137,27 @@
<q-item-label>Modifica</q-item-label>
</q-item-section>
</q-item>
<q-item
v-if="
(tools.isManager() || tools.isEditor()) &&
!optcatalogo.generazionePDFInCorso &&
(editOn || options.show_edit_book)
"
clickable
v-close-popup
@click="modifTrafiletto = true"
>
<q-item-section avatar>
<q-avatar
icon="fas fa-pencil-alt"
color="primary"
text-color="white"
/>
</q-item-section>
<q-item-section>
<q-item-label>Modifica Trafiletto</q-item-label>
</q-item-section>
</q-item>
<!--<q-item
v-if="
@@ -656,6 +677,26 @@
updateFieldToGM
</q-dialog>
<q-dialog
v-if="myproduct && modifTrafiletto"
v-model="modifTrafiletto"
maximized
>
<CModifTrafiletto
v-model="myproduct"
titolo="Trafiletto"
table="productinfos"
mykey="descr_trafiletto_catalogo"
:canModify="true"
:type="costanti.FieldType.editor_nohtml"
@updateproductmodif="updateproductmodif"
@close="modifTrafiletto = false"
:maxlength="800"
>
</CModifTrafiletto>
updateFieldToGM
</q-dialog>
<q-dialog
v-if="visufromgm && myproduct"
v-model="visufromgm"

23
src/components/CModifTrafiletto/CModifTrafiletto.scss Executable file
View File

@@ -0,0 +1,23 @@
.drag-handle {
cursor: grab; /* Mostra la manina */
}
.drag-handle:active {
cursor: grabbing; /* Cambia la manina quando l'utente sta trascinando */
}
.etichetta{
margin-top: 5px;
margin-bottom: 5px;
padding-top: 5px;
padding-bottom: 5px;
font-weight: bold;
font-size: 1.15rem;
}
.boxtitleval{
padding: 10px;
vertical-align: middle;
}

168
src/components/CModifTrafiletto/CModifTrafiletto.ts Executable file
View File

@@ -0,0 +1,168 @@
import { PropType, computed, defineComponent, onMounted, ref, watch } from "vue";
import draggable from 'vuedraggable'
import { tools } from '@tools'
import { useGlobalStore } from '@src/store/globalStore'
import { CMyEditorAI } from '@src/components/CMyEditorAI'
import { CAITools } from '@src/components/CAITools'
import { costanti } from '@costanti'
import type {
IMyScheda,
IProduct,
IRecFields
} from '@src/model';
import { shared_consts } from "app/src/common/shared_vuejs";
import { useProducts } from "app/src/store/Products";
import { useI18n } from "vue-i18n";
import { useQuasar } from "quasar";
export default defineComponent({
name: "CModifTrafiletto",
emits: ['updateproductmodif', 'close', 'Savedb'],
components: {
CMyEditorAI, CAITools
},
props: {
modelValue: {
type: Object as PropType<IProduct>,
required: true,
},
table: {
type: String,
required: true,
},
mykey: {
type: String,
required: true,
},
mysubkey: {
type: String,
required: false,
default: '',
},
titolo: {
type: String,
required: false,
default: '',
},
type: {
type: String,
required: false,
default: '',
},
canModify: {
type: Boolean,
required: false,
default: false,
},
maxlength: {
type: Number,
required: false,
default: 0,
}
},
setup(props, { emit }) {
// Copia locale della lista_prodotti per manipolazione interna
const $q = useQuasar()
const { t } = useI18n()
const globalStore = useGlobalStore()
const products = useProducts()
const mytab = ref('descr')
const loading = ref(false)
const updatetogm = ref(false)
const field_updated_toGM = ref('')
const myproduct = ref<IProduct>({ ...props.modelValue })
const id = computed(() => myproduct.value.productInfo._id)
const myvalue = computed<string>(() => {
return myproduct.value.productInfo[props.mykey]
})
watch(() => props.modelValue, (newVal) => {
myproduct.value = { ...newVal };
}, { deep: false });
async function mounted() {
}
/*
// Aggiorna la copia locale quando il prop cambia
watch(
() => props.lista_prodotti,
(newVal) => {
internalProducts.value = [...newVal];
}
);
*/
function updateproductmodif(element: any) {
// console.log('CModifTrafiletto updateproductmodif ', element)
emit('updateproductmodif', element)
}
function Savedb(element: any) {
tools.saveInDBForTypes($q, props.mykey, element, props.type, true, props.table, props.mysubkey, id.value, null, '');
}
async function updateproduct(load?: boolean) {
myproduct.value = await products.getProductById(myproduct.value._id, load)
}
const copyToClipboard = (text) => {
navigator.clipboard.writeText(text)
.then(() => {
$q.notify({
message: 'Testo copiato negli appunti!',
color: 'positive',
icon: 'check',
position: 'top'
});
})
.catch(err => {
console.error('Errore durante la copia:', err);
$q.notify({
message: 'Errore nella copia',
color: 'negative',
icon: 'error',
position: 'top'
});
});
};
onMounted(mounted)
return {
tools,
globalStore,
costanti,
shared_consts,
t,
products,
mytab,
myproduct,
updateproductmodif,
Savedb,
updatetogm,
field_updated_toGM,
loading,
copyToClipboard,
myvalue,
// refreshDataFromGM,
}
}
})

77
src/components/CModifTrafiletto/CModifTrafiletto.vue Executable file
View File

@@ -0,0 +1,77 @@
<template>
<q-card class="dialog_card">
<q-toolbar class="bg-primary text-white">
<q-toolbar-title> Modifica a {{ myproduct.productInfo.name }}</q-toolbar-title>
<q-btn
flat
round
color="white"
icon="close"
v-close-popup
></q-btn>
</q-toolbar>
<q-card-section class="q-pa-xs inset-shadow">
<div>
<q-inner-loading
id="spinner"
:showing="loading"
>
<q-spinner-tail
color="primary"
size="4em"
>
</q-spinner-tail>
</q-inner-loading>
<q-tabs
v-model="mytab"
inline-label
class="text-blue shadow-2"
>
<q-tab
label="Descrizioni"
name="descr"
icon="fas fa-align-left"
></q-tab>
</q-tabs>
<q-tab-panels
v-model="mytab"
animated
>
<q-tab-panel name="descr">
<q-btn
flat
round
dense
label="Copia la Risposta"
icon="content_copy"
@click="copyToClipboard"
v-tooltip="'Copia negli appunti'"
/>
<CAITools></CAITools>
<CMyEditorAI
v-if="modelValue"
v-model:value="myvalue"
:title="titolo"
@keyup.enter.stop
:showButtons="true"
:canModify="canModify"
:hideTools="true"
@update:value="updateproductmodif"
@showandsave="Savedb"
:maxlength="maxlength"
>
</CMyEditorAI>
</q-tab-panel>
</q-tab-panels>
</div>
</q-card-section>
</q-card>
</template>
<script lang="ts" src="./CModifTrafiletto.ts"></script>
<style lang="scss" scoped>
@import './CModifTrafiletto.scss';
</style>

1
src/components/CModifTrafiletto/index.ts Executable file
View File

@@ -0,0 +1 @@
export { default as CModifTrafiletto } from './CModifTrafiletto.vue'

2
src/components/CMyChipList/CMyChipList.scss
View File

@@ -1,6 +1,6 @@
.clchip{
display: flex;
justify-content: center;
justify-content: left;
//flex: 1;
//flex-direction: column;
}

23
src/components/CMyChipList/CMyChipList.vue
View File

@@ -1,15 +1,22 @@
<template>
<div class="row clchip">
<div v-for="(rec, index) in myarrvalues" :key="index" class="row items-center no-wrap">
<div class="text-caption text-weight-bold q-mr-sm">{{ label }}</div>
<div class="q-mb-sm">
<!-- Etichetta / Titolo -->
<div class="text-subtitle2 text-primary text-weight-medium q-mb-xs">
{{ label }}
</div>
<!-- Chips come valori -->
<div class="q-gutter-sm row wrap">
<q-chip
v-for="(rec, index) in myarrvalues"
:key="index"
:dense="dense"
class="clchip shadow-2"
:color="rec.color"
class="shadow-1 q-px-sm"
:color="rec.color || 'primary'"
text-color="white"
:icon="rec.icon"
:style="`border-radius: 10px;`"
>
:icon="rec.icon || undefined"
style="border-radius: 10px;"
>
{{ rec.label }}
</q-chip>
</div>

8
src/components/CMyEditor/CMyEditor.ts
View File

@@ -34,6 +34,11 @@ export default defineComponent({
required: false,
default: false,
},
hideTools: {
type: Boolean,
required: false,
default: false,
},
maxlength: {
type: Number,
required: false,
@@ -51,8 +56,6 @@ export default defineComponent({
const myvalue = ref('')
const mycolor = ref('')
const showeditor = ref(true)
const myfonts = ref({
arial: 'Arial',
arial_black: 'Arial Black',
@@ -157,7 +160,6 @@ export default defineComponent({
console.log('saveval', myvalue.value)
emit('showandsave', myvalue.value)
// emit('update:value', myvalue)
showeditor.value = false
}
function setcolor() {

7
src/components/CMyEditor/CMyEditor.vue
View File

@@ -13,19 +13,19 @@
color="white"
icon="close"
v-close-popup
@click="showeditor = false"
></q-btn>
</q-toolbar>
<q-card-section class="inset-shadow" style="padding: 4px !important">
<CTitleBanner v-if="title" :title="title"></CTitleBanner>
<form autocapitalize="off" autocomplete="off" spellcheck="false">
<q-toggle
v-if="!hideTools"
v-model="showtools"
:label="showtools ? $t('editor.hidetool') : $t('editor.showtool')"
@click="tools.setCookie('showtools', showtools ? '1' : '0')"
></q-toggle>
<br />
<q-btn v-if="showtools" rounded size="sm" color="primary">
<q-btn v-if="showtools && !hideTools" rounded size="sm" color="primary">
<q-icon name="colorize" class="cursor-pointer">
<q-popup-proxy>
<q-color v-model="mycolor" @change="setcolor"></q-color>
@@ -40,10 +40,11 @@
toolbar-toggle-color="yellow-8"
toolbar-bg="primary"
:readonly="!canModify"
:toolbar="showtools ? toolbarcomp : []"
:toolbar="showtools && !hideTools ? toolbarcomp : []"
:fonts="myfonts"
@update:model-value="changeval"
@paste="onPaste"
@keyup.esc.stop="visueditor = false"
@keyup.enter.stop
v-model="myvalue"
>

4
src/components/CMyEditorAI/CMyEditorAI.scss Executable file
View File

@@ -0,0 +1,4 @@
.myflex{
display: flex;
flex: 1;
}

275
src/components/CMyEditorAI/CMyEditorAI.ts Executable file
View File

@@ -0,0 +1,275 @@
import { tools } from '@tools'
import { CTitleBanner } from '../CTitleBanner'
import { defineComponent, onMounted, ref, toRef, watch } from 'vue'
import { useQuasar } from 'quasar'
export default defineComponent({
name: 'CMyEditorAI',
components: { CTitleBanner },
props: {
title: {
type: String,
required: false,
default: '',
},
value: {
type: String,
required: false,
default: '',
},
myclass: {
type: String,
required: false,
default: '',
},
showButtons: {
type: Boolean,
required: false,
default: true,
},
canModify: {
type: Boolean,
required: false,
default: false,
},
hideTools: {
type: Boolean,
required: false,
default: false,
},
maxlength: {
type: Number,
required: false,
default: 0,
}
},
setup(props, { emit }) {
const $q = useQuasar()
const editorRef = ref(<any>null)
const editor = ref('')
const characterCount = ref(0)
//const myvalue = toRef(props, 'value')
const myvalue = ref('')
const mycolor = ref('')
const myfonts = ref({
arial: 'Arial',
arial_black: 'Arial Black',
AGaramondProRegular: 'AGaramondPro-Regular',
comic_sans: 'Comic Sans MS',
courier_new: 'Courier New',
impact: 'Impact',
lucida_grande: 'Lucida Grande',
times_new_roman: 'Times New Roman',
verdana: 'Verdana',
})
const showtools = ref(false)
const toolbarcomp = ref([
['left', 'center', 'right', 'justify'],
['bold', 'italic', 'underline', 'strike'],
['token', 'hr', 'link', 'custom_btn', 'print', 'fullscreen'],
[
{
label: $q.lang.editor.formatting,
icon: $q.iconSet.editor.formatting,
list: 'no-icons',
options: [
'p',
'h4',
'h5',
'h6',
'code'
]
},
{
label: $q.lang.editor.fontSize,
icon: $q.iconSet.editor.fontSize,
fixedLabel: true,
fixedIcon: true,
list: 'no-icons',
options: [
'size-1',
'size-2',
'size-3',
'size-4',
'size-5',
'size-6',
'size-7'
]
},
{
label: $q.lang.editor.defaultFont,
icon: $q.iconSet.editor.font,
fixedIcon: true,
list: 'no-icons',
options: [
'default_font',
'arial',
'arial_black',
'comic_sans',
'courier_new',
'impact',
'lucida_grande',
'times_new_roman',
'verdana'
]
},
'removeFormat'
],
['quote', 'unordered', 'ordered', 'outdent', 'indent'],
['undo', 'redo', 'viewsource'],
])
watch(() => props.value, (newval, oldval) => {
if (props.value === undefined)
myvalue.value = ''
else
myvalue.value = props.value
})
function getTextLength(html: string) {
// Crea un elemento temporaneo per convertire HTML in testo
const div = document.createElement('div');
div.innerHTML = html; // Imposta l'HTML
return div.innerText.length; // Restituisce la lunghezza del testo
}
function changeval(newval: any) {
// console.log('myEditor: changeval', newval)
characterCount.value = getTextLength(newval)
emit('update:value', newval)
}
function annulla() {
emit('annulla', true)
}
function saveval() {
// Converti i <b> in <strong>
myvalue.value = tools.convertiTagHTMLPerBOT(myvalue.value)
console.log('saveval', myvalue.value)
emit('showandsave', myvalue.value)
// emit('update:value', myvalue)
}
function setcolor() {
document.execCommand('foreColor', false, mycolor.value)
}
/**
* Capture the <CTL-V> paste event, only allow plain-text, no images.
*
* see: https://stackoverflow.com/a/28213320
*
* @param {object} evt - array of files
* @author Daniel Thompson-Yvetot
* @license MIT
*/
function pasteCapture(evt: any) {
// let text, onPasteStripFormattingIEPaste
// evt.preventDefault()
// if (evt.originalEvent && evt.originalEvent.clipboardData.getData) {
// text = evt.originalEvent.clipboardData.getData('text/plain')
// $refs.editor_ref.runCmd('insertText', text)
// }
// else if (evt.clipboardData && evt.clipboardData.getData) {
// text = evt.clipboardData.getData('text/plain')
// $refs.editor_ref.runCmd('insertText', text)
// }
// else if (window.clipboardData && window.clipboardData.getData) {
// if (!onPasteStripFormattingIEPaste) {
// onPasteStripFormattingIEPaste = true
// $refs.editor_ref.runCmd('ms-pasteTextOnly', text)
// }
// onPasteStripFormattingIEPaste = false
// }
}
function mounted() {
if (props.value === undefined)
myvalue.value = ''
else
myvalue.value = props.value
showtools.value = tools.getCookie('showtools', '0') === '1'
characterCount.value = getTextLength(myvalue.value)
}
function onPaste(evt: any) {
// Let inputs do their thing, so we don't break pasting of links.
if (evt.target.nodeName === 'INPUT') return
let text, onPasteStripFormattingIEPaste
evt.preventDefault()
evt.stopPropagation()
if (evt.originalEvent && evt.originalEvent.clipboardData.getData) {
text = evt.originalEvent.clipboardData.getData('text/plain')
editorRef.value.runCmd('insertText', text)
}
else if (evt.clipboardData && evt.clipboardData.getData) {
text = evt.clipboardData.getData('text/plain')
editorRef.value.runCmd('insertText', text)
}
/*else if (ClipboardEvent.clipboardData && ClipboardEvent.clipboardData.getData) {
if (!onPasteStripFormattingIEPaste) {
onPasteStripFormattingIEPaste = true
editorRef.value.runCmd('ms-pasteTextOnly', text)
}
onPasteStripFormattingIEPaste = false
}*/
}
const copyToClipboard = (text) => {
navigator.clipboard.writeText(text)
.then(() => {
$q.notify({
message: 'Testo copiato negli appunti!',
color: 'positive',
icon: 'check',
position: 'top'
});
})
.catch(err => {
console.error('Errore durante la copia:', err);
$q.notify({
message: 'Errore nella copia',
color: 'negative',
icon: 'error',
position: 'top'
});
});
};
onMounted(mounted)
return {
myfonts,
toolbarcomp,
editor,
myvalue,
mycolor,
changeval,
annulla,
saveval,
setcolor,
pasteCapture,
tools,
onPaste,
editorRef,
showtools,
characterCount,
copyToClipboard,
}
}
})

86
src/components/CMyEditorAI/CMyEditorAI.vue Executable file
View File

@@ -0,0 +1,86 @@
<template>
<div>
<q-card class="dialog_card">
<q-toolbar
v-if="showButtons"
class="bg-primary text-white"
style="min-height: 30px"
>
<q-toolbar-title> Editor </q-toolbar-title>
<q-btn
flat
round
color="white"
icon="close"
v-close-popup
></q-btn>
</q-toolbar>
<q-card-section class="inset-shadow" style="padding: 4px !important">
<CTitleBanner v-if="title" :title="title"></CTitleBanner>
<form autocapitalize="off" autocomplete="off" spellcheck="false">
<q-toggle
v-if="!hideTools"
v-model="showtools"
:label="showtools ? $t('editor.hidetool') : $t('editor.showtool')"
@click="tools.setCookie('showtools', showtools ? '1' : '0')"
></q-toggle>
<br />
<q-btn v-if="showtools && !hideTools" rounded size="sm" color="primary">
<q-icon name="colorize" class="cursor-pointer">
<q-popup-proxy>
<q-color v-model="mycolor" @change="setcolor"></q-color>
</q-popup-proxy>
</q-icon>
</q-btn>
<q-editor
ref="editorRef"
content-class="wrap_anywhere"
toolbar-text-color="white"
toolbar-toggle-color="yellow-8"
toolbar-bg="primary"
:readonly="!canModify"
:toolbar="showtools && !hideTools ? toolbarcomp : []"
:fonts="myfonts"
@update:model-value="changeval"
@paste="onPaste"
@keyup.esc.stop="visueditor = false"
@keyup.enter.stop
v-model="myvalue"
>
</q-editor>
<div v-if="maxlength" class="text-gray text-italic">Caratteri: {{ characterCount }} / {{ maxlength }}</div>
</form>
</q-card-section>
<q-card-actions v-if="showButtons" align="center">
<q-btn
v-if="canModify"
:label="$t('dialog.save')"
color="primary"
@click="saveval"
></q-btn>
<q-btn
v-if="canModify"
flat
:label="$t('dialog.close')"
color="primary"
v-close-popup
@click="annulla"
></q-btn>
<q-btn
v-if="!canModify"
:label="$t('dialog.ok')"
color="primary"
v-close-popup
></q-btn>
</q-card-actions>
</q-card>
</div>
</template>
<script lang="ts" src="./CMyEditorAI.ts">
</script>
<style lang="scss" scoped>
@import './CMyEditorAI.scss';
</style>

1
src/components/CMyEditorAI/index.ts Executable file
View File

@@ -0,0 +1 @@
export {default as CMyEditorAI} from './CMyEditorAI.vue'

31
src/components/CMyPopupEdit/CMyPopupEdit.ts
View File

@@ -15,6 +15,7 @@ import { CCurrencyValue } from '../CCurrencyValue'
import { CMapEditAddressByCoord } from '../CMapEditAddressByCoord'
import { CInput } from '../CInput'
import { CMyEditor } from '../CMyEditor'
import { CMyEditorAI } from '../CMyEditorAI'
import { CGallery } from '../CGallery'
import { CSelectImage } from '../CSelectImage'
import { CAccomodation } from '../CAccomodation'
@@ -219,7 +220,7 @@ export default defineComponent({
},
},
components: {
CMyChipList, CDateTime, CDate, CMyToggleList, CMySelect, CMyEditor, CGallery,
CMyChipList, CDateTime, CDate, CMyToggleList, CMySelect, CMyEditor, CGallery, CMyEditorAI,
CCurrencyValue, CLabel, CAccomodation, CSelectImage, CMapEditAddressByCoord, CInput,
},
setup(props, { emit }) {
@@ -254,6 +255,27 @@ export default defineComponent({
minlength: props.mycol ? props.mycol.minlength : undefined
})
const copyToClipboard = (text) => {
navigator.clipboard.writeText(text)
.then(() => {
$q.notify({
message: 'Testo copiato negli appunti!',
color: 'positive',
icon: 'check',
position: 'top'
});
})
.catch(err => {
console.error('Errore durante la copia:', err);
$q.notify({
message: 'Errore nella copia',
color: 'negative',
icon: 'error',
position: 'top'
});
});
};
const { setValDb, getValDb } = MixinBase()
const { getMyUsername } = MixinUsers()
@@ -414,7 +436,7 @@ export default defineComponent({
}
function changevalRecOrig(newval: any, subcol: string = '') {
console.log('changevalRec', newval)
// console.log('changevalRec', newval)
// if (!props.insertMode || (props.insertMode && col.value.fieldtype !== costanti.FieldType.multioption)) {
if (col.value && col.value.allowchar === costanti.ALLOWCHAR_CODE) {
newval = tools.removespaces_slash(newval)
@@ -481,8 +503,7 @@ export default defineComponent({
}
function mounted() {
console.log('mounted CMyPopupEdit')
//console.log('mounted CMyPopupEdit')
myrow.value = props.rec && props.isrec ? { ...props.rec } : { ...props.row }
@@ -928,6 +949,7 @@ export default defineComponent({
}
}
onBeforeMount(mounted)
@@ -975,6 +997,7 @@ export default defineComponent({
handleKeydown,
handleCancel,
popupEditRef,
copyToClipboard,
}
}
})

65
src/components/CMyPopupEdit/CMyPopupEdit.vue
View File

@@ -183,6 +183,36 @@
</div>
</div>
</div>
<div v-else-if="col.fieldtype === costanti.FieldType.op_andor">
<div>
<q-select
v-if="isInModif"
v-model="myvalue"
:label="t('dialog.condition')"
:options="[
{ label: $t('dialog.conditionAND'), value: costanti.OP_ANDOR.OP_AND },
{ label: $t('dialog.conditionOR'), value: costanti.OP_ANDOR.OP_OR },
]"
emit-value
map-options
@update:model-value="changevalRec"
>
</q-select>
<span v-else>
<div class="text-subtitle2 text-primary text-weight-medium">
{{ $t('dialog.condition') }}
</div>
<q-chip
class="q-ma-md q-pa-sm"
:color="myvalue === costanti.OP_ANDOR.OP_AND ? 'red' : 'green'"
text-color="white"
:icon="myvalue === costanti.OP_ANDOR.OP_AND ? 'fas fa-filter' : 'fas fa-sliders-h'"
:label="myvalue === costanti.OP_ANDOR.OP_AND ? $t('dialog.conditionAND') : $t('dialog.conditionOR')"
></q-chip>
</span>
</div>
</div>
<div v-else-if="col.fieldtype === costanti.FieldType.string || col.fieldtype === costanti.FieldType.crypted">
<div
v-if="isInModif"
@@ -1072,6 +1102,22 @@
</q-checkbox>
<span v-html="visuValByType(myvalue, col, row)"></span>
</div>
<div v-else-if="col.fieldtype === costanti.FieldType.op_andor">
<q-select
v-model="scope.value"
:label="t('dialog.condition')"
:options="[
{ label: 'Filtra se Tutti i criteri sono veri (AND)', value: costanti.OP_ANDOR.OP_AND },
{ label: 'Filtra se almeno uno dei criteri è vero (OR)', value: costanti.OP_ANDOR.OP_OR },
]"
emit-value
map-options
:color="scope.value === costanti.OP_ANDOR.OP_AND ? 'red' : 'green'"
:icon="scope.value === costanti.OP_ANDOR.OP_AND ? 'fas fa-filter' : 'fas fa-sliders-h'"
@update:model-value="changevalRec"
>
</q-select>
</div>
<div
v-else-if="col.fieldtype === costanti.FieldType.string || col.fieldtype === costanti.FieldType.crypted"
>
@@ -1097,6 +1143,25 @@
</template>
</q-input>
</div>
<div v-else-if="col.fieldtype === costanti.FieldType.editor_nohtml">
<div
class="q-pa-md"
style="min-width: 600px;"
>
<CMyEditorAI
v-model:value="scope.value"
:title="col.visulabel ? t(col.label_trans) : visulabel ? addstrrequired + col.label : undefined"
@keyup.enter.stop
:showButtons="false"
:canModify="canModify"
:hideTools="true"
@update:value="changevalRec"
@showandsave="Savedb"
:maxlength="col.maxlength"
>
</CMyEditorAI>
</div>
</div>
<div v-else-if="col.fieldtype === costanti.FieldType.number">
<div v-if="visulabel">
<q-input

2
src/components/CMyRecCatalog/CMyRecCatalog.ts
View File

@@ -133,7 +133,7 @@ export default defineComponent({
if (myrec.value.editore) {
for (const receditore of myrec.value.editore) {
const rectrovato: IPublisher = products.publishers.find((editore: IPublisher) => editore._id === receditore)
editorestr.value += rectrovato.name + ' '
editorestr.value += rectrovato?.name + ' '
}
}

33
src/components/CProductTable/CProductTable.ts
View File

@@ -106,8 +106,8 @@ export default defineComponent({
// Colonne della tabella
const allColumns = [
{ name: "pos", label: "Pos", field: "pos", align: "left", style: "width: 50px" },
{ name: "drag", label: "Ordinam.", field: "", align: "left", style: "width: 50px", edit: true },
{ name: "pos", label: "Ind", field: "pos", align: "left", style: "width: 50px" },
{ name: "drag", label: "Ord", field: "", align: "left", style: "width: 50px", edit: true },
{ name: "image", label: "Foto", field: "image", align: "center" },
{ name: "name", label: "Titolo del Libro", field: "name", align: "left" },
{ name: "authors", label: "Autore", field: "authors", align: "left" },
@@ -125,11 +125,11 @@ export default defineComponent({
//{ name: "rank6M", label: "Class. 6M", field: "rank6M", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
//{ name: "rank1Y", label: "Class. 1Y", field: "rank1Y", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "pagine", label: "Pag.", field: "pagine", align: "right" },
{ name: "totVen", label: "Venduti", field: "totVen", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "totFat", label: "Fattur.", field: "totFat", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "totVen", label: "Vend", field: "totVen", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "fatLast6M", label: "Fat 6M", field: "fatLast6M", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "fatLast1Y", label: "Fat Anno", field: "fatLast1Y", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "fatLast1Y", label: "Fat 1A", field: "fatLast1Y", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "fatLast2Y", label: "Fat 2A", field: "fatLast2Y", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "totFat", label: "Fat 5A", field: "totFat", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "ult_ord", label: "Ult. Ordine", field: "ult_ord", align: "left", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "quantity", label: "Magazz.", field: "quantity", align: "right", visu: costanti.VISUCAMPI.PER_EDITORE },
{ name: "actions", label: "Azioni", field: "", align: "center", visu: costanti.VISUCAMPI.PER_EDITORE },
@@ -202,6 +202,9 @@ export default defineComponent({
case 'fatLast1Y':
return element.productInfo?.fatLast1Y;
case 'fatLast2Y':
return element.productInfo?.fatLast2Y;
case 'ult_ord':
return tools.getstrDate(element.productInfo?.dataUltimoOrdine);
@@ -254,6 +257,7 @@ export default defineComponent({
case 'totFat':
case 'fatLast6M':
case 'fatLast1Y':
case 'fatLast2Y':
default:
return '';
@@ -268,14 +272,12 @@ export default defineComponent({
height: '50px'
};
case 'rank3M':
case 'rank6M':
case 'rank1Y':
case 'pagine':
case 'totVen':
case 'totFat':
case 'fatLast6M':
case 'fatLast1Y':
case 'fatLast2Y':
case 'quantity':
return {
textAlign: 'right'
@@ -308,7 +310,15 @@ export default defineComponent({
// 3. Funzione per verificare se una colonna è visibile (isColumnVisible)
const isColumnVisible = (column) => {
const isColumnVisible = (column, real?: boolean) => {
if (column === 'actions' && !real) {
return false
}
if (internalProducts.value?.length > 1000) {
if (column === 'image') {
return false
}
}
const ok = allColumns.some((col) => col.name === column) && (!props.optcatalogo.showListaArgomenti || (props.optcatalogo.showListaArgomenti && !column.edit))
return selectedColumns.value.includes(column) && ok;
}
@@ -458,11 +468,6 @@ export default defineComponent({
case 'image':
return () => showProduct(element);
case 'name':
case 'authors':
case 'isbn':
return () => showProduct(element);
case 'stato':
return () => {
// esempio: mostra dettagli dello stato

4
src/components/CProductTable/CProductTable.vue
View File

@@ -12,7 +12,7 @@
option-value="name"
option-label="label"
filled
style="max-width: 400px"
style="max-width: 300px"
/>
</div>
@@ -108,7 +108,7 @@
{{ getFieldValue(element, field) }}
</td>
<!-- Azioni -->
<td v-else-if="field.name === 'actions' && isColumnVisible('actions')">
<td v-else-if="field.name === 'actions' && isColumnVisible('actions', true)">
<q-btn-dropdown
label="Azioni"
color="primary"

45
src/components/CSchedaProdotto/CSchedaProdotto.ts
View File

@@ -107,6 +107,26 @@ export default defineComponent({
debounce: "1000",
type: costanti.FieldType.number,
},
{
editOn: false,
label: "Fatturati ultimo Anno",
table: "productinfos",
id: myproduct.value.productInfo._id,
rec: myproduct.value.productInfo,
mykey: "fatLast1Y",
debounce: "1000",
type: costanti.FieldType.number,
},
{
editOn: false,
label: "Fatturati ultimi 2 Anni",
table: "productinfos",
id: myproduct.value.productInfo._id,
rec: myproduct.value.productInfo,
mykey: "fatLast2Y",
debounce: "1000",
type: costanti.FieldType.number,
},
{
editOn: false,
label: "Venduti",
@@ -142,13 +162,23 @@ export default defineComponent({
table: "productinfos",
id: myproduct.value.productInfo._id,
rec: myproduct.value.productInfo,
mykey: "vLastY",
mykey: "vLast1Y",
debounce: "1000",
type: costanti.FieldType.number,
},
{
editOn: false,
label: "Venduti Ultimi 2 Anni",
table: "productinfos",
id: myproduct.value.productInfo._id,
rec: myproduct.value.productInfo,
mykey: "vLast2Y",
debounce: "1000",
type: costanti.FieldType.number,
},
// SEZIONE RANKING (FATTURATI)
{
/*{
editOn: false,
label: "Ranking 3 Mesi",
table: "productinfos",
@@ -177,7 +207,7 @@ export default defineComponent({
mykey: "rank1Y",
debounce: "1000",
type: costanti.FieldType.number,
},
},*/
];
return arrlist
}
@@ -187,24 +217,27 @@ export default defineComponent({
{
editOn: true,
label: "Descrizione Trafiletto per Catalogo",
title: myproduct.value?.productInfo?.name,
table: "productinfos",
id: myproduct.value.productInfo._id, // ID dinamico, da sostituire con il valore reale
rec: myproduct.value.productInfo, // Oggetto dinamico, da sostituire con il valore reale
mykey: "descr_trafiletto_catalogo",
debounce: "1000",
type: costanti.FieldType.string,
type: costanti.FieldType.editor_nohtml,
dense: true,
showall: true,
},
{
editOn: true,
label: "Descrizione breve macro",
title: myproduct.value?.productInfo?.name,
table: "productinfos",
id: myproduct.value.productInfo._id, // ID dinamico, da sostituire con il valore reale
rec: myproduct.value.productInfo, // Oggetto dinamico, da sostituire con il valore reale
mykey: "descrizione_breve_macro",
maxlength: 650,
debounce: "1000",
type: costanti.FieldType.string,
type: costanti.FieldType.editor_nohtml,
dense: true,
showall: true,
},
@@ -295,7 +328,7 @@ export default defineComponent({
mykey: "idCatProds",
debounce: "1000",
type: costanti.FieldType.multiselect,
jointable: 'catprods',
jointable: 'catprtotali',
dense: true,
},
{

3
src/components/CSearchProduct/CSearchProduct.ts
View File

@@ -223,7 +223,7 @@ export default defineComponent({
searchList.value = [
{
visible: true,
label: 'Ricerca',
label: 'Cerca un Titolo o un Autore',
table: 'products',
key: 'titolo',
type: costanti.FieldType.select_by_server,
@@ -233,6 +233,7 @@ export default defineComponent({
useinput: true,
filter: null,
tablesel: 'products',
dense: false,
},
]

3
src/components/CSearchProduct/CSearchProduct.vue
View File

@@ -12,7 +12,7 @@
v-if="loadpage"
class="panel"
>
<div class="text-h6 text-bold text-blue text-center">Cerca un Titolo:</div>
<!--<div class="text-h6 text-bold text-blue text-center">Cerca un Titolo:</div>-->
<div
class="col"
v-for="(item, index) in searchList"
@@ -40,6 +40,7 @@
:filter="item.filter"
:filter_extra="item.filter_extra"
:useinput="item.useinput && item.type !== costanti.FieldType.select_by_server"
:dense="item.dense"
@searchOnGM="searchOnGM"
@clear="
item.value = '';

1
src/components/CTableCupleLabelValue/CTableCupleLabelValue.vue
View File

@@ -14,6 +14,7 @@
<div class="table-cell value-cell">
<CMyValueDb
:editOn="myrec.editOn"
:title="myrec.title"
:table="myrec.table"
:id="myrec.id"
:rec="myrec.rec"

1
src/model/CatalogStore.ts
View File

@@ -10,6 +10,7 @@ export interface ICatalog {
foto_collana?: IImg,
idCollane?: string[]
argomenti?: string[]
condition_andor: number,
editore?: string[]
collana_info?: ICollana
descr_introduttiva?: string

2
src/model/GlobalStore.ts
View File

@@ -822,6 +822,7 @@ export interface IMyScheda {
export interface IRecFields {
editOn?: boolean
label?: string
title?: string
table?: string
id?: string
rec?: any
@@ -1064,6 +1065,7 @@ export interface ISearchList {
filteradv?: boolean
filter_extra?: object
visible: boolean
dense?: boolean
}
export interface IOptGrid {

12
src/model/Products.ts
View File

@@ -57,7 +57,7 @@ export interface IProductInfo {
fatLast3M?: number,
fatLast6M?: number,
vLast6M?: number,
vLastY?: number,
vLast1Y?: number,
vLast2Y?: number,
dataUltimoOrdine?: Date,
rank3M?: number,
@@ -105,6 +105,10 @@ export interface IProdView {
id: string
}
export interface IOpAndOr {
condition_andor: number
}
export interface IProduct {
_id?: any
active?: boolean
@@ -243,6 +247,11 @@ export interface ICatPrTotali {
name: string,
quanti: number,
}
export interface ICollaneTotali {
_id: string,
name: string,
quanti: number,
}
export interface ICollana {
_id?: any
@@ -271,6 +280,7 @@ export interface IPublisher {
idapp?: string
name?: string
link?: string
quanti?: number
}
export interface ISubCatProd {

7
src/statics/lang/it.js
View File

@@ -104,6 +104,9 @@ const msg_it = {
subcart: '-{qta}',
origine: 'Origine',
ingredienti: 'Ingredienti',
descrizione_breve_macro: 'Descrizione Breve Macro',
descr_trafiletto_catalogo: 'Trafiletto per Cataloghi',
descrizione_completa_macro: 'Descrizione Estesa',
valori_nutrizionali: 'Valori Nutrizionali',
note: 'Note',
codice_EAN: 'EAN',
@@ -269,6 +272,9 @@ const msg_it = {
ricevo_dono_long: 'Evviva!!!<br><strong>QUESTO MOVIMENTO È REALE E POSSIBILE SE LO FACCIAMO FUNZIONARE TUTTI INSIEME !</strong>',
},
dialog: {
conditionAND: 'Filtra se Tutti i criteri sono veri (AND)',
conditionOR: 'Filtra se almeno uno dei criteri è vero (OR)',
condition: 'Condizione',
azzera: 'Azzera',
continue: 'Continuare',
close: 'Chiudi',
@@ -2024,6 +2030,7 @@ const msg_it = {
},
cataloglist: {
op_andor: 'Condizione',
casaeditrice: 'Casa Editrice',
numprodotti: 'Libri presenti',
foto_collana: 'Foto Catalogo',

7
src/store/Modules/costanti.ts
View File

@@ -482,6 +482,8 @@ export const costanti = {
cards: 16000,
color: 17000,
arrmenu: 18000,
op_andor: 19000,
editor_nohtml: 20000,
},
@@ -543,4 +545,9 @@ export const costanti = {
PER_ADMIN: 16,
},
OP_ANDOR: {
OP_OR: 0,
OP_AND: 1,
}
}

35
src/store/Modules/fieldsTable.ts
View File

@@ -150,19 +150,24 @@ export const colTableCatalogList = [
name: 'argomenti',
label_trans: 'cataloglist.argomenti',
fieldtype: costanti.FieldType.multiselect,
jointable: 'catprods',
jointable: 'catprtotali',
}),
AddCol({
name: 'condition_andor',
label_trans: 'cataloglist.op_andor',
fieldtype: costanti.FieldType.op_andor,
}),
AddCol({
name: 'idCollane',
label_trans: 'cataloglist.collane',
fieldtype: costanti.FieldType.multiselect,
jointable: 'collanas',
jointable: 'collanastotali',
}),
AddCol({
name: 'editore',
label_trans: 'cataloglist.editore',
fieldtype: costanti.FieldType.multiselect,
jointable: 'publishers',
jointable: 'publishers_totali',
}),
AddCol({ name: 'descr_introduttiva', label_trans: 'cataloglist.descr_introduttiva', fieldtype: costanti.FieldType.html, maxlength: 1300 }),
@@ -2587,6 +2592,9 @@ export const colTableProductInfos = [
AddCol({ name: 'date', label_trans: 'products.date', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'link_scheda', label_trans: 'products.link_scheda' }),
AddCol({ name: 'ingredienti', label_trans: 'products.ingredienti', fieldtype: costanti.FieldType.html }),
AddCol({ name: 'descrizione_breve_macro', label_trans: 'products.descrizione_breve_macro', fieldtype: costanti.FieldType.editor_nohtml }),
AddCol({ name: 'descrizione_completa_macro', label_trans: 'products.descrizione_completa_macro', fieldtype: costanti.FieldType.editor_nohtml }),
AddCol({ name: 'descr_trafiletto_catalogo', label_trans: 'products.descr_trafiletto_catalogo', fieldtype: costanti.FieldType.editor_nohtml }),
AddCol({ name: 'valori_nutrizionali', label_trans: 'products.valori_nutrizionali', fieldtype: costanti.FieldType.html }),
AddCol({ name: 'author', label_trans: 'products.author', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'collezione', label_trans: 'products.collezione', fieldtype: costanti.FieldType.string }),
@@ -4395,6 +4403,13 @@ export const fieldsTable = {
colkey: '_id',
collabel: 'name',
},
{
value: 'catprtotali',
label: 'Categorie',
columns: colTableCatProd,
colkey: '_id',
collabel: (row: any) => row.name + ' (' + row.quanti + ')',
},
{
value: 't_web_statiprodottos',
label: 'Stati Prodotto',
@@ -4423,6 +4438,13 @@ export const fieldsTable = {
colkey: '_id',
collabel: 'title',
},
{
value: 'collanastotali',
label: 'Collane Totali',
columns: colTableCollane,
colkey: '_id',
collabel: (row: any) => row.title + ' (' + row.quanti + ')',
},
{
value: 'publishers',
label: 'Nome',
@@ -4430,6 +4452,13 @@ export const fieldsTable = {
colkey: '_id',
collabel: 'name',
},
{
value: 'publishers_totali',
label: 'Nome',
columns: colTablePublisher,
colkey: '_id',
collabel: (row: any) => row.name + ' (' + row.quanti + ')',
},
{
value: 'catais',
label: 'Categorie AI',

26
src/store/Products.ts
View File

@@ -1,4 +1,4 @@
import type { IBaseOrder, ICart, IOrder, IOrderCart, IProduct, IProductsState, IProductInfo, ICatProd, IUserShort, IGasordine, IAuthor, ISubCatProd, IText, IOptCatalogo, ICatalog, ICatPrTotali, ISingleProductOrdered, ISchedaSingola, IMyScheda, IElementiScheda, T_Web_StatiProdotto, T_Web_Tipologie, T_WEB_TipiFormato, IPublisher } from 'model'
import type { IBaseOrder, ICart, IOrder, IOrderCart, IProduct, IProductsState, IProductInfo, ICatProd, IUserShort, IGasordine, IAuthor, ISubCatProd, IText, IOptCatalogo, ICatalog, ICatPrTotali, ISingleProductOrdered, ISchedaSingola, IMyScheda, IElementiScheda, T_Web_StatiProdotto, T_Web_Tipologie, T_WEB_TipiFormato, IPublisher, ICollaneTotali } from 'model'
import { Api } from '@api'
import { serv_constants } from '@src/store/Modules/serv_constants'
@@ -352,6 +352,15 @@ export const useProducts = defineStore('Products', {
return 0
},
getTotaliProdottiByIdCollana: (state: IProductsState) => (idCollana: string): number => {
const myfirstcat = state.collanetotali!.find((rec: ICollaneTotali) => rec._id === idCollana)
if (myfirstcat) {
return myfirstcat.quanti!
}
return 0
},
getSubCatProdsByGas: (state: IProductsState) => (idGasOrdine: string, idCatProd: string): ISubCatProd[] => {
let arrcat = state.subcatprods
@@ -696,7 +705,7 @@ export const useProducts = defineStore('Products', {
},
async loadProducts() {
async loadProducts(loadonlyifempty?: boolean) {
const userStore = useUserStore()
const globalStore = useGlobalStore()
@@ -712,6 +721,11 @@ export const useProducts = defineStore('Products', {
// return new Types.AxiosError(0, null, 0, '')
// }
if (loadonlyifempty) {
if (this.products?.length > 0)
return true
}
let ris = null
let myIdActiveSelected = userStore.my._id
@@ -1515,7 +1529,7 @@ export const useProducts = defineStore('Products', {
replacements['{collana}'] = tools.formatCollane(myproduct.productInfo.idCollana) || '';
}
const maxDescriptionLength = testo.maxlength ?? 100;
const maxDescriptionLength = testo.maxlength || 600;
if (testo.contenuto.includes('{descrizione_da_fdv}')) {
const description = myproduct.productInfo.short_descr || '';
@@ -1534,7 +1548,7 @@ export const useProducts = defineStore('Products', {
if (testo.contenuto.includes('{descrizione_estesa}')) {
let addtesto = false;
const long_descr_macro = myproduct.productInfo.descrizione_completa_macro || '';
if (long_descr_macro.length > maxDescriptionLength) {
if (long_descr_macro.length > maxDescriptionLength && maxDescriptionLength > 0) {
addtesto = true;
}
const addstrcontinua = '<span class="book-link">👉🏻 <a href="{link_macro}" target="_blank">continua a leggere</a></span>';
@@ -1550,14 +1564,14 @@ export const useProducts = defineStore('Products', {
if (testo.contenuto.includes('{descrizione_breve_macro}')) {
const short_descr = myproduct.productInfo.descrizione_breve_macro || '';
replacements['{descrizione_breve_macro}'] = short_descr.length > maxDescriptionLength
replacements['{descrizione_breve_macro}'] = short_descr.length > maxDescriptionLength && maxDescriptionLength > 0
? short_descr.substring(0, short_descr.lastIndexOf(' ', maxDescriptionLength)) + '...'
: short_descr;
}
if (testo.contenuto.includes('{descr_trafiletto_catalogo}')) {
const short_descr = myproduct.productInfo.descr_trafiletto_catalogo || '';
replacements['{descr_trafiletto_catalogo}'] = short_descr.length > maxDescriptionLength
replacements['{descr_trafiletto_catalogo}'] = short_descr.length > maxDescriptionLength && maxDescriptionLength > 0
? short_descr.substring(0, short_descr.lastIndexOf(' ', maxDescriptionLength)) + '...'
: short_descr;
}

3
src/store/globalStore.ts
View File

@@ -440,11 +440,14 @@ export const useGlobalStore = defineStore('GlobalStore', {
else if (table === 'departments') ris = state.departments
else if (table === 'categorys') ris = state.categories
else if (table === 'catprods') ris = Products.catprods
else if (table === 'catprtotali') ris = Products.catprtotali
else if (table === 'collanas') ris = Products.collane
else if (table === 'collanastotali') ris = Products.collane
else if (table === 'subcatprods') ris = Products.subcatprods
else if (table === 'catprods_gas') ris = Products.catprods_gas
else if (table === 'authors') ris = Products.authors
else if (table === 'publishers') ris = Products.publishers
else if (table === 'publishers_totali') ris = Products.publishers
else if (table === 't_web_statiprodottos') ris = Products.stati_prodotto
else if (table === 't_web_tipologies') ris = Products.tipologie
else if (table === 't_web_tipiformatos') ris = Products.tipoformato

2
src/views/admin/gestoreordini/gestoreordini.ts
View File

@@ -162,7 +162,7 @@ export default defineComponent({
storeGasordine.value = tools.getCookie(tools.COOK_SELGAS, '')
await userStore.newsletterload(false)
await productStore.loadProducts()
await productStore.loadProducts(true)
taborders.value = -1

2
src/views/ecommerce/cash/cash.ts
View File

@@ -78,7 +78,7 @@ export default defineComponent({
async function mounted() {
loadpage.value = false
await productStore.loadProducts()
await productStore.loadProducts(true)
cosa.value = tools.getCookie(tools.COOK_COSA_PRODOTTI, shared_consts.PROD.TUTTI, true)
// Inizializza
loadpage.value = true

110
src/views/ecommerce/catalogo/catalogo.ts
View File

@@ -26,6 +26,7 @@ import type {
IText,
ICollana,
IOptRigenera,
IOpAndOr,
} from 'model';
import {
IMyPage,
@@ -107,8 +108,8 @@ export default defineComponent({
}, { deep: false });
watch(optrigenera.value, (newVal) => {
tools.setCookie((showListaArgomenti.value ? 'INC_ES_' : '') +'VIS_DISP', newVal.visibilitaDisp);
tools.setCookie((showListaArgomenti.value ? 'INC_ES_' : '') +'VIS_STATO', newVal.stato);
tools.setCookie((showListaArgomenti.value ? 'INC_ES_' : '') + 'VIS_DISP', newVal.visibilitaDisp);
tools.setCookie((showListaArgomenti.value ? 'INC_ES_' : '') + 'VIS_STATO', newVal.stato);
if (showListaArgomenti.value)
calcArrProducts()
}, { deep: true });
@@ -243,12 +244,14 @@ export default defineComponent({
watch(() => cat.value, (newval, oldval) => {
if (loadpage.value) {
tools.setCookie(getKeyCatAtLoad(), cat.value.toString())
filter.value.author = '' // disattivo il filtro autore
resetSearch()
if (showListaArgomenti.value) {
if (loadpage.value) {
tools.setCookie(getKeyCatAtLoad(), cat.value.toString())
filter.value.author = '' // disattivo il filtro autore
resetSearch()
calcArrProducts()
calcArrProducts()
}
}
})
@@ -489,6 +492,7 @@ export default defineComponent({
editore: string[],
idCollane: string[],
arrargomstr: any[],
op_andor: IOpAndOr,
catstr: string,
gasselstr: string,
cosaValue: any,
@@ -505,7 +509,11 @@ export default defineComponent({
const boolfiltroVuotoidTipologie = filtroidTipologie.length === 0;
const boolfiltroVuotoEditore = editore.length === 0;
const boolfiltroVuotoCollane = idCollane.length === 0;
// const boolfiltroVuotoArgomenti = arrargomstr.length === 0;
const boolfiltroVuotoArgomenti = arrargomstr.length === 0;
const se_tutti_veri = op_andor.condition_andor === costanti.OP_ANDOR.OP_AND;
const trovatocatalogo = getCatalogoByMyPage.value
const arrris = products
.filter((product: IProduct) => {
@@ -536,20 +544,32 @@ export default defineComponent({
const lowerName = (product.productInfo.name || '').toLowerCase();
const lowerCode = (product.productInfo.code || '').toLowerCase();
const boolfiltroVuotoCat = product.productInfo.idCatProds?.length === 0
// Filtri per argomenti e categorie
let hasCategoria = false;
let hasArgomentiCat = true;
let hasCategoria = se_tutti_veri;
let hasArgomentiCat = se_tutti_veri;
if (arrargomstr && arrargomstr.length > 0) {
hasArgomentiCat = (product.productInfo.idCatProds || []).some((idCat: any) => arrargomstr.includes(idCat));
hasCategoria = true;
hasCategoria = se_tutti_veri;
} else {
if (catstr === costanti.NO_CATEGORY) {
hasCategoria = product.productInfo.idCatProds?.length === 0
if (!optcatalogo.value.showListaArgomenti) {
} else {
hasCategoria = !catstr || (catstr && (product.productInfo.idCatProds || []).includes(catstr));
hasCategoria = (catstr === costanti.NO_CATEGORY)
? (boolfiltroVuotoCat ? se_tutti_veri : product.productInfo.idCatProds.length === 0)
: !catstr || (product.productInfo.idCatProds || []).includes(catstr);
hasArgomentiCat = boolfiltroVuotoArgomenti
? se_tutti_veri
: hasArgomentiCat
}
}
/*hasArgomentiCat = boolfiltroVuotoArgomenti
? se_tutti_veri
: hasArgomentiCat*/
// Filtri per autore
const hasAuthor = !filtroAuthor || (product.productInfo.idAuthors || []).includes(filtroAuthor);
@@ -569,13 +589,13 @@ export default defineComponent({
// Filtri per editore
const hasPublished = boolfiltroVuotoEditore
? true
? se_tutti_veri
: editore.includes(product.productInfo.idPublisher);
// Filtri per collana
const hasCollana = boolfiltroVuotoCollane
? true
: (idCollane || []).includes(product.productInfo.idCollana?.toString())
? se_tutti_veri
: (idCollane || []).includes(product.productInfo.idCollana)
// Filtri per GAS
const productgassel = !gasselstr || (cosaValue === shared_consts.PROD.GAS && product.idGasordine === gasselstr);
@@ -589,20 +609,24 @@ export default defineComponent({
return codeMatch || allWordsPresent;
});
return (
searchMatch &&
hasAuthor &&
productgassel &&
hasidTipologie &&
// hasProductTypes &&
(
hasPublished &&
hasCollana &&
hasCategoria &&
hasArgomentiCat
)
// && !hasExcludeProductTypes
);
// Funzione che valuta un gruppo in base a OP_AND o OP_OR
// Raccolgo tutti i gruppi attivi
const filtri = [hasArgomentiCat, hasCategoria, hasCollana, hasPublished];
// Decido se combinare in AND o OR sulla base della scelta globale
let risult = searchMatch && hasAuthor && productgassel && hasidTipologie
if (op_andor.condition_andor === costanti.OP_ANDOR.OP_AND) {
risult = risult && filtri.every(Boolean); // Tutti i gruppi devono essere veri
} else {
risult = risult && filtri.some(Boolean)
}
return risult
// && !hasExcludeProductTypes
})
.sort((a, b) => getProductsSorted([a, b], sortField, sortDir)[0] === a ? -1 : 1);
@@ -654,6 +678,10 @@ export default defineComponent({
generalista = true
}*/
let op_andor: IOpAndOr = {
condition_andor: trovatocatalogo?.condition_andor !== undefined ? trovatocatalogo.condition_andor : costanti.OP_ANDOR.OP_AND,
}
if (!generalista && (trovatocatalogo?.lista_prodotti.length > 0)) {
arrprod = trovatocatalogo?.lista_prodotti
} else {
@@ -668,6 +696,7 @@ export default defineComponent({
filtroPublishers,
filtroCollane,
arrargomstr,
op_andor,
catstr,
gasselstr,
cosa.value,
@@ -749,6 +778,11 @@ export default defineComponent({
const gasselstr = cosa.value === shared_consts.PROD.GAS ? idGasSel.value || '' : '';
const trovatocatalogo = getCatalogoByMyPage.value
let op_andor: IOpAndOr = {
condition_andor: trovatocatalogo?.condition_andor ?? costanti.OP_ANDOR.OP_AND,
}
if (trovatocatalogo?.lista_prodotti.length > 0) {
arrprod = trovatocatalogo?.lista_prodotti
} else {
@@ -764,6 +798,7 @@ export default defineComponent({
filtroPublishers,
filtroCollane,
arrargomstr,
op_andor,
catstr,
gasselstr,
cosa.value,
@@ -785,7 +820,7 @@ export default defineComponent({
function getProductsSorted(arrprod: IProduct[], sort_field: string, sort_dir: number): IProduct[] {
if (sort_field) {
console.log('--- Primi 10 elementi INIZIALI:');
// console.log('--- Primi 10 elementi INIZIALI:');
arrprod.slice(0, 15).forEach((product, index) => {
console.log(
`${index + 1}. ${product.productInfo?.name} (${product.productInfo?.date_pub})`
@@ -817,7 +852,7 @@ export default defineComponent({
// logga i primi N elementi, mostrando il nome del prodotto (productInfo.name e la data di pibblicazione : productinfo.date_pub
if (sortedArr.length > 0) {
console.log('Primi 15 elementi ordinati: ***** ');
// console.log('Primi 15 elementi ordinati: ***** ');
sortedArr.slice(0, 15).forEach((product, index) => {
console.log(
`${index + 1}. ${product.productInfo?.name} (${product.productInfo?.date_pub})`
@@ -1053,15 +1088,16 @@ export default defineComponent({
generatinglist.value = true
cat.value = tools.getCookie(getKeyCatAtLoad(), '')
if (showListaArgomenti.value)
cat.value = tools.getCookie(getKeyCatAtLoad(), '')
tabcatalogo.value = tools.getCookie('TAB_CAT', 'visu')
optrigenera.value.visibilitaDisp = tools.getCookie((showListaArgomenti.value ? 'INC_ES_' : '') + 'VIS_DISP', costanti.DISP.DISPONIBILI)
optrigenera.value.stato = tools.getCookie((showListaArgomenti.value ? 'INC_ES_' : '') +'VIS_STATO', costanti.STATO.IN_COMMERCIO)
optrigenera.value.stato = tools.getCookie((showListaArgomenti.value ? 'INC_ES_' : '') + 'VIS_STATO', costanti.STATO.IN_COMMERCIO)
loadpage.value = false
await productStore.loadProducts()
await productStore.loadProducts(true)
mycolumns.value = fieldsTable.getArrColsByTable('products')
@@ -1120,7 +1156,7 @@ export default defineComponent({
);
}
// productStore.getTotaliProdottiByIdCollana(rec._id)
function onLoadScroll(index: number, done: any) {
if (index >= 1) {

115
src/views/ecommerce/catalogo/catalogo.vue
View File

@@ -8,10 +8,10 @@
{{ getTitoloCatalogo() }}
</div>
<div
v-if="ispageCatalogata && tools.isEditor()"
v-if="ispageCatalogata && tools.isEditor() && getCatalogoByMyPage?.referenti.length > 0"
class="text-h7 text-center text-red q-ma-sm"
>
{{$t('cataloglist.referenti')}}: <span class="text-bold">{{ getReferentiCatalogo() }}</span>
{{ $t('cataloglist.referenti') }}: <span class="text-bold">{{ getReferentiCatalogo() }}</span>
</div>
<q-tabs
v-if="optcatalogo.pdf && tools.isEditor()"
@@ -779,53 +779,70 @@
>
<q-card class="q-ma-md">
<q-card-section>
<div style="width: 500px">
<CMyValueDb
v-if="getCatalogoByMyPage"
:editOn="true"
:title="t('cataloglist.argomenti')"
table="catalogs"
:id="getCatalogoByMyPage._id"
:rec="getCatalogoByMyPage"
mykey="argomenti"
debounce="1000"
:type="costanti.FieldType.multiselect"
jointable="catprods"
class="q-mb-md"
:dense="false"
>
</CMyValueDb>
<CMyValueDb
v-if="getCatalogoByMyPage"
:editOn="true"
:title="t('cataloglist.collane')"
table="catalogs"
:id="getCatalogoByMyPage._id"
:rec="getCatalogoByMyPage"
mykey="idCollane"
debounce="1000"
:type="costanti.FieldType.multiselect"
jointable="collanas"
class="q-mb-md"
:dense="false"
>
</CMyValueDb>
<CMyValueDb
v-if="getCatalogoByMyPage"
:editOn="true"
:title="t('cataloglist.editore')"
table="catalogs"
:id="getCatalogoByMyPage._id"
:rec="getCatalogoByMyPage"
mykey="editore"
debounce="1000"
:type="costanti.FieldType.multiselect"
jointable="publishers"
class="q-mb-md"
:dense="false"
>
</CMyValueDb>
<div style="width: 600px; margin: 0 auto">
<div class="row">
<CMyValueDb
v-if="getCatalogoByMyPage"
:editOn="true"
table="catalogs"
:title="t('cataloglist.op_andor')"
:id="getCatalogoByMyPage._id"
:rec="getCatalogoByMyPage"
mykey="condition_andor"
debounce="1000"
:type="costanti.FieldType.op_andor"
class="q-mb-md"
:dense="false"
>
</CMyValueDb>
</div>
<div>
<CMyValueDb
v-if="getCatalogoByMyPage"
:editOn="true"
:title="t('cataloglist.argomenti')"
table="catalogs"
:id="getCatalogoByMyPage._id"
:rec="getCatalogoByMyPage"
mykey="argomenti"
debounce="1000"
:type="costanti.FieldType.multiselect"
jointable="catprods"
class="q-mb-md"
:dense="false"
>
</CMyValueDb>
<CMyValueDb
v-if="getCatalogoByMyPage"
:editOn="true"
:title="t('cataloglist.collane')"
table="catalogs"
:id="getCatalogoByMyPage._id"
:rec="getCatalogoByMyPage"
mykey="idCollane"
debounce="1000"
:type="costanti.FieldType.multiselect"
jointable="collanastotali"
class="q-mb-md"
:dense="false"
>
</CMyValueDb>
<CMyValueDb
v-if="getCatalogoByMyPage"
:editOn="true"
:title="t('cataloglist.editore')"
table="catalogs"
:id="getCatalogoByMyPage._id"
:rec="getCatalogoByMyPage"
mykey="editore"
debounce="1000"
:type="costanti.FieldType.multiselect"
jointable="publishers_totali"
class="q-mb-md"
:dense="false"
>
</CMyValueDb>
</div>
<q-btn-toggle
v-model="optrigenera.visibilitaDisp"

2
src/views/ecommerce/checkOut/checkOut.ts
View File

@@ -30,7 +30,7 @@ export default defineComponent({
async function mounted() {
// Inizializza
await productStore.loadProducts()
await productStore.loadProducts(true)
endload.value = true

2
src/views/ecommerce/orderInfo/orderInfo.ts
View File

@@ -496,7 +496,7 @@ export default defineComponent({
showWhichCode.value = tools.getCookie(tools.COOK_SHOWCODE, shared_consts.ShowCode.ALL, true)
await userStore.newsletterload(false)
await productStore.loadProducts()
await productStore.loadProducts(true)
updateorders(true)

2
src/views/ecommerce/productsList/productsList.ts
View File

@@ -156,7 +156,7 @@ export default defineComponent({
async function mounted() {
loadpage.value = false
await productStore.loadProducts()
await productStore.loadProducts(true)
cosa.value = tools.getCookie(tools.COOK_COSA_PRODOTTI, shared_consts.PROD.GAS, true)
if (cosa.value === shared_consts.PROD.TUTTI)
cosa.value = shared_consts.PROD.GAS

2
src/views/toolsAI/main/main.ts
View File

@@ -113,7 +113,7 @@ export default defineComponent({
async function mounted() {
loadpage.value = false
await productStore.loadProducts()
await productStore.loadProducts(true)
cosa.value = tools.getCookie(tools.COOK_COSA_PRODOTTI, shared_consts.PROD.TUTTI, true)
// Inizializza
loadpage.value = true