Merge pull request #30 from Xatta-Trone/main

add pg student

Author: Xatta-Trone

app/Http/Controllers/Api/Admin/UserDataController.php

@@ -29,7 +29,13 @@ public function index()
         $u = UserData::query();
         $t = new VueTable2Service();
         return $t->get($u, [
-            'id', 'student_name', 'merit', 'student_id', 'hall_name', 'status'
+            'id',
+            'student_name',
+            'merit',
+            'student_id',
+            'hall_name',
+            'status',
+            'grad_level'
         ]);
     }
 
@@ -70,7 +76,7 @@ public function update(UserDataAddRequest $request, $id)
         }
 
         $user = UserData::find($id);
-        $userdata = ['name' => $user->student_name, 'student_id' => $user->student_id, 'email' => $request->input('email')];
+        $userdata = ['name' => $user->student_name, 'student_id' => $user->student_id, 'email' => $request->input('email'), 'grad_level' => $user->grad_level];
 
 
         return $this->createNewAccount($userdata,  $id, true);
@@ -86,4 +92,4 @@ public function destroy($id)
     {
         //
     }
-}
+}

app/Imports/DummyUserDataImport.php

@@ -20,6 +20,7 @@ public function model(array $row)
             'student_id' => $row['student_id'] ?? $row['student_no'] ?? $row['Student_Id'] ?? null,
             'student_name' => $row['student_name'] ?? $row['name_english'] ?? $row['name'] ?? null,
             'hall_name' => $row['hall_name'] ?? $row['hall'] ?? null,
+            'grad_level' => $row['grad_level'] ?? "UG",
         ]);
     }
 

app/Traits/UserTrait.php

@@ -68,7 +68,7 @@ public function createNewAccount($userData,  $updateUserData = null, $isAddedByA
 
         $userPassword = $this->randomPassword();
         $userData['password'] = bcrypt($userPassword);
-        $userData['student_id'] = $this->studentIdWithoutPrefix($userData['student_id']);
+        $userData['student_id'] = $userData['grad_level'] == 'UG' ? $this->studentIdWithoutPrefix($userData['student_id']) : $userData['student_id'];
         $userData['user_letter'] = $this->userLetter($userData['name']);
         $user = User::create($userData);
         $user->password = $userPassword;

database/migrations/2025_02_11_040701_add_grad_level_to_user_data_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddGradLevelToUserDataTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user_data', function (Blueprint $table) {
+            $table->string('grad_level')->nullable()->default("UG");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user_data', function (Blueprint $table) {
+            $table->dropColumn('grad_level');
+        });
+    }
+}

database/migrations/2025_02_11_040955_add_grad_level_to_dummy_user_data_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddGradLevelToDummyUserDataTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('dummy_user_data', function (Blueprint $table) {
+            $table->string('grad_level')->nullable()->default("UG");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('dummy_user_data', function (Blueprint $table) {
+            $table->dropColumn('grad_level');
+        });
+    }
+}