소스 검색

fixed #352

ali 2 년 전
부모
커밋
e7e53cd433
2개의 변경된 파일과 20개의 추가작업 그리고 5개의 파일을 삭제
  1. 16 1
      src/components/Widgets/Team/LeaderTeamShow/LeaderTeamShow.vue
  2. 4 4
      src/models/TranscriptSheet.js

+ 16 - 1
src/components/Widgets/Team/LeaderTeamShow/LeaderTeamShow.vue

@@ -145,7 +145,11 @@
                 <q-btn size="md"
                        color="primary"
                        label="جزییات"
-                       :to="{name: 'UserPanel.Classroom.MyAsGraderClassroom.AnswerBooks.ShowGrade', params: {classroom_id: $route.params.classroom_id, answer_book_id: inputData.props.row.id}, query: {read_only: 1}}"
+                       :to="{
+                         name: 'UserPanel.Classroom.MyAsGraderClassroom.AnswerBooks.ShowGrade',
+                         params: {classroom_id: team.classroom, answer_book_id: inputData.props.row.id},
+                         query: {read_only: 1}
+                       }"
                        class="q-mr-md" />
               </div>
             </template>
@@ -182,15 +186,20 @@
 </template>
 
 <script>
+import { shallowRef } from 'vue'
 import { Test } from 'src/models/Test.js'
+import { Team } from 'src/models/Team.js'
 import { mixinWidget } from 'src/mixin/Mixins.js'
 import { APIGateway } from 'src/api/APIGateway.js'
 import { AnswerBook } from 'src/models/AnswerBook.js'
 import { EntityShow, EntityIndex } from 'quasar-crud'
 import { FormBuilderAssist } from 'quasar-form-builder'
+import BtnControl from 'src/components/Control/btn.vue'
 import { TranscriptSheet } from 'src/models/TranscriptSheet.js'
 import { SessionAttendanceSheets } from 'src/models/SessionAttendanceSheets'
 
+const BtnControlComp = shallowRef(BtnControl)
+
 export default {
   name: 'LeaderTeamShow',
   components: {
@@ -215,6 +224,7 @@ export default {
         { type: 'separator', name: 'space', size: '0', col: 'col-12' },
         { type: 'inputEditor', name: 'description', responseKey: 'description', label: 'توضیحات', col: 'col-12' }
       ],
+      team: new Team(),
 
       teamRegistrationListInputs: [
         { type: 'hidden', name: 'team', value: teamId }
@@ -426,6 +436,7 @@ export default {
           value: 'WAITING_FOR_GRADING',
           col: 'col-md-4 col-12'
         },
+        { type: BtnControlComp, name: 'btn', label: 'جستجو', placeholder: ' ', atClick: () => {}, col: 'col-md-2 col-12' },
         { type: 'hidden', name: 'registration__teams__id', value: null }
       ],
       answerBooksListApi: APIGateway.answerBook.APIAdresses.base,
@@ -579,6 +590,9 @@ export default {
   },
   mounted() {
     this.mounted = true
+    FormBuilderAssist.setAttributeByName(this.answerBooksListInputs, 'btn', 'atClick', () => {
+      this.$refs.answerBooksList.search()
+    })
   },
   methods: {
     onConfirmedSelectedRegistrations (data) {
@@ -594,6 +608,7 @@ export default {
         })
     },
     afterLoadInputData (responseData) {
+      this.team = new Team(responseData)
       FormBuilderAssist.setAttributeByName(this.sessionsListInputs, 'classroom', 'value', responseData.classroom)
       FormBuilderAssist.setAttributeByName(this.answerBooksListInputs, 'registration__teams__id', 'value', responseData.id)
       FormBuilderAssist.setAttributeByName(this.transcriptSheetsListInputs, 'registration__teams__id', 'value', responseData.id)

+ 4 - 4
src/models/TranscriptSheet.js

@@ -10,10 +10,10 @@ class TranscriptSheet extends Model {
         infoKey: 'status_info',
         enumListKey: 'statusEnums',
         enums: [
-          { label: 'CLEAN_PASSED', value: 'قبول' },
-          { label: 'CONDITIONAL_PASSED', value: 'قبول مشروط' },
-          { label: 'FAILED', value: 'مردود' },
-          { label: 'FAILED_DUE_TO_PRE_CONDITIONAL', value: 'مردود(سابقه قبول مشروط)' }
+          { label: 'قبول', value: 'CLEAN_PASSED' },
+          { value: 'CONDITIONAL_PASSED', label: 'قبول مشروط' },
+          { value: 'FAILED', label: 'مردود' },
+          { value: 'FAILED_DUE_TO_PRE_CONDITIONAL', label: 'مردود(سابقه قبول مشروط)' }
         ]
       }
     })