Nuova Grafica , Nuovi settori e categorie, Beni e Servizi.

Nella Nazionalità non c'è Repubblica di San Marino Aggiungere Bottone di "Chiudi" nella visualizzazione della Card cerca persona, mettere solo una parte della parola da cercare... Gruppi sistemare il bottone di Nuovo e controllare altro.. adTypeBacheca per la tabella mybachecas (Evento, Offro, Cerco) Semplificare le CATEGORIE ?! o togliere la Specializzazione? (con Giovanna)
2022-02-19 22:02:54 +01:00
parent 9161909003
commit 1aea88a1fa
61 changed files with 1669 additions and 399 deletions
--- a/src/views/admin/dbop/dbop.vue
+++ b/src/views/admin/dbop/dbop.vue
@@ -213,6 +213,12 @@
        @click="EseguiFunz('setVerifiedByAportadorToALL')"></q-btn>
      <br>
    </div>
+    <div class="row">
+      <q-btn
+        label="1. Cancella Tabelle (Sectors, SectorGoods, Skills, Goods)" color="negative"
+        @click="EseguiFunz('emptyTabCatServiziBeni')"></q-btn>
+      <br>
+    </div>
    <div class="row">
      <q-btn
        label="1. Cancella e Ricrea tutte le Tabelle (Sector, Skill, SubSkill, Contribtype, AdType)" color="negative"
@@ -232,12 +238,12 @@
      <br>
    </div>

-    <div class="row">
+    <!--<div class="row">
      <q-btn
        label="copyFrom1To13" color="negative"
        @click="EseguiFunz('copyFrom1To13')"></q-btn>
      <br>
-    </div>
+    </div>-->

    <div class="row">
      <q-btn
--- a/src/views/testServer/testServer.vue
+++ b/src/views/testServer/testServer.vue
@@ -1,7 +1,12 @@
 <template>
  <q-page class="">

-   <CTestServer></CTestServer>
+    <CTestServer></CTestServer>
+
+    <!--<iframe src="https://discord.com/widget?id=941826887821434890&theme=dark" width="350" height="500"
+            allowtransparency="true" frameborder="0"
+            sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe>
+            -->

  </q-page>

--- a/src/views/user/editprofile/editprofile.vue
+++ b/src/views/user/editprofile/editprofile.vue
@@ -140,9 +140,10 @@
          tablesel="cities"
          mykey="profile"
          :useinput="false"
-          mysubkey="born_city"
+          mysubkey="born_city_id"
+          jointable="cities"
          :pickup="true"
-          :type="costanti.FieldType.string">
+          :type="costanti.FieldType.select_by_server">
        </CMyFieldDb>

        <CMyFieldDb
--- a/src/views/user/myfriends/myfriends.vue
+++ b/src/views/user/myfriends/myfriends.vue
@@ -10,14 +10,14 @@
        :prop_mycolumns="colmyUserPeople"
        prop_colkey="_id"
        col_title="username"
-        :vertical="-1"
+        :vertical="costanti.VISUTABLE_LISTA"
        nodataLabel=" "
        :prop_search="true"
        hint="Username da trovare"
        :finder="true"
        :choose_visutype="true"
        :finder_noNull="true"
-        :options="shared_consts.OPTIONS_SEARCH_ONLY_FULL_WORDS"
+        :options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
        :butt_modif_new="false"
        noresultLabel="Username non trovato"
        :arrfilters="arrfilterand"
--- a/src/views/user/mygroup/mygroup.vue
+++ b/src/views/user/mygroup/mygroup.vue
@@ -135,7 +135,7 @@
            :finder="false"
            :choose_visutype="true"
            :finder_noNull="false"
-            :options="shared_consts.OPTIONS_SEARCH_USER_ONLY_FULL_WORDS"
+            :options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
            :butt_modif_new="false"
            noresultLabel="Username non trovato"
            :arrfilters="arrfilterand"
@@ -166,7 +166,7 @@
            :finder="false"
            :choose_visutype="false"
            :finder_noNull="false"
-            :options="shared_consts.OPTIONS_SEARCH_USER_ONLY_FULL_WORDS"
+            :options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
            :butt_modif_new="false"
            noresultLabel="Username non trovato"
            :arrfilters="arrfilterand"
