diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts
index 8b81ef75..ab74a4fe 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -45,12 +45,13 @@ export const shared_consts = {
REPORT_FILT_ATTIVITA: 2,
TAB_COUNTRY: 'countries',
+ TAB_CITIES: 'cities',
TAB_PHONES: 'phones',
TAB_SETTINGS: 'settings',
KEY_TO_CRYPTED: ['PWD_FROM'],
- TablePickup: ['countries', 'phones'],
+ TablePickup: ['countries', 'phones', 'cities'],
CashType: {
None: 0,
diff --git a/src/components/CCopyBtn/CCopyBtn.scss b/src/components/CCopyBtn/CCopyBtn.scss
index 02d3a55c..a216597a 100755
--- a/src/components/CCopyBtn/CCopyBtn.scss
+++ b/src/components/CCopyBtn/CCopyBtn.scss
@@ -21,11 +21,6 @@ $grayshadow: #555;
height: 200px;
}
-.myimg-view {
- border-radius: 5px !important;
- height: 80px;
-}
-
.q-img {
&__image {
border-radius: 10px !important;
diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue
index 30471637..b181a245 100755
--- a/src/components/CEventsCalendar/CEventsCalendar.vue
+++ b/src/components/CEventsCalendar/CEventsCalendar.vue
@@ -11,7 +11,7 @@
-
+
@@ -120,7 +120,7 @@
-
+
{{ addOrUpdateEvent() }} {{ $t('cal.event') }}
@@ -350,7 +350,7 @@
-
+
{{ $t('cal.booking') }}
@@ -481,7 +481,7 @@
-
+
{{ $t('cal.booking') }}
diff --git a/src/components/CGallery/CGallery.scss b/src/components/CGallery/CGallery.scss
index 271a7140..9c9a074e 100755
--- a/src/components/CGallery/CGallery.scss
+++ b/src/components/CGallery/CGallery.scss
@@ -32,11 +32,6 @@ $grayshadow: #555;
}
-.myimg-view {
- border-radius: 5px !important;
- height: 80px;
-}
-
.q-img {
&__image {
border-radius: 10px !important;
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index 35c07c96..a487a53f 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -135,7 +135,7 @@ export default defineComponent({
type: Object as PropType,
required: false,
default: () => {
- return { sortBy: 'desc', descending: false, page: 1, rowsNumber: 10, rowsPerPage: 10 }
+ return { sortBy: 'desc', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 }
},
},
defaultnewrec: {
@@ -216,11 +216,16 @@ export default defineComponent({
return lab
})
- watch(searchList.value, (to: any, from: any) => {
+ watch(() => searchList.value, (to: any, from: any) => {
console.log('watch searchlist', to)
refresh()
})
+ watch(() => props.filtercustom, (to: any, from: any) => {
+ console.log('filtercustom', to)
+ refresh()
+ })
+
function searchval(newval: any, table: any) {
console.log('searchval', newval, table)
tools.setCookie(tools.COOK_SEARCH + table, newval)
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index 6f39cc10..d849483d 100755
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -169,8 +169,8 @@
-
+
- {{ pagination.rowsNumber }} elementi trovati
+ {{ pagination.rowsNumber }} elementi trovati
@@ -364,7 +364,7 @@
-
+
Nuovo:
@@ -404,7 +404,7 @@
-
+
{{ mytitle }}
{{ recModif[col_title] }}
diff --git a/src/components/CMyEditor/CMyEditor.vue b/src/components/CMyEditor/CMyEditor.vue
index ce9bfa1f..b653e74c 100755
--- a/src/components/CMyEditor/CMyEditor.vue
+++ b/src/components/CMyEditor/CMyEditor.vue
@@ -1,6 +1,6 @@
-
+
Editor
@@ -25,6 +25,7 @@
[{}])
@@ -477,6 +478,17 @@ export default defineComponent({
return ''
} else {
let mystr = ''
+ let mylink = ''
+
+ if (col.link)
+ mylink = col.link.replace(col.name, val)
+ if (col.tipovisu === costanti.TipoVisu.LINK && col.link) {
+ return "" + val + ''
+ } else if (col.tipovisu === costanti.TipoVisu.BUTTON && col.link) {
+ return ''
+ }
+
+
if (props.showall) {
return val
} else {
@@ -586,6 +598,7 @@ export default defineComponent({
myvalue,
countryname,
visueditor,
+ visuhtml,
showeditor,
isviewfield,
changeval,
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index d2ff830b..a40668de 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -2,7 +2,7 @@
+ :class="{ flex: true, 'justify-center': true }">
@@ -24,8 +24,10 @@
-
+
+
+ {{ myvalue }}
+
+ {{ myvalue }}
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
{{ myop.name }} {{ myop.surname }}
diff --git a/src/components/CSkill/CSkill.scss b/src/components/CSkill/CSkill.scss
index ab083089..935e5c5e 100755
--- a/src/components/CSkill/CSkill.scss
+++ b/src/components/CSkill/CSkill.scss
@@ -27,3 +27,4 @@
.q-img__content > div{
background: rgba(0,0,0,0.17) !important;
}
+
diff --git a/src/components/CSkill/CSkill.ts b/src/components/CSkill/CSkill.ts
index def5e920..62cfe560 100755
--- a/src/components/CSkill/CSkill.ts
+++ b/src/components/CSkill/CSkill.ts
@@ -25,6 +25,11 @@ export default defineComponent({
return []
}
},
+ username: {
+ type: String,
+ required: false,
+ default: ''
+ }
},
components: {
CMyFieldDb, CGridTableRec,
@@ -44,7 +49,7 @@ export default defineComponent({
data: {},
field: 'myskills'
}
- };
+ }
if (props.defaultnewrec) {
@@ -72,13 +77,23 @@ export default defineComponent({
function extraparams() {
+ let lk_tab = 'users'
+ let lk_LF = 'userId'
+ let lk_FF = '_id'
+ let lk_as = 'user'
+ let af_objId_tab = 'myId'
+
+ if (props.username) {
+ // lk_LF = 'username'
+ }
+
return {
lookup1: {
- lk_tab: 'users',
- lk_LF: 'userId',
- lk_FF: '_id',
- lk_as: 'user',
- af_objId_tab: 'myId',
+ lk_tab,
+ lk_LF,
+ lk_FF,
+ lk_as,
+ af_objId_tab,
lk_proj: {
idSkill: 1,
idSubSkill: 1,
@@ -97,12 +112,24 @@ export default defineComponent({
}
}
+ function getFilterCustom() {
+ /*if (props.username) {
+ return [
+ { username: props.username }
+ ]
+ } else {
+ return props.filtercustom
+ }*/
+
+ }
+
return {
tools,
costanti,
colmySkills,
getdefaultnewrec,
extraparams,
+ getFilterCustom,
}
},
})
diff --git a/src/components/CSkill/CSkill.vue b/src/components/CSkill/CSkill.vue
index 65e86b24..931f2607 100755
--- a/src/components/CSkill/CSkill.vue
+++ b/src/components/CSkill/CSkill.vue
@@ -2,6 +2,7 @@
diff --git a/src/components/CTitleBanner/CTitleBanner.ts b/src/components/CTitleBanner/CTitleBanner.ts
index c1a0469e..f93a80cc 100755
--- a/src/components/CTitleBanner/CTitleBanner.ts
+++ b/src/components/CTitleBanner/CTitleBanner.ts
@@ -70,9 +70,11 @@ export default defineComponent({
}
function apri() {
- myvisible.value = !myvisible.value
- if (myvisible.value)
- emit('apri')
+ if (props.canopen) {
+ myvisible.value = !myvisible.value
+ if (myvisible.value)
+ emit('apri')
+ }
}
function getclass() {
diff --git a/src/components/CTitleBanner/CTitleBanner.vue b/src/components/CTitleBanner/CTitleBanner.vue
index 53be5661..b6223499 100755
--- a/src/components/CTitleBanner/CTitleBanner.vue
+++ b/src/components/CTitleBanner/CTitleBanner.vue
@@ -24,8 +24,8 @@
+ v-if="imgpreview" class="text-center cursor-pointer clBorderSteps" style="opacity: 0.5;"
+ @click="myvisible = !myvisible">
diff --git a/src/components/Header/Header.ts b/src/components/Header/Header.ts
index f42dbf2d..a990d7f0 100755
--- a/src/components/Header/Header.ts
+++ b/src/components/Header/Header.ts
@@ -345,9 +345,13 @@ export default defineComponent({
function getappname() {
let mystr = tools.getsuffisso() + tools.getappname(tools.isMobile())
- //if (!tools.isMobile()) {
+ if (!tools.isMobile()) {
+ //if (!tools.isMobile()) {
mystr += ' ' + getAppVersion()
- //}
+ //}
+ } else {
+ mystr = ''
+ }
return mystr
diff --git a/src/css/app.scss b/src/css/app.scss
index 2f374caa..102413e7 100755
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -869,7 +869,29 @@ $heightBtn: 100%;
.combowidth {
min-width: 150px;
- @media (max-width: 400px) {
+ @media (max-width: 450px) {
min-width: 300px;
}
}
+
+.myimg-view {
+ border-radius: 5px !important;
+ height: 80px;
+}
+
+.dialog_card{
+ min-width: 100%;
+ width: 100% !important;
+ margin-left: 2px !important;
+ margin-right: 2px !important;
+
+ @media (max-width: 600px) {
+ width: auto;
+ min-width: auto;
+ }
+
+}
+
+.wrap_anywhere {
+ overflow-wrap: anywhere;
+}
diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js
index 30e6edeb..85224b26 100755
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -23,6 +23,7 @@ const msg_website_it = {
pages: {
home: 'Home',
profile: 'Profilo',
+ profile2: 'ProfiloU',
test: 'Test',
projects: 'Progetti',
report: 'Report Ore',
diff --git a/src/db/static_data.ts b/src/db/static_data.ts
index 9c4b9277..07aeb8ff 100755
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -383,11 +383,22 @@ const baseroutes: IListRoutes[] = [
path: '/profile',
materialIcon: 'fas fa-user',
name: 'pages.profile',
- component: () => import('@/views/user/profile/profile.vue'),
+ component: () => import('@/views/user/editprofile/editprofile.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
+ {
+ active: true,
+ order: 130,
+ path: '/my/:username',
+ materialIcon: 'fas fa-user',
+ name: 'pages.profile2',
+ component: () => import('@/views/user/myprofile/myprofile.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
{
active: true,
order: 120,
diff --git a/src/mixins/mixin-users.ts b/src/mixins/mixin-users.ts
index 1a2508b5..06ffc8b0 100755
--- a/src/mixins/mixin-users.ts
+++ b/src/mixins/mixin-users.ts
@@ -2,6 +2,8 @@ import { IMessage } from '@src/model'
import { useUserStore } from '@store/UserStore'
import { useGlobalStore } from '@store/globalStore'
import { useProducts } from '@store/Products'
+import { serv_constants } from '@store/Modules/serv_constants'
+import { tools } from '@store/Modules/tools'
// You can declare a mixin as the same style as components.
export default function () {
@@ -70,8 +72,10 @@ export default function () {
function getMyImgforIcon() {
const userStore = useUserStore()
- const ris = userStore.getImgByUsername(userStore.my.username)
- return (ris !== '') ? `img:${ris}` : 'fas fa-user'
+ const mypath = userStore.getImgByUsername(userStore.my.username)
+ let img_small = tools.baseurl(mypath) + '/' + serv_constants.PREFIX_IMG_SMALL + tools.getLastItem(mypath);
+ console.log('img_small', img_small)
+ return (img_small !== '') ? `img:${img_small}` : 'fas fa-user'
}
function getIconCart() {
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 23dd958f..916ad8f2 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -491,6 +491,8 @@ export interface IColGridTable {
askaction?: string
foredit?: boolean
fieldtype?: number
+ tipovisu?: number
+ link?: string
jointable?: string
resultjoin?: string[]
visuonlyEditVal?: boolean
diff --git a/src/rootgen/admin/eventlist/eventlist.vue b/src/rootgen/admin/eventlist/eventlist.vue
index f70fb871..074713f3 100755
--- a/src/rootgen/admin/eventlist/eventlist.vue
+++ b/src/rootgen/admin/eventlist/eventlist.vue
@@ -101,7 +101,7 @@
-
+
Note: {{ eventsel.title }}
@@ -122,7 +122,7 @@
-
+
{{ eventsel.title }}
diff --git a/src/rootgen/admin/newsletter/newsletter.ts b/src/rootgen/admin/newsletter/newsletter.ts
index ecf7ef24..8891583e 100755
--- a/src/rootgen/admin/newsletter/newsletter.ts
+++ b/src/rootgen/admin/newsletter/newsletter.ts
@@ -80,7 +80,7 @@ export default defineComponent({
}
}
- watch(idparam, (newval, oldval) => {
+ watch(() => idparam, (newval, oldval) => {
tab.value = idparam.value
})
diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts
index b3610abf..0220838f 100755
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -49,6 +49,7 @@ export const costanti = {
hours: 8000,
crypted: 9000,
},
+
FieldTypeArr: [
{ label: 'Boolean', value: 1 },
{ label: 'Date', value: 2 },
@@ -59,5 +60,10 @@ export const costanti = {
{ label: 'Number', value: 64 },
],
+ TipoVisu: {
+ TESTO: 1,
+ LINK: 2,
+ BUTTON: 3,
+ },
}
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 05e0e98d..71dbb09d 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -59,6 +59,8 @@ function AddCol(params: IColGridTable) {
action: (params.action === undefined) ? '' : params.action,
foredit: (params.foredit === undefined) ? true : params.foredit,
fieldtype: (params.fieldtype === undefined) ? costanti.FieldType.string : params.fieldtype,
+ tipovisu: (params.tipovisu === undefined) ? costanti.TipoVisu.TESTO : params.tipovisu,
+ link: (params.link === undefined) ? '' : params.link,
visuonlyEditVal: (params.visuonlyEditVal === undefined) ? false : params.visuonlyEditVal,
askaction: (params.askaction === undefined) ? '' : params.askaction,
jointable: (params.jointable === undefined) ? '' : params.jointable,
@@ -389,7 +391,7 @@ export const colmySkills = [
}), */
//AddCol({ name: 'name', label_trans: 'reg.name', fieldtype: costanti.FieldType.string }),
//AddCol({ name: 'surname', label_trans: 'reg.surname', fieldtype: costanti.FieldType.string }),
- AddCol({ name: 'username', label_trans: 'reg.username', foredit: false }),
+ AddCol({ name: 'username', label_trans: 'reg.username', foredit: false, tipovisu: costanti.TipoVisu.LINK, link: '/my/username' }),
AddCol({
name: 'idSkill',
label_trans: 'skill.name',
@@ -1309,6 +1311,10 @@ export const fieldsTable = {
AddCol({
name: 'profile.nationality', field: 'profile', subfield: 'nationality', label_trans: 'reg.nationality',
}),
+ AddCol({ name: 'profile.dateofbirth', label_trans: 'reg.dateofbirth', fieldtype: costanti.FieldType.onlydate }),
+ AddCol({ name: 'profile.born_city', label_trans: 'reg.born_city', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'profile.born_province', label_trans: 'reg.born_province', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'profile.born_country', label_trans: 'reg.born_country', fieldtype: costanti.FieldType.string }),
AddCol({
name: 'profile.cell', field: 'profile', subfield: 'cell', label_trans: 'reg.cell',
}),
@@ -1457,6 +1463,7 @@ export const fieldsTable = {
tableRemotePickup: [
'countries',
'phones',
+ 'cities',
],
tableWithUsername: [
diff --git a/src/store/Modules/serv_constants.ts b/src/store/Modules/serv_constants.ts
index 505a6977..4feda00d 100755
--- a/src/store/Modules/serv_constants.ts
+++ b/src/store/Modules/serv_constants.ts
@@ -36,4 +36,24 @@ export const serv_constants = {
RIS_UNSUBSCRIBED_STR: 'unsubscribed',
RIS_UNSUBSCRIBED_NOT_EXIST: -5,
+ LIST_END: '10000000',
+ LIST_START: null,
+
+ PREFIX_IMG: 'm_',
+ PREFIX_IMG_SMALL: 'sm_',
+
+ Privacy: {
+ all: 'all',
+ friends: 'friends',
+ mygroup: 'mygroup',
+ onlyme: 'onlyme',
+ inherited: 'inherited'
+ },
+
+ TypeProj: {
+ TYPE_PROJECT: 1,
+ TYPE_SUBDIR: 2,
+ }
+
+
}
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index fc85fde4..e7b0fb1a 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -96,7 +96,7 @@ export const tools = {
'yellow',
],
- MAX_CHARACTERS: 60,
+ MAX_CHARACTERS: 200,
projects: 'projects',
todos: 'todos',
EMPTY: 0,
@@ -3338,7 +3338,7 @@ export const tools = {
return ''
},
getsuffisso() {
- if (this.isTest()) return 'TEST: '
+ if (this.isTest()) return 'T: '
return ''
},
@@ -4360,7 +4360,16 @@ export const tools = {
col = 'green-5'
}
return col
- }
+ },
+
+ baseurl(folder: string) {
+ return folder.substring(0, folder.lastIndexOf('/'))
+ },
+
+ getLastItem(thePath: string) {
+ return thePath.substring(thePath.lastIndexOf('/') + 1)
+ },
+
// getLocale() {
// if (navigator.languages && navigator.languages.length > 0) {
// return navigator.languages[0]
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 7e3a8d7d..8c68b9fa 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -176,6 +176,16 @@ export const useUserStore = defineStore('UserStore', {
return ''
},
+ getImgByProfile(userparam: IUserFields): string {
+
+ try{
+ if (userparam.profile && userparam.profile.img) {
+ return 'upload/profile/' + userparam.username + '/' + userparam.profile.img
+ }
+ }catch (e) {}
+ return 'images/noimg.png'
+ },
+
getRefLink(username: string): string {
if (username === '')
username = this.my.username
@@ -805,5 +815,19 @@ export const useUserStore = defineStore('UserStore', {
return false
}
},
+
+ async loadUserProfile(username: string) {
+ const data = {
+ username
+ }
+
+ return Api.SendReq('/users/profile', 'POST', data)
+ .then((res) => {
+ return res.data
+ }).catch((error) => {
+ return {}
+ })
+
+ }
},
})
diff --git a/src/views/login/signup/signup.ts b/src/views/login/signup/signup.ts
index ee98cca5..c7666dea 100755
--- a/src/views/login/signup/signup.ts
+++ b/src/views/login/signup/signup.ts
@@ -17,7 +17,7 @@ export default defineComponent({
const invited = computed(() => $route.params.invited)
// @ts-ignore
- watch(invited, (newval, oldval) => {
+ watch(() => invited, (newval, oldval) => {
console.log('$route.params.invited')
adult.value = !!$route.params.invited
})
diff --git a/src/views/projects/proj-list/proj-list.vue.off b/src/views/projects/proj-list/proj-list.vue.off
index 79999b90..6121e8b1 100755
--- a/src/views/projects/proj-list/proj-list.vue.off
+++ b/src/views/projects/proj-list/proj-list.vue.off
@@ -3,7 +3,7 @@
-
+
Nuovo
diff --git a/src/views/user/profile/profile.scss b/src/views/user/editprofile/editprofile.scss
similarity index 100%
rename from src/views/user/profile/profile.scss
rename to src/views/user/editprofile/editprofile.scss
diff --git a/src/views/user/profile/profile.ts b/src/views/user/editprofile/editprofile.ts
similarity index 99%
rename from src/views/user/profile/profile.ts
rename to src/views/user/editprofile/editprofile.ts
index e92f643f..5497b983 100755
--- a/src/views/user/profile/profile.ts
+++ b/src/views/user/editprofile/editprofile.ts
@@ -14,7 +14,7 @@ import { costanti } from '@costanti'
export default defineComponent({
- name: 'ProfileMy',
+ name: 'EditProfile',
components: { CProfile, CTitleBanner, CMyFieldDb, CSkill },
props: {},
setup() {
diff --git a/src/views/user/profile/profile.vue b/src/views/user/editprofile/editprofile.vue
similarity index 77%
rename from src/views/user/profile/profile.vue
rename to src/views/user/editprofile/editprofile.vue
index 92dd1731..362451ff 100755
--- a/src/views/user/profile/profile.vue
+++ b/src/views/user/editprofile/editprofile.vue
@@ -1,4 +1,4 @@
-
+
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -102,6 +61,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -113,21 +151,6 @@
-
-
-
-
-