exam_user add status: avoid

admin/src/utils/api.js

@@ -81,6 +81,9 @@ const api = {
     deleteExamUser: (id) => {
         return axios.delete('exam-users/' + id);
     },
+    avoidExamUser: (id) => {
+        return axios.put('exam-users-avoid', {id});
+    },
     storeExamUser: (params) => {
         return axios.post('exam-users', params);
     },

admin/src/views/user/detail.vue

@@ -116,6 +116,15 @@
                                         <el-button type="danger" size="small">Remove</el-button>
                                     </template>
                                 </el-popconfirm>
+                                <el-popconfirm
+                                    v-if="examInfo.status === 0"
+                                    title="Confirm Avoid ?"
+                                    @confirm="handleAvoidExam(examInfo.id)"
+                                >
+                                    <template #reference>
+                                        <el-button type="info" size="small">Avoid</el-button>
+                                    </template>
+                                </el-popconfirm>
                             </td>
                         </tr>
                     </table>
@@ -190,6 +199,12 @@ export default {
             await fetchPageData()
         }
 
+        const handleAvoidExam = async (id) => {
+            let res = await api.avoidExamUser(id)
+            ElMessage.success(res.msg)
+            await fetchPageData()
+        }
+
         const handleAssignExam = async () => {
             assignExam.value.open(id)
         }
@@ -213,6 +228,7 @@ export default {
         return {
             ...toRefs(state),
             handleRemoveExam,
+            handleAvoidExam,
             handleAssignExam,
             handleEnableUser,
             handleViewInviteInfo,

app/Http/Controllers/ExamUserController.php

@@ -92,4 +92,11 @@ class ExamUserController extends Controller
         return $this->success($result, 'Remove user exam success!');
     }
 
+    public function avoid(Request $request)
+    {
+        $request->validate(['id' => 'required']);
+        $result = $this->repository->avoidExamUser($request->id);
+        return $this->success($result, 'Avoid user exam success!');
+    }
+
 }

app/Models/ExamUser.php

@@ -10,10 +10,12 @@ class ExamUser extends NexusModel
 
     const STATUS_NORMAL = 0;
     const STATUS_FINISHED = 1;
+    const STATUS_AVOIDED = -1;
 
     public static $status = [
         self::STATUS_NORMAL => ['text' => 'Normal'],
         self::STATUS_FINISHED => ['text' => 'Finished'],
+        self::STATUS_AVOIDED => ['text' => 'Avoided'],
     ];
 
     const IS_DONE_YES = 1;

app/Repositories/ExamRepository.php

@@ -355,6 +355,7 @@ class ExamRepository extends BaseRepository
         }
         $examUsers = $query->get();
         if ($examUsers->isEmpty()) {
+            do_log("$logPrefix, no examUser, query: " . last_query());
             return null;
         }
         if ($examUsers->count() > 1) {
@@ -454,6 +455,13 @@ class ExamRepository extends BaseRepository
         return $result;
     }
 
+    public function avoidExamUser(int $examUserId)
+    {
+        $examUser = ExamUser::query()->findOrFail($examUserId);
+        $result = $examUser->update(['status' => ExamUser::STATUS_AVOIDED]);
+        return $result;
+    }
+
     public function cronjonAssign()
     {
         $exams = $this->listValid(null, Exam::DISCOVERED_YES);

app/Repositories/UserRepository.php

@@ -37,7 +37,7 @@ class UserRepository extends BaseRepository
         $baseInfo = $userResource->response()->getData(true)['data'];
 
         $examRep = new ExamRepository();
-        $examProgress = $examRep->getUserExamProgress($id, ExamUser::STATUS_NORMAL, ['exam']);
+        $examProgress = $examRep->getUserExamProgress($id, null, ['exam']);
         if ($examProgress) {
             $examResource = new ExamUserResource($examProgress);
             $examInfo = $examResource->response()->getData(true)['data'];

routes/api.php

@@ -49,6 +49,7 @@ Route::group(['middleware' => ['auth:sanctum', 'permission', 'locale']], functio
     Route::get('exam-indexes', [\App\Http\Controllers\ExamController::class, 'indexes']);
 
     Route::resource('exam-users', \App\Http\Controllers\ExamUserController::class);
+    Route::put('exam-users-avoid', [\App\Http\Controllers\ExamUserController::class, 'avoid']);
 
     Route::get('dashboard/system-info', [\App\Http\Controllers\DashboardController::class, 'systemInfo']);
     Route::get('dashboard/stat-data', [\App\Http\Controllers\DashboardController::class, 'statData']);