website non si vede

Stato e Contributo non te lo seleziona se clicchi a destra nel toggle
Ordinare per ultimo inserito
Corretto che Aggiungendo un Record, veniva salvato in anticipo
cancellazione Record, Inserimento Record : errori vari
This commit is contained in:
paoloar77
2022-02-17 17:43:27 +01:00
parent dedf35c659
commit 9161909003
29 changed files with 243 additions and 68 deletions

View File

@@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto..." echo "Sincronizzazione in remoto..."
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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 " echo "Finito $SERVERDIR_WEBSITE "
fi fi

View File

@@ -19,7 +19,7 @@ sleep 1
npm run buildpwa npm run buildpwa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." 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 cp .env.prod.bak .env.production

View File

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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 " echo "Finito $SERVERDIR_WEBSITE "
fi fi

View File

@@ -5,7 +5,7 @@ source ./.env.test
cp .env.test .env.production cp .env.test .env.production
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." 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" echo "Finito $SERVERDIR_WEBSITE"
cp .env.prod.bak .env.production cp .env.prod.bak .env.production

View File

@@ -6,6 +6,7 @@ import { useGlobalStore } from '@store/globalStore'
import { useUserStore } from '@store/UserStore' import { useUserStore } from '@store/UserStore'
import { Header } from '@/components/Header' import { Header } from '@/components/Header'
import { MyFooter } from '@/components/MyFooter' import { MyFooter } from '@/components/MyFooter'
import { CFirstPageApp } from '@/components/CFirstPageApp'
import { computed } from 'vue' import { computed } from 'vue'
import { CProvaPao } from '@/components/CProvaPao' import { CProvaPao } from '@/components/CProvaPao'
import { tools } from '@store/Modules/tools' import { tools } from '@store/Modules/tools'
@@ -14,6 +15,7 @@ export default {
components: { components: {
appHeader: Header, appHeader: Header,
appFooter: MyFooter, appFooter: MyFooter,
CFirstPageApp,
CProvaPao, CProvaPao,
BannerCookies, /* , CPreloadImages */ BannerCookies, /* , CPreloadImages */
}, },

View File

@@ -11,6 +11,7 @@
<q-page-container id="mypage"> <q-page-container id="mypage">
<div v-if="finishLoading"> <div v-if="finishLoading">
<CFirstPageApp></CFirstPageApp>
<router-view/> <router-view/>
</div> </div>
<q-inner-loading id="spinner" :showing="!finishLoading"> <q-inner-loading id="spinner" :showing="!finishLoading">

View File

@@ -45,6 +45,8 @@ export default defineComponent({
const col_footer = ref('idCity') const col_footer = ref('idCity')
const col_tabfooter = ref('mycities') const col_tabfooter = ref('mycities')
const mypagination = ref({ sortBy: 'date_created', descending: true, page: 1, rowsNumber: 10, rowsPerPage: 10 })
const col = ref(<IColGridTable>{}) const col = ref(<IColGridTable>{})
const idSector = computed(() => { const idSector = computed(() => {
@@ -288,6 +290,8 @@ export default defineComponent({
adType: 1, adType: 1,
photos: 1, photos: 1,
note: 1, note: 1,
website: 1,
//**ADDFIELD_MYSKILL
descr: 1, descr: 1,
date_created: 1, date_created: 1,
date_updated: 1, date_updated: 1,
@@ -360,6 +364,7 @@ export default defineComponent({
col, col,
toolsext, toolsext,
getdefaultnewrec, getdefaultnewrec,
mypagination,
} }
}, },
}) })

View File

@@ -24,6 +24,7 @@
</q-input> </q-input>
</div> </div>
<CGridTableRec <CGridTableRec
v-if="searchList.length > 0" v-if="searchList.length > 0"
:prop_mytable="table" :prop_mytable="table"
@@ -34,6 +35,7 @@
:col_footer="col_footer" :col_footer="col_footer"
:col_tabfooter="col_tabfooter" :col_tabfooter="col_tabfooter"
:vertical="costanti.VISUTABLE_LISTA" :vertical="costanti.VISUTABLE_LISTA"
:prop_pagination="mypagination"
:showType="costanti.SHOW_MYCARD" :showType="costanti.SHOW_MYCARD"
:nodataLabel="'Nessuna Competenza trovata'" :nodataLabel="'Nessuna Competenza trovata'"
:prop_search="true" :prop_search="true"

View File

@@ -0,0 +1,5 @@
.mybanner {
font-weight: bold;
font-size: 1.1rem;
text-align: center;
}

View File

@@ -0,0 +1,44 @@
import { useQuasar } from 'quasar'
import {
defineComponent, onBeforeMount, onBeforeUnmount, onMounted, ref, toRefs, watch, inject, computed,
} from 'vue'
import { tools } from '@store/Modules/tools'
import { shared_consts } from '@src/common/shared_vuejs'
import { useI18n } from '@src/boot/i18n'
import { useRouter } from 'vue-router'
import { static_data } from '@/db/static_data'
import { useGlobalStore } from '@store/globalStore'
import { useUserStore } from '@store/UserStore'
import MixinUsers from '../../mixins/mixin-users'
export default defineComponent({
name: 'CFirstPageApp',
components: {},
props: {},
setup() {
const $q = useQuasar()
const { t } = useI18n()
const $router = useRouter()
const userStore = useUserStore()
const globalStore = useGlobalStore()
function mounted() {
// mounted
}
onMounted(mounted)
return {
tools,
static_data,
globalStore,
t,
}
},
})

View File

@@ -0,0 +1,22 @@
<template>
<div v-if="tools.isTest()">
<q-banner
rounded
dense
class="bg-primary text-white"
color="primary q-title"
style="text-align: center;">
<template v-slot:avatar>
<q-icon name="fas fa-exclamation-triangle" color="yellow" size="xs" />
</template>
<span class="mybanner">Ambiente di Test</span>
</q-banner>
</div>
</template>
<script lang="ts" src="./CFirstPageApp.ts">
</script>
<style lang="scss" scoped>
@import './CFirstPageApp.scss';
</style>

View File

@@ -0,0 +1 @@
export { default as CFirstPageApp } from './CFirstPageApp.vue'

View File

@@ -37,7 +37,8 @@
<q-btn <q-btn
v-if="isInModif" v-if="isInModif"
color="primary" @click="apri" color="primary" @click="apri"
:label="$t('gallery.select_image')"> icon="fas fa-file-upload"
:label="$t('gallery.load_image')">
</q-btn> </q-btn>
</div> </div>
</div> </div>

View File

@@ -878,7 +878,7 @@ export default defineComponent({
newRecord.value = props.defaultnewrec() newRecord.value = props.defaultnewrec()
newRecord.value['userId'] = userStore.my._id newRecord.value['userId'] = userStore.my._id
newRecord.value['idapp'] = process.env.APP_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 newRecordBool.value = true
} }
@@ -890,7 +890,7 @@ export default defineComponent({
console.log('newRecord.value', newRecord.value) console.log('newRecord.value', newRecord.value)
serverData.value.push(newRecord.value) // serverData.value.push(newRecord.value)
pagination.value.rowsNumber++ pagination.value.rowsNumber++
loading.value = false loading.value = false
@@ -1020,9 +1020,14 @@ export default defineComponent({
} }
function ActionAfterYes(action: number, item: any, data?: any) { function ActionAfterYes(action: number, item: any, data?: any) {
if (action === lists.MenuAction.DELETE_RECTABLE) { if (action === lists.MenuAction.DELETE_RECTABLE) {
if ((serverData.value.length > 0) && item) { 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() refresh_arr()
} }
} else if (action === lists.MenuAction.DUPLICATE_RECTABLE) { } else if (action === lists.MenuAction.DUPLICATE_RECTABLE) {
@@ -1327,7 +1332,7 @@ export default defineComponent({
if (indrec >= 0) if (indrec >= 0)
serverData.value[indrec] = ris serverData.value[indrec] = ris
else else
serverData.value.push(ris) serverData.value = [ris, ...serverData.value]
newRecord.value = null newRecord.value = null
// refresh() // refresh()
@@ -1395,6 +1400,10 @@ export default defineComponent({
} }
function showColCheck(col: IColGridTable, tipovis: number, visulabel:boolean, value: any = '', record: any = null){ 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) const check = tools.checkIfShowField(col, tipovis, visulabel, value)
let valuePresent = (colVisib.value.includes(col.field! + col.subfield) || colVisib.value.includes(col.field + '.' + col.subfield)) let valuePresent = (colVisib.value.includes(col.field! + col.subfield) || colVisib.value.includes(col.field + '.' + col.subfield))

View File

@@ -107,7 +107,7 @@
:class="$q.screen.lt.sm ? `` : `row` + ` text-blue `"> :class="$q.screen.lt.sm ? `` : `row` + ` text-blue `">
<span v-for="(item, index) in searchList" :key="index"> <span v-for="(item, index) in searchList" :key="index">
<div class="text-center q-my-xs" v-if="(item.type === costanti.FieldType.separator)"> <div class="text-center q-my-xs" v-if="(item.type === costanti.FieldType.separator)">
<q-btn rounded flat size="sm" dense :icon="!showfilteradv ? 'fas fa-arrow-down' : 'fas fa-arrow-up'" label="Filtri Avanzati" @click="showfilteradv = !showfilteradv"></q-btn> <q-btn size="sm" dense :icon="!showfilteradv ? 'fas fa-arrow-down' : 'fas fa-arrow-up'" label="Filtri Avanzati" @click="showfilteradv = !showfilteradv"></q-btn>
</div> </div>
<CMySelect <CMySelect
@@ -461,6 +461,7 @@
<div <div
class="q-ma-sm q-pa-sm colmodif col-grow popupedit" class="q-ma-sm q-pa-sm colmodif col-grow popupedit"
@click="colclicksel = mycol"> @click="colclicksel = mycol">
<CMyPopupEdit <CMyPopupEdit
:table="mytable" :table="mytable"
:canEdit="true" :canEdit="true"
@@ -494,6 +495,10 @@
<q-card-section class="inset-shadow"> <q-card-section class="inset-shadow">
<div <div
v-for="col in mycolumns" :key="col.name" class="newrec_fields"> v-for="col in mycolumns" :key="col.name" class="newrec_fields">
<div class="text-center q-my-xs" v-if="(col.fieldtype === costanti.FieldType.separator)">
<q-btn size="sm" dense :icon="!showfilteradv ? 'fas fa-arrow-down' : 'fas fa-arrow-up'" label="Campi Avanzati" @click="showfilteradv = !showfilteradv"></q-btn>
</div>
<div <div
v-if="showColCheck(col, tools.TIPOVIS_NEW_RECORD, true, 0, newRecord) && col.foredit "> v-if="showColCheck(col, tools.TIPOVIS_NEW_RECORD, true, 0, newRecord) && col.foredit ">
<div class=""> <div class="">
@@ -536,8 +541,11 @@
<q-card-section class="inset-shadow"> <q-card-section class="inset-shadow">
<div <div
v-for="col in mycolumns" :key="col.name"> v-for="col in mycolumns" :key="col.name">
<div class="text-center q-my-xs" v-if="(col.fieldtype === costanti.FieldType.separator)">
<q-btn size="sm" dense :icon="!showfilteradv ? 'fas fa-arrow-down' : 'fas fa-arrow-up'" label="Campi Avanzati" @click="showfilteradv = !showfilteradv"></q-btn>
</div>
<div <div
v-if="showColCheck(col, tools.TIPOVIS_EDIT_RECORD, false) && col.foredit"> v-else-if="showColCheck(col, tools.TIPOVIS_EDIT_RECORD, false) && col.foredit">
<div> <div>
<CMyPopupEdit <CMyPopupEdit
:table="mytable" :table="mytable"

View File

@@ -1,8 +1,8 @@
<template> <template>
<div> <div>
<div class="row q-ma-sm shadow" style="border-radius: 4px;border: 1px solid rgba(0, 0, 0, 0.12);"> <div class="row q-ma-sm shadow justify-center" style="border-radius: 4px;border: 1px solid rgba(0, 0, 0, 0.12);">
<CBigBtn <CBigBtn
label="Bacheca" to="/bacheca" icon="fas fa-bullhorn" color="blue"> label="Bacheca" to="/bacheca" icon="fas fa-bullhorn" color="indigo">
</CBigBtn> </CBigBtn>
<CBigBtn <CBigBtn
label="Lavoro" to="/work" icon="fas fa-briefcase" color="blue"> label="Lavoro" to="/work" icon="fas fa-briefcase" color="blue">
@@ -24,8 +24,8 @@
</CBigBtn> </CBigBtn>
</div> </div>
<div class="text-center">P.S: Attualmente è attivo solo il bottone <b>Lavoro</b>.<br> <div class="text-center">P.S: Attualmente sono attivi il bottone <b>Bacheca e Lavoro</b>.<br>
Gli altri verranno attivati nei prossimi giorni.</div> Gli altri verranno attivati prossimamente .</div>
</div> </div>
</template> </template>

View File

@@ -20,7 +20,8 @@
</q-field> </q-field>
</div> </div>
<div :class="` col-grow popupedit `" :style="withBorder() ? `` : ``"> <div :class="` col-grow clpopupVisuCard `" :style="withBorder() ? `` : ``">
<CMyPopupEdit <CMyPopupEdit
v-bind="$attrs" v-bind="$attrs"
:isrec="true" :isrec="true"

View File

@@ -4,3 +4,8 @@
padding: 2px; padding: 2px;
height: 60px; height: 60px;
} }
.clpopupVisuCard{
/*border-radius: $generic-border-radius */
}

View File

@@ -148,7 +148,7 @@ export default defineComponent({
default: '', default: '',
}, },
id: { id: {
type: String, type: [String, Number],
required: false, required: false,
default: '', default: '',
}, },

View File

@@ -32,6 +32,35 @@
@update:model-value="Savedb"></q-toggle> @update:model-value="Savedb"></q-toggle>
</div> </div>
</div> </div>
<div v-else-if="col.fieldtype === costanti.FieldType.link">
<div v-if="isInModif">
<q-input
v-bind="$attrs"
v-model="myvalue"
:style="$q.screen.lt.sm ? 'min-width: 300px' : ''"
:disable="disable"
:readonly="disable"
:type="`text`"
@keyup.enter.stop
@update:model-value="changevalRec"
autofocus
:label="col.label">
</q-input>
</div>
<div v-else>
<div class="q-ma-xs">
<q-btn v-if="myvalue"
type="a" rounded size="md"
:class="{disabled: disable }"
color="white" text-color="blue" icon="fas fa-globe"
:href="tools.getlinkstd(myvalue)"
:label="myvalue"
target="_blank"
>
</q-btn>
</div>
</div>
</div>
<div v-else-if="col.fieldtype === costanti.FieldType.username_chip"> <div v-else-if="col.fieldtype === costanti.FieldType.username_chip">
<div class="q-ma-xs"> <div class="q-ma-xs">
<q-btn v-if="col.tipovisu === costanti.TipoVisu.LINK && myvalue" <q-btn v-if="col.tipovisu === costanti.TipoVisu.LINK && myvalue"
@@ -326,7 +355,7 @@
<q-item-label>{{ opt[fieldsTable.getLabelByTable(col.jointable)] }}</q-item-label> <q-item-label>{{ opt[fieldsTable.getLabelByTable(col.jointable)] }}</q-item-label>
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
<q-toggle :model-value="selected" @update:value="toggleOption(opt)"/> <q-toggle :model-value="selected" @update:model-value="toggleOption(opt)"/>
</q-item-section> </q-item-section>
</q-item> </q-item>
</template> </template>

View File

@@ -165,7 +165,7 @@
<q-item-label v-if="'hint' in opt" class="hint">{{ opt['hint'] }}</q-item-label> <q-item-label v-if="'hint' in opt" class="hint">{{ opt['hint'] }}</q-item-label>
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
<q-toggle :model-value="selected" @update:value="toggleOption(opt)"/> <q-toggle :model-value="selected" @update:model-value="toggleOption(opt)"/>
</q-item-section> </q-item-section>
</q-item> </q-item>
</template> </template>

View File

@@ -103,6 +103,8 @@ export default defineComponent({
adType: 1, adType: 1,
photos: 1, photos: 1,
note: 1, note: 1,
//**ADDFIELD_MYSKILL
website: 1,
descr: 1, descr: 1,
date_created: 1, date_created: 1,
date_updated: 1, date_updated: 1,
@@ -136,6 +138,8 @@ export default defineComponent({
adType: 1, adType: 1,
photos: 1, photos: 1,
note: 1, note: 1,
//**ADDFIELD_MYSKILL
website: 1,
descr: 1, descr: 1,
date_created: 1, date_created: 1,
date_updated: 1, date_updated: 1,
@@ -169,6 +173,8 @@ export default defineComponent({
adType: 1, adType: 1,
photos: 1, photos: 1,
note: 1, note: 1,
//**ADDFIELD_MYSKILL
website: 1,
descr: 1, descr: 1,
date_created: 1, date_created: 1,
date_updated: 1, date_updated: 1,

View File

@@ -950,6 +950,6 @@ $heightBtn: 100%;
} }
.popupedit{ .popupedit{
// border: 1px solid #bbb; border: 1px solid #bbb;
border-radius: $generic-border-radius border-radius: $generic-border-radius
} }

View File

@@ -512,6 +512,7 @@ export interface IColGridTable {
resultjoin?: string[] resultjoin?: string[]
tablesel?: string tablesel?: string
notsave?: boolean notsave?: boolean
isadvanced_field?: boolean
showWhen?: number showWhen?: number
maxlength?: number maxlength?: number
allowchar?: number allowchar?: number
@@ -686,6 +687,8 @@ export interface IMySkill {
NumLevel: number NumLevel: number
adType: number adType: number
note: string note: string
//**ADDFIELD_MYSKILL
website: string
descr: string descr: string
date_created?: Date, date_created?: Date,
date_updated?: Date, date_updated?: Date,
@@ -703,6 +706,8 @@ export interface IMyBacheca {
NumLevel: number NumLevel: number
adType: number adType: number
note: string note: string
//**ADDFIELD_MYBACHECAS
website: string
descr: string descr: string
date_created?: Date, date_created?: Date,
date_updated?: Date, date_updated?: Date,

View File

@@ -22,6 +22,7 @@ const msg_it = {
directory: 'Directory', directory: 'Directory',
list: 'Lista', list: 'Lista',
select_image: 'Scegli un\'Immagine', select_image: 'Scegli un\'Immagine',
load_image: 'Carica un\'Immagine',
}, },
profile: { profile: {
chisei: 'Chi Sei? Raccontaci di te:', chisei: 'Chi Sei? Raccontaci di te:',

View File

@@ -110,6 +110,7 @@ export const costanti = {
object: 10000, object: 10000,
separator: 11000, separator: 11000,
username_chip: 12000, username_chip: 12000,
link: 12500,
}, },
FieldTypeArr: [ FieldTypeArr: [

View File

@@ -86,6 +86,7 @@ function AddCol(params: IColGridTable) {
remote_field: (params.remote_field === undefined) ? '' : params.remote_field, remote_field: (params.remote_field === undefined) ? '' : params.remote_field,
maxlength: (params.maxlength === undefined) ? 0 : params.maxlength, maxlength: (params.maxlength === undefined) ? 0 : params.maxlength,
filter_field: (params.filter_field === undefined) ? '' : params.filter_field, 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: 'region', label_trans: 'producer.region' }),
AddCol({ name: 'city', label_trans: 'producer.city' }), AddCol({ name: 'city', label_trans: 'producer.city' }),
AddCol({ name: 'img', label_trans: 'producer.img' }), AddCol({ name: 'img', label_trans: 'producer.img' }),
AddCol({ name: 'website', label_trans: 'producer.website' }), AddCol({ name: 'website', label_trans: 'reg.website' }),
AddCol(DeleteRec), AddCol(DeleteRec),
AddCol(DuplicateRec), AddCol(DuplicateRec),
] ]
@@ -322,7 +323,7 @@ export const colTableStorehouse = [
AddCol({ name: 'city', label_trans: 'store.city' }), AddCol({ name: 'city', label_trans: 'store.city' }),
AddCol({ name: 'region', label_trans: 'store.region' }), AddCol({ name: 'region', label_trans: 'store.region' }),
AddCol({ name: 'img', label_trans: 'store.img' }), AddCol({ name: 'img', label_trans: 'store.img' }),
AddCol({ name: 'website', label_trans: 'store.website' }), AddCol({ name: 'website', label_trans: 'reg.website' }),
AddCol(DeleteRec), AddCol(DeleteRec),
AddCol(DuplicateRec), AddCol(DuplicateRec),
] ]
@@ -546,14 +547,6 @@ export const colmyUserGroup = [
export const colmySkills = [ 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({ AddCol({
name: 'username', name: 'username',
label_trans: 'reg.username', label_trans: 'reg.username',
@@ -564,6 +557,19 @@ export const colmySkills = [
noshowlabel: true, noshowlabel: true,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, 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({ AddCol({
name: 'adType', name: 'adType',
label_trans: 'adTypes.name', label_trans: 'adTypes.name',
@@ -605,6 +611,13 @@ export const colmySkills = [
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
allowNewValue: true, allowNewValue: true,
}), }),
AddCol({
name: '',
fieldtype: costanti.FieldType.separator,
required: false,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
visible: false,
}),
AddCol({ AddCol({
name: 'idSubSkill', name: 'idSubSkill',
label_trans: 'skill.subskill', label_trans: 'skill.subskill',
@@ -617,7 +630,9 @@ export const colmySkills = [
icon: 'far fa-id-card', icon: 'far fa-id-card',
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
allowNewValue: true, allowNewValue: true,
isadvanced_field: true,
}), }),
AddCol({ AddCol({
name: 'numLevel', name: 'numLevel',
label_trans: 'level.name', 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, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
noshowlabel: false, noshowlabel: false,
icon: 'grading', icon: 'grading',
isadvanced_field: true,
}), }),
AddCol({ AddCol({
name: 'idStatusSkill', name: 'idStatusSkill',
@@ -636,6 +652,7 @@ export const colmySkills = [
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
noshowlabel: true, noshowlabel: true,
icon: 'mood', icon: 'mood',
isadvanced_field: true,
}), }),
AddCol({ AddCol({
name: 'idContribType', name: 'idContribType',
@@ -646,19 +663,7 @@ export const colmySkills = [
noshowlabel: true, noshowlabel: true,
icon: 'currency_exchange', icon: 'currency_exchange',
//icon: 'fas fa-hands-helping', //icon: 'fas fa-hands-helping',
}), isadvanced_field: true,
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({ AddCol({
name: 'photos', name: 'photos',
@@ -667,27 +672,23 @@ export const colmySkills = [
jointable: '', jointable: '',
showpicprofile_ifnotset: true, showpicprofile_ifnotset: true,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
isadvanced_field: true,
}), }),
AddCol({ AddCol({
name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html, name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, 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(DuplicateRec),
AddCol(ModifRec), AddCol(ModifRec),
AddCol(DeleteRec), AddCol(DeleteRec),
] ]
export const colmyBachecas = [ 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({ AddCol({
name: 'username', name: 'username',
label_trans: 'reg.username', label_trans: 'reg.username',
@@ -698,6 +699,19 @@ export const colmyBachecas = [
noshowlabel: true, noshowlabel: true,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, 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({ AddCol({
name: 'adType', name: 'adType',
label_trans: 'adTypes.name', label_trans: 'adTypes.name',
@@ -739,6 +753,13 @@ export const colmyBachecas = [
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
allowNewValue: true, allowNewValue: true,
}), }),
AddCol({
name: '',
fieldtype: costanti.FieldType.separator,
required: false,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
visible: false,
}),
AddCol({ AddCol({
name: 'idSubSkill', name: 'idSubSkill',
label_trans: 'skill.subskill', label_trans: 'skill.subskill',
@@ -751,7 +772,9 @@ export const colmyBachecas = [
icon: 'far fa-id-card', icon: 'far fa-id-card',
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
allowNewValue: true, allowNewValue: true,
isadvanced_field: true,
}), }),
AddCol({ AddCol({
name: 'numLevel', name: 'numLevel',
label_trans: 'level.name', 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, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
noshowlabel: false, noshowlabel: false,
icon: 'grading', icon: 'grading',
isadvanced_field: true,
}), }),
AddCol({ AddCol({
name: 'idStatusSkill', name: 'idStatusSkill',
@@ -770,6 +794,7 @@ export const colmyBachecas = [
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
noshowlabel: true, noshowlabel: true,
icon: 'mood', icon: 'mood',
isadvanced_field: true,
}), }),
AddCol({ AddCol({
name: 'idContribType', name: 'idContribType',
@@ -780,19 +805,7 @@ export const colmyBachecas = [
noshowlabel: true, noshowlabel: true,
icon: 'currency_exchange', icon: 'currency_exchange',
//icon: 'fas fa-hands-helping', //icon: 'fas fa-hands-helping',
}), isadvanced_field: true,
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({ AddCol({
name: 'photos', name: 'photos',
@@ -801,13 +814,17 @@ export const colmyBachecas = [
jointable: '', jointable: '',
showpicprofile_ifnotset: true, showpicprofile_ifnotset: true,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
isadvanced_field: true,
}), }),
AddCol({ AddCol({
name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html, name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, 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(DuplicateRec),
AddCol(ModifRec), AddCol(ModifRec),
AddCol(DeleteRec), AddCol(DeleteRec),

View File

@@ -1751,6 +1751,7 @@ export const tools = {
// console.log('param1', par.param1) // console.log('param1', par.param1)
globalStore.DeleteRec({ table, id: par.param1 }).then((ris) => { globalStore.DeleteRec({ table, id: par.param1 }).then((ris) => {
if (ris) { if (ris) {
debugger
mythis.ActionAfterYes(func, par.param2, null) mythis.ActionAfterYes(func, par.param2, null)
this.showPositiveNotif(mythisq, t('db.deletedrecord')) this.showPositiveNotif(mythisq, t('db.deletedrecord'))
} else { } else {
@@ -4935,10 +4936,14 @@ export const tools = {
adType: 0, adType: 0,
photos: [], photos: [],
note: '', note: '',
//**ADDFIELD_MYSKILL
website: '',
descr: '', descr: '',
} }
}, },
getdefaultnewrec_MyBacheca(): any { getdefaultnewrec_MyBacheca(): any {
return { return {
_id: 0, _id: 0,
@@ -4952,6 +4957,8 @@ export const tools = {
adType: 0, adType: 0,
photos: [], photos: [],
note: '', note: '',
//**ADDFIELD_MYBACHECAS
website: '',
descr: '', descr: '',
} }

View File

@@ -105,6 +105,7 @@ export default defineComponent({
photos: 1, photos: 1,
idCity: 1, idCity: 1,
note: 1, note: 1,
website: 1,
comune: 1, comune: 1,
mycities: 1, mycities: 1,
sector: 1, sector: 1,
@@ -126,6 +127,8 @@ export default defineComponent({
photos: 1, photos: 1,
idCity: 1, idCity: 1,
note: 1, note: 1,
//**ADDFIELD_MYGROUPS
website: 1,
comune: 1, comune: 1,
mycities: 1, mycities: 1,
} }