diff --git a/deploy_on_production.sh b/deploy_on_production.sh index 205a04fd..9f17ff55 100755 --- a/deploy_on_production.sh +++ b/deploy_on_production.sh @@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto..." echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8822' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/deploy_on_test_server.sh b/deploy_on_test_server.sh index 072fc1b9..a1aa307c 100755 --- a/deploy_on_test_server.sh +++ b/deploy_on_test_server.sh @@ -19,7 +19,7 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8822' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ cp .env.prod.bak .env.production diff --git a/send_to_production.sh b/send_to_production.sh index 0effc4e5..ed1ed271 100755 --- a/send_to_production.sh +++ b/send_to_production.sh @@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8822' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/send_to_test.sh b/send_to_test.sh index 22a0257a..99974a2d 100755 --- a/send_to_test.sh +++ b/send_to_test.sh @@ -5,7 +5,7 @@ source ./.env.test cp .env.test .env.production echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8822' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE" cp .env.prod.bak .env.production diff --git a/src/App.ts b/src/App.ts index 91b39e02..a04f1f31 100755 --- a/src/App.ts +++ b/src/App.ts @@ -6,6 +6,7 @@ import { useGlobalStore } from '@store/globalStore' import { useUserStore } from '@store/UserStore' import { Header } from '@/components/Header' import { MyFooter } from '@/components/MyFooter' +import { CFirstPageApp } from '@/components/CFirstPageApp' import { computed } from 'vue' import { CProvaPao } from '@/components/CProvaPao' import { tools } from '@store/Modules/tools' @@ -14,6 +15,7 @@ export default { components: { appHeader: Header, appFooter: MyFooter, + CFirstPageApp, CProvaPao, BannerCookies, /* , CPreloadImages */ }, diff --git a/src/App.vue b/src/App.vue index 45cfbf82..c16711c5 100755 --- a/src/App.vue +++ b/src/App.vue @@ -11,6 +11,7 @@
+
diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 2b204fc3..4502ea49 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -45,6 +45,8 @@ export default defineComponent({ const col_footer = ref('idCity') const col_tabfooter = ref('mycities') + const mypagination = ref({ sortBy: 'date_created', descending: true, page: 1, rowsNumber: 10, rowsPerPage: 10 }) + const col = ref({}) const idSector = computed(() => { @@ -288,6 +290,8 @@ export default defineComponent({ adType: 1, photos: 1, note: 1, + website: 1, + //**ADDFIELD_MYSKILL descr: 1, date_created: 1, date_updated: 1, @@ -360,6 +364,7 @@ export default defineComponent({ col, toolsext, getdefaultnewrec, + mypagination, } }, }) diff --git a/src/components/CFinder/CFinder.vue b/src/components/CFinder/CFinder.vue index 13409393..f3db5674 100755 --- a/src/components/CFinder/CFinder.vue +++ b/src/components/CFinder/CFinder.vue @@ -24,6 +24,7 @@ + +
+ + + Ambiente di Test + +
+ + + + + diff --git a/src/components/CFirstPageApp/index.ts b/src/components/CFirstPageApp/index.ts new file mode 100755 index 00000000..43b86e35 --- /dev/null +++ b/src/components/CFirstPageApp/index.ts @@ -0,0 +1 @@ +export { default as CFirstPageApp } from './CFirstPageApp.vue' diff --git a/src/components/CGallery/CGallery.vue b/src/components/CGallery/CGallery.vue index 687175f3..68447122 100755 --- a/src/components/CGallery/CGallery.vue +++ b/src/components/CGallery/CGallery.vue @@ -37,7 +37,8 @@ + icon="fas fa-file-upload" + :label="$t('gallery.load_image')"> diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index c9590a56..c7b8806f 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -878,7 +878,7 @@ export default defineComponent({ newRecord.value = props.defaultnewrec() newRecord.value['userId'] = userStore.my._id newRecord.value['idapp'] = process.env.APP_ID - globalStore.saveTable(mydata).then(ris => console.log('RISULT', ris)) + // globalStore.saveTable(mydata).then(ris => console.log('RISULT', ris)) newRecordBool.value = true } @@ -890,7 +890,7 @@ export default defineComponent({ console.log('newRecord.value', newRecord.value) - serverData.value.push(newRecord.value) + // serverData.value.push(newRecord.value) pagination.value.rowsNumber++ loading.value = false @@ -1020,9 +1020,14 @@ export default defineComponent({ } function ActionAfterYes(action: number, item: any, data?: any) { + if (action === lists.MenuAction.DELETE_RECTABLE) { if ((serverData.value.length > 0) && item) { - serverData.value.splice(serverData.value.indexOf(item), 1) + console.log('item', item) + let indelim = serverData.value.findIndex((rec: any) => rec._id === item._id) + console.log('indexof', indelim) + if (indelim >= 0) + serverData.value.splice(indelim, 1) refresh_arr() } } else if (action === lists.MenuAction.DUPLICATE_RECTABLE) { @@ -1327,7 +1332,7 @@ export default defineComponent({ if (indrec >= 0) serverData.value[indrec] = ris else - serverData.value.push(ris) + serverData.value = [ris, ...serverData.value] newRecord.value = null // refresh() @@ -1395,6 +1400,10 @@ export default defineComponent({ } function showColCheck(col: IColGridTable, tipovis: number, visulabel:boolean, value: any = '', record: any = null){ + + if (col.isadvanced_field && !showfilteradv.value) + return false + const check = tools.checkIfShowField(col, tipovis, visulabel, value) let valuePresent = (colVisib.value.includes(col.field! + col.subfield) || colVisib.value.includes(col.field + '.' + col.subfield)) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index b1e43d82..a9e65d42 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -107,7 +107,7 @@ :class="$q.screen.lt.sm ? `` : `row` + ` text-blue `">
- +
+
+ +
+ +
@@ -536,8 +541,11 @@
+
+ +
+ v-else-if="showColCheck(col, tools.TIPOVIS_EDIT_RECORD, false) && col.foredit">
-
+
+ label="Bacheca" to="/bacheca" icon="fas fa-bullhorn" color="indigo"> @@ -24,8 +24,8 @@
-
P.S: Attualmente รจ attivo solo il bottone Lavoro.
- Gli altri verranno attivati nei prossimi giorni.
+
P.S: Attualmente sono attivi il bottone Bacheca e Lavoro.
+ Gli altri verranno attivati prossimamente .
diff --git a/src/components/CMyFieldRec/CMyFieldRec.vue b/src/components/CMyFieldRec/CMyFieldRec.vue index fab91441..a1a1e7b7 100755 --- a/src/components/CMyFieldRec/CMyFieldRec.vue +++ b/src/components/CMyFieldRec/CMyFieldRec.vue @@ -20,7 +20,8 @@
-
+
+
+
+
+ + +
+
+
+ + +
+
+
{{ opt[fieldsTable.getLabelByTable(col.jointable)] }} - + diff --git a/src/components/CMySelect/CMySelect.vue b/src/components/CMySelect/CMySelect.vue index 5c6fc241..5a26af34 100755 --- a/src/components/CMySelect/CMySelect.vue +++ b/src/components/CMySelect/CMySelect.vue @@ -165,7 +165,7 @@ {{ opt['hint'] }} - + diff --git a/src/components/CSkill/CSkill.ts b/src/components/CSkill/CSkill.ts index d4bd6204..746cf5d4 100755 --- a/src/components/CSkill/CSkill.ts +++ b/src/components/CSkill/CSkill.ts @@ -103,6 +103,8 @@ export default defineComponent({ adType: 1, photos: 1, note: 1, + //**ADDFIELD_MYSKILL + website: 1, descr: 1, date_created: 1, date_updated: 1, @@ -136,6 +138,8 @@ export default defineComponent({ adType: 1, photos: 1, note: 1, + //**ADDFIELD_MYSKILL + website: 1, descr: 1, date_created: 1, date_updated: 1, @@ -169,6 +173,8 @@ export default defineComponent({ adType: 1, photos: 1, note: 1, + //**ADDFIELD_MYSKILL + website: 1, descr: 1, date_created: 1, date_updated: 1, diff --git a/src/css/app.scss b/src/css/app.scss index ec5a7616..a96d90ce 100755 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -950,6 +950,6 @@ $heightBtn: 100%; } .popupedit{ - // border: 1px solid #bbb; + border: 1px solid #bbb; border-radius: $generic-border-radius } diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 3292cf72..0ee9d243 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -512,6 +512,7 @@ export interface IColGridTable { resultjoin?: string[] tablesel?: string notsave?: boolean + isadvanced_field?: boolean showWhen?: number maxlength?: number allowchar?: number @@ -686,6 +687,8 @@ export interface IMySkill { NumLevel: number adType: number note: string + //**ADDFIELD_MYSKILL + website: string descr: string date_created?: Date, date_updated?: Date, @@ -703,6 +706,8 @@ export interface IMyBacheca { NumLevel: number adType: number note: string + //**ADDFIELD_MYBACHECAS + website: string descr: string date_created?: Date, date_updated?: Date, diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 83e3ed7e..5d0c15d0 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -22,6 +22,7 @@ const msg_it = { directory: 'Directory', list: 'Lista', select_image: 'Scegli un\'Immagine', + load_image: 'Carica un\'Immagine', }, profile: { chisei: 'Chi Sei? Raccontaci di te:', diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index f3849bd8..d8ceda0f 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -110,6 +110,7 @@ export const costanti = { object: 10000, separator: 11000, username_chip: 12000, + link: 12500, }, FieldTypeArr: [ diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 63c46a2b..6be48caf 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -86,6 +86,7 @@ function AddCol(params: IColGridTable) { remote_field: (params.remote_field === undefined) ? '' : params.remote_field, maxlength: (params.maxlength === undefined) ? 0 : params.maxlength, filter_field: (params.filter_field === undefined) ? '' : params.filter_field, + isadvanced_field: (params.isadvanced_field === undefined) ? false : params.isadvanced_field, } } @@ -250,7 +251,7 @@ export const colTableProducer = [ AddCol({ name: 'region', label_trans: 'producer.region' }), AddCol({ name: 'city', label_trans: 'producer.city' }), AddCol({ name: 'img', label_trans: 'producer.img' }), - AddCol({ name: 'website', label_trans: 'producer.website' }), + AddCol({ name: 'website', label_trans: 'reg.website' }), AddCol(DeleteRec), AddCol(DuplicateRec), ] @@ -322,7 +323,7 @@ export const colTableStorehouse = [ AddCol({ name: 'city', label_trans: 'store.city' }), AddCol({ name: 'region', label_trans: 'store.region' }), AddCol({ name: 'img', label_trans: 'store.img' }), - AddCol({ name: 'website', label_trans: 'store.website' }), + AddCol({ name: 'website', label_trans: 'reg.website' }), AddCol(DeleteRec), AddCol(DuplicateRec), ] @@ -546,14 +547,6 @@ export const colmyUserGroup = [ export const colmySkills = [ - /*AddCol({ - name: 'userId', label_trans: 'order.users', fieldtype: costanti.FieldType.string, jointable: 'users', - visible: false - }), */ - //AddCol({ name: 'name', label_trans: 'reg.name', fieldtype: costanti.FieldType.string }), - //AddCol({ name: 'surname', label_trans: 'reg.surname', fieldtype: costanti.FieldType.string }), - // AddCol({ name: 'subTitle', label_trans: 'event.title', fieldtype: costanti.FieldType.string, - // showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit , maxlength: 70, noshowlabel: true }), AddCol({ name: 'username', label_trans: 'reg.username', @@ -564,6 +557,19 @@ export const colmySkills = [ noshowlabel: true, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, }), + AddCol({ + name: 'idCity', + label_trans: 'skill.city', + fieldtype: costanti.FieldType.multiselect_by_server, + jointable: 'cities', + tablesel: 'cities', + noshowlabel: true, + icon: 'fas fa-map-marker-alt', + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, + remote_table: 'mycities', + remote_key: '_id', + remote_field: 'comune', + }), AddCol({ name: 'adType', label_trans: 'adTypes.name', @@ -605,6 +611,13 @@ export const colmySkills = [ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, allowNewValue: true, }), + AddCol({ + name: '', + fieldtype: costanti.FieldType.separator, + required: false, + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit, + visible: false, + }), AddCol({ name: 'idSubSkill', label_trans: 'skill.subskill', @@ -617,7 +630,9 @@ export const colmySkills = [ icon: 'far fa-id-card', showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, allowNewValue: true, + isadvanced_field: true, }), + AddCol({ name: 'numLevel', label_trans: 'level.name', @@ -627,6 +642,7 @@ export const colmySkills = [ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, noshowlabel: false, icon: 'grading', + isadvanced_field: true, }), AddCol({ name: 'idStatusSkill', @@ -636,6 +652,7 @@ export const colmySkills = [ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, noshowlabel: true, icon: 'mood', + isadvanced_field: true, }), AddCol({ name: 'idContribType', @@ -646,19 +663,7 @@ export const colmySkills = [ noshowlabel: true, icon: 'currency_exchange', //icon: 'fas fa-hands-helping', - }), - AddCol({ - name: 'idCity', - label_trans: 'skill.city', - fieldtype: costanti.FieldType.multiselect_by_server, - jointable: 'cities', - tablesel: 'cities', - noshowlabel: true, - icon: 'fas fa-map-marker-alt', - showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, - remote_table: 'mycities', - remote_key: '_id', - remote_field: 'comune', + isadvanced_field: true, }), AddCol({ name: 'photos', @@ -667,27 +672,23 @@ export const colmySkills = [ jointable: '', showpicprofile_ifnotset: true, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, + isadvanced_field: true, }), AddCol({ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, - titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '' + titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '', + isadvanced_field: true, }), - AddCol({ name: 'website', label_trans: 'producer.website' }), + //**ADDFIELD_MYSKILL + AddCol({ name: 'website', label_trans: 'reg.website', isadvanced_field: true, fieldtype: costanti.FieldType.link, + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist }), AddCol(DuplicateRec), AddCol(ModifRec), AddCol(DeleteRec), ] export const colmyBachecas = [ - /*AddCol({ - name: 'userId', label_trans: 'order.users', fieldtype: costanti.FieldType.string, jointable: 'users', - visible: false - }), */ - //AddCol({ name: 'name', label_trans: 'reg.name', fieldtype: costanti.FieldType.string }), - //AddCol({ name: 'surname', label_trans: 'reg.surname', fieldtype: costanti.FieldType.string }), - // AddCol({ name: 'subTitle', label_trans: 'event.title', fieldtype: costanti.FieldType.string, - // showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit , maxlength: 70, noshowlabel: true }), AddCol({ name: 'username', label_trans: 'reg.username', @@ -698,6 +699,19 @@ export const colmyBachecas = [ noshowlabel: true, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, }), + AddCol({ + name: 'idCity', + label_trans: 'skill.city', + fieldtype: costanti.FieldType.multiselect_by_server, + jointable: 'cities', + tablesel: 'cities', + noshowlabel: true, + icon: 'fas fa-map-marker-alt', + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, + remote_table: 'mycities', + remote_key: '_id', + remote_field: 'comune', + }), AddCol({ name: 'adType', label_trans: 'adTypes.name', @@ -739,6 +753,13 @@ export const colmyBachecas = [ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, allowNewValue: true, }), + AddCol({ + name: '', + fieldtype: costanti.FieldType.separator, + required: false, + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit, + visible: false, + }), AddCol({ name: 'idSubSkill', label_trans: 'skill.subskill', @@ -751,7 +772,9 @@ export const colmyBachecas = [ icon: 'far fa-id-card', showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, allowNewValue: true, + isadvanced_field: true, }), + AddCol({ name: 'numLevel', label_trans: 'level.name', @@ -761,6 +784,7 @@ export const colmyBachecas = [ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, noshowlabel: false, icon: 'grading', + isadvanced_field: true, }), AddCol({ name: 'idStatusSkill', @@ -770,6 +794,7 @@ export const colmyBachecas = [ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, noshowlabel: true, icon: 'mood', + isadvanced_field: true, }), AddCol({ name: 'idContribType', @@ -780,19 +805,7 @@ export const colmyBachecas = [ noshowlabel: true, icon: 'currency_exchange', //icon: 'fas fa-hands-helping', - }), - AddCol({ - name: 'idCity', - label_trans: 'skill.city', - fieldtype: costanti.FieldType.multiselect_by_server, - jointable: 'cities', - tablesel: 'cities', - noshowlabel: true, - icon: 'fas fa-map-marker-alt', - showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, - remote_table: 'mycities', - remote_key: '_id', - remote_field: 'comune', + isadvanced_field: true, }), AddCol({ name: 'photos', @@ -801,13 +814,17 @@ export const colmyBachecas = [ jointable: '', showpicprofile_ifnotset: true, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, + isadvanced_field: true, }), AddCol({ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, - titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '' + titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '', + isadvanced_field: true, }), - AddCol({ name: 'website', label_trans: 'producer.website' }), + //**ADDFIELD_MYBACHECAS + AddCol({ name: 'website', label_trans: 'reg.website', isadvanced_field: true, fieldtype: costanti.FieldType.link, + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist }), AddCol(DuplicateRec), AddCol(ModifRec), AddCol(DeleteRec), diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 2dcb6cf3..c30f5113 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -1751,6 +1751,7 @@ export const tools = { // console.log('param1', par.param1) globalStore.DeleteRec({ table, id: par.param1 }).then((ris) => { if (ris) { + debugger mythis.ActionAfterYes(func, par.param2, null) this.showPositiveNotif(mythisq, t('db.deletedrecord')) } else { @@ -4935,10 +4936,14 @@ export const tools = { adType: 0, photos: [], note: '', + //**ADDFIELD_MYSKILL + website: '', descr: '', } }, + + getdefaultnewrec_MyBacheca(): any { return { _id: 0, @@ -4952,6 +4957,8 @@ export const tools = { adType: 0, photos: [], note: '', + //**ADDFIELD_MYBACHECAS + website: '', descr: '', } diff --git a/src/views/user/mygroups/mygroups.ts b/src/views/user/mygroups/mygroups.ts index eabd3dab..5e0c9403 100755 --- a/src/views/user/mygroups/mygroups.ts +++ b/src/views/user/mygroups/mygroups.ts @@ -105,6 +105,7 @@ export default defineComponent({ photos: 1, idCity: 1, note: 1, + website: 1, comune: 1, mycities: 1, sector: 1, @@ -126,6 +127,8 @@ export default defineComponent({ photos: 1, idCity: 1, note: 1, + //**ADDFIELD_MYGROUPS + website: 1, comune: 1, mycities: 1, }