소스 검색

classroom

ali 3 년 전
부모
커밋
5cad67be17
2개의 변경된 파일과 23개의 추가작업 그리고 16개의 파일을 삭제
  1. 3 3
      src/pages/User/Profile/classroomInfo.vue
  2. 20 13
      src/pages/User/Profile/classrooms.vue

+ 3 - 3
src/pages/User/Profile/classroomInfo.vue

@@ -39,7 +39,8 @@
                              @onloadn="onloadnClassroom" />
       </q-tab-panel>
 
-      <q-tab-panel name="educations">
+      <q-tab-panel name="educations"
+                   class="q-pa-none">
         <entity-index v-if="mounted"
                       ref="entityIndex"
                       v-model:value="inputs"
@@ -174,7 +175,7 @@ export default {
       mounted: false,
       tab: 'classroomInfo',
       inputs: [],
-      api: null,
+      api: APIGateway.classroom.APIAdresses.byId(classroomId),
       classroom: new Classroom(),
       table: {
         columns: [
@@ -309,7 +310,6 @@ export default {
     }
   },
   mounted () {
-    this.api = APIGateway.classroom.APIAdresses.byId(this.$route.params.id)
     this.mounted = true
   },
   methods: {

+ 20 - 13
src/pages/User/Profile/classrooms.vue

@@ -56,6 +56,7 @@ import BtnControl from 'src/components/Control/btn.vue'
 import { Registration } from 'src/models/Registration.js'
 import EntityIndexGridItem from 'src/components/EntityIndexGridItem.vue'
 import Breadcrumbs from 'src/components/Widgets/Breadcrumbs/Breadcrumbs.vue'
+import { Classroom } from 'src/models/Classroom'
 
 const BtnControlComp = shallowRef(BtnControl)
 
@@ -139,26 +140,33 @@ export default {
             field: row => row.id
           },
           {
-            name: 'title',
+            name: 'classroom_info.title',
             required: true,
-            label: 'نام درس',
+            label: 'عنوان',
             align: 'left',
-            field: row => row.classroom_info.unit_info.title
+            field: row => row.classroom_info?.title
           },
+          // {
+          //   name: 'title',
+          //   required: true,
+          //   label: 'نام درس',
+          //   align: 'left',
+          //   field: row => row.classroom_info.unit_info.title
+          // },
           {
             name: 'audience_gender_type',
             required: true,
             label: 'جنسیت',
             align: 'left',
-            field: row => (row.classroom_info.audience_gender_type === 'FEMALE') ? 'خواهران' : (row.classroom_info.audience_gender_type === 'MALE') ? 'برادران' : 'خواهران و برادران'
-          },
-          {
-            name: 'title',
-            required: true,
-            label: 'نوع',
-            align: 'left',
-            field: row => (row.classroom_info?.unit_info?.category_info?.type === 'TRAINING') ? 'دوره آموزشی' : (row.classroom_info?.unit_info?.category_info?.type === 'DISCUSSION_CIRCLE') ? 'حلقه مباحثاتی' : '-'
+            field: row => (new Classroom(row.classroom_info)).audience_gender_type_info.label
           },
+          // {
+          //   name: 'title',
+          //   required: true,
+          //   label: 'نوع',
+          //   align: 'left',
+          //   field: row => (row.classroom_info?.unit_info?.category_info?.type === 'TRAINING') ? 'دوره آموزشی' : (row.classroom_info?.unit_info?.category_info?.type === 'DISCUSSION_CIRCLE') ? 'حلقه مباحثاتی' : '-'
+          // },
           {
             name: 'title',
             required: true,
@@ -209,8 +217,7 @@ export default {
             align: 'left',
             field: ''
           }
-        ],
-        data: []
+        ]
       },
       tableKeys: {
         data: 'results',