diff --git a/src/App.vue b/src/App.vue index bb56a9f4..d9402ad5 100755 --- a/src/App.vue +++ b/src/App.vue @@ -8,8 +8,6 @@ - -
@@ -22,6 +20,9 @@ + + +
diff --git a/src/components/CBarSelection/CBarSelection.scss b/src/components/CBarSelection/CBarSelection.scss index 9c36fa47..0cefc76b 100755 --- a/src/components/CBarSelection/CBarSelection.scss +++ b/src/components/CBarSelection/CBarSelection.scss @@ -49,13 +49,15 @@ .barselection { + padding: 0; + flex-wrap: nowrap; display: flex; align-items: center; - justify-content: space-around; + justify-content: space-between; } .myitem { - padding: 0px 6px 0px 6px !important; + padding: 0px 0px 0px 0px !important; } .myitem-0 { @@ -68,5 +70,9 @@ } .myitem-2 { + flex-grow: 0; +} + +.myitem-3 { flex-grow: 1; } diff --git a/src/components/CBarSelection/CBarSelection.ts b/src/components/CBarSelection/CBarSelection.ts index 19bda666..594680c7 100755 --- a/src/components/CBarSelection/CBarSelection.ts +++ b/src/components/CBarSelection/CBarSelection.ts @@ -39,6 +39,7 @@ import { CMyCardPopup } from '@/components/CMyCardPopup' import { CMyCardGrpPopup } from '@/components/CMyCardGrpPopup' import { CMyCardCircuitPopup } from '@/components/CMyCardCircuitPopup' import { useRouter } from 'vue-router' +import { table } from 'console' export default defineComponent({ name: 'CBarSelection', @@ -276,7 +277,7 @@ export default defineComponent({ } function visButtRow() { - return false + return true } function gotoPageSel() { @@ -286,6 +287,10 @@ export default defineComponent({ } } + function createNewRecordDialog() { + globalStore.addNewRecord = tablesel.value + } + created() onMounted(mounted) @@ -329,6 +334,7 @@ export default defineComponent({ optionsMainCards, tablesel, gotoPageSel, + createNewRecordDialog, } } }) diff --git a/src/components/CBarSelection/CBarSelection.vue b/src/components/CBarSelection/CBarSelection.vue index 132e293d..daaccb55 100755 --- a/src/components/CBarSelection/CBarSelection.vue +++ b/src/components/CBarSelection/CBarSelection.vue @@ -6,204 +6,195 @@
- -
+ >
-
-
-
- -
-
- - - -
+ + + + +
+ + - - + +
+ + - - - + + - - - + - -
-
+ (scope.opt && checkIfShowRec(scope.opt)) + " + > + + + {{ + scope.opt[fieldsTable.getLabelByTable(item.table)] || + scope.opt + }} + +
+ + + + + + diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 162cfcb3..cd52168b 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -55,10 +55,6 @@ export default defineComponent({ const globalStore = useGlobalStore() const userStore = useUserStore() - const myselector = ref({}) - - provide('myselector', myselector) - const arrfilterand: any = ref([]) const filtercustom: any = ref([]) const searchList_Servizi = ref([]) diff --git a/src/components/CFinder/CFinder.vue b/src/components/CFinder/CFinder.vue index 8566a448..2a871fe9 100755 --- a/src/components/CFinder/CFinder.vue +++ b/src/components/CFinder/CFinder.vue @@ -49,7 +49,6 @@ :nodataLabel="noMsgRecord" :prop_search="true" :finder="true" - :labelBtnAddExtra="noButtAdd ? `` : `Aggiungi ${strextra}`" :choose_visutype="visuType" :butt_modif_new="true && !noButtAdd" noresultLabel="Il filtro selezionato non ha trovato nessun risultato" @@ -58,11 +57,14 @@ :prop_searchList="searchList" :defaultnewrec="getdefaultnewrec" :selector="selector" + labelBtnAddRow="NONE" + :labelBtnAddExtra="noButtAdd ? `` : ``" :extraparams="extraparams()" > + globalStore.myselector) const valoriopt = computed(() => (item: any, addall: boolean, addnone: boolean) => { // console.log('valoriopt', item.table) @@ -341,9 +339,16 @@ export default defineComponent({ return lab }) + watch(() => globalStore.addNewRecord, (value: any, oldval: any) => { + if (globalStore.addNewRecord === props.prop_mytable) { + createNewRecordDialog() + globalStore.addNewRecord = '' + } + }) + watch(() => globalStore.myselector, (value: any, oldval: any) => { - console.log('******* CGRIDTABLEREC : globalStore.myselector', globalStore.myselector) - console.log(' . value', value) + // console.log('******* CGRIDTABLEREC : globalStore.myselector', globalStore.myselector) + // console.log(' . value', value) const rec = searchList.value.find((myrec) => myrec.table === globalStore.myselector.table) // check if exist if (rec) { rec.value = globalStore.myselector.data @@ -1854,7 +1859,7 @@ export default defineComponent({ } function visButtRow() { - return props.labelBtnAddRow !== addRow.value + return (props.labelBtnAddRow !== addRow.value) && props.labelBtnAddRow !== 'NONE' } function checkIfShowRec(rec: any) { @@ -2108,7 +2113,6 @@ export default defineComponent({ myinfscroll, t, exportTable, - myselector, } } }) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index d4b1ce2a..8aca001f 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -2,182 +2,258 @@
+ @click="createNewRecordDialog" + >
-
-
{{ mytitle }}
+
+
{{ mytitle }}
+ icon="fas fa-pencil-alt" + @update:model-value="changefuncAct" + @click="canEdit = !canEdit" + > + @click="createNewRecord" + >
- +
- +
-
- +
+ + + - - - - - - + + - - - - + + +
-
- +
- + @update:model-value="changeCol" + > -
-
{{ pagination.rowsNumber }} elemento trovato
-
{{ pagination.rowsNumber }} elementi trovati
+
+ {{ pagination.rowsNumber }} elemento trovato +
+
+ {{ pagination.rowsNumber }} elementi trovati +
- + - +
-
- - - {{ col.label }} - - + + {{ col.label }} +
- + v-if=" + showType === costanti.SHOW_MYCARD || + (myvertical !== costanti.VISUTABLE_USER_TABGROUP && + myvertical !== costanti.VISUTABLE_USER_TABCIRCUIT && + myvertical === costanti.VISUTABLE_LISTA && + shared_consts.TABLES_VISU_CMYSRECCARD.includes(tablesel)) + " + >
- -
- {{ actual = tools.getstrVeryShortDate(row.dateTimeStart) }} - {{ tools.getstrDateLong(row.dateTimeStart) }} +
+ {{ + (actual = tools.getstrVeryShortDate(row.dateTimeStart)) + }} + {{ tools.getstrDateLong(row.dateTimeStart) }}
@@ -267,10 +367,15 @@
+ v-else-if=" + (showType === costanti.SHOW_USERINFO && + myvertical !== costanti.VISUTABLE_SCHEDA_USER) || + (myvertical === 2 && + shared_consts.TABLES_VISU_LISTA_USER.includes(tablesel)) + " + class="fill-all-width" + >
-
-
+ v-else-if=" + (showType === costanti.SHOW_GROUPINFO && + myvertical !== costanti.VISUTABLE_SCHEDA_GROUP) || + (myvertical === 2 && tablesel === 'mygroups') + " + class="fill-all-width" + >
-
- - + + - {{ tools.isEntrataByRecMov(row) ? t('movement.movin') : t('movement.movout') }} + {{ + tools.isEntrataByRecMov(row) + ? t('movement.movin') + : t('movement.movout') + }} -
- +
+ v-if=" + showColCheck(col, tools.TIPOVIS_SHOW_RECORD, true, 1, row) + " + class="tdclass" + >
- + @showandsave="showandsel" + >
@@ -340,18 +466,20 @@
-
- - + v-model:selected="selected" + > -