From d019cdac583818faac5b3b49960b22ff69e3d0f6 Mon Sep 17 00:00:00 2001 From: mahdi purHosseini Date: Mon, 25 Sep 2023 11:15:42 +0330 Subject: [PATCH] fix some problems --- app/Http/Controllers/ItemController.php | 1 - app/Http/Controllers/TestResultController.php | 18 +--- ...2019_04_11_105200_create_options_table.php | 34 ------- database/seeds/AccessSeeder.php | 50 ---------- database/seeds/PermissionSeeder.php | 61 ------------ database/seeds/UserTableSeeder.php | 98 ------------------- 6 files changed, 1 insertion(+), 261 deletions(-) delete mode 100644 database/2019_04_11_105200_create_options_table.php delete mode 100644 database/seeds/AccessSeeder.php delete mode 100644 database/seeds/PermissionSeeder.php delete mode 100644 database/seeds/UserTableSeeder.php diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index e20915d8..932ce899 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -6,7 +6,6 @@ use Illuminate\Http\Request; use App\Http\Requests\StoreItemRequest; use App\Item; - use App\User; use Illuminate\Support\Facades\Storage; class ItemController extends Controller diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php index 4792b21e..ce020006 100644 --- a/app/Http/Controllers/TestResultController.php +++ b/app/Http/Controllers/TestResultController.php @@ -2,21 +2,6 @@ namespace App\Http\Controllers; -<<<<<<< HEAD - use Illuminate\Http\Request; - use Illuminate\Support\Facades\Auth; - use App\Http\Requests\StoreTestResultRequest; - use App\TestResult; - use App\InputValue; - use App\Input; - use App\MedicalCenter; - use App\TestType; - use App\Gallery; - use App\Uploadable; - use App\Media; - use Intervention\Image\ImageManagerStatic as Image; - use Intervention\Image\ImageManager; -======= use App\Http\Requests\StoreTestResultRequest; use App\Input; use App\InputValue; @@ -25,7 +10,6 @@ use App\TestResult; use App\TestType; use Illuminate\Http\Request; ->>>>>>> b389ea53068b2084084b9704400a50529ba035eb use Illuminate\Support\Facades\Storage; class TestResultController extends Controller @@ -492,7 +476,7 @@ } $TestResult[ 'filesPath' ] = $FilesPath; } - // dd($TestResult->test_type()->device_label); + $TestResult[ 'device_label' ] = $TestResult->test_type->device_label; return \MessageResponse::data( $TestResult ); } diff --git a/database/2019_04_11_105200_create_options_table.php b/database/2019_04_11_105200_create_options_table.php deleted file mode 100644 index 9094f9aa..00000000 --- a/database/2019_04_11_105200_create_options_table.php +++ /dev/null @@ -1,34 +0,0 @@ -bigIncrements('id'); - $table->string('title'); - $table->unsignedBigInteger('input_id'); - $table->foreign('input_id')->references('id')->on('inputs'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('options'); - } -} diff --git a/database/seeds/AccessSeeder.php b/database/seeds/AccessSeeder.php deleted file mode 100644 index f125bc6d..00000000 --- a/database/seeds/AccessSeeder.php +++ /dev/null @@ -1,50 +0,0 @@ -assignAllRoleToAdministrator() ) { - dump( 'Success.' ); - } else { - dump( 'Error: Please Check And Run Again.' ); - } - } - - private function assignAllRoleToAdministrator() - { - $roleModel = new Role(); - if ( $roleModel->where( 'name' , 'administrator' )->first() == null ) { - Role::create( [ - 'name' => 'administrator' - ] ); - } - - // assign role to user id 1 - $user = User::find( 1 ); - $user->assignRole( 'administrator' ); - - // get all permission - $permissions = []; - foreach ( Permission::all() as $item ) { - $permissions[ 'permissions' ][ $item ] = "1"; - } - - // assign all permissions to role administrator - foreach ($permissions['permissions'] as $permission) { - $role = Role::where('id', 1)->first(); - $role->syncPermissions(array_keys($permission)); - } - return true; - } - } diff --git a/database/seeds/PermissionSeeder.php b/database/seeds/PermissionSeeder.php deleted file mode 100644 index c98826c9..00000000 --- a/database/seeds/PermissionSeeder.php +++ /dev/null @@ -1,61 +0,0 @@ -assignAllRoleToAdministrator()){ - dump('Success: Created Role Administrator'); - - // create roles default - admin - $roleMain = new RoleMain(); - if($roleMain->getItems()->where('name', 'admin')->first() == null){ - if(!$roleMain->storeToDB(['name' => 'admin'])){ - dump('Error: Can Not Create Role Admin'); - }else{ - dump('Success: Created Role Admin'); - } - } - - // create roles default - user - $roleMain = new RoleMain(); - if($roleMain->getItems()->where('name','user')->first() == null){ - if(!$roleMain->storeToDB(['name' => 'user'])){ - dump('Error: Can Not Create Role User'); - }else{ - dump('Success: Created Role User'); - } - } - - // create roles default - caller - $roleMain = new RoleMain(); - if($roleMain->getItems()->where('name','caller')->first() == null){ - if(!$roleMain->storeToDB(['name' => 'caller'])){ - dump('Error: Can Not Create Role Caller'); - }else{ - dump('Success: Created Role Caller'); - } - } - - }else{ - dump('Error: Please Check And Run Again.'); - } - } -} diff --git a/database/seeds/UserTableSeeder.php b/database/seeds/UserTableSeeder.php deleted file mode 100644 index d2224918..00000000 --- a/database/seeds/UserTableSeeder.php +++ /dev/null @@ -1,98 +0,0 @@ -registerData(); - } - - public function registerData() - { - $faker = Factory::create(); - - $user = User::create( [ - 'is_admin' => 1 , - 'department_id' => 1 , - 'first_name' => 'سیداحمد' , - 'last_name' => 'موسوی' , - 'name_en' => 'Seyyed Ahmad Mousavi' , - 'tel' => '09214309687' , - 'national_code' => '0371661773' , - 'password' => Hash::make( '12345678' ) , - 'birth_date' => '1998/05/22' , - 'marriage_date' => '1998/05/22' , - ] ); - if ( $permissions = Department::find( $user->department_id )->permissionsArray ) { - foreach ( $permissions as $permission ) { - UserPermission::create( [ - 'user_id' => $user->id , - 'permission_id' => $permission , - ] ); - }; - } - - - UserPhone::create( [ - 'user_id' => $user->id , - 'type' => 1 , - 'phone' => '09214309687' , - ] ); - - $user = User::create( [ - 'is_admin' => 1 , - 'department_id' => 1 , - 'first_name' => 'حسین' , - 'last_name' => 'بایگان' , - 'name_en' => 'Hossein Bayegan' , - 'tel' => '09021950725' , - 'national_code' => '0371661773' , - 'password' => Hash::make( '12345678' ) , - 'birth_date' => '1998/05/22' , - 'marriage_date' => '1998/05/22' , - ] ); - if ( $permissions = Department::find( $user->department_id )->permissionsArray ) { - foreach ( $permissions as $permission ) { - UserPermission::create( [ - 'user_id' => $user->id , - 'permission_id' => $permission , - ] ); - }; - } - - for ( $i = 0 ; $i < 15 ; $i++ ) { - $tel = Faker::mobile(); - $user = User::create( [ - 'is_admin' => 0 , - 'department_id' => Department::where( 'id' , '!=' , 1 )->inRandomOrder()->first()->id , - 'first_name' => Faker::firstName() , - 'last_name' => Faker::lastName() , - 'tel' => $tel , - 'code' => random_int( 1000 , 9999 ) , - 'national_code' => Faker::melliCode() , - 'password' => Hash::make( '12345678' ) , - 'birth_date' => $faker->date() , - 'marriage_date' => $faker->date() , - ] ); - UserPhone::create( [ - 'user_id' => $user->id , - 'type' => 1 , - 'phone' => $tel , - ] ); - - } - - } - }