Aggiungere "San Marino" e suoi comuni

Corretto Filtro a mano della ricerca
Creare filtro ricerca per trovare la sottocategoria o categoria -> Skill e SubSkill

src/components/CGridTableRec/CGridTableRec.ts

@@ -20,6 +20,7 @@ import { lists } from '@store/Modules/lists'
 import { IParamsQuery } from 'model'
 import { CMyPopupEdit } from '../CMyPopupEdit'
 import { CMyFriends } from '../CMyFriends'
+import { CMyUser } from '../CMyUser'
 import { CMyGroups } from '../CMyGroups'
 import { CMyFieldDb } from '../CMyFieldDb'
 import { CMySelect } from '../CMySelect'
@@ -172,6 +173,16 @@ export default defineComponent({
       required: false,
       default: '',
     },
+    col_footer: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    col_tabfooter: {
+      type: String,
+      required: false,
+      default: '',
+    },
     showCol: {
       type: Boolean,
       required: false,
@@ -193,7 +204,7 @@ export default defineComponent({
       default: '',
     },
   },
-  components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups },
+  components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups, CMyUser },
   setup(props, { emit }) {
     const $q = useQuasar()
     const { t } = useI18n()
@@ -342,6 +353,8 @@ export default defineComponent({
         if (userId === userStore.my._id) {
           // E' il mio, quindi modificalo
           return true
+        } else {
+          return false
         }
       } else {
         return false
@@ -878,9 +891,7 @@ export default defineComponent({
       pagination.value = props.prop_pagination
 
       myvertical.value = props.vertical
-      if (props.finder) {
-        myvertical.value = tools.getCookie('myv', 0)
-      }
+      myvertical.value = tools.getCookie('myv_' + props.prop_mytable, props.vertical)
     }
 
     function mounted() {
@@ -1019,7 +1030,7 @@ export default defineComponent({
 
     function checkIfColShow(field: string | undefined) {
       let vis = true
-      if (props.prop_mytable === 'myskills' && !props.prop_search) {
+      if (shared_consts.TABLES_NOT_SHOW_IF_USERNAME.includes(props.prop_mytable) && !props.prop_search) {
         if (field === 'username') {
           vis = false
         }
@@ -1333,6 +1344,17 @@ export default defineComponent({
       return ''
     }
 
+    function getLabelFooterByRow(row: any) {
+      if (props.col_footer) {
+
+        let mycol = fieldsTable.getColByTable(tablesel.value, props.col_footer)
+        if (mycol) {
+          return tools.getValueByRemoteField(mycol, row, row[props.col_footer], props.col_tabfooter)
+        }
+      }
+      return ''
+    }
+
     // onMounted(mounted)
 
     created()
@@ -1413,6 +1435,7 @@ export default defineComponent({
       showColCheck,
       getValueExtra,
       shared_consts,
+      getLabelFooterByRow,
     }
   }
 })

src/components/CGridTableRec/CGridTableRec.vue

@@ -247,13 +247,13 @@
 
         <div v-if="choose_visutype" class="">
           <q-radio v-model="myvertical" :val="2" label="Lista"
-                   @update:model-value="tools.setCookie('myv', myvertical) "/>
+                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
           <q-radio v-if="mytable === toolsext.TABMYGROUPS" v-model="myvertical" :val="costanti.VISUTABLE_SCHEDA_GROUP" label="Scheda"
-                   @update:model-value="tools.setCookie('myv', myvertical) "/>
+                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
           <q-radio v-else v-model="myvertical" :val="costanti.VISUTABLE_SCHEDA_USER" label="Scheda"
-                   @update:model-value="tools.setCookie('myv', myvertical) "/>
-          <q-radio v-model="myvertical" :val="0" label="Tabella"
-                   @update:model-value="tools.setCookie('myv', myvertical) "/>
+                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
+          <q-radio v-if="$q.screen.gt.xs" v-model="myvertical" :val="0" label="Tabella"
+                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
         </div>
       </template>
 
@@ -303,8 +303,18 @@
       </template>
 
       <template v-slot:item="props">
-        <div v-if="((showType === costanti.SHOW_USERINFO) && myvertical !== costanti.VISUTABLE_SCHEDA_USER) || ((myvertical === 2) && (tablesel === 'users' || tablesel === 'myskills'))" class="fill-all-width">
+        <div v-if="((showType === costanti.SHOW_USERINFO) && myvertical !== costanti.VISUTABLE_SCHEDA_USER) || ((myvertical === 2) && (shared_consts.TABLES_VISU_LISTA_USER.includes(tablesel)))" class="fill-all-width">
           <div>
+            <CMyUser
+              :mycontact="props.row"
+              :visu="visufind"
+              :groupname="extrafield"
+              :labelextra="col_title ? props.row[col_title] : ''"
+              :labelFooter="col_footer ? getLabelFooterByRow(props.row) : ''"
+            >
+            </CMyUser>
+
+            <!--
             <CMyFriends
               v-model="filter"
               :finder="false"
@@ -313,6 +323,8 @@
               :groupname="extrafield"
               :labelextra="props.row[col_title]"
             />
+            -->
+            <q-separator></q-separator>
           </div>
 
         </div>
@@ -330,12 +342,14 @@
         </div>
         <div
           v-else
-          class="q-pa-xs col-xs-12 col-sm-6 col-md-4 col-lg-3 grid-style-transition"
+          class="q-pa-xs col-xs-12 col-sm-6 col-md-4 col-lg-3 "
           :style="props.selected ? 'transform: scale(0.95);' : ''"
         >
-          <q-card :class="props.selected ? 'bg-grey-2 my-card' : 'my-card'">
-            <q-bar v-if="!visuinpage" dense class="bg-primary text-white full-height">
-              <span class=""> {{ props.row[col_title] }} </span>
+
+          <q-card :class="props.selected ? 'bg-grey-2 my-card-withshadow no-padding' : 'my-card-withshadow no-padding'"
+                  style="background: radial-gradient(circle, #ffffff 0%, #bbddff 100%)">
+            <q-bar v-if="!visuinpage && canModifyThisRec(props.row)" dense class="bg-primary text-white full-height">
+              <span v-if="props.row['username']">{{props.row['username']}}</span>
               <q-space/>
 
               <q-btn
@@ -352,7 +366,8 @@
                 {{ props.row[col_title] }}
               </q-toolbar-title>
             </q-toolbar>-->
-            <q-card-section class="inset-shadow">
+
+            <q-card-section class="">
               <q-list dense>
                 <div v-for="col in mycolumns" :key="col.name">
                   <q-item v-if="showColCheck(col, tools.TIPOVIS_SHOW_RECORD, false, tools.getValue(props.row,col.field, col.subfield))"
@@ -438,7 +453,7 @@
         </div>
       </div>
     </div>
-    <q-dialog v-model="newRecordBool" @hide="hidewindow">
+    <q-dialog v-model="newRecordBool" @hide="hidewindow" :maximized="true">
       <q-card class="dialog_card">
         <q-bar dense class="bg-primary text-white">
           Nuovo:
@@ -483,8 +498,7 @@
     <q-dialog v-model="editRecordBool">
       <q-card class="dialog_card">
         <q-bar dense class="bg-primary text-white full-height">
-          <span v-if="mytitle">{{ mytitle }}</span>
-          <span v-else>{{ recModif[col_title] }}</span>
+          <span class="ellipsis">{{ recModif[col_title] }}</span>
           <q-space/>
           <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
         </q-bar>