Revert "nuova veste grafica: myskills, mygoods, mybachecas, myhosps,"

This reverts commit 6fad472211.

src/views/admin/dbop/dbop.vue

@@ -397,22 +397,6 @@
       ></q-btn>
       <br />
     </div>
-    <div class="row">
-      <q-btn
-        label="Converti Tabelle: myskills, mygoods da INT a STRING"
-        color="primary"
-        @click="EseguiFunz('ConvTablesFromIntToString', '', '')"
-      ></q-btn>
-      <br />
-    </div>
-    <div class="row">
-      <q-btn
-        label="Removeinteger"
-        color="primary"
-        @click="EseguiFunz('Removeinteger', '', '')"
-      ></q-btn>
-      <br />
-    </div>
 
     <q-field stack-label dense>
       <template v-slot:control>

src/views/user/mypagegood/mypagegood.ts

@@ -3,7 +3,7 @@ import { useUserStore } from '@store/UserStore'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from '@/boot/i18n'
 import { useQuasar } from 'quasar'
-import { CMyCardService } from '@/components/CMyCardService'
+import { CMyCardPopup } from '@/components/CMyCardPopup'
 import { CMyPage } from '@/components/CMyPage'
 import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
 import { toolsext } from '@store/Modules/toolsext'
@@ -11,7 +11,7 @@ import { tools } from '@store/Modules/tools'
 
 export default defineComponent({
   name: 'mypagegood',
-  components: { CMyCardService, CMyPage, CCheckIfIsLogged },
+  components: { CMyCardPopup, CMyPage, CCheckIfIsLogged },
   props: {},
   setup() {
     const userStore = useUserStore()

src/views/user/mypagegood/mypagegood.vue

@@ -1,24 +1,23 @@
 <template>
-  <CMyPage
-    title="Bene"
-    imgbackground="images/calendario_eventi.jpg"
-    sizes="max-height: 120px"
-    styleadd="bottom: -20px !important;"
-  >
+  <CMyPage title="Bene"
+           imgbackground="images/calendario_eventi.jpg"
+           sizes="max-height: 120px" styleadd="bottom: -20px !important;">
+
     <div v-if="!tools.isLogged()">
       <CCheckIfIsLogged></CCheckIfIsLogged>
     </div>
 
-    <CMyCardService
-      v-if="idGood"
+    <CMyCardPopup
+      v-if="!!idGood"
       :table="toolsext.TABMYGOODS"
       :nopopup="true"
-      :idRec="idGood"
-    >
-    </CMyCardService>
+      :idRec="idGood">
+
+    </CMyCardPopup>
+
+    <br>
+    <br>
 
-    <br />
-    <br />
   </CMyPage>
 </template>
 

src/views/user/mypagehosp/mypagehosp.ts

@@ -3,7 +3,7 @@ import { useUserStore } from '@store/UserStore'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from '@/boot/i18n'
 import { useQuasar } from 'quasar'
-import { CMyCardService } from '@/components/CMyCardService'
+import { CMyCardPopup } from '@/components/CMyCardPopup'
 import { CMyPage } from '@/components/CMyPage'
 import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
 import { toolsext } from '@store/Modules/toolsext'
@@ -11,7 +11,7 @@ import { tools } from '@store/Modules/tools'
 
 export default defineComponent({
   name: 'mypagehosp',
-  components: { CMyCardService, CMyPage, CCheckIfIsLogged },
+  components: { CMyCardPopup, CMyPage, CCheckIfIsLogged },
   props: {},
   setup() {
     const userStore = useUserStore()

src/views/user/mypagehosp/mypagehosp.vue

@@ -7,13 +7,13 @@
       <CCheckIfIsLogged></CCheckIfIsLogged>
     </div>
 
-    <CMyCardService
+    <CMyCardPopup
       v-if="!!idHosp"
       :table="toolsext.TABMYHOSPS"
       :nopopup="true"
       :idRec="idHosp">
 
-    </CMyCardService>
+    </CMyCardPopup>
 
     <br>
     <br>

src/views/user/myservice/myservice.ts

@@ -5,7 +5,7 @@ import { CDateTime } from '@/components/CDateTime'
 import { CMyPage } from '@/components/CMyPage'
 import { CMyCardPopup } from '@/components/CMyCardPopup'
 import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
-import { CMyCardService } from '@/components/CMyCardService'
+import { CSkill } from '@/components/CSkill'
 import { tools } from '@store/Modules/tools'
 import { computed, defineComponent, onMounted, ref, watch } from 'vue'
 import { useUserStore } from '@store/UserStore'
@@ -24,7 +24,7 @@ import { colCitys } from '@store/Modules/fieldsTable'
 
 export default defineComponent({
   name: 'myservice',
-  components: { CProfile, CTitleBanner, CMyFieldDb, CMyCardService, CDateTime, CMyPage, CCheckIfIsLogged, CMyCardPopup },
+  components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CMyPage, CCheckIfIsLogged, CMyCardPopup },
   props: {},
   setup() {
     const userStore = useUserStore()
@@ -54,12 +54,37 @@ export default defineComponent({
       return userStore.my.username
     }
 
+    function loadSkill() {
+      // Carica il profilo di quest'utente
+      if (idSkill.value) {
+
+        userStore.loadSkill(idSkill.value).then((ris) => {
+          myskill.value = ris
+          if (ris.userId) {
+            filtroutente.value = [{ userId: ris.userId , _id: ris._id }]
+
+          }
+        })
+
+      }
+    }
+
+    watch(() => idSkill.value, (to: any, from: any) => {
+      loadSkill()
+    })
+
+    function mounted() {
+      loadSkill()
+    }
+
     function checkifShow(col: string) {
       //++Todo: checkifShow Permessi !
       return true
     }
 
 
+    onMounted(mounted)
+
     return {
       profile,
       tools,

src/views/user/myservice/myservice.vue

@@ -7,11 +7,13 @@
       <CCheckIfIsLogged></CCheckIfIsLogged>
     </div>
     <div v-else>
-      <CMyCardService v-if="idSkill"
+      <CMyCardPopup
+        v-if="!!idSkill"
         :table="toolsext.TABMYSKILLS"
         :nopopup="true"
         :idRec="idSkill">
-      </CMyCardService>
+
+      </CMyCardPopup>
     </div>
 
     <!--