Skip to content

Commit

Permalink
Merge pull request sebastianbergmann#113 from sheby460/chumaBranch
Browse files Browse the repository at this point in the history 
Chuma branch
  • Loading branch information
@sheby460
sheby460 authored Aug 2, 2024
2 parents 5d1c439 + c2704d9 commit 234af89
Show file tree
Hide file tree
Showing 9 changed files with 149 additions and 78 deletions.
12 changes: 6 additions & 6 deletions app/Http/Controllers/AuthController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,15 @@ public function handleRegistration(Request $request){
]);

}
//$dob = \DateTime::createFromFormat('d-m-Y', $request->input('DOB'))->format('Y-m-d');
$dob = \DateTime::createFromFormat('d-m-Y', $request->input('DOB'))->format('Y-m-d');

$user = User::create([
'fname' => $request->input('fname'),
'mname' => $request->input('mname'),
'lname' => $request->input('lname'),
'username' => $request->input('username'),
'DOB' => $request->input('DOB'),
// 'DOB' => $request->input('DOB'),
// 'DOB' => $request->input('DOB'),
'gender' => $request->input('gender'),
'marital_status' => $request->input('marital_status'),
'email' => $request->input('email'),
Expand All @@ -112,19 +113,18 @@ public function handleRegistration(Request $request){
'job_title' => $request->input('job_title'),
'home_address' => $request->input('home_address'),
'district' => $request->input('district'),
'region' => $request->input('region'),
'professional_reg_number' => $request->input('professional_reg_number'),
'place_of_birth' => $request->input('place_of_birth'),
'place_of_birth' => $request->input('place_of_birth'),
'house_no' => $request->input('house_no'),
'street' => $request->input('street'),
'deptId' => $request->input('deptId'),
'employment_typeId' => $request->input('employment_typeId'),
'health_info_Id' => $request->input('health_info_Id'),
// 'health_info_Id' => $request->input('health_info_Id'),
'employee_cv' => $request->input('employee_cv'),
'NIN' => $request->input('NIN'),
'nssf_no' => $request->input('nssf_no'),
'domicile' => $request->input('domicile'),
// 'deptId' => $request->input('deptId'),
// 'employment_typeId' => $request->input('employment_typeId'),
'password' => Hash::make($request->input('password')),

]);
Expand Down
14 changes: 7 additions & 7 deletions app/Http/Controllers/CcbrtRelationController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@ public function editRelationData(Request $request,$id){
public function destroy(string $id)
{
$relate = CcbrtRelation::find($id);

if (!$relate) {
return redirect()->route('ccbrt_relation.index')->with('error', 'Record not found.');
}

$relate->delete();

return redirect()->route('ccbrt_relation.index')->with('success', 'Record deleted successfully.');
}




}
8 changes: 3 additions & 5 deletions app/Http/Controllers/LanguageKnowledgeController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,23 +87,21 @@ public function edit($id)
*/
public function update(Request $request, $id)
{

$validator = Validator::make($request->all(), [
'language' => 'required|string|max:255',
'speaking' => 'required|string|max:255',
'reading' => 'required|string|max:255',
'writing' => 'required|string|max:255',
]);

//dd(1234);
if ($validator->fails()) {
return redirect()->back()->withErrors($validator)->withInput();
}


$languageKnowledge = LanguageKnowledge::findOrFail($id);

// Check if the authenticated user owns this language knowledge
if ($languageKnowledge->userId != Auth::id()) {
return redirect()->route('language_knowledge.index')->with('error', 'Unauthorized access.');
}

$languageKnowledge->update([
'language' => $request->input('language'),
Expand Down
64 changes: 57 additions & 7 deletions app/Http/Controllers/ProfileController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use App\Models\HealthDetails;
use App\Models\LanguageKnowledge;
use App\Models\Policy;
use App\Models\User;
use App\Models\UserAdditionalInfo;
use App\Models\UserFamilyDetails;
use Illuminate\Http\Request;
Expand Down Expand Up @@ -89,15 +90,64 @@ public function edit(string $id)
return view('user_profile.edit', compact('user'));
}

/**
* Update the specified resource in storage.
*/
public function update(Request $request, string $id)
{
//
/**
* Update the specified resource in storage.
*/
public function update(Request $request, string $id)
{
// Validate the incoming request data
$validator = Validator::make($request->all(), [
'fname' => 'required',
'lname' => 'required',
'email' => 'required|email|:users,email',
'DOB' => 'required',
]);

if ($validator->fails()) {
return response()->json([
'status' => 400,
'error' => $validator->errors()
]);
}


// Find the user by ID
$user = User::findOrFail($id);

// Update the user details
$user->fname = $request->input('fname');
$user->mname = $request->input('mname');
$user->lname = $request->input('lname');
$user->username = $request->input('username');
$user->DOB = $request->input('DOB');
$user->gender = $request->input('gender');
$user->marital_status = $request->input('marital_status');
$user->email = $request->input('email');
$user->religion = $request->input('religion');
$user->mobile = $request->input('mobile');
// $user->job_title = $request->input('job_title');
$user->home_address = $request->input('home_address');
$user->district = $request->input('district');
$user->region = $request->input('region');
$user->professional_reg_number = $request->input('professional_reg_number');
$user->place_of_birth = $request->input('place_of_birth');
$user->house_no = $request->input('house_no');
$user->street = $request->input('street');
// $user->deptId = $request->input('deptId');
// $user->employment_typeId = $request->input('employment_typeId');
// $user->health_info_Id = $request->input('health_info_Id');
$user->employee_cv = $request->input('employee_cv');
$user->NIN = $request->input('NIN');
$user->nssf_no = $request->input('nssf_no');
$user->domicile = $request->input('domicile');

// Save the updated user record
$user->save();

// Redirect or respond with success message
return redirect()->route('profile.index')->with('success', 'User updated successfully.');
}



/**
* Remove the specified resource from storage.
Expand Down
1 change: 0 additions & 1 deletion database/migrations/2026_08_13_100000_create_users_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public function up(): void
$table->foreign('deptId')->references('id')->on('departments');
$table->foreign('employment_typeId')->references('id')->on('employment_types');
$table->string('delete_status')->nullable();
$table->foreign('role_id')->references('id')->on('roles');
$table->rememberToken();
$table->timestamps();
});
Expand Down
2 changes: 1 addition & 1 deletion resources/views/ccbrt_relation/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class="nav-link">Language</a></li>
<tr>
<td>{{ $relation->names }}</td>
<td>{{ $relation->relation }}</td>
<td>{{ $relation->department }}</td>
<td>{{ $relation->department}}</td>
<td>{{ $relation->position }}</td>
<td>
<!-- Edit button -->
Expand Down
Loading

0 comments on commit 234af89

Please sign in to comment.