From 0498ba891a42487880bda5db812e8ab02784271e Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Sat, 3 Dec 2022 03:48:53 +0100
Subject: [PATCH] fix activities

---
 src/views/user/myactivities/myactivities.vue | 114 +++++++------------
 src/views/user/myprofile/myprofile.vue       |   2 +-
 2 files changed, 41 insertions(+), 75 deletions(-)

diff --git a/src/views/user/myactivities/myactivities.vue b/src/views/user/myactivities/myactivities.vue
index 8b8462f1..6b1f8c81 100755
--- a/src/views/user/myactivities/myactivities.vue
+++ b/src/views/user/myactivities/myactivities.vue
@@ -29,7 +29,7 @@
       <div class="q-gutter-sm q-pa-sm q-pb-md">
         <div
           v-if="myuser && myuser.date_reg"
-          class="fit column no-wrap justify-evenly items-center content-start"
+          class="row wrap justify-evenly items-center content-start"
         >
           <CTitleBanner
             v-if="site.confpages.showCompetenze"
@@ -41,14 +41,7 @@
             :canopen="true"
           >
             <div
-              class="
-                fit
-                column
-                no-wrap
-                justify-evenly
-                items-center
-                content-start
-              "
+              class="fit column no-wrap justify-evenly items-center content-start"
             >
               <div v-if="site.confpages.showNameSurname">
                 <div class="text-h6">
@@ -62,74 +55,47 @@
                 {{ myuser.username }}
               </div>
             </div>
-            <q-select
-              v-model="actualcard"
-              :options="optionsMainCards"
-              emit-value
-              borderless
-              map-options
-              :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
-            >
-              <template v-slot:option="scope">
-                <q-item v-bind="scope.itemProps">
-                  <q-item-section avatar>
-                    <q-icon :name="scope.opt.icon" />
-                  </q-item-section>
-                  <q-item-section>
-                    <q-item-label>{{ scope.opt.label }}</q-item-label>
-                    <!--<q-item-label caption>{{
-                        scope.opt.description
-                      }}</q-item-label>-->
-                  </q-item-section>
-                </q-item>
-              </template>
-            </q-select>
 
-            <q-tab-panels v-model="actualcard" animated>
-              <q-tab-panel
-                v-for="(card, ind) of mycards"
-                :key="ind"
-                :name="card.table"
-              >
-                <div v-if="card.table === 'mygroups'">
-                  <q-list>
-                    <span
-                      v-for="(grp, index) in listgroupsfiltered"
-                      :key="index"
-                      class="q-my-sm q-mx-none"
-                      clickable
+            <div v-for="(card, ind) of mycards" :key="ind" :name="card.table">
+              <div class="text-h6">{{card.title}}</div>
+              <div v-if="card.table === 'mygroups'">
+                <q-list>
+                  <span
+                    v-for="(grp, index) in listgroupsfiltered"
+                    :key="index"
+                    class="q-my-sm q-mx-none"
+                    clickable
                     >
-                      <CMyGroup :mygrp="grp" :visu="costanti.USER_GROUPS">
-                      </CMyGroup>
-                    </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
+                    <CMyGroup :mygrp="grp" :visu="costanti.USER_GROUPS">
+                    </CMyGroup>
+                  </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
-                        :mycircuit="circuit"
-                        :visu="costanti.USER_CIRCUITS"
-                      >
-                      </CMyCircuit>
-                    </span>
-                  </q-list>
-                </div>
-                <div v-else>
-                  <CSkill
-                    v-if="card.table === actualcard"
-                    :table="card.table"
-                    :filtercustom="filtroutente"
-                    :butt_modif_new="isMyRecord(myuser.username)"
-                  />
-                </div>
-              </q-tab-panel>
-            </q-tab-panels>
+                    </CMyCircuit>
+                  </span>
+                </q-list>
+              </div>
+              <div v-else>
+                <CSkill
+                  :table="card.table"
+                  :filtercustom="filtroutente"
+                  :butt_modif_new="isMyRecord(myuser.username)"
+                  visuinpage="true"
+                />
+              </div>
+            </div>
           </CTitleBanner>
         </div>
       </div>
diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue
index 400ea66f..65f3adcc 100755
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -160,7 +160,7 @@
                 size="md"
                 color="orange"
                 :label="$t('profile.myactivities')"
-                :to="`/skills/` + myusername()"
+                :to="`/skills/` + myuser.username"
                 >
               </q-btn>