Merge branch 'master' of http://git.hghweb.ir/ali.s/palizvani-front-vite

src/components/Widgets/Classroom/AdminClassroomInfoOfUser/AdminClassroomInfoOfUser.vue

@@ -807,7 +807,6 @@ export default {
     this.getUserInfo()
     this.getClassroom()
     this.mounted = true
-    FormBuilderAssist.setAttributeByName(this.testListInputs, 'owner', 'value', this.user.id)
   },
   methods: {
     getClassroom () {
@@ -903,7 +902,7 @@ export default {
         loading: false,
         path: [
           {
-            label: 'دوره های من',
+            label: 'دوره های کاربر',
             to: { name: 'UserPanel.Profile.AllClassrooms' }
           },
           {

src/components/Widgets/Classroom/AdminClassroomShow/components/ActivitySheetList.vue

@@ -36,8 +36,10 @@
           <q-btn size="md"
                  color="primary"
                  outline
-                 label="سابقه آموزشی"
-                 class="q-mr-md" />
+                 class="q-mr-md"
+                 :to="{ name: 'Admin.Classroom.UserClass', params: { classroom_id: classroomId, user_id: inputData.props.row.owner }}">
+            سابقه آموزشی
+          </q-btn>
           <!--                :to="{name: 'Admin.Session.Show', params: {id: inputData.props.row.id}}"-->
           <delete-btn @click="showConfirmRemoveDialog(inputData.props.row, 'id', getRemoveMessage(inputData.props.row))" />
         </div>

src/components/Widgets/Classroom/AdminClassroomShow/components/MembersList.vue

@@ -22,10 +22,12 @@
       </template>
       <template v-else-if="inputData.col.name === 'action'">
         <div class="action-column-entity-index">
-          <q-btn color="primary"
+          <q-btn size="md"
+                 color="primary"
+                 outline
                  class="q-mr-md"
                  :to="{ name: 'Admin.Classroom.UserClass', params: { classroom_id: classroomId, user_id: inputData.props.row.owner }}">
-            مشاهده دوره
+            سابقه آموزشی
           </q-btn>
           <q-btn v-if="inputData.props.row.status === 'DROPPED_FOR_CONDITION'"
                  color="primary"

src/pages/Admin/User/show.vue

@@ -86,33 +86,6 @@
             </template>
           </template>
         </entity-index>
-        <q-separator class="q-my-md" />
-        <entity-index v-if="mounted"
-                      ref="registrationsActivitySheetList"
-                      v-model:value="registrationsActivitySheetListInputs"
-                      title="لیست فعالت های کلاسی"
-                      :api="registrationsActivitySheetListApi"
-                      :table="registrationsActivitySheetListTable"
-                      :table-keys="registrationsActivitySheetListTableKeys"
-                      :show-search-button="false"
-                      :show-reload-button="false"
-                      :show-expand-button="false">
-          <template v-slot:entity-index-table-cell="{inputData}">
-            <template v-if="inputData.col.name === 'number'">
-              {{ inputData.rowNumber }}
-            </template>
-            <template v-else-if="inputData.col.name === 'action'">
-              <div class="action-column-entity-index">
-                <q-btn color="primary"
-                       :to="{name: 'Admin.User.ClassroomInfo', params: {id: $route.params.id, classroom_id: inputData.props.row.classroom_info.id}}"
-                       label="جزییات" />
-              </div>
-            </template>
-            <template v-else>
-              {{ inputData.col.value }}
-            </template>
-          </template>
-        </entity-index>
         <q-skeleton v-else
                     type="rect"
                     height="200px" />