La foto non si carica bene sul server.

L'immagine della Bacheca metterla in fondo. Creare un'area LAVORO ed un'area BACHECA. Poter contattare la persona dalla pagina che si apre. Riscritto visualizzazione della Card Competenza
2022-02-17 00:44:52 +01:00
parent ec410c32d5
commit dedf35c659
62 changed files with 1311 additions and 229 deletions
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -23,6 +23,7 @@ import { CMyFriends } from '../CMyFriends'
 import { CMyUser } from '../CMyUser'
 import { CMyGroups } from '../CMyGroups'
 import { CMyFieldDb } from '../CMyFieldDb'
+import { CMyRecCard } from '../CMyRecCard'
 import { CMySelect } from '../CMySelect'
 import { CTitleBanner } from '../CTitleBanner'

@@ -32,7 +33,7 @@ import { useQuasar } from 'quasar'
 import { costanti } from '@costanti'
 import translate from '@/globalroutines/util'
 import { toolsext } from '@store/Modules/toolsext'
-import { CMySkill } from '@/components/CMySkill'
+import { CMyCardPopup } from '@/components/CMyCardPopup'

 export default defineComponent({
  name: 'CGridTableRec',
@@ -205,7 +206,7 @@ export default defineComponent({
      default: '',
    },
  },
-  components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups, CMyUser, CMySkill },
+  components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups, CMyUser, CMyRecCard, CMyCardPopup },
  setup(props, { emit }) {
    const $q = useQuasar()
    const { t } = useI18n()
@@ -233,6 +234,9 @@ export default defineComponent({

    const loading = ref(false)

+    const visupagedialog = ref(false)
+    const myrecdialog = ref(null)
+
    const startsearch = ref(false)

    const serverData: any = ref([])
@@ -282,7 +286,7 @@ export default defineComponent({
    })

    watch(() => searchList.value, (to: any, from: any) => {
-      console.log('watch searchlist', to)
+      // console.log('watch searchlist', to)
      refresh()
    })

@@ -291,12 +295,12 @@ export default defineComponent({
    })

    watch(() => props.filtercustom, (to: any, from: any) => {
-      console.log('filtercustom', to)
+      // console.log('filtercustom', to)
      refresh()
    })

    function searchval(newval: any, table: any) {
-      console.log('searchval', newval, table)
+      // console.log('searchval', newval, table)
      tools.setCookie(tools.COOK_SEARCH + table, newval)

      if (table === 'skills') {
@@ -317,9 +321,9 @@ export default defineComponent({
            const recSkill = searchList.value.find((rec) => rec.table === 'skills')
            let trovato = false
            if (recSkill) {
-              console.log('recSkill.value', recSkill)
+              // console.log('recSkill.value', recSkill)
              const arrvalues = valoriopt.value(recSkill.value, false)
-              console.log('arrvalues', arrvalues)
+              // console.log('arrvalues', arrvalues)
              if (arrvalues)
                trovato = arrvalues.find((rec: any) => rec[recSkill.key] === valsaved)
            }
@@ -579,8 +583,8 @@ export default defineComponent({
      emit('savefilter', myfilterand)
    }

-    function onRequest(props: any) {
-      const { page, rowsPerPage, rowsNumber, sortBy, descending } = props.pagination
+    function onRequest(myprops: any) {
+      const { page, rowsPerPage, rowsNumber, sortBy, descending } = myprops.pagination
      const myfilternow = myfilter.value
      const myfilterandnow = myfilterand.value

@@ -1055,11 +1059,11 @@ export default defineComponent({

    function checkIfColShow(field: string | undefined) {
      let vis = true
-      if (shared_consts.TABLES_NOT_SHOW_IF_USERNAME.includes(props.prop_mytable) && !props.prop_search) {
+      /*if (shared_consts.TABLES_NOT_SHOW_IF_USERNAME.includes(props.prop_mytable) && !props.prop_search) {
        if (field === 'username') {
          vis = false
        }
-      }
+      }*/
      return vis
    }

@@ -1087,7 +1091,7 @@ export default defineComponent({
    }

    function changeTable(mysel: any) {
-      console.log('changeTable', tablesel.value)
+      // console.log('changeTable', tablesel.value)
      if (tablesel.value === undefined || tablesel.value === '')
        return

@@ -1432,6 +1436,12 @@ export default defineComponent({
    function cmdExt(cmd: any, id: any, val2: any) {
      console.log('cmd', cmd)

+      if (cmd === costanti.CMD_SHOW_PAGE) {
+        visupagedialog.value = true
+        myrecdialog.value = id
+        return true
+      }
+
      let action = 0
      if (cmd === costanti.CMD_DELETE) {
        action = lists.MenuAction.DELETE_RECTABLE
@@ -1532,6 +1542,8 @@ export default defineComponent({
      getLabelFooterByRow,
      showfilteradv,
      cmdExt,
+      visupagedialog,
+      myrecdialog,
    }
  }
 })
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -313,13 +313,14 @@
      </template>

      <template v-slot:item="props">
-        <div v-if="showType === costanti.SHOW_MYSKILL || (myvertical === costanti.VISUTABLE_LISTA && tablesel === 'myskills') ">
-          <CMySkill
-            :prop_myskill="props.row"
+        <div v-if="showType === costanti.SHOW_MYCARD || (myvertical === costanti.VISUTABLE_LISTA && shared_consts.TABLES_VISU_CMYSRECCARD.includes(tablesel)) ">
+          <CMyRecCard
+            :table="tablesel"
+            :prop_myrec="props.row"
            @cmdext="cmdExt"
            :visu="visufind"
          >
-          </CMySkill>
+          </CMyRecCard>

        </div>
        <div 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">
@@ -394,7 +395,6 @@
                <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))"
                          :class="clByCol(col)" class="riduci_pad">
-
                    <q-item-section avatar v-if="col.icon">
                      <q-item-label class="q-table__col"><q-icon :name="col.icon"></q-icon></q-item-label>
                    </q-item-section>
@@ -406,6 +406,7 @@
                      <div class="tdclass">
                        <div :class="getclrow(props.row)">

+
                          <CMyPopupEdit
                            :table="mytable"
                            :canEdit="canEdit"
@@ -433,6 +434,14 @@
      </template>
    </q-table>

+    <q-dialog v-model="visupagedialog" @hide="hidewindow" :maximized="$q.screen.lt.sm">
+      <CMyCardPopup
+        :table="mytable"
+        :prop_myrec="myrecdialog">
+
+      </CMyCardPopup>
+    </q-dialog>
+
    <div v-if="rowclicksel">

      <CTitleBanner title="Record:"></CTitleBanner>
@@ -450,7 +459,7 @@
              </q-field>
            </div>
            <div
-              class="q-ma-sm q-pa-sm colmodif col-grow rounded-borders " style="border: 1px solid #bbb"
+              class="q-ma-sm q-pa-sm colmodif col-grow popupedit"
              @click="colclicksel = mycol">
              <CMyPopupEdit
                :table="mytable"
@@ -475,7 +484,7 @@
        </div>
      </div>
    </div>
-    <q-dialog v-model="newRecordBool" @hide="hidewindow" :maximized="true">
+    <q-dialog v-model="newRecordBool" @hide="hidewindow" :maximized="$q.screen.lt.sm">
      <q-card class="dialog_card">
        <q-bar dense class="bg-primary text-white">
          Nuovo:
@@ -517,9 +526,9 @@
        </q-card-actions>
      </q-card>
    </q-dialog>
-    <q-dialog v-model="editRecordBool">
+    <q-dialog v-model="editRecordBool" @hide="hidewindow" :maximized="$q.screen.lt.sm">
      <q-card class="dialog_card">
-        <q-bar dense class="bg-primary text-white full-height">
+        <q-bar dense class="bg-primary text-white">
          <span class="ellipsis">{{ recModif[col_title] }}</span>
          <q-space/>
          <q-btn flat round color="white" icon="close" v-close-popup></q-btn>