diff --git a/Modules/Leave/Http/Controllers/LeaveController.php b/Modules/Leave/Http/Controllers/LeaveController.php index 11913b7..7f65e29 100644 --- a/Modules/Leave/Http/Controllers/LeaveController.php +++ b/Modules/Leave/Http/Controllers/LeaveController.php @@ -22,6 +22,7 @@ class LeaveController extends Controller public function index() { $data['leaves'] = $this->leaveRepository->findAll(); + // dd($data['leaves']); return view('leave::index'); } @@ -39,7 +40,14 @@ class LeaveController extends Controller */ public function store(Request $request): RedirectResponse { - dd($request->all()); + $inputData = $request->all(); + try { + $this->leaveRepository->create($inputData); + toastr()->success('Leave Created Succesfully'); + } catch (\Throwable $th) { + toastr()->error($th->getMessage()); + } + return redirect()->route('leave.index'); } /** diff --git a/Modules/Leave/Models/Leave.php b/Modules/Leave/Models/Leave.php index 64d02eb..0739923 100644 --- a/Modules/Leave/Models/Leave.php +++ b/Modules/Leave/Models/Leave.php @@ -3,20 +3,10 @@ namespace Modules\Leave\Models; use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; -use Modules\Leave\Database\factories\LeaveFactory; class Leave extends Model { - use HasFactory; + protected $table = 'tbl_leaves'; + protected $guarded = []; - /** - * The attributes that are mass assignable. - */ - protected $fillable = []; - - protected static function newFactory(): LeaveFactory - { - //return LeaveFactory::new(); - } } diff --git a/Modules/Leave/Providers/LeaveServiceProvider.php b/Modules/Leave/Providers/LeaveServiceProvider.php index 12d7d98..0dcaf5c 100644 --- a/Modules/Leave/Providers/LeaveServiceProvider.php +++ b/Modules/Leave/Providers/LeaveServiceProvider.php @@ -4,6 +4,8 @@ namespace Modules\Leave\Providers; use Illuminate\Support\Facades\Blade; use Illuminate\Support\ServiceProvider; +use Modules\Leave\Repositories\LeaveInterface; +use Modules\Leave\Repositories\LeaveRepository; class LeaveServiceProvider extends ServiceProvider { @@ -29,6 +31,7 @@ class LeaveServiceProvider extends ServiceProvider */ public function register(): void { + $this->app->bind(LeaveInterface::class, LeaveRepository::class); $this->app->register(RouteServiceProvider::class); } @@ -56,7 +59,7 @@ class LeaveServiceProvider extends ServiceProvider */ public function registerTranslations(): void { - $langPath = resource_path('lang/modules/'.$this->moduleNameLower); + $langPath = resource_path('lang/modules/' . $this->moduleNameLower); if (is_dir($langPath)) { $this->loadTranslationsFrom($langPath, $this->moduleNameLower); @@ -72,7 +75,7 @@ class LeaveServiceProvider extends ServiceProvider */ protected function registerConfig(): void { - $this->publishes([module_path($this->moduleName, 'config/config.php') => config_path($this->moduleNameLower.'.php')], 'config'); + $this->publishes([module_path($this->moduleName, 'config/config.php') => config_path($this->moduleNameLower . '.php')], 'config'); $this->mergeConfigFrom(module_path($this->moduleName, 'config/config.php'), $this->moduleNameLower); } @@ -81,14 +84,14 @@ class LeaveServiceProvider extends ServiceProvider */ public function registerViews(): void { - $viewPath = resource_path('views/modules/'.$this->moduleNameLower); + $viewPath = resource_path('views/modules/' . $this->moduleNameLower); $sourcePath = module_path($this->moduleName, 'resources/views'); - $this->publishes([$sourcePath => $viewPath], ['views', $this->moduleNameLower.'-module-views']); + $this->publishes([$sourcePath => $viewPath], ['views', $this->moduleNameLower . '-module-views']); $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower); - $componentNamespace = str_replace('/', '\\', config('modules.namespace').'\\'.$this->moduleName.'\\'.ltrim(config('modules.paths.generator.component-class.path'), config('modules.paths.app_folder',''))); + $componentNamespace = str_replace('/', '\\', config('modules.namespace') . '\\' . $this->moduleName . '\\' . ltrim(config('modules.paths.generator.component-class.path'), config('modules.paths.app_folder', ''))); Blade::componentNamespace($componentNamespace, $this->moduleNameLower); } @@ -104,8 +107,8 @@ class LeaveServiceProvider extends ServiceProvider { $paths = []; foreach (config('view.paths') as $path) { - if (is_dir($path.'/modules/'.$this->moduleNameLower)) { - $paths[] = $path.'/modules/'.$this->moduleNameLower; + if (is_dir($path . '/modules/' . $this->moduleNameLower)) { + $paths[] = $path . '/modules/' . $this->moduleNameLower; } } diff --git a/Modules/Leave/Repositories/LeaveRepository.php b/Modules/Leave/Repositories/LeaveRepository.php index 62ff34c..abdb3a5 100644 --- a/Modules/Leave/Repositories/LeaveRepository.php +++ b/Modules/Leave/Repositories/LeaveRepository.php @@ -8,7 +8,7 @@ class LeaveRepository implements LeaveInterface { public function findAll() { - return Leave::all(); + return Leave::get(); } public function getLeaveById($leaveId) diff --git a/Modules/Leave/database/migrations/2024_04_04_102430_create_leaves_table.php b/Modules/Leave/database/migrations/2024_04_04_102430_create_leaves_table.php index 29e656a..0accbdc 100644 --- a/Modules/Leave/database/migrations/2024_04_04_102430_create_leaves_table.php +++ b/Modules/Leave/database/migrations/2024_04_04_102430_create_leaves_table.php @@ -12,8 +12,10 @@ return new class extends Migration public function up(): void { Schema::create('leaves', function (Blueprint $table) { - $table->id(); - + $table->tinyInteger('leave_id')->unsigned()->autoIncrement(); + $table->integer('employee_id'); + $table->date('start_date'); + $table->date('end_date'); $table->timestamps(); }); } diff --git a/Modules/Leave/resources/views/create.blade.php b/Modules/Leave/resources/views/create.blade.php index c1393bb..c56be23 100644 --- a/Modules/Leave/resources/views/create.blade.php +++ b/Modules/Leave/resources/views/create.blade.php @@ -24,7 +24,8 @@
-
+ + @csrf @include('leave::partials.action')
diff --git a/Modules/Leave/resources/views/partials/action.blade.php b/Modules/Leave/resources/views/partials/action.blade.php index c33288d..04ce95d 100644 --- a/Modules/Leave/resources/views/partials/action.blade.php +++ b/Modules/Leave/resources/views/partials/action.blade.php @@ -1,22 +1,22 @@
- +
- +
- +
- +
- +
diff --git a/app/Helpers/OMIS.php b/app/Helpers/OMIS.php index 5d980be..e799df7 100644 --- a/app/Helpers/OMIS.php +++ b/app/Helpers/OMIS.php @@ -185,7 +185,8 @@ class OMIS ]); } } - private function initDB() + + public static function initDB() { static $initialized = false; if (!$initialized) { @@ -225,64 +226,64 @@ class OMIS `updated_at` timestamp NULL DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; "); - DB::statement("CREATE TABLE IF NOT EXISTS `tbl_users` ( - `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - `name` varchar(255) NULL, - `email` varchar(255) NULL, - `username` varchar(255) NULL, - `email_verified_at` timestamp NULL DEFAULT NULL, - `password` varchar(255) NULL, - `remember_token` varchar(100) DEFAULT NULL, - `display_order` INT(11) DEFAULT 1, - `roles_id` INT(11), - `branches_id` INT(11), - `vendors_id` INT(11), - `employees_id` INT(11), - `status` INT(11) DEFAULT 1, - `created_at` timestamp NULL DEFAULT NULL, - `createdby` INT(11), - `updated_at` timestamp NULL DEFAULT NULL, - `updatedby` INT(11) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - "); - DB::statement("CREATE TABLE IF NOT EXISTS tbl_roles ( - role_id INT(11) AUTO_INCREMENT PRIMARY KEY, - title VARCHAR(255), - alias VARCHAR(255), - description TEXT, - display_order INT(11), - status INT(11), - remarks TEXT, - created_at DATETIME, - createdby INT(11), - updated_at DATETIME, - updatedby INT(11) - );"); - DB::statement("CREATE TABLE IF NOT EXISTS tbl_permissions ( - permission_id INT(11) AUTO_INCREMENT PRIMARY KEY, - title VARCHAR(255), - alias VARCHAR(255), - modal VARCHAR(255), - command VARCHAR(255), - created_at DATETIME, - createdby INT(11), - updated_at DATETIME, - updatedby INT(11), - status INT(11) + // DB::statement("CREATE TABLE IF NOT EXISTS `tbl_users` ( + // `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, + // `name` varchar(255) NULL, + // `email` varchar(255) NULL, + // `username` varchar(255) NULL, + // `email_verified_at` timestamp NULL DEFAULT NULL, + // `password` varchar(255) NULL, + // `remember_token` varchar(100) DEFAULT NULL, + // `display_order` INT(11) DEFAULT 1, + // `roles_id` INT(11), + // `branches_id` INT(11), + // `vendors_id` INT(11), + // `employees_id` INT(11), + // `status` INT(11) DEFAULT 1, + // `created_at` timestamp NULL DEFAULT NULL, + // `createdby` INT(11), + // `updated_at` timestamp NULL DEFAULT NULL, + // `updatedby` INT(11) + // ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + // "); + // DB::statement("CREATE TABLE IF NOT EXISTS tbl_roles ( + // role_id INT(11) AUTO_INCREMENT PRIMARY KEY, + // title VARCHAR(255), + // alias VARCHAR(255), + // description TEXT, + // display_order INT(11), + // status INT(11), + // remarks TEXT, + // created_at DATETIME, + // createdby INT(11), + // updated_at DATETIME, + // updatedby INT(11) + // );"); + // DB::statement("CREATE TABLE IF NOT EXISTS tbl_permissions ( + // permission_id INT(11) AUTO_INCREMENT PRIMARY KEY, + // title VARCHAR(255), + // alias VARCHAR(255), + // modal VARCHAR(255), + // command VARCHAR(255), + // created_at DATETIME, + // createdby INT(11), + // updated_at DATETIME, + // updatedby INT(11), + // status INT(11) - );"); - DB::statement("CREATE TABLE IF NOT EXISTS tbl_rolepermissions ( - rolepermission_id INT(11) AUTO_INCREMENT PRIMARY KEY, - roles_id INT(11), - permissions_id INT(11), - display_order INT(11), - remarks VARCHAR(255), - created_at DATETIME, - createdby INT(11), - updated_at DATETIME, - updatedby INT(11), - status INT(11) - );"); + // );"); + // DB::statement("CREATE TABLE IF NOT EXISTS tbl_rolepermissions ( + // rolepermission_id INT(11) AUTO_INCREMENT PRIMARY KEY, + // roles_id INT(11), + // permissions_id INT(11), + // display_order INT(11), + // remarks VARCHAR(255), + // created_at DATETIME, + // createdby INT(11), + // updated_at DATETIME, + // updatedby INT(11), + // status INT(11) + // );"); DB::statement("CREATE TABLE IF NOT EXISTS `tbl_settings` ( `setting_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, `title` varchar(255) NULL, @@ -509,8 +510,7 @@ class OMIS ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; "); - DB::statement(" - CREATE TABLE IF NOT EXISTS `tbl_castes` ( + DB::statement("CREATE TABLE IF NOT EXISTS `tbl_castes` ( `caste_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, `title` varchar(255) DEFAULT NULL, `alias` varchar(255) DEFAULT NULL, @@ -524,8 +524,7 @@ class OMIS ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; "); - DB::statement(" - CREATE TABLE IF NOT EXISTS `tbl_ethnicities` ( + DB::statement("CREATE TABLE IF NOT EXISTS `tbl_ethnicities` ( `ethnicity_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, `title` varchar(255) DEFAULT NULL, `alias` varchar(255) DEFAULT NULL, @@ -539,8 +538,7 @@ class OMIS ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; "); - DB::statement(" - CREATE TABLE IF NOT EXISTS `tbl_dags` ( + DB::statement("CREATE TABLE IF NOT EXISTS `tbl_dags` ( `dag_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, `title` varchar(255) DEFAULT NULL, `alias` varchar(255) DEFAULT NULL, @@ -554,83 +552,12 @@ class OMIS ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; "); - DB::statement(" - CREATE TABLE IF NOT EXISTS `tbl_nationalities` ( - `nationality_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, - `title` varchar(255) DEFAULT NULL, - `alias` varchar(255) DEFAULT NULL, - `status` varchar(255) DEFAULT NULL, - `remarks` varchar(255) DEFAULT NULL, - `display_order` int(11) DEFAULT NULL, - `created_at` timestamp NULL DEFAULT NULL, - `createdby` int(11) DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `updatedby` int(11) DEFAULT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -"); - - DB::statement(" - CREATE TABLE IF NOT EXISTS `tbl_employees` ( - `employee_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, - `first_name` varchar(255) DEFAULT NULL, - `middle_name` varchar(255) DEFAULT NULL, - `last_name` varchar(255) DEFAULT NULL, - `email` varchar(255) DEFAULT NULL, - `genders_id` int(11) DEFAULT NULL, - `nepali_dob` date DEFAULT NULL, - `dob` date DEFAULT NULL, - `nationalities_id` int(11) DEFAULT NULL, - `about_me` text, - `signature` varchar(255) DEFAULT NULL, - `father_name` varchar(255) DEFAULT NULL, - `mother_name` varchar(255) DEFAULT NULL, - `grand_father_name` varchar(255) DEFAULT NULL, - `grand_mother_name` varchar(255) DEFAULT NULL, - `spouse` varchar(255) DEFAULT NULL, - `contact` varchar(255) DEFAULT NULL, - `alt_contact` varchar(255) DEFAULT NULL, - `profile_picture` varchar(255) DEFAULT NULL, - `users_id` int(11) DEFAULT NULL, - `is_login_required` tinyint(1) DEFAULT NULL, - `skills` text, - `experience` text, - `permanent_address` text, - `permanent_city` int(11) DEFAULT NULL, - `temporary_address` text, - `temporary_city` int(11) DEFAULT NULL, - `old_system_address` text, - `education` text, - `castes_id` int(11) DEFAULT NULL, - `ethnicities_id` int(11) DEFAULT NULL, - `dags_id` int(11) DEFAULT NULL, - `title` varchar(255) DEFAULT NULL, - `alias` varchar(255) DEFAULT NULL, - `status` varchar(255) DEFAULT NULL, - `display_order` int(11) DEFAULT NULL, - `created_at` timestamp NULL DEFAULT NULL, - `createdby` int(11) DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `updatedby` int(11) DEFAULT NULL, - `remarks` varchar(255) DEFAULT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - "); - - DB::statement(" - CREATE TABLE IF NOT EXISTS `tbl_onboardings` ( - `onboarding_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, - `doj` datetime DEFAULT NULL, - `designations_id` int(11) DEFAULT NULL, - `position_status` varchar(255) DEFAULT NULL, - `departments_id` int(11) DEFAULT NULL, - `shifts_id` int(11) DEFAULT NULL, - `agreement` varchar(255) DEFAULT NULL, - `nda` varchar(255) DEFAULT NULL, - `terms` text DEFAULT NULL, - `workoptions` varchar(255) DEFAULT NULL, + DB::statement("CREATE TABLE IF NOT EXISTS `tbl_nationalities` ( + `nationality_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, `title` varchar(255) DEFAULT NULL, `alias` varchar(255) DEFAULT NULL, - `status` int(11) DEFAULT NULL, - `remarks` text DEFAULT NULL, + `status` varchar(255) DEFAULT NULL, + `remarks` varchar(255) DEFAULT NULL, `display_order` int(11) DEFAULT NULL, `created_at` timestamp NULL DEFAULT NULL, `createdby` int(11) DEFAULT NULL, @@ -639,6 +566,75 @@ class OMIS ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; "); + // DB::statement("CREATE TABLE IF NOT EXISTS `tbl_employees` ( + // `employee_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, + // `first_name` varchar(255) DEFAULT NULL, + // `middle_name` varchar(255) DEFAULT NULL, + // `last_name` varchar(255) DEFAULT NULL, + // `email` varchar(255) DEFAULT NULL, + // `genders_id` int(11) DEFAULT NULL, + // `nepali_dob` date DEFAULT NULL, + // `dob` date DEFAULT NULL, + // `nationalities_id` int(11) DEFAULT NULL, + // `about_me` text, + // `signature` varchar(255) DEFAULT NULL, + // `father_name` varchar(255) DEFAULT NULL, + // `mother_name` varchar(255) DEFAULT NULL, + // `grand_father_name` varchar(255) DEFAULT NULL, + // `grand_mother_name` varchar(255) DEFAULT NULL, + // `spouse` varchar(255) DEFAULT NULL, + // `contact` varchar(255) DEFAULT NULL, + // `alt_contact` varchar(255) DEFAULT NULL, + // `profile_picture` varchar(255) DEFAULT NULL, + // `users_id` int(11) DEFAULT NULL, + // `is_login_required` tinyint(1) DEFAULT NULL, + // `skills` text, + // `experience` text, + // `permanent_address` text, + // `permanent_city` int(11) DEFAULT NULL, + // `temporary_address` text, + // `temporary_city` int(11) DEFAULT NULL, + // `old_system_address` text, + // `education` text, + // `castes_id` int(11) DEFAULT NULL, + // `ethnicities_id` int(11) DEFAULT NULL, + // `dags_id` int(11) DEFAULT NULL, + // `title` varchar(255) DEFAULT NULL, + // `alias` varchar(255) DEFAULT NULL, + // `status` varchar(255) DEFAULT NULL, + // `display_order` int(11) DEFAULT NULL, + // `created_at` timestamp NULL DEFAULT NULL, + // `createdby` int(11) DEFAULT NULL, + // `updated_at` timestamp NULL DEFAULT NULL, + // `updatedby` int(11) DEFAULT NULL, + // `remarks` varchar(255) DEFAULT NULL + // ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + // "); + + // DB::statement(" + // CREATE TABLE IF NOT EXISTS `tbl_onboardings` ( + // `onboarding_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, + // `doj` datetime DEFAULT NULL, + // `designations_id` int(11) DEFAULT NULL, + // `position_status` varchar(255) DEFAULT NULL, + // `departments_id` int(11) DEFAULT NULL, + // `shifts_id` int(11) DEFAULT NULL, + // `agreement` varchar(255) DEFAULT NULL, + // `nda` varchar(255) DEFAULT NULL, + // `terms` text DEFAULT NULL, + // `workoptions` varchar(255) DEFAULT NULL, + // `title` varchar(255) DEFAULT NULL, + // `alias` varchar(255) DEFAULT NULL, + // `status` int(11) DEFAULT NULL, + // `remarks` text DEFAULT NULL, + // `display_order` int(11) DEFAULT NULL, + // `created_at` timestamp NULL DEFAULT NULL, + // `createdby` int(11) DEFAULT NULL, + // `updated_at` timestamp NULL DEFAULT NULL, + // `updatedby` int(11) DEFAULT NULL + // ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + // "); + // Dharamaraj DB::statement(" @@ -705,58 +701,43 @@ class OMIS ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; "); - DB::statement(" - CREATE TABLE IF NOT EXISTS `tbl_leavetypes` ( - `leavetype_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, - `title` varchar(255) DEFAULT NULL, - `alias` varchar(255) DEFAULT NULL, - `status` int(11) DEFAULT NULL, - `remarks` text DEFAULT NULL, - `display_order` int(11) DEFAULT NULL, - `created_at` timestamp NULL DEFAULT NULL, - `createdby` int(11) DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `updatedby` int(11) DEFAULT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - "); + // DB::statement(" + // CREATE TABLE IF NOT EXISTS `tbl_leavetypes` ( + // `leavetype_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, + // `title` varchar(255) DEFAULT NULL, + // `alias` varchar(255) DEFAULT NULL, + // `status` int(11) DEFAULT NULL, + // `remarks` text DEFAULT NULL, + // `display_order` int(11) DEFAULT NULL, + // `created_at` timestamp NULL DEFAULT NULL, + // `createdby` int(11) DEFAULT NULL, + // `updated_at` timestamp NULL DEFAULT NULL, + // `updatedby` int(11) DEFAULT NULL + // ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + // "); - DB::statement(" - CREATE TABLE IF NOT EXISTS `tbl_leaves` ( - `leave_id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, - `title` varchar(255) DEFAULT NULL, - `alias` varchar(255) DEFAULT NULL, - `status` int(11) DEFAULT NULL, - `remarks` text DEFAULT NULL, - `display_order` int(11) DEFAULT NULL, - `created_at` timestamp NULL DEFAULT NULL, - `createdby` int(11) DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `updatedby` int(11) DEFAULT NULL, - `leavetypes_id` int(11) DEFAULT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; - "); + // if (!(DB::table('users')->first())) { + // DB::statement("INSERT INTO `users` (`name`,`email`,`username`,`password`,`roles_id`,`status`) VALUES ('Prajwal Adhikari','prajwalbro@hotmail.com','prajwalbro@hotmail.com','$2y$10$3zlF9VeXexzWKRDPZuDio.W7RZIC3tU.cjwMoLzG8ki8bVwAQn1WW','1','1');"); + // } - if (!(DB::table('users')->first())) { - DB::statement("INSERT INTO `tbl_users` (`name`,`email`,`username`,`password`,`roles_id`,`status`) VALUES ('Prajwal Adhikari','prajwalbro@hotmail.com','prajwalbro@hotmail.com','$2y$10$3zlF9VeXexzWKRDPZuDio.W7RZIC3tU.cjwMoLzG8ki8bVwAQn1WW','1','1');"); - } - if (!(DB::table('settings')->first())) { - DB::statement("INSERT INTO `tbl_settings` (`title`, `description`, `status`) VALUES ('Bibhuti OMIS', '', '1');"); - } + // if (!(DB::table('settings')->first())) { + // DB::statement("INSERT INTO `tbl_settings` (`title`, `description`, `status`) VALUES ('Bibhuti OMIS', '', '1');"); + // } - if (!(DB::table('countries')->first())) { - DB::statement("INSERT INTO `tbl_countries` (`title`,`alias`,`status`) VALUES ('Nepal','nepal', '1');"); - } - if (!(DB::table('proviences')->first())) { - DB::statement("INSERT INTO `tbl_proviences` (`title`,`alias`,`status`) VALUES ('Bagmati','bagmati', '1');"); - } + // if (!(DB::table('countries')->first())) { + // DB::statement("INSERT INTO `tbl_countries` (`title`,`alias`,`status`) VALUES ('Nepal','nepal', '1');"); + // } + // if (!(DB::table('proviences')->first())) { + // DB::statement("INSERT INTO `tbl_proviences` (`title`,`alias`,`status`) VALUES ('Bagmati','bagmati', '1');"); + // } - if (!(DB::table('roles')->first())) { - DB::statement("INSERT INTO `tbl_roles` (`title`,`alias`,`status`) VALUES ('Admin','admin','1');"); - DB::statement("INSERT INTO `tbl_roles` (`title`,`alias`,`status`) VALUES ('Manager','manager','1');"); - DB::statement("INSERT INTO `tbl_roles` (`title`,`alias`,`status`) VALUES ('Branch','branch','1');"); - DB::statement("INSERT INTO `tbl_roles` (`title`,`alias`,`status`) VALUES ('Agent','agent','1');"); - DB::statement("INSERT INTO `tbl_roles` (`title`,`alias`,`status`) VALUES ('Student','student','1');"); - } + // if (!(DB::table('roles')->first())) { + // DB::statement("INSERT INTO `tbl_roles` (`title`,`alias`,`status`) VALUES ('Admin','admin','1');"); + // DB::statement("INSERT INTO `tbl_roles` (`title`,`alias`,`status`) VALUES ('Manager','manager','1');"); + // DB::statement("INSERT INTO `tbl_roles` (`title`,`alias`,`status`) VALUES ('Branch','branch','1');"); + // DB::statement("INSERT INTO `tbl_roles` (`title`,`alias`,`status`) VALUES ('Agent','agent','1');"); + // DB::statement("INSERT INTO `tbl_roles` (`title`,`alias`,`status`) VALUES ('Student','student','1');"); + // } $initialized = true; } diff --git a/composer.json b/composer.json index f3be905..1915f0d 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,12 @@ "Database\\Factories\\": "database/factories/", "Database\\Seeders\\": "database/seeders/", "Modules\\": "Modules/" - } + }, + "files":[ + "app/Helpers/OMIS.php", + "app/Helpers/BibClass.php", + "app/Helpers/bibHelper.php" + ] }, "autoload-dev": { "psr-4": { diff --git a/package-lock.json b/package-lock.json index 49c564c..ade625b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "OMIS-SETUP", + "name": "New-OMIS", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/routes/web.php b/routes/web.php index 5278a05..6ea49ba 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,7 +14,7 @@ use Illuminate\Support\Facades\Route; | routes are loaded by the RouteServiceProvider and all of them will | be assigned to the "web" middleware group. Make something great! | -*/ + */ Route::get('/', function () { return view('welcome'); @@ -27,3 +27,7 @@ Route::get('/dashboard', [App\Http\Controllers\HomeController::class, 'index'])- Route::resource('roles', RoleController::class)->names('roles'); Route::resource('permissions', PermissionController::class)->names('permissions'); Route::resource('users', UserController::class)->names('users'); + +Route::get('/initialize-db', function () { + OMIS::initDB(); +});