From 8fa6757cc951e3b12cba0e99be61af8f741e26f1 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Sun, 7 Jan 2024 17:27:27 +0100
Subject: [PATCH] Corretto il pagato - fix Group Add link

---
 src/components/CGridTableRec/CGridTableRec.ts   |  6 +++++-
 src/components/CGridTableUser/CGridTableUser.ts |  6 +++++-
 src/components/CMyPopupEdit/CMyPopupEdit.vue    | 10 +++++++---
 src/model/GlobalStore.ts                        |  2 ++
 src/statics/lang/it.js                          |  3 ++-
 src/store/Modules/fieldsTable.ts                |  6 +++++-
 src/store/Modules/tools.ts                      | 12 +++++++++++-
 7 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index 90282090..fbcbd615 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -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])
         }
       })
diff --git a/src/components/CGridTableUser/CGridTableUser.ts b/src/components/CGridTableUser/CGridTableUser.ts
index f6424442..79f94e56 100755
--- a/src/components/CGridTableUser/CGridTableUser.ts
+++ b/src/components/CGridTableUser/CGridTableUser.ts
@@ -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])
         }
       })
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index 106b6c06..193f3c9b 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -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"
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 71694ae7..0dae54a8 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -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
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index d1d9615f..f702794c 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -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',
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 5241438c..aea186b3 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -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',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index e122393b..2691f7a8 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -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 !