--- a/src/views/user/mygroups/mygroups.ts
+++ b/src/views/user/mygroups/mygroups.ts
@@ -32,6 +32,33 @@ export default defineComponent({
      arrfilterand.value = []

      searchList.value = [
+        {
+          label: 'Provincia',
+          table: 'provinces',
+          key: 'idProvince',
+          type: costanti.FieldType.select,
+          value: tools.getCookie(tools.COOK_SEARCH + 'provinces', costanti.FILTER_TUTTI),
+          addall: true,
+          arrvalue: [],
+          filter: null,
+          useinput: true,
+          icon: 'flag',
+        },
+        {
+          label: 'Comune',
+          table: 'cities',
+          key: 'idCity',
+          type: costanti.FieldType.select_by_server,
+          value: 0,
+          addall: true,
+          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'cities', costanti.FILTER_TUTTI),
+          useinput: true,
+          filter: null,
+          // filter: getFilterCitiesByProvince,
+          // param1: shared_consts.PARAM_SHOW_PROVINCE,
+          tablesel: 'cities',
+          icon: 'fas fa-map-marker-alt',
+        },
        {
          label: 'Categorie',
          table: 'catgrps',
@@ -42,32 +69,7 @@ export default defineComponent({
          filter: null,
          addall: true,
          useinput: false,
-        },
-        {
-          label: 'Provincia',
-          table: 'provinces',
-          key: 'idProvince',
-          type: costanti.FieldType.multiselect,
-          value: 0,
-          addall: true,
-          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'provinces', [costanti.FILTER_TUTTI]),
-          filter: null,
-          useinput: true,
-          icon: 'flag',
-        },
-        {
-          label: 'Città',
-          table: 'cities',
-          key: 'idCity',
-          type: costanti.FieldType.multiselect_by_server,
-          value: 0,
-          addall: true,
-          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'cities', [costanti.FILTER_TUTTI]),
-          useinput: true,
-          filter: null,
-          // filter: getFilterCitiesByProvince,
-          // param1: shared_consts.PARAM_SHOW_PROVINCE,
-          tablesel: 'cities',
+          icon: 'engineering',
        },
      ]

@@ -80,6 +82,10 @@ export default defineComponent({

    })

+    function getdefaultnewrec(): any {
+      return tools.getdefaultnewrec_MyGroup()
+    }
+
    function extraparams() {
      let lk_tab = 'mygroups'
      let lk_LF = 'userId'
@@ -149,6 +155,7 @@ export default defineComponent({
      searchList,
      colmyUserGroup,
      extraparams,
+      getdefaultnewrec,
    }
  }
 })
--- a/src/views/user/mygroups/mygroups.vue
+++ b/src/views/user/mygroups/mygroups.vue
@@ -17,7 +17,7 @@
        :finder="true"
        :choose_visutype="true"
        :finder_noNull="false"
-        :options="shared_consts.OPTIONS_SEARCH_ONLY_FULL_WORDS"
+        :options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
        :butt_modif_new="true"
        noresultLabel="nome del gruppo non trovato"
        :arrfilters="arrfilterand"
@@ -26,6 +26,7 @@
        :showType="costanti.SHOW_GROUPINFO"
        keyMain=""
        :showCol="false"
+        :defaultnewrec="getdefaultnewrec"
        :extraparams="extraparams()">

      </CGridTableRec>
--- a/src/views/user/myprofile/myprofile.ts
+++ b/src/views/user/myprofile/myprofile.ts
@@ -17,6 +17,7 @@ import { costanti } from '@costanti'
 import { IUserFields } from 'model'
 import { shared_consts } from '@/common/shared_vuejs'
 import { static_data } from '@/db/static_data'
+import { fieldsTable } from '@store/Modules/fieldsTable'
 import MixinUsers from '@/mixins/mixin-users'


@@ -120,6 +121,7 @@ export default defineComponent({
      animation,
      isMyRecord,
      getRefLink,
+      fieldsTable,
    }
  }
 })
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -20,7 +20,20 @@
          {{ myuser.username }}
        </div>
        <div class="col-12 text-h7">
-          <span v-if="myuser.profile && myuser.profile.born_city">{{ myuser.profile.born_city }}</span> <span
+          <span v-if="myuser.profile && myuser.profile.born_city_id">
+              <CMyFieldRec
+                title="Comune"
+                table="users"
+                :id="myuser._id"
+                :columns="fieldsTable.userlist()"
+                :rec="mygrp"
+                field="profile.born_city_id"
+                :canEdit="false"
+                :canModify="false">
+              </CMyFieldRec>
+
+
+            {{ myuser.profile.born_city_str }}</span> <span
          v-if="myuser.profile && myuser.profile.nationality && myuser.profile.nationality !== 'Italia'">({{
            myuser.profile.nationality
          }})</span>