Merge branch 'omis_dharma' of ssh://bibgit.com:22022/dharmaraj/New-OMIS

This commit is contained in:
2024-04-16 10:57:27 +05:45
148 changed files with 6372 additions and 695 deletions

View File

@ -45,8 +45,8 @@ class EmployeeController extends Controller
public function create()
{
$data['title'] = 'Create Employee';
$data['departmentList'] = [];
$data['designationList'] = [];
$data['departmentList'] = $this->adminService->pluckDepartments();
$data['designationList'] = $this->adminService->pluckDesignations();
$data['nationalityList'] = $this->adminService->pluckNationalities();
$data['genderList'] = $this->adminService->pluckGenders();
$data['casteList'] = $this->adminService->pluckCastes();

View File

@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
return new class extends Migration {
/**
* Run the migrations.
*/
@ -43,6 +42,6 @@ return new class extends Migration
*/
public function down(): void
{
Schema::dropIfExists('employees');
Schema::dropIfExists('tbl_employees');
}
};

View File

@ -27,7 +27,7 @@
<div class="col-md-4">
{{ html()->label('Gender')->class('form-label') }}
{{ html()->select('genders_id', [1 => 'male', 2 => 'female'])->class('form-select')->placeholder('Select Gender') }}
{{ html()->select('genders_id', $genderList)->class('form-select')->placeholder('Select Gender') }}
</div>
<div class="col-md-4">
@ -39,7 +39,7 @@
<div class="col-md-4">
{{ html()->label('Nationality')->class('form-label') }}
{{ html()->select('nationalities_id', [1 => 'Nepal', 2 => 'Other'])->class('form-control')->placeholder('Select Nationality') }}
{{ html()->select('nationality_id', $nationalityList)->class('form-select')->placeholder('Select Nationality') }}
</div>
<div class="col-md-4">
@ -91,12 +91,12 @@
<hr>
<div class="col-md-4">
{{ html()->label('Department')->class('form-label') }}
{{ html()->select('department_id', ['Nepal'])->class('form-select')->placeholder('Select Department') }}
{{ html()->select('department_id', $departmentList)->class('form-select')->placeholder('Select Department') }}
</div>
<div class="col-md-4">
{{ html()->label('Designation')->class('form-label') }}
{{ html()->select('designation_id', ['Nepal'])->class('form-select')->placeholder('Select Designation') }}
{{ html()->select('designation_id', $designationList)->class('form-select')->placeholder('Select Designation') }}
</div>
{{-- <div class="col-md-4">
@ -115,7 +115,6 @@
</div>
<!-- end card -->
<div class="mb-4 text-end">
<button type="submit" class="btn btn-success w-sm">Save</button>
</div>