"Autoprodotto": metterlo come campo e filtro a parte ??

Se non hai l'USERNAME TELEGRAM presente, allora il BOT ti deve dire come fare per impostarlo. Creare una Chat di Help Supporto Tecnico
2022-02-25 17:24:15 +01:00
parent c8dd9b7d4f
commit f63fdbb175
27 changed files with 118 additions and 55 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.2.10"
+APP_VERSION="0.2.11"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/_ALL_SITES/freeplanet.app/.env.development
+++ b/_ALL_SITES/freeplanet.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.2.10"
+APP_VERSION="0.2.11"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="1"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/_ALL_SITES/freeplanet.app/db/lang/ws_it.js
+++ b/_ALL_SITES/freeplanet.app/db/lang/ws_it.js
@@ -2,7 +2,7 @@ const msg_website_it = {
  ws: {
    sitename: 'FreePlanet',
    siteshortname: 'FreePlanet',
-    botname: 'il Bot di FreePlanet',
+    botname: 'FreePlanet',
  },
  products: {
    quantity: 'Quantità',
--- a/_ALL_SITES/insiemesipuo.app/.env.development
+++ b/_ALL_SITES/insiemesipuo.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.2.10"
+APP_VERSION="0.2.11"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js
+++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js
@@ -2,7 +2,7 @@ const msg_website_it = {
  ws: {
    sitename: 'InsiemeSiPuò',
    siteshortname: 'ISP',
-    botname: 'il Bot di InsiemeSiPuò',
+    botname: 'InsiemeSiPuò',
  },
  products: {
    quantity: 'Quantità',
--- a/_ALL_SITES/popolodelnuovomondo.app/.env.development
+++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.2.10"
+APP_VERSION="0.2.11"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="12"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/_ALL_SITES/popolodelnuovomondo.app/db/lang/ws_it.js
+++ b/_ALL_SITES/popolodelnuovomondo.app/db/lang/ws_it.js
@@ -2,7 +2,7 @@ const msg_website_it = {
  ws: {
    sitename: 'PopoloDelNuovoMondo',
    siteshortname: 'PDNM',
-    botname: 'il Bot di PdNM',
+    botname: 'PdNM',
  },
  products: {
    quantity: 'Quantità',
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -166,6 +166,25 @@ export const shared_consts = {
    },
  ],

+  OtherFilters: [
+    {
+      label: 'AutoProduzione',
+      value: 1,
+    },
+    {
+      label: 'Ecovillaggio',
+      value: 2,
+    },
+    {
+      label: 'Azienda Prodotti Locali',
+      value: 4,
+    },
+    {
+      label: 'Upcycle',
+      value: 8,
+    },
+  ],
+
  Provinces: [
    { _id: 1, reg: 'SIC', value: 'AG', label: 'Agrigento', }, {
      _id: 2,
--- a/src/components/CCopyBtn/CCopyBtn.vue
+++ b/src/components/CCopyBtn/CCopyBtn.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="q-ma-sm">
    <div class="column cursor-pointer" @click="copytoclip">
-      <q-field outlined :label="title" stack-label class="text-center cursor-pointer">
+      <q-field outlined :label="title" stack-label class="text-center cursor-pointer" label-color="text-blue">
        <template v-slot:prepend v-if="!tools.isMobile()">
          <q-btn round dense flat icon="far fa-copy"/>
        </template>
--- a/src/components/CDashboard/CDashboard.vue
+++ b/src/components/CDashboard/CDashboard.vue
@@ -23,13 +23,35 @@
          </q-item>
        </q-card>
      </div>
+      <div class="col-md-3 col-lg-3 col-sm-12 col-xs-12 box_3" style="border-left: 1px solid #efefef;"
+           v-bind:class="{'border-top': $q.platform.is.mobile}">
+        <q-card class="no-shadow q-pa-sm">
+          <q-item class="q-pb-none q-pt-xs">
+            <q-item-section>
+              <q-item-label class="text-h4" style="font-weight: 500;letter-spacing: 3px;">{{ calcstat.numMyGoods }}</q-item-label>
+              <q-item-label :class="!$q.dark.isActive? 'text-grey-7':'text-white'" style="letter-spacing: 1px;">Beni</q-item-label>
+            </q-item-section>
+
+            <q-item-section side>
+              <q-icon name="engineering" class="box_3" size="60px"></q-icon>
+            </q-item-section>
+          </q-item>
+          <q-item class="q-py-xs" style="min-height: unset">
+            <q-item-section>
+              <div class="progress-base q-my-sm">
+                <div class="progress-bar-3" style="width:100%"></div>
+              </div>
+            </q-item-section>
+          </q-item>
+        </q-card>
+      </div>
      <div class="col-md-3 col-lg-3 col-sm-12 col-xs-12 box_3" style="border-left: 1px solid #efefef;"
           v-bind:class="{'border-top': $q.platform.is.mobile}">
        <q-card class="no-shadow q-pa-sm">
          <q-item class="q-pb-none q-pt-xs">
            <q-item-section>
              <q-item-label class="text-h4" style="font-weight: 500;letter-spacing: 3px;">{{ calcstat.numMySkills }}</q-item-label>
-              <q-item-label :class="!$q.dark.isActive? 'text-grey-7':'text-white'" style="letter-spacing: 1px;">Competenze</q-item-label>
+              <q-item-label :class="!$q.dark.isActive? 'text-grey-7':'text-white'" style="letter-spacing: 1px;">Servizi</q-item-label>
            </q-item-section>

            <q-item-section side>
@@ -67,28 +89,6 @@
          </q-item>
        </q-card>
      </div>
-      <div class="col-md-3 col-lg-3 col-sm-12 col-xs-12 box_3" style="border-left: 1px solid #efefef;"
-           v-bind:class="{'border-top': $q.platform.is.mobile}">
-        <q-card class="no-shadow q-pa-sm">
-          <q-item class="q-pb-none q-pt-xs">
-            <q-item-section>
-              <q-item-label class="text-h4" style="font-weight: 500;letter-spacing: 3px;">{{ calcstat.numMyGoods }}</q-item-label>
-              <q-item-label :class="!$q.dark.isActive? 'text-grey-7':'text-white'" style="letter-spacing: 1px;">Beni</q-item-label>
-            </q-item-section>
-
-            <q-item-section side>
-              <q-icon name="engineering" class="box_3" size="60px"></q-icon>
-            </q-item-section>
-          </q-item>
-          <q-item class="q-py-xs" style="min-height: unset">
-            <q-item-section>
-              <div class="progress-base q-my-sm">
-                <div class="progress-bar-3" style="width:100%"></div>
-              </div>
-            </q-item-section>
-          </q-item>
-        </q-card>
-      </div>
      <div v-if="true" class="col-md-3 col-lg-3 col-sm-12 col-xs-12 box_1">
        <q-card class="no-shadow q-pa-sm">
          <q-item class="q-pb-none q-pt-xs">
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -222,8 +222,7 @@ export default defineComponent({
          table: 'statusSkills',
          key: 'idStatusSkill',
          value: 0,
-          // arrvalue: tools.getCookie(tools.COOK_SEARCH + 'statusSkills', []),
-          arrvalue: [],
+          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'statusSkills', []),
          type: costanti.FieldType.multiselect,
          filter: null,
          useinput: false,
@@ -240,6 +239,7 @@ export default defineComponent({
          arrvalue: [],
          filter: null,
          useinput: false,
+          icon: 'fas fa-globe-europe'
        },
        {
          label: 'Provincia',
@@ -375,8 +375,7 @@ export default defineComponent({
          table: 'statusSkills',
          key: 'idStatusSkill',
          value: 0,
-          // arrvalue: tools.getCookie(tools.COOK_SEARCH + 'statusSkills', []),
-          arrvalue: [],
+          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'statusSkills', []),
          type: costanti.FieldType.multiselect,
          filter: null,
          useinput: false,
@@ -393,17 +392,7 @@ export default defineComponent({
          arrvalue: [],
          filter: null,
          useinput: false,
-        },
-        {
-          label: 'Regione',
-          table: 'regions',
-          key: 'idReg',
-          type: costanti.FieldType.select,
-          value: tools.getCookie(tools.COOK_SEARCH + 'regions', costanti.FILTER_TUTTI),
-          addall: true,
-          arrvalue: [],
-          filter: null,
-          useinput: false,
+          icon: 'fas fa-globe-europe'
        },
        {
          label: 'Provincia',
@@ -504,6 +493,7 @@ export default defineComponent({
          arrvalue: [],
          filter: null,
          useinput: false,
+          icon: 'fas fa-globe-europe'
        },
        {
          label: 'Provincia',
@@ -623,6 +613,18 @@ export default defineComponent({
          filteradv: true,
          //icon: 'swap_horizontal_circle',
        },
+        {
+          label: 'Altri Filtri',
+          table: 'otherfilters',
+          key: 'otherfilters',
+          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'otherfilters', []),
+          value: 0,
+          type: costanti.FieldType.multiselect,
+          addall: false,
+          filter: null,
+          useinput: false,
+          icon: 'fas fa-filter'
+        },
        {
          label: '',
          table: '',
@@ -651,6 +653,7 @@ export default defineComponent({
          arrvalue: [],
          filter: null,
          useinput: false,
+          icon: 'fas fa-globe-europe'
        },
        {
          label: 'Provincia',
--- a/src/components/CLabel/CLabel.ts
+++ b/src/components/CLabel/CLabel.ts
@@ -18,6 +18,11 @@ export default defineComponent({
      required: true,
      default: '',
    },
+    copy: {
+      type: Boolean,
+      required: false,
+      default: false,
+    }
  },
  components: {},
  setup(props, { emit }) {
--- a/src/components/CLabel/CLabel.vue
+++ b/src/components/CLabel/CLabel.vue
@@ -7,7 +7,7 @@
      color="blue-6"
      >

-      <template v-slot:prepend>
+      <template v-if="copy" v-slot:prepend>
        <q-btn round dense flat icon="far fa-copy" @click="copytoclip"/>
      </template>
      <template v-slot:control>
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -99,7 +99,7 @@
                :label="col.label">
              </q-input>
            </div>
-            <div v-else-if="col.tipovisu === costanti.TipoVisu.TESTO" :class="{ flex: !isInModif}">
+            <div v-else-if="col.tipovisu === costanti.TipoVisu.TESTO_BORDATO" :class="{ flex: !isInModif}">
              <CLabel
                v-bind="$attrs"
                :value="myvalue"
--- a/src/components/CSkill/CSkill.ts
+++ b/src/components/CSkill/CSkill.ts
@@ -227,6 +227,7 @@ export default defineComponent({
            idSector: 1,
            idSkill: 1,
            idShipping: 1,
+            otherfilters: 1,
            myskill: 1,
            idStatusSkill: 1,
            idContribType: 1,
@@ -262,6 +263,7 @@ export default defineComponent({
            idSector: 1,
            idSkill: 1,
            idShipping: 1,
+            otherfilters: 1,
            myskill: 1,
            idStatusSkill: 1,
            idContribType: 1,
@@ -297,6 +299,7 @@ export default defineComponent({
            idSector: 1,
            idSkill: 1,
            idShipping: 1,
+            otherfilters: 1,
            myskill: 1,
            idStatusSkill: 1,
            idContribType: 1,
--- a/src/components/Footer/Footer.vue
+++ b/src/components/Footer/Footer.vue
@@ -23,7 +23,9 @@
              <a v-if="!!TwitterPage()" :href="TwitterPage()" target="_blank">
                <i aria-hidden="true" class="q-icon fab fa-twitter icon_contact links"> </i></a>

+
              <a v-if="!!TelegramSupport()" :href="TelegramSupport()" target="_blank">
+                <span class="text-h5">Supporto Tecnico: </span>
                <i aria-hidden="true" class="q-icon fab fa-telegram icon_contact links"></i></a>

              <a v-if="!!Whatsapp_Cell()" :href="ChatWhatsapp()" target="_blank">
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -2,7 +2,7 @@ const msg_website_it = {
  ws: {
    sitename: 'InsiemeSiPuò',
    siteshortname: 'ISP',
-    botname: 'il Bot di InsiemeSiPuò',
+    botname: 'InsiemeSiPuò',
  },
  products: {
    quantity: 'Quantità',
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -189,8 +189,8 @@ const routes_manager: IListRoutes[] = [
    materialIcon: 'edit',
    name: 'otherpages.admin.usereventlist',
    component: () => import('@/rootgen/admin/eventlist/eventlist.vue'),
-    inmenu: true,
-    submenu: true,
+    inmenu: functionality.BOOKING_EVENTS,
+    submenu: functionality.BOOKING_EVENTS,
    level_parent: 0,
    level_child: 0.5,
    infooter: true,
@@ -410,7 +410,7 @@ const baseroutes: IListRoutes[] = [
    component: () => import('@/root/eventi/eventi.vue'),
    meta: { requiresAuth: true },
    inmenu: true,
-    infooter: false,
+    infooter: true,
  },
  /*{
    active: true,
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -764,6 +764,7 @@ export interface IMyGoods {
  idShipping: number[]
  idStatusSkill: number[]
  idContribType: string[]
+  otherfilters: number[]
  idCity: number[]
  photos: IGallery[]
  NumLevel: number
--- a/src/root/mainview/mainview.ts
+++ b/src/root/mainview/mainview.ts
@@ -7,6 +7,7 @@ import { CSkill } from '@/components/CSkill'
 import { CMainView } from '@/components/CMainView'
 import { CDashboard } from '@/components/CDashboard'
 import { CChartMap } from '@src/components/CChartMap'
+import { Footer } from '@src/components/Footer'
 import { CUserNonVerif } from '@/components/CUserNonVerif'
 import { CCopyBtn } from '@/components/CCopyBtn'
 import { CMapsEsempio } from '@src/components/CMapsEsempio'
@@ -19,7 +20,7 @@ import MixinUsers from '@/mixins/mixin-users'

 export default defineComponent({
  name: 'mainview',
-  components: { CSkill, CChartMap, CMapsEsempio, CDashboard, CUserNonVerif, CMainView, CCopyBtn },
+  components: { CSkill, CChartMap, CMapsEsempio, CDashboard, CUserNonVerif, CMainView, CCopyBtn, Footer },
  setup() {
    const globalStore = useGlobalStore()
    const userStore = useUserStore()
--- a/src/root/mainview/mainview.vue
+++ b/src/root/mainview/mainview.vue
@@ -60,6 +60,7 @@

    </div>

+    <Footer></Footer>
  </q-page>

 </template>
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -217,7 +217,7 @@ const msg_it = {
      authentication: {
        telegram: {
          open: 'Clicca qui per aprire il BOT Telegram e segui le istruzioni',
-          ifclose: 'Se non si apre Telegram cliccando sul bottone oppure l\'avevi eliminato, vai su Telegram e cerca \'{botname}\' dall\'icona della lente, poi premi Start e segui le istruzioni.',
+          ifclose: 'Se non si apre Telegram cliccando sul bottone oppure l\'avevi eliminato, vai su Telegram e cerca il Bot di \'{botname}\' dall\'icona della lente, poi premi Start e segui le istruzioni.',
          openbot: 'Apri \'{botname}\' su Telegram',
        },
        login: {
@@ -829,6 +829,7 @@ const msg_it = {
      telegram_bot_name: 'BotName',
      telegram_key_test: 'Chiave Bot Test',
      telegram_bot_name_test: 'BotName Test',
+      telegram_support_chat: 'Telegram Support',
      pathreg_add: 'Suffisso',
      ask_to_verify_reg: 'Chiedi Verif. Reg',
    },
@@ -928,6 +929,9 @@ const msg_it = {
    },
    shipping: {
      name: 'Consegna'
+    },
+    otherfilters: {
+      name: 'Altri Filtri'
    }
  },

--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -207,6 +207,7 @@ export const costanti = {
    LINK: 2,
    BUTTON: 3,
    LINKIMG: 4,
+    TESTO_BORDATO: 5,
  },

 }
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -689,6 +689,17 @@ export const colmyGoods = [
    //icon: 'fas fa-hands-helping',
    // isadvanced_field: true,
  }),
+  AddCol({
+    name: 'otherfilters',
+    label_trans: 'otherfilters.name',
+    fieldtype: costanti.FieldType.multiselect,
+    jointable: 'otherfilters',
+    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+    noshowlabel: true,
+    icon: 'fas fa-filter',
+    //icon: 'fas fa-hands-helping',
+    // isadvanced_field: true,
+  }),
  AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
    required: false,
    visible: false,
@@ -1086,6 +1097,7 @@ export const colTableSites = [
  AddCol({ name: 'email_pwd', label_trans: 'sites.email_pwd', fieldtype: costanti.FieldType.string }),
  AddCol({ name: 'telegram_key', label_trans: 'sites.telegram_key', fieldtype: costanti.FieldType.string }),
  AddCol({ name: 'telegram_bot_name', label_trans: 'sites.telegram_bot_name', fieldtype: costanti.FieldType.string }),
+  AddCol({ name: 'telegram_support_chat', label_trans: 'sites.telegram_support_chat', fieldtype: costanti.FieldType.string }),
  AddCol({ name: 'telegram_key_test', label_trans: 'sites.telegram_key_test', fieldtype: costanti.FieldType.string }),
  AddCol({
    name: 'telegram_bot_name_test',
@@ -1944,7 +1956,8 @@ export const colTableUsersISP = [
  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', maxlength: 12
+    name: 'profile.cell', field: 'profile', subfield: 'cell', label_trans: 'reg.cell', maxlength: 12,
+    tipovisu: costanti.TipoVisu.TESTO_BORDATO
  }),
  AddCol({
    name: 'profile.email_paypal',
@@ -2640,6 +2653,13 @@ export const fieldsTable = {
      colkey: 'value',
      collabel: 'label',
    },
+    {
+      value: 'otherfilters',
+      label: 'Altri Filtri',
+      columns: colTableGeneric,
+      colkey: 'value',
+      collabel: 'label',
+    },
  ],

 }
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -4966,6 +4966,7 @@ export const tools = {
      idSectorGood: 0,
      idGood: 0,
      idShipping: [],
+      otherfilters: [],
      idStatusSkill: [],
      idContribType: [],
      idCity: [],
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -1489,6 +1489,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
      else if (table === 'regions') myarr = shared_consts.Regions
      else if (table === 'provinces') myarr = shared_consts.Provinces
      else if (table === 'shippings') myarr = shared_consts.Shippings
+      else if (table === 'otherfilters') myarr = shared_consts.OtherFilters
      else if (table === toolsext.TABCALDATE) myarr = this.getArrDateEvent()
      else if (table === toolsext.TABCALALLDATE) myarr = this.getArrAllDateEvent()
      else myarr = this.getListByTable(table)
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -186,6 +186,7 @@
              </CDateTime>
              <CLabel
                v-bind="$attrs"
+                :copy="true"
                :value="myuser.profile.intcode_cell + myuser.profile.cell"
                label="Cellulare"
              />