surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Pagina MySkills personale

Browse Source
This commit is contained in:
paoloar77
2022-01-26 01:31:07 +01:00
parent d3eee69aa7
commit 5842fa69e1
23 changed files with 478 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/CFinder/CFinder.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<div class="q-ma-sm q-gutter-sm q-pa-xs">
<div class="q-pa-sm bi-border-all">
<div class="q-ma-sm q-gutter-sm q-pa-xs bg-green">
<CGridTableRec
v-if="searchList.length > 0"
prop_mytable="myskills"

1
src/components/CGallery/CGallery.vue
View File

@@ -1,7 +1,6 @@
<template>
<!--<div class="q-pa-md items-start " style="display: inline-flex; width: 800px;"> -->
<div v-if="!edit">
<div class="q-pa-md q-gutter-md">
<q-card :class="getclass()" @click="apri">
<div v-for="(mygallery, index) in getlistimages()" :key="index">

27
src/components/CGridTableRec/CGridTableRec.ts
View File

@@ -70,6 +70,11 @@ export default defineComponent({
required: false,
default: false,
},
visuinpage: {
type: Boolean,
required: false,
default: false,
},
showType: {
type: Number,
required: false,
@@ -962,7 +967,7 @@ export default defineComponent({
}
function visuIntestazCol(col: IColGridTable) {
if (col.fieldtype === costanti.FieldType.html || col.fieldtype === costanti.FieldType.listimages) {
if (col.fieldtype === costanti.FieldType.html || col.fieldtype === costanti.FieldType.listimages || col.noshowlabel) {
return false
} else {
return true
@@ -1226,7 +1231,23 @@ export default defineComponent({
}
function checkIfShowRec(rec: any) {
return (rec._id > 0 && typeof rec._id === 'number') || rec._id !== 'number'
return ((rec._id > 0 && typeof rec._id === 'number') || rec._id !== 'number') && rec !== -100
}
function showColCheck(col: IColGridTable, newrec: boolean){
return (colVisib.value.includes(col.field! + col.subfield) || colVisib.value.includes(col.field + '.' + col.subfield)) &&
(!col.showOnlyNewRec || (col.showOnlyNewRec && newrec)) &&
(col.visible) &&
(!props.visuinpage || (col.visuinpage && props.visuinpage))
}
function getValueExtra(col: IColGridTable, record: any) {
if (record) {
if (col.filter_field! in record) {
return col.filter_field ? record[col.filter_field] || '' : ''
}
}
return ''
}
// onMounted(mounted)
@@ -1302,6 +1323,8 @@ export default defineComponent({
labelcombo,
filter,
myvertical,
showColCheck,
getValueExtra,
}
}
})

34
src/components/CGridTableRec/CGridTableRec.vue
View File

@@ -65,7 +65,7 @@
:props="props"
class="text-italic text-weight-bold"
>
<span v-if="col && colVisib.includes(col.field + col.subfield)">
<span v-if="col && showColCheck(col, false)">
{{ col.label }}
</span>
@@ -167,7 +167,7 @@
<template
v-if="item.arrvalue.length >= 1"
v-slot:selected-item="scope">
<div v-if="scope.opt[fieldsTable.getLabelByTable(item.table)]">
<div v-if="scope.opt[fieldsTable.getLabelByTable(item.table)] || (scope.opt && checkIfShowRec(scope.opt)) ">
<q-chip
removable
dense
@@ -178,7 +178,7 @@
class="q-my-none q-ml-xs q-mr-none"
>
<q-avatar color="primary" text-color="white" :icon="item.icon" size="12px"/>
{{ scope.opt[fieldsTable.getLabelByTable(item.table)] }}
{{ scope.opt[fieldsTable.getLabelByTable(item.table)] || (scope.opt) }}
</q-chip>
</div>
</template>
@@ -252,7 +252,7 @@
<q-td
v-for="col in mycolumns" :key="col.name" :props="props">
<div
v-if="colVisib.includes(col.field + col.subfield)" class="tdclass">
v-if="showColCheck(col, false)" class="tdclass">
<div :class="getclrow(props.row)">
<CMyPopupEdit
:table="mytable"
@@ -307,8 +307,8 @@
:style="props.selected ? 'transform: scale(0.95);' : ''"
>
<q-card :class="props.selected ? 'bg-grey-2' : ''" style="min-width: 200px;">
<q-bar dense class="bg-primary text-white">
<span class="ellipsis"> {{ props.row[col_title] }} </span>
<q-bar v-if="!visuinpage" dense class="bg-primary text-white full-height">
<span class=""> {{ props.row[col_title] }} </span>
<q-space/>
<q-btn
v-if="canModifyThisRec(props.row)"
@@ -328,10 +328,15 @@
<q-list dense>
<div v-for="col in mycolumns" :key="col.name">
<q-item v-if="colVisib.includes(col.field + col.subfield) &&
(!col.noshowifnone || (col.noshowifnone && tools.getValue(props.row,col.field, col.subfield)))"
<q-item v-if="showColCheck(col, false) &&
(!col.noshowifnone || (col.noshowifnone && 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>
<q-item-section avatar v-if="visuIntestazCol(col)">
<q-item-label class="q-table__col">{{ col.label }}</q-item-label>
</q-item-section>
@@ -373,7 +378,7 @@
<div
class="q-ma-xs q-pa-xs text-center rounded-borders q-list--bordered"
v-for="mycol in mycolumns" :key="mycol.name">
<div v-if="colVisib.includes(mycol.field + mycol.subfield)">
<div v-if="showColCheck(mycol, false)">
<div class="row items-center justify-center q-gutter-md q-ma-xs">
<div class="q-ma-xs">
<q-field rounded outlined bg-color="orange-3" dense>
@@ -386,6 +391,7 @@
class="q-ma-sm q-pa-sm colmodif col-grow rounded-borders " style="border: 1px solid #bbb"
@click="colclicksel = mycol">
mycol : {{mycol}}
<CMyPopupEdit
:table="mytable"
:canEdit="true"
@@ -395,7 +401,7 @@
:mycol="mycol"
:showall="true"
:row="rowclicksel"
:tablesel="col.tablesel"
:tablesel="mycol.tablesel"
:field="mycol.field"
:subfield="mycol.subfield"
@save="SaveValdb"
@@ -420,7 +426,7 @@
<div
v-for="col in mycolumns" :key="col.name" class="newrec_fields">
<div
v-if="colVisib.includes(col.field + col.subfield) && col.foredit">
v-if="showColCheck(col, true) && col.foredit">
<div class="">
<CMyPopupEdit
:table="mytable"
@@ -431,6 +437,7 @@
:field="col.field"
:subfield="col.subfield"
:tablesel="col.tablesel"
:value_extra="getValueExtra(col, newRecord)"
:isInModif="true"
minuteinterval="1"
:visulabel="true"
@@ -452,7 +459,7 @@
</q-dialog>
<q-dialog v-model="editRecordBool">
<q-card class="dialog_card">
<q-bar dense class="bg-primary text-white">
<q-bar dense class="bg-primary text-white full-height">
<span v-if="mytitle">{{ mytitle }}</span>
<span v-else>{{ recModif[col_title] }}</span>
<q-space/>
@@ -462,7 +469,7 @@
<div
v-for="col in mycolumns" :key="col.name">
<div
v-if="colVisib.includes(col.field + col.subfield) && col.foredit">
v-if="showColCheck(col, false) && col.foredit">
<div>
<CMyPopupEdit
:table="mytable"
@@ -474,6 +481,7 @@
v-model:row="recModif"
:field="col.field"
:subfield="col.subfield"
:value_extra="getValueExtra(col, recModif)"
minuteinterval="1"
@save="SaveValue"
@show="selItem(recModif, col, true)"

13
src/components/CMyPopupEdit/CMyPopupEdit.ts
View File

@@ -120,6 +120,16 @@ export default defineComponent({
required: false,
default: '',
},
field_extra: {
type: String,
required: false,
default: '',
},
value_extra: {
type: [String, Number],
required: false,
default: '',
},
table: {
type: String,
required: false,
@@ -511,7 +521,7 @@ export default defineComponent({
}
function visInNewRec(col: any) {
return !col.notShowInNewRec
return (!col.notShowInNewRec || (col.showOnlyNewRec && props.insertMode)) && (!col.noShowView || (col.noShowView && props.isInModif))
}
function getclassCol(col: any) {
@@ -637,6 +647,7 @@ export default defineComponent({
fieldsTable,
onInput,
globalStore,
userStore,
getTitleGall,
getDirectoryGall,
removephoto,

65
src/components/CMyPopupEdit/CMyPopupEdit.vue
View File

@@ -1,6 +1,6 @@
<template>
<div :class="getclassCol(col)">
<div v-if="(visInNewRec(col) && visulabel) || !visulabel " style="flex-grow: 1;">
<div v-if="(visInNewRec(col) && visulabel) || (!visulabel && !col.showOnlyNewRec && !col.noShowView) " style="flex-grow: 1;">
<div
:class="{ flex: !isInModif, 'justify-center': true }">
<div>
@@ -50,16 +50,19 @@
</div>
<div v-else>
<q-btn v-if="col.tipovisu === costanti.TipoVisu.LINK && myvalue" type="a" rounded dense size="sm"
color="white" text-color="blue" icon="person" :to="col.link.replace(col.name, myvalue)">
<span :class="{disabled: disable }">{{ myvalue }}</span>
<q-btn v-if="col.tipovisu === costanti.TipoVisu.LINK && myvalue"
type="a" rounded size="md"
:class="{disabled: disable }"
color="white" text-color="blue" :icon="`img:`+userStore.getImgByUsername(myvalue)" :to="col.link.replace(col.name, myvalue)"
:label="myvalue"
>
</q-btn>
<q-avatar v-else-if="col.tipovisu === costanti.TipoVisu.LINKIMG && myvalue" size="60px">
<q-img :src="getImgUser(contact)" :alt="myvalue" img-class="imgprofile" height="60px"/>
</q-avatar>
<q-btn v-else-if="col.tipovisu === costanti.TipoVisu.BUTTON && myvalue" rounded dense size="sm"
color="primary" icon="person" :to="col.link.replace(col.name, myvalue)">{{ myvalue }}
<q-btn v-else-if="col.tipovisu === costanti.TipoVisu.BUTTON && myvalue" rounded size="sm"
color="primary" icon="person" :to="col.link.replace(col.name, myvalue)" :label="myvalue">
</q-btn>
<span v-else :class="{disabled: disable }" v-html="visuValByType(myvalue, col, row)"></span>
</div>
@@ -108,8 +111,8 @@
:title="getTitleGall()"
:directory="getDirectoryGall()"
:imgGall="myvalue"
:edit="isviewfield()"
:canModify="canModify"
:edit="isviewfield() && isInModif"
:canModify="canModify && isInModif"
@showandsave="Savedb">
</CGallery>
</div>
@@ -250,6 +253,9 @@
:multiple="true"
:withToggle="true"
:label="col.label"
:filter_table="col.filter_table"
:filter_field="col.filter_field"
:value_extra="value_extra"
v-model:arrvalue="myvalue"
@update:arrvalue="changevalRec"
:addall="false"
@@ -313,6 +319,9 @@
:pickup="col.fieldtype === costanti.FieldType.select_by_server"
:tablesel="col.type === costanti.FieldType.select_by_server ? tablesel : ''"
@update:value="changevalRec"
:filter_table="col.filter_table"
:filter_field="col.filter_field"
:value_extra="value_extra"
:optval="fieldsTable.getKeyByTable(col.jointable)"
:optlab="fieldsTable.getLabelByTable(col.jointable)"
:options="globalStore.getTableJoinByName(col.jointable, col.addall, col.filter)"
@@ -340,6 +349,9 @@
:addall="false"
:tablesel="col.tablesel"
:pickup="true"
:filter_table="col.filter_table"
:filter_field="col.filter_field"
:value_extra="value_extra"
label-color="primary"
class="combowidth"
color="primary"
@@ -356,6 +368,9 @@
:label="col.label"
v-model:value="myvalue"
@update:value="changevalRec"
:filter_table="col.filter_table"
:filter_field="col.filter_field"
:value_extra="value_extra"
:optval="fieldsTable.getKeyByTable(col.jointable)"
:optlab="fieldsTable.getLabelByTable(col.jointable)"
:options="globalStore.getTableJoinByName(col.jointable, col.addall, col.filter)"
@@ -385,7 +400,7 @@
</p>
<div v-if="!isFieldDb()">
<CMyEditor
v-model:value="myvalue" :title="getTitleEditor(col, row)" @keyup.enter.stop
v-model:value="myvalue" :title="getTitleEditor(col, row) && !isInModif" @keyup.enter.stop
:showButtons="false"
:canModify="canModify"
@update:value="changevalRec"
@@ -394,18 +409,29 @@
</div>
</div>
<div v-else>
<q-btn
v-if="myvalue"
:label="$t('cal.details')" color="primary" text-color="white"
@click="visuhtml = true">
</q-btn>
<div class="row justify-evenly">
<q-btn
v-if="myvalue"
class="q-mx-md"
icon="fas fa-info" color="primary" text-color="white"
round
@click="visuhtml = true">
</q-btn>
<q-btn
v-if="myvalue && col.field_extra1"
icon="far fa-file-alt" :label="col.titlepopupedit" color="primary" text-color="white"
:to="`/mypage/`+row['_id']"
>
</q-btn>
</div>
<!--<div v-html="visuValByType(myvalue, col, row)" @click="visueditor = true"></div>-->
<div v-if="!isFieldDb()">
<q-dialog v-model="visuhtml" full-height full-width>
<q-card>
<q-bar dense class="bg-primary text-white">
<span class="ellipsis"> {{ getTitleEditor(col, row) }} </span>
<span> {{ getTitleEditor(col, row) }} </span>
<q-space/>
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
</q-bar>
@@ -528,6 +554,9 @@
v-model:value="scope.value"
:pickup="col.fieldtype === costanti.FieldType.select_by_server"
:tablesel="col.type === costanti.FieldType.select_by_server ? tablesel : ''"
:filter_table="col.filter_table"
:filter_field="col.filter_field"
:value_extra="value_extra"
:optval="fieldsTable.getKeyByTable(col.jointable)"
:optlab="fieldsTable.getLabelByTable(col.jointable)"
:options="globalStore.getTableJoinByName(col.jointable, col.addall, col.filter)"
@@ -542,6 +571,9 @@
@update:arrvalue="changevalRec"
:addall="false"
:tablesel="tablesel"
:filter_table="col.filter_table"
:filter_field="col.filter_field"
:value_extra="value_extra"
:pickup="true"
label-color="primary"
class="combowidth"
@@ -589,6 +621,9 @@
v-model:value="scope.value"
@update:value="changevalRec"
:tablesel="tablesel"
:filter_table="col.filter_table"
:filter_field="col.filter_field"
:value_extra="value_extra"
:pickup="pickup"
:optval="fieldsTable.getKeyByTable(tablesel)"
:optlab="fieldsTable.getLabelByTable(tablesel)"

70
src/components/CMySelect/CMySelect.ts
View File

@@ -37,6 +37,26 @@ export default defineComponent({
required: false,
default: ''
},
type: {
type: Number,
required: false,
default: 0
},
filter_table: {
type: String,
required: false,
default: ''
},
filter_field: {
type: String,
required: false,
default: ''
},
value_extra: {
type: [String, Number],
required: false,
default: ''
},
optlab: [String, Function],
optval: {
type: String,
@@ -121,7 +141,7 @@ export default defineComponent({
if (!props.multiselect_by_server) {
valori.value = valoriload.value
} else {
console.log('@@@ VALORI CHANGED (1)', valori.value)
// console.log('@@@ VALORI CHANGED (1)', valori.value)
}
},
)
@@ -202,7 +222,7 @@ export default defineComponent({
}
function mounted() {
console.log(' #### mounted myselect', props.options, 'arrvalue', myarrvalue.value)
// console.log(' #### mounted myselect', props.options, 'arrvalue', myarrvalue.value)
let rec: any
if (props.options) {
if (!props.multiselect_by_server) {
@@ -254,7 +274,7 @@ export default defineComponent({
}
// }
}
console.log('@@@ VALORI CHANGED (4)', valori.value)
// console.log('@@@ VALORI CHANGED (4)', valori.value)
if (!props.multiselect_by_server) {
valori.value = valoriload.value
} else {
@@ -269,7 +289,45 @@ export default defineComponent({
console.log('Filter val', val, val.length)
let myarr: any = []
if (val.length <= 1) {
if (!fieldsTable.tableRemotePickup.includes(props.tablesel)) {
myarr = props.options
let needle: any = props.value_extra
// console.log('needle', needle)
if (props.filter_table) {
// console.log(' FILTERTABLE', props.filter_field, myarr)
if (props.multiple) {
myarr = myarr.filter((rec: any) => rec[props.filter_field] === needle)
} else {
myarr = myarr.filter((rec: any) => rec[props.filter_field].includes(needle))
}
// console.log(' RISSSSSSSSS: ', myarr)
}
if (props.addall) {
let myobj: any = {}
if (typeof props.optlab === 'string') {
myobj[props.optlab] = '(Tutti)'
myobj[props.optval] = costanti.FILTER_TUTTI
}
if (myarr)
myarr = [myobj, ...myarr]
// console.log(' myarr: ', myarr)
}
if (myarr && myarr.length > 0) {
valori.value = myarr
} else {
if (props.filter_table) {
valori.value = []
}
}
return
}
if (val.length <= 1) {
console.log('@@@ LENGTH <= 1')
abort()
return
@@ -296,8 +354,6 @@ export default defineComponent({
}
// const needle = val.toLocaleLowerCase()
// optFiltered.value = optFiltered.value.filter((v: any) => v.toLocaleLowerCase().indexOf(needle) > -1)
} else {
myarr = props.options
}
if (props.addall) {
@@ -313,7 +369,7 @@ export default defineComponent({
if (myarr && myarr.length > 0) {
valori.value = myarr
if (props.multiselect_by_server) {
console.log('@@@ VALORI CHANGED (3)', valori.value)
// console.log('@@@ VALORI CHANGED (3)', valori.value)
}
}

3
src/components/CMySelect/CMySelect.vue
View File

@@ -114,6 +114,7 @@
@update:model-value="changeval"
rounded
outlined
@filter="filterFn"
v-bind="$attrs"
:input-class="myclass"
:use-input="useinput"
@@ -149,7 +150,6 @@
v-if="withToggle"
v-slot:option="{ itemProps, opt, selected, toggleOption }">
<q-item v-bind="itemProps">
<q-item-section>
<q-item-label>{{ opt[optlab] }}</q-item-label>
</q-item-section>
@@ -174,6 +174,7 @@
:option-value="optval"
:option-label="optlab"
@update:model-value="changeval"
@filter="filterFn"
:label="label"
emit-value
options-selected-class="text-deep-orange"

16
src/components/CSkill/CSkill.ts
View File

@@ -25,6 +25,11 @@ export default defineComponent({
return []
}
},
visuinpage: {
type: Boolean,
required: false,
default: false,
},
username: {
type: String,
required: false,
@@ -95,8 +100,12 @@ export default defineComponent({
lk_as,
af_objId_tab,
lk_proj: {
recSkill: 1,
sector: 1,
idSkill: 1,
idSubSkill: 1,
idStatusSkill: 1,
idContribType: 1,
idCity: 1,
numLevel: 1,
photos: 1,
@@ -104,11 +113,12 @@ export default defineComponent({
subTitle: 1,
date_created: 1,
date_updated: 1,
comune: 1,
userId: 1,
username: 1,
name: 1,
surname: 1,
comune: 1,
mycities: 1,
'profile.img': 1,
'profile.qualifica': 1,
}
@@ -120,8 +130,12 @@ export default defineComponent({
lk_as: 'comune',
af_objId_tab: '',
lk_proj: {
recSkill: 1,
sector: 1,
idSkill: 1,
idSubSkill: 1,
idStatusSkill: 1,
idContribType: 1,
idCity: 1,
numLevel: 1,
photos: 1,

4
src/components/CSkill/CSkill.vue
View File

@@ -9,9 +9,11 @@
prop_colkey="idSkill"
col_title="subTitle"
:vertical="true"
:choose_visutype="true"
:choose_visutype="!visuinpage"
:butt_modif_new="!visuinpage"
nodataLabel="Nessuna Competenza inserita"
:prop_search="false"
:visuinpage="visuinpage"
noresultLabel="Il filtro selezionato non ha trovato nessun risultato"
:defaultnewrec="getdefaultnewrec"
:filtercustom="filtercustom"