- Aggiornato grafica Pagina Gruppi

- Lista Utenti appartenenti al gruppo
- Lista richieste gruppo
- Nome e Cognome tolti

src/views/login/signup/signup.vue

@@ -1,6 +1,6 @@
 <template>
     <q-page padding class="signup">
-        <CSignUp :showcell="false" :showaportador="true">
+        <CSignUp :showcell="false" :showaportador="true" :show_namesurname="false">
 
         </CSignUp>
     </q-page>

src/views/user/editprofile/editprofile.ts

@@ -11,6 +11,7 @@ import { useI18n } from '@/boot/i18n'
 import { toolsext } from '@store/Modules/toolsext'
 import { useQuasar } from 'quasar'
 import { costanti } from '@costanti'
+import { static_data } from '@/db/static_data'
 
 
 export default defineComponent({
@@ -87,6 +88,7 @@ export default defineComponent({
       getpayment,
       tools,
       costanti,
+      static_data,
       filtroutente,
     }
   }

src/views/user/editprofile/editprofile.vue

@@ -7,18 +7,20 @@
 
       <div class="column">
         <div class="myrow">
-          <CMyFieldDb
-            :title="$t('reg.name')"
-            table="users"
-            mykey="name"
-            :type="costanti.FieldType.string">
-          </CMyFieldDb>
-          <CMyFieldDb
-            :title="$t('reg.surname')"
-            table="users"
-            mykey="surname"
-            :type="costanti.FieldType.string">
-          </CMyFieldDb>
+          <div v-if="static_data.functionality.SHOW_NAMESURNAME">
+            <CMyFieldDb
+              :title="$t('reg.name')"
+              table="users"
+              mykey="name"
+              :type="costanti.FieldType.string">
+            </CMyFieldDb>
+            <CMyFieldDb
+              :title="$t('reg.surname')"
+              table="users"
+              mykey="surname"
+              :type="costanti.FieldType.string">
+            </CMyFieldDb>
+          </div>
         </div>
         <div class="myrow">
           <CMyFieldDb

src/views/user/mygroup/mygroup.scss

@@ -16,3 +16,9 @@
   border-radius: 1rem;
   padding: 5px;
 }
+
+.members, .admins{
+  font-weight: bold;
+  text-align: center;
+  vertical-align: center;
+}

src/views/user/mygroup/mygroup.ts

@@ -1,5 +1,6 @@
 import { CGridTableRec } from '@/components/CGridTableRec'
 import { CMyFriends } from '@/components/CMyFriends'
+import { CMyUser } from '@/components/CMyUser'
 import { CTitleBanner } from '@/components/CTitleBanner'
 import { CProfile } from '@/components/CProfile'
 import { CMyFieldRec } from '@/components/CMyFieldRec'
@@ -21,7 +22,7 @@ import { colmyUserPeople, colmyUserGroup } from '@store/Modules/fieldsTable'
 
 export default defineComponent({
   name: 'mygroup',
-  components: { CProfile, CTitleBanner, CMyFieldRec, CSkill, CDateTime, CMyFriends, CGridTableRec },
+  components: { CProfile, CTitleBanner, CMyFieldRec, CSkill, CDateTime, CMyFriends, CGridTableRec, CMyUser },
   props: {},
   setup() {
     const userStore = useUserStore()
@@ -39,6 +40,7 @@ export default defineComponent({
     const mygrp = ref(<IMyGroup|null>{})
     const users_in_group = ref(<IFriends[]>[])
 
+    const tabgrp = ref('info')
     const tab = ref('membri')
 
     const arrfilterand: any = ref([])
@@ -54,10 +56,10 @@ export default defineComponent({
       return userStore.my.username
     }
 
-    function loadGroup() {
+    async function loadGroup() {
       // Carica il profilo di quest'utente
       if (groupname.value) {
-        userStore.loadGroup(groupname.value).then((ris) => {
+        await userStore.loadGroup(groupname.value).then((ris) => {
           if (ris) {
             mygrp.value = ris.mygroup
             users_in_group.value = ris.users_in_group
@@ -75,13 +77,14 @@ export default defineComponent({
       loadGroup()
     })
 
-    function mounted() {
-      loadGroup()
+    async function mounted() {
+      await loadGroup()
 
       searchList.value = []
       filtercustom.value = [{ 'profile.mygroups': { $elemMatch: {groupname: {$eq: groupname.value }} } } ]
-      filtercustom_rich.value = [{ req_users: { $elemMatch: {username: {$eq: userStore.my.username }} } } ]
+
       arrfilterand.value = []
+      filtercustom_rich.value = []
       //++TODO: sistemare la filtercustom ... richieste...
     }
 
@@ -124,11 +127,11 @@ 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'
+      let lk_tab = ''
+      let lk_LF = ''
+      let lk_FF = ''
+      let lk_as = ''
+      let af_objId_tab = ''
 
       return {
         lookup1: {
@@ -138,15 +141,31 @@ export default defineComponent({
           lk_as,
           af_objId_tab,
           lk_proj: {
-            username: 1,
-            name: 1,
+            'username': 1,
             'profile.img': 1,
             'profile.qualifica': 1,
           }
-        }
+        },
       }
     }
 
+    function extraparams_rich() {
+      return {
+        querytype: shared_consts.QUERYTYPE_MYGROUP,
+        myid: mygrp.value ? mygrp.value._id : '',
+      }
+    }
+
+    function numUsers() {
+      return users_in_group.value ? users_in_group.value.length : 0
+    }
+    function numAdmins() {
+      return (mygrp.value && mygrp.value.admins) ? mygrp.value.admins.length : 0
+    }
+    function listaAdmins() {
+      return (mygrp.value && mygrp.value.admins) ? mygrp.value.admins.map((rec) => rec.username).join(', ') : ''
+    }
+
 
     onMounted(mounted)
 
@@ -174,7 +193,12 @@ export default defineComponent({
       colmyUserPeople,
       colmyUserGroup,
       extraparams,
+      extraparams_rich,
       tab,
+      tabgrp,
+      numUsers,
+      numAdmins,
+      listaAdmins,
       users_in_group,
     }
   }

src/views/user/mygroup/mygroup.vue

@@ -15,19 +15,6 @@
       <div class="col-12 text-h7 text-blue text-shadow-2">
         {{ mygrp.groupname }}
       </div>
-      <div>
-        <CMyFieldRec
-          title="Visibilità"
-          table="mygroups"
-          :columns="colmyUserGroup"
-          :rec="mygrp"
-          field="visibility"
-          :canModify="false">
-        </CMyFieldRec>
-      </div>
-      <div class="col-12 text-h7">
-        <span v-if="checkifShow('descr')">{{ mygrp.descr }}</span>
-      </div>
 
       <div>
         <q-btn
@@ -45,13 +32,157 @@
         />
       </div>
 
-      <div v-if="mygrp.title">
-        <br>
-        <div class="q-ma-sm q-gutter-sm q-pa-xs">
-          <div v-if="mygrp.note" v-html="mygrp.note">
+      <q-tabs v-model="tabgrp" class="text-blue">
+        <q-tab label="Info" name="info" icon="fas fa-info"></q-tab>
+        <q-tab v-if="!!mygrp.note && userStore.IsMyGroupByGroupname(mygrp.groupname)" label="Pagina" name="page" icon="fas fa-file-word"></q-tab>
+        <q-tab v-if="userStore.IsMyGroupByGroupname(mygrp.groupname)" label="Iscritti" name="membri" icon="fas fa-users"></q-tab>
+        <q-tab v-if="tools.iAmAdminGroup(groupname)" label="Richieste" name="rich" icon="fas fa-user-plus"></q-tab>
+      </q-tabs>
+
+      <q-tab-panels v-model="tabgrp" animated>
+        <q-tab-panel name="info">
+          <div>
+            <q-card>
+              <CMyFieldRec
+                title="Visibilità"
+                table="mygroups"
+                :id="mygrp._id"
+                :columns="colmyUserGroup"
+                :rec="mygrp"
+                field="visibility"
+                :canEdit="true"
+                :canModify="true">
+              </CMyFieldRec>
+            </q-card>
+            <q-card>
+              <div class="members">
+                <q-icon name="fas fa-users"></q-icon>
+                {{ numUsers() }} {{ numUsers() === 1 ? t('groups.member') : t('groups.members') }}
+              </div>
+              <div class="admins">
+                <q-icon name="fas fa-user-cog"></q-icon>
+                {{ numAdmins() }} {{ numAdmins() === 1 ? t('groups.admin') : t('groups.admins') }}
+              </div>
+              <div v-for="(user, index) of mygrp.admins" :key="index">
+                <CMyUser
+                  :mycontact="user"
+                  :visu="costanti.FIND_PEOPLE"
+                  @setCmd="setCmd"
+                >
+                </CMyUser>
+              </div>
+            </q-card>
+
           </div>
-        </div>
-      </div>
+          <q-card>
+            <br>
+            <div class="col-12 text-h7">
+              <span v-if="checkifShow('descr')">{{ mygrp.descr }}</span>
+            </div>
+          </q-card>
+
+          <div v-if="mygrp.title" class="myrow justify-evenly items-center q-pa-sm q-ma-sm">
+            <q-card>
+              <div class="col-6 q-ma-xs">
+                <q-btn
+                  v-if="getLinkGrpTelegram()" icon="fab fa-telegram"
+                  color="blue" type="a"
+                  size="md"
+                  rounded
+                  :label="$t('msgs.telegrammsg')"
+                  :href="getLinkGrpTelegram()" target="__blank">
+                </q-btn>
+
+              </div>
+              <div class="col-6 q-ma-xs">
+                <q-btn
+                  v-if="getLinkWebSite()" icon="fas fa-globe"
+                  color="blue" type="a"
+                  size="md"
+                  rounded
+                  :label="$t('reg.website')"
+                  :href="getLinkWebSite()" target="__blank">
+                </q-btn>
+              </div>
+            </q-card>
+
+          </div>
+
+        </q-tab-panel>
+
+        <q-tab-panel name="page">
+          <div v-if="mygrp.title">
+            <br>
+            <div class="q-ma-sm q-gutter-sm q-pa-xs">
+              <div v-if="mygrp.note" v-html="mygrp.note">
+              </div>
+            </div>
+          </div>
+        </q-tab-panel>
+
+        <q-tab-panel name="membri">
+          <CGridTableRec
+            ref="tabMembri"
+            prop_mytable="users"
+            prop_mytitle=""
+            :prop_mycolumns="colmyUserPeople"
+            prop_colkey="_id"
+            col_title="username"
+            :vertical="costanti.VISUTABLE_LISTA"
+            nodataLabel="Nessun Iscritto"
+            :prop_search="true"
+            hint="Username da trovare"
+            :finder="false"
+            :choose_visutype="true"
+            :finder_noNull="false"
+            :options="shared_consts.OPTIONS_SEARCH_USER_ONLY_FULL_WORDS"
+            :butt_modif_new="false"
+            noresultLabel="Username non trovato"
+            :arrfilters="arrfilterand"
+            :filtercustom="filtercustom"
+            :prop_searchList="searchList"
+            :showType="costanti.SHOW_USERINFO"
+            keyMain=""
+            :showCol="false"
+            :extrafield="groupname"
+            :extraparams="extraparams()"
+            :visufind="tools.iAmAdminGroup(groupname) ? costanti.REQ_REMOVE_USER_TO_GROUP : costanti.FIND_PEOPLE"
+          >
+
+          </CGridTableRec>
+        </q-tab-panel>
+        <q-tab-panel name="rich">
+
+          <CGridTableRec
+            prop_mytable="mygroups"
+            prop_mytitle=""
+            :prop_mycolumns="colmyUserPeople"
+            prop_colkey="_id"
+            col_title="username"
+            :vertical="costanti.VISUTABLE_LISTA"
+            nodataLabel="Nessuna Richiesta in sospeso"
+            :prop_search="false"
+            hint="Username da trovare"
+            :finder="false"
+            :choose_visutype="false"
+            :finder_noNull="false"
+            :options="shared_consts.OPTIONS_SEARCH_USER_ONLY_FULL_WORDS"
+            :butt_modif_new="false"
+            noresultLabel="Username non trovato"
+            :arrfilters="arrfilterand"
+            :filtercustom="filtercustom_rich"
+            :prop_searchList="searchList"
+            :showType="costanti.SHOW_USERINFO"
+            keyMain=""
+            :showCol="false"
+            :extraparams="extraparams_rich()"
+            :extrafield="groupname"
+            :visufind="costanti.REQ_ADD_USER_TO_GROUP"
+          >
+
+          </CGridTableRec>
+        </q-tab-panel>
+      </q-tab-panels>
 
       <q-btn
         v-if="mygrp.admins.includes(userStore.my.username)" icon="fas fa-pencil-alt"
@@ -61,103 +192,6 @@
         to="/editgrp">
       </q-btn>
 
-      <div v-if="mygrp.title" class="myrow justify-evenly items-center q-pa-sm q-ma-sm">
-
-        <div class="col-6 q-ma-xs">
-          <q-btn
-            v-if="getLinkGrpTelegram()" icon="fab fa-telegram"
-            color="blue" type="a"
-            size="md"
-            rounded
-            :label="$t('msgs.telegrammsg')"
-            :href="getLinkGrpTelegram()" target="__blank">
-          </q-btn>
-
-        </div>
-        <div class="col-6 q-ma-xs">
-          <q-btn
-            v-if="getLinkWebSite()" icon="fas fa-globe"
-            color="blue" type="a"
-            size="md"
-            rounded
-            :label="$t('reg.website')"
-            :href="getLinkWebSite()" target="__blank">
-          </q-btn>
-        </div>
-
-      </div>
-      <div v-if="tools.iAmAdminGroup(groupname)">
-        <q-tabs v-model="tab" class="text-blue">
-          <q-tab label="Membri" name="membri" icon="fas fa-users"></q-tab>
-          <q-tab label="Richieste" name="rich" icon="fas fa-user-plus"></q-tab>
-        </q-tabs>
-
-        <q-tab-panels v-model="tab" animated>
-          <q-tab-panel name="membri">
-            <CGridTableRec
-              ref="tabMembri"
-              prop_mytable="users"
-              prop_mytitle=""
-              :prop_mycolumns="colmyUserPeople"
-              prop_colkey="_id"
-              col_title="username"
-              :vertical="costanti.VISUTABLE_LISTA"
-              nodataLabel="Nessun Membro"
-              :prop_search="true"
-              hint="Username da trovare"
-              :finder="false"
-              :choose_visutype="true"
-              :finder_noNull="false"
-              :options="shared_consts.OPTIONS_SEARCH_USER_ONLY_FULL_WORDS"
-              :butt_modif_new="false"
-              noresultLabel="Username non trovato"
-              :arrfilters="arrfilterand"
-              :filtercustom="filtercustom"
-              :prop_searchList="searchList"
-              :showType="costanti.SHOW_USERINFO"
-              keyMain=""
-              :showCol="false"
-              :extrafield="groupname"
-              :extraparams="extraparams()"
-              :visufind="costanti.REQ_REMOVE_USER_TO_GROUP"
-            >
-
-            </CGridTableRec>
-          </q-tab-panel>
-          <q-tab-panel name="rich">
-            <CGridTableRec
-              prop_mytable="mygroups"
-              prop_mytitle=""
-              :prop_mycolumns="colmyUserPeople"
-              prop_colkey="_id"
-              col_title="username"
-              :vertical="costanti.VISUTABLE_LISTA"
-              nodataLabel=" "
-              :prop_search="false"
-              hint="Username da trovare"
-              :finder="false"
-              :choose_visutype="false"
-              :finder_noNull="false"
-              :options="shared_consts.OPTIONS_SEARCH_USER_ONLY_FULL_WORDS"
-              :butt_modif_new="false"
-              noresultLabel="Username non trovato"
-              :arrfilters="arrfilterand"
-              :filtercustom="filtercustom_rich"
-              :prop_searchList="searchList"
-              :showType="costanti.SHOW_USERINFO"
-              keyMain=""
-              :showCol="false"
-              :extraparams="extraparams()"
-              :extrafield="groupname"
-              :visufind="costanti.REQ_ADD_USER_TO_GROUP"
-            >
-
-            </CGridTableRec>
-          </q-tab-panel>
-        </q-tab-panels>
-
-      </div>
-
     </div>
     <div v-else class="fit column no-wrap justify-evenly items-center content-start">
       <q-skeleton type="QAvatar" size="140px" height="140px" animation="fade"/>

src/views/user/mygroups/mygroups.vue

@@ -11,7 +11,7 @@
         prop_colkey="_id"
         col_title="groupname"
         :vertical="costanti.VISUTABLE_LISTA"
-        nodataLabel="Nessuna Richiesta in sospeso"
+        nodataLabel=" Nessun Gruppo"
         :prop_search="true"
         hint="nome del gruppo da trovare"
         :finder="true"

src/views/user/myprofile/myprofile.ts

@@ -14,6 +14,7 @@ import { useQuasar } from 'quasar'
 import { costanti } from '@costanti'
 import { IUserFields } from 'model'
 import { shared_consts } from '@/common/shared_vuejs'
+import { static_data } from '@/db/static_data'
 
 
 export default defineComponent({
@@ -106,6 +107,7 @@ export default defineComponent({
       myusername,
       userStore,
       t,
+      static_data,
       animation,
     }
   }

src/views/user/myprofile/myprofile.vue

@@ -8,10 +8,12 @@
         </q-avatar>
       </div>
 
-      <div class="text-h6">
-        <span v-if="checkifShow('name')"> {{ myuser.name }}</span> <span v-if="checkifShow('surname')">{{
-          myuser.surname
-        }}</span>
+      <div v-if="static_data.functionality.SHOW_NAMESURNAME">
+        <div class="text-h6">
+          <span v-if="checkifShow('name')"> {{ myuser.name }}</span> <span v-if="checkifShow('surname')">{{
+            myuser.surname
+          }}</span>
+        </div>
       </div>
       <div class="col-12 text-h7 text-blue text-shadow-2">
         {{ myuser.username }}
@@ -38,7 +40,7 @@
         />
       </div>
 
-      <div v-if="myuser.name">
+      <div v-if="myuser._id">
         <div class="col-12 text-h8 q-mt-sm" v-if="myuser.profile.qualifica">
           <em><span class="qualifica">{{ myuser.profile.qualifica }}</span></em>
         </div>
@@ -55,7 +57,7 @@
         to="/editprofile">
       </q-btn>
 
-      <div v-if="myuser.name" class="myrow justify-evenly items-center q-pa-sm q-ma-sm">
+      <div v-if="myuser._id" class="myrow justify-evenly items-center q-pa-sm q-ma-sm">
 
         <div class="col-6 q-ma-xs">
           <q-btn
@@ -117,7 +119,7 @@
 
     </CTitleBanner>
 
-    <div v-if="myuser.name">
+    <div v-if="myuser._id">
       <CTitleBanner
         class="" :title="$t('dashboard.info')" bgcolor="bg-primary" clcolor="text-white"
         myclass="myshad" :canopen="true">