Kaynağa Gözat

update classrooms.vue filter

ali 3 yıl önce
ebeveyn
işleme
3b8424cccb

+ 7 - 7
src/components/Template/SideBard/UserPanelSideBar.vue

@@ -37,13 +37,13 @@ export default {
           show: true,
           active: false
         },
-        {
-          title: 'مدیریت حلقه ها',
-          routeName: 'UserPanel.Profile.AllDiscussionCirclesClassrooms',
-          icon: 'groups',
-          show: true,
-          active: false
-        },
+        // {
+        //   title: 'مدیریت حلقه ها',
+        //   routeName: 'UserPanel.Profile.AllDiscussionCirclesClassrooms',
+        //   icon: 'groups',
+        //   show: true,
+        //   active: false
+        // },
         {
           title: 'دوره های آموزشی',
           routeName: null,

+ 4 - 3
src/components/Widgets/Ticket/AdminTicketList/AdminTicketList.vue

@@ -125,6 +125,8 @@ export default {
         return { name: 'AdminPanel.Ticket.Show', params: { id: ticketId } }
       } else if (defaultSourceType === 'DISCUSSION_CIRCLE_CLASSROOM') {
         return { name: 'AdminPanel.Ticket.Show', params: { id: ticketId } }
+      } else if (defaultSourceType === 'CONTENT') {
+        return { name: 'AdminPanel.Ticket.Show', params: { id: ticketId } }
       } else {
         return { name: 'AdminPanel.Ticket.Show', params: { id: ticketId } }
       }
@@ -137,9 +139,8 @@ export default {
 
       if (defaultSourceType === 'INVOICE') {
         return 'FINANCIAL'
-      }
-      if (defaultSourceType === 'TRAINING_CLASSROOM' || defaultSourceType === 'DISCUSSION_CIRCLE_CLASSROOM') {
-        return 'EDUCATIONAL'
+      } else if (defaultSourceType === 'CONTENT') {
+        return 'CONTENT'
       } else {
         return 'GENERAL'
       }

+ 1 - 0
src/pages/Admin/Classroom/index.vue

@@ -85,6 +85,7 @@ export default {
           placeholder: ' ',
           col: 'col-md-2 col-12'
         },
+        { type: 'hidden', name: 'type', value: 'TRAINING' },
         { type: BtnControlComp, name: 'btn', label: 'جستجو', placeholder: ' ', atClick: () => {}, col: 'col-md-2 col-12' }
       ],
       api: APIGateway.classroom.APIAdresses.base,

+ 0 - 1
src/pages/Admin/DiscussionCirclesClassroom/index.vue

@@ -70,7 +70,6 @@ export default {
         { type: 'select', name: 'status', options: Enums.classroomStatuses, value: null, label: 'وضعیت دوره', placeholder: ' ', col: 'col-md-2 col-12' },
         { type: 'select', name: 'unit', options: [], value: null, label: 'درس', placeholder: ' ', col: 'col-md-2 col-12' },
         { type: 'hidden', name: 'type', value: 'DISCUSSION_CIRCLE' },
-        { type: 'hidden', name: 'unit__category__type', value: 'DISCUSSION_CIRCLE' },
         { type: BtnControlComp, name: 'btn', label: 'جستجو', placeholder: ' ', atClick: () => {}, col: 'col-md-2 col-12' }
       ],
       api: APIGateway.classroom.APIAdresses.base,

+ 18 - 0
src/pages/User/Profile/classrooms.vue

@@ -58,6 +58,24 @@ export default {
   data () {
     return {
       inputs: [
+        {
+          type: 'select',
+          name: 'classroom__type',
+          options: [
+            {
+              label: 'دوره های آموزشی',
+              value: 'TRAINING'
+            },
+            {
+              label: 'حلقه های مباحثاتی',
+              value: 'DISCUSSION_CIRCLE'
+            }
+          ],
+          value: 'TRAINING',
+          label: 'نوع',
+          placeholder: ' ',
+          col: 'col-md-2 col-12'
+        },
         {
           type: 'select',
           name: 'status',