diff --git a/src/components/CCatalogList/CCatalogList.ts b/src/components/CCatalogList/CCatalogList.ts index 270b6a34..bdaac6f9 100755 --- a/src/components/CCatalogList/CCatalogList.ts +++ b/src/components/CCatalogList/CCatalogList.ts @@ -38,6 +38,11 @@ export default defineComponent({ required: false, default: true, }, + isCatalogoGenerale: { + type: Boolean, + required: false, + default: false, + }, heightcarousel: { type: String, required: false, diff --git a/src/components/CCatalogList/CCatalogList.vue b/src/components/CCatalogList/CCatalogList.vue index d6f44beb..b45e1259 100755 --- a/src/components/CCatalogList/CCatalogList.vue +++ b/src/components/CCatalogList/CCatalogList.vue @@ -25,7 +25,7 @@ :noresultLabel="t('grid.nosearchfound')" :arrfilters="arrfilterand" :filtercustom="filtercustom" - :prop_searchList="tools.getsearchList_Cataloghi()" + :prop_searchList="tools.getsearchList_Cataloghi(isCatalogoGenerale)" :defaultnewrec="tools.getdefaultnewrec(table)" labelBtnAddRow="NONE" :prop_SortFieldsAvailable="mySortFieldsAvailable()" diff --git a/src/components/CGridOriz/CGridOriz.ts b/src/components/CGridOriz/CGridOriz.ts index e7f6df10..130032c5 100755 --- a/src/components/CGridOriz/CGridOriz.ts +++ b/src/components/CGridOriz/CGridOriz.ts @@ -49,6 +49,11 @@ export default defineComponent({ required: false, default: true, }, + isCatalogoGenerale: { + type: Boolean, + required: false, + default: false, + }, prop_modif: { type: Boolean, required: false, @@ -645,7 +650,7 @@ export default defineComponent({ ] - searchList_Cataloghi.value = tools.getsearchList_Cataloghi() + searchList_Cataloghi.value = tools.getsearchList_Cataloghi(isCatalogoGenerale) searchList_Hosp.value = [ { diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index be514526..28a1e0e2 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -2837,6 +2837,15 @@ export default defineComponent({ } } + function getisDettagliByCatalog() { + const rec = searchList.value.find((myrec) => myrec.table === shared_consts.TABLES_CATALOG && myrec.key === 'dettagli') + if (rec) { + return rec.value + } + + return false + } + created() @@ -2973,6 +2982,7 @@ export default defineComponent({ loadMore, onIntersection, showfilteradv, + getisDettagliByCatalog, } } }) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 059a712e..51d11211 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -569,6 +569,7 @@ v-else-if="tablesel === shared_consts.TABLES_CATALOG" :table="tablesel" :prop_myrec="row" + :dettagli="getisDettagliByCatalog()" :opt="opt" @cmdext="cmdExt" :editOn="editOn" @@ -910,6 +911,13 @@ + diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue index ff9da4f6..2996222d 100755 --- a/src/components/CMyEditElem/CMyEditElem.vue +++ b/src/components/CMyEditElem/CMyEditElem.vue @@ -210,7 +210,8 @@ addstr="px" @update:model-value="modifElem" > - + +
+
+
- +
+
- +
+
+
diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index 93ddd20e..4483f314 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -356,13 +356,15 @@ + :heightcard="myel.heightcard" :widthcard="myel.widthcard" + :isCatalogoGenerale="myel.parambool3"> diff --git a/src/components/CMyRecCatalog/CMyRecCatalog.ts b/src/components/CMyRecCatalog/CMyRecCatalog.ts index 2d0fa080..da1f0723 100755 --- a/src/components/CMyRecCatalog/CMyRecCatalog.ts +++ b/src/components/CMyRecCatalog/CMyRecCatalog.ts @@ -38,6 +38,11 @@ export default defineComponent({ required: false, default: false, }, + dettagli: { + type: Boolean, + required: false, + default: false, + }, margin_right: { type: Number, required: false, diff --git a/src/components/CMyRecCatalog/CMyRecCatalog.vue b/src/components/CMyRecCatalog/CMyRecCatalog.vue index 8192286c..0f35ded0 100755 --- a/src/components/CMyRecCatalog/CMyRecCatalog.vue +++ b/src/components/CMyRecCatalog/CMyRecCatalog.vue @@ -3,14 +3,9 @@ - --> - +
{{ myrec.title }}
-
+
{{ $t('cataloglist.numprodotti') }}: {{ numprodottistr }}
{{ $t('cataloglist.referenti') }}: @@ -59,28 +54,28 @@
{{ t('cataloglist.collane') }}: {{ collanestr }}
{{ $t('cataloglist.argomenti') }}: {{ argomentistr + ` (${numprodtot})` }}
{{ $t('cataloglist.casaeditrice') }}: {{ editorestr }}
Testo descrittivo: @@ -89,7 +84,7 @@ }}
Sfondo: @@ -98,7 +93,7 @@ }}
Copertina: @@ -119,7 +114,7 @@ (Data: {{ tools.getstrDate(myrec.data_generato) }})
Lista generata il: @@ -145,9 +140,9 @@
+ + {{ + setmeta({ + title: 'Lista Cron', + description: '', + keywords: '', + }) + }} + + +
+ + + + +
+ + + + diff --git a/src/router/routesAdmin.ts b/src/router/routesAdmin.ts index 535adfb1..b74a6f08 100644 --- a/src/router/routesAdmin.ts +++ b/src/router/routesAdmin.ts @@ -344,6 +344,19 @@ function getRoutesAd(site: ISites) { level_child: 0.5, onlyAdmin: true, }, + { + active: true, + order: 32, + path: '/admin/lista_crons', + materialIcon: 'fas fa-clock', + name: 'otherpages.admin.lista_cron', + component: () => import('@src/rootgen/admin/lista_cron/lista_cron.vue'), + inmenu: true, + submenu: true, + level_parent: 0, + level_child: 0.5, + onlyAdmin: true, + }, { active: true, order: 30, diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 47896c4c..296fc8ad 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -174,6 +174,7 @@ const msg_it = { pages: 'Pagine', Home: 'Pagina Home', elems: 'Elementi Pagine', + lista_cron: 'Lista Cron', operators: 'Operatori', disciplines: 'Discipline', media: 'Media', @@ -2047,6 +2048,7 @@ const msg_it = { img_bordata_stampa: 'Immagine di sfondo (per STAMPA)', img_intro_stampa: 'Copertina introduttiva (per STAMPA)', pagina_introduttiva_sfondo_nero: 'Pagina intro a sfondo nero', + isCatalogoGenerale: 'Fa parte del Catalogo Generale', collane: 'Collane', idPageAssigned: 'Pagina Assegnata', idPageAssigned_stampa: 'Pagina Assegnata (per STAMPA)', @@ -2094,7 +2096,20 @@ const msg_it = { destnewsletter: { descr: 'Descrizione', tipodest_id: 'Tipo Destinatario', - } + }, + + cron: { + active: 'Attivato', + descr: 'Descrizione', + nomeFunzioneDbOp: 'Nome Funzione DB', + startTime: 'Ora Inizio', + everyXMinutes: 'Ogni X Minuti', + quanteVolteEseguiAlGG: 'Tot al GG', + lastJobStarted: 'Ultimo Job Iniziato', + lastJobEnd: 'Ultimo Job Completato', + eseguito: 'Eseguito', + status: 'Stato', + }, }, }; diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 3ba4b3cd..abcd6aa3 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -147,6 +147,7 @@ export const colTableCatalogList = [ fieldtype: costanti.FieldType.select, jointable: 'mypages_id', }), + AddCol({ name: 'isCatalogoGenerale', label_trans: 'cataloglist.isCatalogoGenerale', fieldtype: costanti.FieldType.boolean }), AddCol({ name: 'argomenti', label_trans: 'cataloglist.argomenti', @@ -370,6 +371,21 @@ export const colmyelCatalogo = [ ] +export const colcrons = [ + AddCol({ name: 'active', label_trans: 'cron.active', fieldtype: costanti.FieldType.boolean }), + AddCol({ name: 'descr', label_trans: 'cron.descr', fieldtype: costanti.FieldType.string }), + AddCol({ name: 'status', label_trans: 'cron.status', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'nomeFunzioneDbOp', label_trans: 'cron.nomeFunzioneDbOp', fieldtype: costanti.FieldType.string }), + AddCol({ name: 'startTime', label_trans: 'cron.startTime', fieldtype: costanti.FieldType.string }), + AddCol({ name: 'everyXMinutes', label_trans: 'cron.everyXMinutes', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'quanteVolteEseguito', label_trans: 'cron.eseguito', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'quanteVolteEseguiAlGG', label_trans: 'cron.quanteVolteEseguiAlGG', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'lastJobStarted', label_trans: 'cron.lastJobStarted', fieldtype: costanti.FieldType.date }), + AddCol({ name: 'lastJobEnd', label_trans: 'cron.lastJobEnd', fieldtype: costanti.FieldType.date }), + AddCol({ name: 'log', label_trans: 'cron.log', fieldtype: costanti.FieldType.string }), + // AddCol({ name: 'date_created', label_trans: 'cron.date_created', fieldtype: costanti.FieldType.date }), +] + export const colmyelems = [ AddCol({ name: 'active', label_trans: 'myelems.active', fieldtype: costanti.FieldType.boolean }), AddCol({ name: 'path', label_trans: 'myelems.path' }), @@ -4603,6 +4619,13 @@ export const fieldsTable = { colkey: '_id', collabel: 'title', }, + { + value: 'crons', + label: 'Lista Cron', + columns: colcrons, + colkey: '_id', + collabel: 'title', + }, { value: 'catalogo', label: 'Elementi Catalogo', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 1786c201..26d86330 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -9828,7 +9828,7 @@ export const tools = { return (!userStore.isEditor && !userStore.isCommerciale && !userStore.isAdmin && !userStore.isManager & !userStore.isGrafico) }, - getsearchList_Cataloghi() { + getsearchList_Cataloghi(isCatalogoGenerale: boolean) { const lista = [ { visible: !this.isUtente(), @@ -9857,6 +9857,34 @@ export const tools = { useinput: false, icon: 'fas fa-globe' }, + { + visible: !this.isUtente(), + label: 'Solo Catalogo Generale', + key: 'isCatalogoGenerale', + type: costanti.FieldType.boolean, + value: this.isUtente() ? isCatalogoGenerale: this.getCookie(this.COOK_SEARCH + costanti.FILTER_SEP + shared_consts.TABLES_CATALOG + costanti.FILTER_SEP + 'isCatalogoGenerale', isCatalogoGenerale), + keycookie: '', + addall: true, + arrvalue: [], + filter: null, + useinput: false, + icon: 'fas fa-bookmark' + }, + { + visible: !this.isUtente(), + label: 'Dettagli', + table: shared_consts.TABLES_CATALOG, + key: 'dettagli', + notinsearch: true, // non usarlo nella ricerca filtro + type: costanti.FieldType.boolean, + value: this.isUtente() ? false: this.getCookie(this.COOK_SEARCH + costanti.FILTER_SEP + shared_consts.TABLES_CATALOG + costanti.FILTER_SEP + 'dettagli', true), + keycookie: '', + addall: true, + arrvalue: [], + filter: null, + useinput: false, + icon: 'fas fa-info-circle' + }, ] console.log('getsearchList_Cataloghi', lista) diff --git a/src/store/Modules/toolsext.ts b/src/store/Modules/toolsext.ts index 67e3ea14..9e28812e 100755 --- a/src/store/Modules/toolsext.ts +++ b/src/store/Modules/toolsext.ts @@ -88,6 +88,7 @@ export const toolsext = { TABGROUPS: 'groups', TABMYPAGE: 'mypages', TABMYELEMS: 'myelems', + TABCRONS: 'crons', TABMYBOT: 'bots', TABCALZOOM: 'calzoom', TABTEMPLEMAIL: 'templemail', diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index ee22ba77..d871f285 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -1891,8 +1891,8 @@ export const useGlobalStore = defineStore('GlobalStore', { if (page.loadFirst) page.loaded = true } - this.myelems = [] this.myelems = (res.data.myelems) ? [...res.data.myelems] : [] + this.crons = (res.data.crons) ? [...res.data.crons] : [] this.myschedas = [] this.myschedas = (res.data.myschedas) ? [...res.data.myschedas] : [] // console.log('this.mypage', this.mypage) diff --git a/src/views/admin/dbopmacro/dbopmacro.vue b/src/views/admin/dbopmacro/dbopmacro.vue index d8c4c579..767914c1 100755 --- a/src/views/admin/dbopmacro/dbopmacro.vue +++ b/src/views/admin/dbopmacro/dbopmacro.vue @@ -47,6 +47,11 @@ color="accent" @click="EseguiFunz('updateAllBook', {usaDBGMLocale: false, caricatutti: true})" > +