Merge pull request #34 from Xatta-Trone/main

Xatta-Trone · web-flow · commit 1107579ddc2d · 2025-03-17T23:15:00.000-05:00
fix grad level
diff --git a/app/Http/Controllers/Api/Admin/UserController.php b/app/Http/Controllers/Api/Admin/UserController.php
@@ -77,7 +77,7 @@ public function store(UserCreateRequest $request)
             ], 422);
         }
 
-        $userdata = $checkForStudentInDB != null ? array_merge($request->validated(), ['name' => $checkForStudentInDB->student_name, 'student_id' => $student_id_without_prefix, 'max_devices' => config('user.allowed_device_number')]) : array_merge($request->validated(), ['student_id' => $student_id_without_prefix, 'max_devices' => config('user.allowed_device_number')]);
+        $userdata = $checkForStudentInDB != null ? array_merge($request->validated(), ['name' => $checkForStudentInDB->student_name, 'student_id' => $student_id_without_prefix,, 'grad_level' => $checkForStudentInDB->grad_level, 'max_devices' => config('user.allowed_device_number')]) : array_merge($request->validated(), ['student_id' => $student_id_without_prefix, 'grad_level' => 'UG', 'max_devices' => config('user.allowed_device_number')]);
 
         return $this->createNewAccount($userdata, $checkForStudentInDB != null ? $checkForStudentInDB->id : null, true);
     }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function store(UserCreateRequest $request)`
`77`	`77`	`], 422);`
`78`	`78`	`}`
`79`	`79`
`80`		`- $userdata = $checkForStudentInDB != null ? array_merge($request->validated(), ['name' => $checkForStudentInDB->student_name, 'student_id' => $student_id_without_prefix, 'max_devices' => config('user.allowed_device_number')]) : array_merge($request->validated(), ['student_id' => $student_id_without_prefix, 'max_devices' => config('user.allowed_device_number')]);`
	`80`	`+ $userdata = $checkForStudentInDB != null ? array_merge($request->validated(), ['name' => $checkForStudentInDB->student_name, 'student_id' => $student_id_without_prefix,, 'grad_level' => $checkForStudentInDB->grad_level, 'max_devices' => config('user.allowed_device_number')]) : array_merge($request->validated(), ['student_id' => $student_id_without_prefix, 'grad_level' => 'UG', 'max_devices' => config('user.allowed_device_number')]);`
`81`	`81`
`82`	`82`	`return $this->createNewAccount($userdata, $checkForStudentInDB != null ? $checkForStudentInDB->id : null, true);`
`83`	`83`	`}`