Add to the Circuit

Remove to the Circuit Revoke request Users Admins
2022-09-02 02:25:17 +02:00
parent 1f414e19ea
commit 037ce99485
27 changed files with 438 additions and 206 deletions
--- a/src/views/user/mycircuit/mycircuit.ts
+++ b/src/views/user/mycircuit/mycircuit.ts
@@ -67,14 +67,10 @@ export default defineComponent({
      return userStore.my.profile
    }

-    function circuitname() {
-      return userStore.my.username
-    }
-
    async function loadCircuit() {
      // Carica il profilo di quest'utente
      if (path.value) {
-        await userStore.loadCIrcuit(path.value, idnotif.value).then(({ data, status }: {data: any, status: number}) => {
+        await userStore.loadCircuit(path.value, idnotif.value).then(({ data, status }: {data: any, status: number}) => {
          console.log('data', data)
          if (data) {
            circuit.value = data.circuit
@@ -99,7 +95,9 @@ export default defineComponent({
      await loadCircuit()

      searchList.value = []
-      filtercustom.value = [{ 'profile.listUserAccounts': { $elemMatch: {circuitId: {$eq: path.value }} } } ]
+      if (circuit.value) {
+        filtercustom.value = [{ 'profile.mycircuits': { $elemMatch: { circuitname: { $eq: circuit.value.name } } } }]
+      }

      arrfilterand.value = []
      filtercustom_rich.value = []
@@ -118,8 +116,6 @@ export default defineComponent({
    }


-
-
    function extraparams() {
      let lk_tab = 'users'
      let lk_LF = 'userId'
@@ -175,7 +171,6 @@ export default defineComponent({
    onMounted(mounted)

    return {
-      name,
      profile,
      tools,
      costanti,
@@ -186,7 +181,6 @@ export default defineComponent({

      filtroutente,
      showPic,
-      circuitname,
      userStore,
      t,
      animation,
--- a/src/views/user/mycircuit/mycircuit.vue
+++ b/src/views/user/mycircuit/mycircuit.vue
@@ -53,7 +53,7 @@
              <q-menu>
                <q-list v-if="true" style="min-width: 150px">
                  <q-item clickable v-close-popup
-                          @click="tools.removeFromMyCircuits($q, userStore.my.username, circuit.name, $t('db.domanda_exit_fromcircuit', {name: circuit.name }))">
+                          @click="tools.removeFromMyCircuits($q, userStore.my.username, circuit.name, $t('circuit.domanda_exit_fromcircuit', {name: circuit.name }))">
                    <q-item-section avatar>
                      <q-icon color="negative" name="fas fa-user-minus"/>
                    </q-item-section>
@@ -78,28 +78,17 @@
              v-if="userStore.IsAskedCircuitByName(circuit.name) && !userStore.IsMyCircuitByName(circuit.name)"
              icon="fas fa-user-minus"
              flat :label="$t('shared.cancel_ask_short')"
-              @click="tools.cancelReqCircuits($q, userStore.my.username, circuit.name)"
+              @click="tools.cancelReqCircuit($q, userStore.my.username, circuit.name)"
            />
          </div>

        </div>
        <div v-if="circuit.name" class="no-wrap justify-evenly items-center content-start">

-
-          <!--
-          <q-btn
-            v-if="tools.iAmAdminCircuit(name)" icon="fas fa-pencil-alt"
-            color="blue"
-            size="md"
-            :label="$t('otherpages.modifgrp')"
-            to="/editgrp">
-          </q-btn>
-          -->
-
          <q-tabs v-model="tabgrp" class="text-blue">
            <q-tab :label="t('shared.info1')" name="info" icon="fas fa-info"></q-tab>
            <q-tab v-if="!!circuit.note" :label="t('circuit.page')" name="page" icon="fas fa-file-word"></q-tab>
-            <q-tab v-if="tools.iCanShowCircuitsMember(circuit) || tools.iAmAdminCircuit(name)"
+            <q-tab v-if="tools.iCanShowCircuitsMember(circuit) || tools.iAmAdminCircuit(circuit.name)"
                   :label="t('shared.subscribes')" name="members" icon="fas fa-users"></q-tab>
          </q-tabs>

@@ -116,25 +105,25 @@
                  <q-card-section>
                    <div v-if="circuit.createdBy" class="element">
                      <q-icon name="fas fa-lightbulb"></q-icon>
-                      {{ $t('circuit.createdby', {
+                      {{ $t('shared.createdby', {
                      username: circuit.createdBy,
                      date: tools.getstrDateYY(circuit.date_created), })
                      }}
                    </div>
-                    <div v-if="!!circuit.date_updated && circuit.date_updated !== circuit.createdBy" class="element">
+                    <div v-if="!!circuit.date_updated && tools.getstrDate(circuit.date_updated) !== tools.getstrDate(circuit.date_created)" class="element">
                      <q-icon name="fas fa-pencil-alt"></q-icon>
-                      {{ $t('circuit.lastmodify', {
+                      {{ $t('shared.lastmodify', {
                      date: tools.getstrDateYY(circuit.date_updated), })
                      }}
                    </div>

                    <div class="members">
                      <q-icon name="fas fa-users"></q-icon>
-                      {{ numUsers() }} {{ numUsers() === 1 ? t('circuit.member') : t('shared.members') }}
+                      {{ numUsers() }} {{ numUsers() === 1 ? t('shared.member') : t('shared.members') }}
                    </div>
                    <div class="admins">
                      <q-icon name="fas fa-user-cog"></q-icon>
-                      {{ numAdmins() }} {{ numAdmins() === 1 ? t('circuit.admin') : t('shared.admins') }}
+                      {{ numAdmins() }} {{ numAdmins() === 1 ? t('shared.admin') : t('shared.admins') }}
                    </div>
                    <div v-for="(user, index) of circuit.admins" :key="index">
                      <CMyUser
@@ -177,11 +166,11 @@
            <q-tab-panel name="members" style="max-width: 400px;" v-if="tools.iCanShowCircuitsMember(circuit)">

              <q-tabs
-                v-show="tools.iAmAdminCircuit(name)"
+                v-show="tools.iAmAdminCircuit(circuit.name)"
                v-model="tabmembers" class="text-blue">
                <q-tab label="Tutti" name="all" icon="fas fa-users"></q-tab>
-                <q-tab v-if="tools.iAmAdminCircuit(name)" label="Richieste" name="rich" icon="fas fa-user-plus"></q-tab>
-                <q-tab v-if="tools.iAmAdminCircuit(name)" label="Rifiutati" name="refused" icon="fas fa-user-minus"></q-tab>
+                <q-tab v-if="tools.iAmAdminCircuit(circuit.name)" label="Richieste" name="rich" icon="fas fa-user-plus"></q-tab>
+                <q-tab v-if="tools.iAmAdminCircuit(circuit.name)" label="Rifiutati" name="refused" icon="fas fa-user-minus"></q-tab>
              </q-tabs>

              <q-tab-panels v-model="tabmembers" animated>
@@ -209,9 +198,9 @@
                :prop_searchList="searchList"
                :showType="costanti.SHOW_USERINFO"
                :showCol="false"
-                :extrafield="name"
+                :circuitname="circuit.name"
                :extraparams="extraparams()"
-                :visufind="tools.iAmAdminCircuit(name) ? costanti.REQ_REMOVE_USER_TO_CIRCUIT : costanti.FIND_PEOPLE"
+                :visufind="tools.iAmAdminCircuit(circuit.name) ? costanti.REQ_REMOVE_USER_TO_CIRCUIT : costanti.FIND_PEOPLE"
              >

              </CGridTableRec>
@@ -219,7 +208,7 @@
              <q-tab-panel name="rich">

                <CGridTableRec
-                  prop_mytable="mycircuits"
+                  prop_mytable="circuits"
                  prop_mytitle=""
                  :prop_mycolumns="colmyUserPeople"
                  prop_colkey="_id"
@@ -241,7 +230,7 @@
                  keyMain=""
                  :showCol="false"
                  :extraparams="extraparams_rich()"
-                  :extrafield="name"
+                  :circuitname="circuit.name"
                  :visufind="costanti.REQ_ADD_USER_TO_CIRCUIT"
                >

@@ -250,7 +239,7 @@
              <q-tab-panel name="refused">

                <CGridTableRec
-                  prop_mytable="mycircuits"
+                  prop_mytable="circuits"
                  prop_mytitle=""
                  :prop_mycolumns="colmyUserPeople"
                  prop_colkey="_id"
@@ -272,7 +261,7 @@
                  keyMain=""
                  :showCol="false"
                  :extraparams="extraparams_refused()"
-                  :extrafield="name"
+                  :circuitname="circuit.name"
                  :visufind="costanti.REQ_ADD_USER_TO_CIRCUIT"
                >

@@ -291,7 +280,7 @@
              <q-skeleton :animation="animation"/>
            </div>
            <div class="col-12 text-h7 text-grey text-center">
-              {{ name }}
+              {{ circuit.path }}
            </div>
            <div class="col-12 text-h7">
              <q-skeleton :animation="animation"/>
@@ -312,7 +301,7 @@
        full-height full-width
      >

-        <img :src="getImgGrp()" :alt="name" class="full-width">
+        <img :src="getImgCircuit()" :alt="circuit.name" class="full-width">

      </q-dialog>
    </div>
--- a/src/views/user/mygroup/mygroup.vue
+++ b/src/views/user/mygroup/mygroup.vue
@@ -120,14 +120,14 @@
                  <q-card-section>
                    <div class="element">
                      <q-icon name="fas fa-lightbulb"></q-icon>
-                      {{ $t('groups.createdby', {
+                      {{ $t('shared.createdby', {
                      username: mygrp.createdBy,
                      date: tools.getstrDateYY(mygrp.date_created), })
                      }}
                    </div>
-                    <div v-if="!!mygrp.date_updated && mygrp.date_updated !== mygrp.createdBy" class="element">
+                    <div v-if="!!mygrp.date_updated && tools.getstrshortDate(mygrp.date_updated) !== tools.getstrshortDate(mygrp.createdBy)" class="element">
                      <q-icon name="fas fa-pencil-alt"></q-icon>
-                      {{ $t('groups.lastmodify', {
+                      {{ $t('shared.lastmodify', {
                      date: tools.getstrDateYY(mygrp.date_updated), })
                      }}
                    </div>
@@ -167,11 +167,11 @@

                    <div class="members">
                      <q-icon name="fas fa-users"></q-icon>
-                      {{ numUsers() }} {{ numUsers() === 1 ? t('groups.member') : t('shared.members') }}
+                      {{ numUsers() }} {{ numUsers() === 1 ? t('shared.member') : t('shared.members') }}
                    </div>
                    <div class="admins">
                      <q-icon name="fas fa-user-cog"></q-icon>
-                      {{ numAdmins() }} {{ numAdmins() === 1 ? t('groups.admin') : t('shared.admins') }}
+                      {{ numAdmins() }} {{ numAdmins() === 1 ? t('shared.admin') : t('shared.admins') }}
                    </div>
                    <div v-for="(user, index) of mygrp.admins" :key="index">
                      <CMyUser
--- a/src/views/user/myprofile/myprofile.ts
+++ b/src/views/user/myprofile/myprofile.ts
@@ -7,6 +7,7 @@ import { CCopyBtn } from '@/components/CCopyBtn'
 import { CSkill } from '@/components/CSkill'
 import { CDateTime } from '@/components/CDateTime'
 import { CMyGroup } from '@/components/CMyGroup'
+import { CMyCircuit } from '@/components/CMyCircuit'
 import { CMyUser } from '@/components/CMyUser'
 import { CUserNonVerif } from '@/components/CUserNonVerif'
 import { tools } from '@store/Modules/tools'
@@ -18,7 +19,7 @@ import { useI18n } from '@/boot/i18n'
 import { toolsext } from '@store/Modules/toolsext'
 import { useQuasar } from 'quasar'
 import { costanti } from '@costanti'
-import { IMyGroup, IUserFields } from 'model'
+import { ICircuit, IMyCircuit, IMyGroup, IUserFields } from 'model'
 import { shared_consts } from '@/common/shared_vuejs'
 import { static_data } from '@/db/static_data'
 import { fieldsTable } from '@store/Modules/fieldsTable'
@@ -30,7 +31,7 @@ export default defineComponent({
  name: 'myprofile',
  components: {
    CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CCopyBtn, CUserNonVerif, CMyFieldRec, CMyUser,
-    CMyGroup, CLabel
+    CMyGroup, CLabel, CMyCircuit
  },
  props: {},
  setup() {
@@ -62,6 +63,7 @@ export default defineComponent({
    })

    const listgroupsfiltered = ref(<IMyGroup[]>[])
+    const listcircuitsfiltered = ref(<IMyCircuit[]>[])


    function profile() {
@@ -87,6 +89,12 @@ export default defineComponent({
              listgroupsfiltered.value = []
            }

+            try {
+              listcircuitsfiltered.value = myuser.value.profile.mycircuits
+            } catch (e) {
+              listcircuitsfiltered.value = []
+            }
+
          }
        })

--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -203,6 +203,18 @@
                  </span>
                </q-list>

+              </div>
+              <div v-else-if="card.table === 'circuits'">
+                <q-list>
+                  <span v-for="(circuit, index) in listcircuitsfiltered" :key="index" class="q-my-sm q-mx-none" clickable>
+                    <CMyCircuit
+                      :mycircuit="circuit"
+                      :visu="costanti.USER_CIRCUITS"
+                    >
+                    </CMyCircuit>
+                  </span>
+                </q-list>
+
              </div>
              <div v-else>
                <CSkill