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

Corretto il pagato

Browse Source 
- fix Group Add link
This commit is contained in:
Surya Paolo
2024-01-07 17:27:27 +01:00
parent ecd3154dd8
commit 8fa6757cc9
7 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1984,7 +1984,11 @@ export default defineComponent({
if (col.field_toduplicate_nospace) {
//
let trovato = tools.removespecial_chars(myobj[col.name])
myobj[col.field_toduplicate_nospace] = trovato
if (myobj[col.field_toduplicate_nospace] === '') {
myobj[col.field_toduplicate_nospace] = trovato
}
let attuale = tools.removespecial_chars(myobj[col.field_toduplicate_nospace])
myobj[col.field_toduplicate_nospace] = attuale
// console.log('trovato', trovato, 'name', myobj[col.name], 'duplicate:', myobj[col.field_toduplicate_nospace], 'orig', myobj[col.name])
}
})

6
src/components/CGridTableUser/CGridTableUser.ts
View File

@@ -1952,7 +1952,11 @@ export default defineComponent({
if (col.field_toduplicate_nospace) {
//
let trovato = tools.removespecial_chars(myobj[col.name])
myobj[col.field_toduplicate_nospace] = trovato
if (myobj[col.field_toduplicate_nospace] === '') {
myobj[col.field_toduplicate_nospace] = trovato
}
let attuale = tools.removespecial_chars(myobj[col.field_toduplicate_nospace])
myobj[col.field_toduplicate_nospace] = attuale
// console.log('trovato', trovato, 'name', myobj[col.name], 'duplicate:', myobj[col.field_toduplicate_nospace], 'orig', myobj[col.name])
}
})

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

@@ -85,8 +85,7 @@
v-if="
col.extrafield &&
(col.tipovisu !== costanti.TipoVisu.LINK ||
(col.tipovisu === costanti.TipoVisu.LINK &&
myvalue))
(col.tipovisu === costanti.TipoVisu.LINK && myvalue))
"
>
<span class="extrafield">{{ $t(col.extrafield) }}</span>
@@ -205,7 +204,7 @@
col.fieldtype === costanti.FieldType.crypted
"
>
<div v-if="isInModif" :class="{ flex: !isInModif }">
<div v-if="isInModif" :class="{ flex: !isInModif, 'q-mb-sm': true }">
<q-input
v-bind="$attrs"
v-model="myvalue"
@@ -227,6 +226,11 @@
:label="col.visulabel ? $t(col.label_trans) : col.label"
>
</q-input>
<q-label v-if="col.showLinkResult">
Diventerà: <a :href="tools.generateURL(col.showLinkResult, myvalue)" target="_blank">{{tools.generateURL(col.showLinkResult, myvalue)}}</a>
</q-label>
</div>
<div
v-else-if="col.tipovisu === costanti.TipoVisu.TESTO_BORDATO"

2
src/model/GlobalStore.ts
View File

@@ -769,6 +769,7 @@ export interface IColGridTable {
remote_field?: string
field_extra1?: string
field_toduplicate_nospace?: string
showLinkResult?: string
subfield_extra1?: string
allowNewValue?: boolean
showpicprofile_ifnotset?: boolean
@@ -1129,6 +1130,7 @@ export interface ICircuit {
data_costituz?: Date
deperimento: boolean
showAlways: boolean
ignoreLimits: boolean
transactionsEnabled: boolean
status: number
freq_deper?: string

3
src/statics/lang/it.js
View File

@@ -577,7 +577,7 @@ const msg_it = {
note_payment: 'Note Aggiuntive',
country_pay: 'Paese di Destinazione Pagamenti',
username_telegram: 'Username Telegram',
groupname: 'Il link della pagina diventerà:',
groupname: 'Nome Breve per la URL:',
firstname_telegram: 'Nome Telegram',
lastname_telegram: 'Cognome Telegram',
telegram: 'Chat Telegram \'{botname}\'',
@@ -1237,6 +1237,7 @@ const msg_it = {
createdby: 'Creato da {username} in data {date}',
createddate: 'Creato in data {date}',
lastmodify: 'Ultima modifica {date}',
short_descr: 'Descrizione Breve',
},
groups: {
info: 'Informazioni su questo gruppo',

6
src/store/Modules/fieldsTable.ts
View File

@@ -63,6 +63,7 @@ function AddCol(params: IColGridTable) {
titlepopupedit: (params.titlepopupedit === undefined) ? '' : params.titlepopupedit,
field_extra1: (params.field_extra1 === undefined) ? '' : params.field_extra1,
field_toduplicate_nospace: (params.field_toduplicate_nospace === undefined) ? '' : params.field_toduplicate_nospace,
showLinkResult: (params.showLinkResult === undefined) ? '' : params.showLinkResult,
subfield_extra1: (params.subfield_extra1 === undefined) ? '' : params.subfield_extra1,
allowNewValue: (params.allowNewValue === undefined) ? false : params.allowNewValue,
showpicprofile_ifnotset: (params.showpicprofile_ifnotset === undefined) ? false : params.showpicprofile_ifnotset,
@@ -892,6 +893,7 @@ export const colmyUserGroup = [
name: 'groupname', label_trans: 'reg.groupname', required: false,
maxlength: 30,
allowchar: costanti.ALLOWCHAR_CODE,
showLinkResult: '{site}/grp/{value}',
showWhen: costanti.showWhen.InPage + costanti.showWhen.NewRec
}),
AddCol({
@@ -919,7 +921,7 @@ export const colmyUserGroup = [
}),
AddCol(
{
name: 'descr', label_trans: 'proj.longdescr', required: true,
name: 'descr', label_trans: 'shared.short_descr', required: true,
noshowlabel: true,
maxlength: 100
}
@@ -3256,6 +3258,7 @@ export const colTableCircuitComplete = [
AddCol({ name: 'data_costituz', label_trans: 'circuit.data_costituz', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'deperimento', label_trans: 'circuit.deperimento', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'showAlways', label_trans: 'circuit.showAlways', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'ignoreLimits', label_trans: 'circuit.ignoreLimits', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'transactionsEnabled', label_trans: 'circuit.transactionsEnabled', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'freq_deper', label_trans: 'circuit.freq_deper' }),
AddCol({ name: 'minuto_deper', label_trans: 'circuit.minuto_deper', fieldtype: costanti.FieldType.number }),
@@ -3396,6 +3399,7 @@ export const colTableCircuit = [
AddCol({ name: 'regulation', label_trans: 'circuit.regulation', fieldtype: costanti.FieldType.html, required: false }),
AddCol({ name: 'deperimento', label_trans: 'circuit.deperimento', fieldtype: costanti.FieldType.boolean, disable: true }),
AddCol({ name: 'showAlways', label_trans: 'circuit.showAlways', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'ignoreLimits', label_trans: 'circuit.ignoreLimits', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'transactionsEnabled', label_trans: 'circuit.transactionsEnabled', fieldtype: costanti.FieldType.boolean }),
AddCol({
name: 'status', label_trans: 'circuit.status',

12
src/store/Modules/tools.ts
View File

@@ -8324,7 +8324,17 @@ export const tools = {
return (val1 / valmax * 100)
else
return 0
}
},
getHost() {
return this.getUrlSite()
},
generateURL(mylink: string, value: string): string {
const site = this.getUrlSite()
return mylink.replace('{site}', site).replace('{value}', value);
},
// FINE !