Browse Source

fixed #78

ali 3 năm trước cách đây
mục cha
commit
35a99aa348

+ 1 - 1
src/components/Widgets/Other/AllClassrooms/AllClassrooms.vue

@@ -413,7 +413,7 @@ export default {
         })
     },
     isClassroomRegistered (classroomId) {
-      return !!this.userRegistrations.list.find(item => item.classroom === classroomId)
+      return !!this.userRegistrations.list.find(item => item.classroom === classroomId && (item.status === 'REGISTERED' || item.status === 'ENROLLED'))
     },
     getTerm (classroom) {
       if (!classroom.beginning_registration_period) {

+ 1 - 1
src/components/Widgets/Other/ClassroomCarousel/ClassroomCarousel.vue

@@ -260,7 +260,7 @@ export default {
       return ShamsiDate.getTerm(classroom.beginning_registration_period)
     },
     isClassroomRegistered (classroomId) {
-      return !!this.userRegistrations.list.find(item => item.classroom === classroomId)
+      return !!this.userRegistrations.list.find(item => item.classroom === classroomId && (item.status === 'REGISTERED' || item.status === 'ENROLLED'))
     },
     getUserRegistrations () {
       this.userRegistrations.loading = true

+ 1 - 1
src/pages/Admin/Classroom/create.vue

@@ -17,7 +17,7 @@
                    :show-save-button="false"
                    :show-reload-button="false">
       <template #after-form-builder>
-        <div class="flex justify-end">
+        <div class="flex justify-end q-mt-md">
           <q-btn color="primary"
                  label="ایجاد دوره آموزشی جدید"
                  @click="createClassroom" />

+ 1 - 1
src/pages/Admin/Classroom/show.vue

@@ -45,7 +45,7 @@
                      :show-reload-button="false"
                      :after-load-input-data="afterLoadInputData">
           <template #after-form-builder>
-            <div class="flex justify-end">
+            <div class="flex justify-end q-mt-md">
               <q-btn color="primary"
                      label="بروزرسانی اطلاعات"
                      @click="updateClassroom" />

+ 1 - 1
src/pages/Admin/DiscussionCirclesClassroom/create.vue

@@ -17,7 +17,7 @@
                    :show-save-button="false"
                    :show-reload-button="false">
       <template #after-form-builder>
-        <div class="flex justify-end">
+        <div class="flex justify-end q-mt-md">
           <q-btn color="primary"
                  label="ایجاد حلقه آموزشی جدید"
                  @click="createClassroom" />

+ 1 - 1
src/pages/Admin/DiscussionCirclesClassroom/show.vue

@@ -45,7 +45,7 @@
                      :show-reload-button="false"
                      :after-load-input-data="afterLoadInputData">
           <template #after-form-builder>
-            <div class="flex justify-end">
+            <div class="flex justify-end q-mt-md">
               <q-btn color="primary"
                      label="بروزرسانی اطلاعات"
                      @click="updateClassroom" />