From 0b666ae79a3f6cbbedacfa8b8786f752c0cd261a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=91=D0=B0=D0=B1=D0=BA=D0=B8=D0=BD?= Date: Fri, 1 Jul 2022 12:11:15 +0300 Subject: [PATCH] Document begin --- .../Controllers/DocStructureController.php | 84 ------------------- app/Http/Controllers/DocumentController.php | 8 +- .../{DocStructureModel.php => Document.php} | 8 +- ...2_06_27_152119_create_documents_table.php} | 6 +- database/seeders/DatabaseSeeder.php | 4 + database/seeders/ProjectTableSeeder.php | 24 ++++++ routes/web.php | 8 +- 7 files changed, 47 insertions(+), 95 deletions(-) delete mode 100644 app/Http/Controllers/DocStructureController.php rename app/Models/{DocStructureModel.php => Document.php} (62%) rename database/migrations/{2022_06_27_152119_create_doc_structure_models_table.php => 2022_06_27_152119_create_documents_table.php} (78%) create mode 100644 database/seeders/ProjectTableSeeder.php diff --git a/app/Http/Controllers/DocStructureController.php b/app/Http/Controllers/DocStructureController.php deleted file mode 100644 index 7bf6f30..0000000 --- a/app/Http/Controllers/DocStructureController.php +++ /dev/null @@ -1,84 +0,0 @@ -session()->get('project_id'); + $documents = Document::find($project_id); + return view('documents.list', ['documents' => $documents]); } /** diff --git a/app/Models/DocStructureModel.php b/app/Models/Document.php similarity index 62% rename from app/Models/DocStructureModel.php rename to app/Models/Document.php index 4d9cd1d..742e5b0 100644 --- a/app/Models/DocStructureModel.php +++ b/app/Models/Document.php @@ -6,7 +6,13 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -class DocStructureModel extends Model +class Document extends Model { use HasFactory, SoftDeletes; + + protected $fillable = [ + 'project_id', + 'name', + 'parent_id', + ]; } diff --git a/database/migrations/2022_06_27_152119_create_doc_structure_models_table.php b/database/migrations/2022_06_27_152119_create_documents_table.php similarity index 78% rename from database/migrations/2022_06_27_152119_create_doc_structure_models_table.php rename to database/migrations/2022_06_27_152119_create_documents_table.php index 0b90849..9b89129 100644 --- a/database/migrations/2022_06_27_152119_create_doc_structure_models_table.php +++ b/database/migrations/2022_06_27_152119_create_documents_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateDocStructureModelsTable extends Migration +class CreateDocumentsTable extends Migration { /** * Run the migrations. @@ -13,10 +13,10 @@ class CreateDocStructureModelsTable extends Migration */ public function up() { - Schema::create('doc_structure_models', function (Blueprint $table) { + Schema::create('documents', function (Blueprint $table) { $table->id(); $table->integer('project_id')->unsigned(); - $table->string('category'); + $table->string('name'); $table->integer('parent_id')->unsigned()->nullable(); $table->timestamps(); $table->softDeletes(); diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 16f459a..5ffff18 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -4,6 +4,7 @@ namespace Database\Seeders; use Illuminate\Database\Seeder; use Database\Seeders\UsersTableSeeder; +use Database\Seeders\ProjectTableSeeder; class DatabaseSeeder extends Seeder { @@ -17,6 +18,9 @@ class DatabaseSeeder extends Seeder $this->call([ UsersTableSeeder::class, ]); + $this->call([ + ProjectTableSeeder::class, + ]); // \App\Models\User::factory(10)->create(); } } diff --git a/database/seeders/ProjectTableSeeder.php b/database/seeders/ProjectTableSeeder.php new file mode 100644 index 0000000..7db408c --- /dev/null +++ b/database/seeders/ProjectTableSeeder.php @@ -0,0 +1,24 @@ +insert([ + 'name' => 'Ил-76МД90А', + 'description' => 'АОС Ил-76МД90А', + 'mmc_path' => '/Docs/Project/643 Россия/IL-76MD-90А_ru/2_MMC', + ]); + + } +} diff --git a/routes/web.php b/routes/web.php index 3b7887b..faa1034 100644 --- a/routes/web.php +++ b/routes/web.php @@ -37,10 +37,8 @@ Route::prefix('admin')->middleware(['admin'])->group(function () { Route::resource('/projects', ProjectController::class)->middleware(['auth']); Route::post('/project/{project}/select',SelectProjectController::class)->middleware(['auth'])->name('project.select'); -Route::prefix('project/'.session('project_id'))->middleware(['auth'])->group(function () { - Route::resource('/mmc', MMCController::class); - Route::resource('/documents', DocumentController::class); - Route::resource('/auk', DocumenAUKControllertController::class); -}); +Route::resource('/mmc', MMCController::class); +Route::resource('/documents', DocumentController::class); +Route::resource('/auk', AUKController::class); require __DIR__ . '/auth.php';