diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 44ece296..8cc7fc6d 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -189,6 +189,7 @@ export const shared_consts = { TABLES_WITH_DATE: ['mybachecas', 'myhosps'], TABLES_WITH_SORTING: ['mybachecas', 'myhosps'], TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'myhosps', 'mygoods'], + TABLES_FAVORITE_BOOKMARK: ['myskills', 'mygoods', 'mybachecas', 'myhosps'], // costanti.VISUTABLE_SCHEDA_USER, VISUTABLE_SCHEDA_GROUP, VISUTABLE_USER_TABGROUP, VISUTABLE_USER_TABCIRCUIT, VISUTABLE_GROUP_CIRCUIT VERTIC_SHOW_GRID: [-1, 2, -3, -4, -5, -6], @@ -539,6 +540,14 @@ export const shared_consts = { value: 23, label: 'Asciugacapelli', }, + { + value: 24, + label: 'Riscaldamento a legna', + }, + { + value: 25, + label: 'Riscaldamento a gas', + }, ], Regions: [ @@ -1546,4 +1555,41 @@ export const shared_consts = { return ['_id', 'username', 'group', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'notask_verif', 'verified_by_aportador', 'trust_modified', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on'] }, + getProjectForAll(proj_add: any) { + let proj = { + idContribType: 1, + idCity: 1, + pub_to_share: 1, + adType: 1, + photos: 1, + note: 1, + descr: 1, + date_created: 1, + date_updated: 1, + userId: 1, + username: 1, + name: 1, + surname: 1, + lasttimeonline: 1, + comune: 1, + mycities: 1, + 'profile.img': 1, + 'profile.mygroups': 1, + 'profile.mycircuits': 1, + 'profile.qualifica': 1, + 'profile.resid_province': 1, + 'profile.username_telegram': 1, + 'profile.favorite': 1, + 'profile.bookmark': 1, + reported: 1, + date_report: 1, + username_who_report: 1, + }; + + if (proj_add) + proj = Object.assign({}, proj, proj_add); + + return proj; + }, + } diff --git a/src/components/CAccomodation/CAccomodation.vue b/src/components/CAccomodation/CAccomodation.vue index 60b5131a..3d9606be 100755 --- a/src/components/CAccomodation/CAccomodation.vue +++ b/src/components/CAccomodation/CAccomodation.vue @@ -1,12 +1,8 @@ diff --git a/src/components/CMyActivities/CMyActivities.vue b/src/components/CMyActivities/CMyActivities.vue index 38fbcbb8..824fd6de 100755 --- a/src/components/CMyActivities/CMyActivities.vue +++ b/src/components/CMyActivities/CMyActivities.vue @@ -91,30 +91,15 @@ myclass="myshad" :canopen="true" > -<<<<<<< HEAD -
- -
- - - - - + + >>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) :noaut="true" - > - - - + :title="card.title" + /> +
+
-
-
{{ card.title }}
- - - + +
+ + +
+ +
+
+
+
+ +
+ +
+ - - - + :title="card.title" + /> +
+
-
- -
- -
+ + diff --git a/src/components/CMyCardService/CMyCardService.ts b/src/components/CMyCardService/CMyCardService.ts index 392fc5c2..904b4aa5 100644 --- a/src/components/CMyCardService/CMyCardService.ts +++ b/src/components/CMyCardService/CMyCardService.ts @@ -5,8 +5,10 @@ import { CTitleBanner } from '@/components/CTitleBanner' import { CProfile } from '@/components/CProfile' import { CDateTime } from '@/components/CDateTime' import { CMyPage } from '@/components/CMyPage' +import { CMyChipList } from '@/components/CMyChipList' import { CMyFieldRec } from '@/components/CMyFieldRec' import { CMyUser } from '@/components/CMyUser' +import { CGalleryImages } from '@/components/CGalleryImages' import { CAccomodation } from '@/components/CAccomodation' import { tools } from '@store/Modules/tools' import { useUserStore } from '@store/UserStore' @@ -19,14 +21,16 @@ import { costanti } from '@costanti' import { IColGridTable, IImgGallery, IUserFields } from 'model' import { shared_consts } from '@/common/shared_vuejs' import { colCitys, fieldsTable } from '@store/Modules/fieldsTable' -import { useRoute } from 'vue-router' +import { useRoute, useRouter } from 'vue-router' import { useNotifStore } from '@store/NotifStore' export default defineComponent({ name: 'CMyCardService', - components: { CProfile, CTitleBanner, + components: { + CProfile, CTitleBanner, CMyFieldDb, CDateTime, CMyPage, CMyFieldRec, CAccomodation, - CMyUser }, + CMyUser, CGalleryImages, CMyChipList + }, props: { table: { type: String, @@ -60,6 +64,10 @@ export default defineComponent({ const showPic = ref(false) + const $router = useRouter() + + const usersList = ref({ show: false, title: '', list: [] }) + const myrec = ref({}) const col = ref({}) @@ -71,7 +79,7 @@ export default defineComponent({ function load() { // Carica il profilo di quest'utente - if (props.idRec > 0) { + if (props.idRec) { userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => { myrec.value = ris notifStore.setAsRead(idnotif.value) @@ -110,8 +118,6 @@ export default defineComponent({ return false } -<<<<<<< HEAD -======= function getRecGoodSkillByRec(rec: any) { if (props.table === 'myskills') return rec.recSkill @@ -160,7 +166,6 @@ export default defineComponent({ return obj } ->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) onMounted(mounted) return { @@ -181,6 +186,12 @@ export default defineComponent({ showBadge, getlinkpage, calendarStore, + getSectorByRec, + getRecGoodSkillByRec, + usersList, + clicca, + naviga, + getTypeHosps, } } }) diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue index aaee5d22..5584ff14 100644 --- a/src/components/CMyCardService/CMyCardService.vue +++ b/src/components/CMyCardService/CMyCardService.vue @@ -1,32 +1,22 @@