ali 3 år sedan
förälder
incheckning
328148928a

+ 2 - 2
src/components/Widgets/SessionAttendanceSheet/AdminSessionAttendanceSheetList/AdminSessionAttendanceSheetList.vue

@@ -33,9 +33,9 @@
             حضور و غیاب
           </q-btn>
           <q-btn color="primary"
-                 :outline="inputData.props.row.assignment_status !== null"
+                 :outline="inputData.props.row.assignment_status !== 'NOT_SENT'"
                  :to="{name: 'Admin.Classroom.Session.AttendanceSheet.Assignment', params: {classroom_id: $route.params.classroom_id, session_id: $route.params.session_id, session_attendance_sheet_id: inputData.props.row.id}}">
-            <template v-if="inputData.props.row.assignment_status !== null">
+            <template v-if="inputData.props.row.assignment_status !== 'NOT_SENT'">
               ویرایش تصحیح
             </template>
             <template v-else>

+ 1 - 1
src/components/Widgets/SessionAttendanceSheet/AdminSessionAttendanceSheetShowAssignment/AdminSessionAttendanceSheetShowAssignment.vue

@@ -116,7 +116,7 @@
             </div>
           </div>
         </div>
-        <entity-show v-if="mounted && sessionAttendanceSheets.assignment_status !== null"
+        <entity-show v-if="mounted && sessionAttendanceSheets.assignment_status !== 'NOT_SENT'"
                      :key="entityShowSessionAssignment"
                      v-model:value="sessionAssignmentInfoInputs"
                      title="پاسخ کاربر"

+ 6 - 1
src/models/SessionAttendanceSheets.js

@@ -10,6 +10,10 @@ class SessionAttendanceSheets extends Model {
       { key: 'answer_attachment' },
       { key: 'answer_info' },
       { key: 'session' },
+      {
+        key: 'session_attendance_sheets',
+        default: []
+      },
       { key: 'assignment_status' },
       {
         key: 'attendance_status',
@@ -25,6 +29,7 @@ class SessionAttendanceSheets extends Model {
       { key: 'creator_info' },
       { key: 'session' },
       { key: 'session_info' },
+      { key: 'assignment_status' },
       { key: 'creation_time' }
     ], {
       status: {
@@ -69,7 +74,7 @@ class SessionAttendanceSheets extends Model {
         enums: [
           {
             label: 'ارسال نشده',
-            value: null
+            value: 'NOT_SENT'
           },
           {
             label: 'ارسال شده',

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

@@ -352,7 +352,7 @@ export default {
             required: true,
             label: 'وضعیت',
             align: 'left',
-            field: row => (new ProjectAttendanceSheets(this.getProjectAttendanceSheets(row))).is_answer_verified_info.label
+            field: row => (new ProjectAttendanceSheets(this.getProjectAttendanceSheets(row))).answer_status_info.label
           },
           {
             name: 'actions',

+ 6 - 4
src/pages/User/Profile/sessionInfo.vue

@@ -91,7 +91,7 @@
         </q-inner-loading>
         <template v-if="session.assignment_description">
           <q-separator class="q-my-lg" />
-          <entity-create v-if="submitAttendanceStatusMounted && (!currentUserAttendanceSheet || currentUserAttendanceSheet.assignment_status === null)"
+          <entity-create v-if="submitAttendanceStatusMounted && (!currentUserAttendanceSheet || currentUserAttendanceSheet.assignment_status === 'NOT_SENT')"
                          ref="entityCreateSubmitAssignment"
                          v-model:value="submitAssignmentInputs"
                          :api="submitAssignmentApi"
@@ -100,7 +100,7 @@
                          :show-edit-button="false"
                          :show-index-button="false"
                          :show-reload-button="false" />
-          <entity-show v-if="submitAttendanceStatusMounted && currentUserAttendanceSheet && currentUserAttendanceSheet.assignment_status !== null"
+          <entity-show v-if="submitAttendanceStatusMounted && currentUserAttendanceSheet && currentUserAttendanceSheet.assignment_status !== 'NOT_SENT'"
                        v-model:value="sessionAssignmentInfoInputs"
                        title="پاسخ کاربر"
                        :loaded-data="currentUserAttendanceSheet"
@@ -151,6 +151,7 @@ export default {
     return {
       classroom: new Classroom(),
       session: new Session(),
+      sessionAttendanceSheets: new SessionAttendanceSheets(),
       mounted: false,
       api: APIGateway.session.APIAdresses.sessionAndCurrentUserAttendanceSheet(sessionId),
       sessionInfoInputs: [
@@ -231,11 +232,11 @@ export default {
       return ShamsiDate.getDateTime(data)
     },
     currentUserAttendanceSheet () {
-      if (!this.session?.session_attendance_sheets || this.session.session_attendance_sheets.length === 0) {
+      if (!this.sessionAttendanceSheets?.session_attendance_sheets || this.sessionAttendanceSheets.session_attendance_sheets.length === 0) {
         return null
       }
 
-      return this.session.session_attendance_sheets[0]
+      return this.sessionAttendanceSheets.session_attendance_sheets[0]
     }
   },
   mounted() {
@@ -320,6 +321,7 @@ export default {
     },
     beforeLoadInputData (data) {
       this.session = new Session(data)
+      this.sessionAttendanceSheets = new SessionAttendanceSheets(data)
       this.classroom.loading = true
       this.submitAttendanceStatusMounted = true
       this.getClassInfo(this.session.classroom)