Index: app/Exports/FoldersExport.php =================================================================== --- app/Exports/FoldersExport.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ app/Exports/FoldersExport.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -29,5 +29,4 @@ $row->user_id . ' - ' . User::find($row->user_id)->username, $row->Department::find($row->department_id)->name . ' - ' . Department::find($row->department_id)->code, - $row->is_important, $row->created_at, $row->updated_at Index: app/Http/Controllers/Dashboard/FilesController.php =================================================================== --- app/Http/Controllers/Dashboard/FilesController.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ app/Http/Controllers/Dashboard/FilesController.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -54,5 +54,12 @@ if ($request->has('file_item')) { foreach ($request->file_item as $file) { - $fileName = $folder->name . '-' . uniqid() . '.' . $file->getClientOriginalExtension(); + $fileName = $file->getClientOriginalName(); + + if(File::where(['folder_id' => $folder->id, 'name' => $fileName])->count() > 0) { + Alert::flash("The uploaded file already exists", "error"); + + return redirect()->back(); + } + $file->storeAs($location . DIRECTORY_SEPARATOR, $fileName); $newFile = new File(); @@ -63,5 +70,4 @@ $newFile->save(); } - Notification::send($users, new NewFileCreated("New files added")); Alert::flash("New files added successfully"); @@ -81,27 +87,3 @@ return Storage::download($file->location); } - - public function renameFile(FileNameRequest $request, $id) - { - $file = File::find($id); - $fileExtension = explode('.', $file->name)[1]; - - $file->name = $request->name . '.' . $fileExtension; - $newLocation = 'Departments' . DIRECTORY_SEPARATOR . explode(DIRECTORY_SEPARATOR, $file->location)[1] . DIRECTORY_SEPARATOR . explode(DIRECTORY_SEPARATOR, $file->location)[2] . DIRECTORY_SEPARATOR . $file->name; - - if(Storage::disk('uploads')->has($newLocation)) { - Alert::flash("A file with the same name already exists", "error"); - return redirect()->back(); - } - else { - Storage::disk('uploads')->move($file->location, $newLocation); - - $file->location = $newLocation; - $file->updated_at = Carbon::now(); - $file->save(); - - Alert::flash($file->name . " updated successfully"); - return redirect()->back(); - } - } } Index: app/Http/Controllers/Dashboard/FoldersController.php =================================================================== --- app/Http/Controllers/Dashboard/FoldersController.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ app/Http/Controllers/Dashboard/FoldersController.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -18,4 +18,5 @@ use Illuminate\Support\Facades\Storage; use App\Http\Controllers\Controller; +use function Sodium\increment; class FoldersController extends Controller @@ -58,7 +59,4 @@ else if ($request->query('sort') == 'no_of_files') { $folders = Folder::orderBy('no_of_files', 'desc')->paginate(12); - } - else if ($request->query('sort') == 'important') { - $folders = Folder::where('is_important', true)->paginate(12); } else if ($request->query('sort') == 'recent') { @@ -96,5 +94,4 @@ "docsCount" => Department::withCount('folder')->get(), "totalDocs" => Folder::all()->count(), - "countImportant" => Folder::where('is_important', true)->get()->count(), "diskTotal" => $diskTotal, "diskTotalSize" => $diskTotalSize, @@ -118,6 +115,23 @@ { $folder = new Folder(); + + $existingFolder = Folder::where(['department_id' => $request->department, 'name' => $request->name, 'arch_id' => $request->arch_id])->count(); + + $existingFolderName = Folder::where(['department_id' => $request->department, 'name' => $request->name])->count(); + $existingFolderArchId = Folder::where(['department_id' => $request->department, 'arch_id' => $request->arch_id])->count(); + + if($existingFolder > 0) { + $folder->version = $existingFolder + 1; + } + + if(($existingFolderName > 0 && $existingFolderArchId <= 0) || ($existingFolderName <= 0 && $existingFolderArchId > 0)) { + Alert::flash("Can't create another version since folder name or archive ID is different", "error"); + + return redirect()->route("dashboard.folders.index"); + } + + $department = Department::find($request->department); + $user = auth()->user(); - $department = Department::find($request->department); $folder->user()->associate($user); @@ -128,10 +142,4 @@ $folder->name = $request->name; $folder->note = $request->note; - - if($request->has('is_important')){ - $folder->is_important = true; - }else{ - $folder->is_important = false; - } $location = $folder->department->location . DIRECTORY_SEPARATOR . $request->name; @@ -178,89 +186,28 @@ } - public function edit(FolderRequest $request, $id) - { - $folder = Folder::findOrFail($id); + public function destroy($id) + { + $folder = Folder::find($id); + + $existingFolders = Folder::where(['department_id' => $folder->department->id, 'name' => $folder->name, 'arch_id' => $folder->arch_id])->count(); + + if($existingFolders > 1 && $folder->version == 1) { + Alert::flash($folder->name . " has versions", "error"); + return redirect()->back(); + } + $files = File::where('folder_id', $id)->get(); - $department = Department::find($request->department); - - $folder->department()->increment('no_of_folders'); - - $oldLocation = $folder->location; - - $folder->name = $request->name; - $folder->arch_id = $request->arch_id; - $folder->note = $request->note; - $folder->updated_at = Carbon::now(); - - $newLocation = Department::find($request->department)->location . DIRECTORY_SEPARATOR . $request->name; - - if($folder->department_id != $request->department){ - $folder->department()->decrement('no_of_folders'); - if (!Storage::disk('uploads')->has($newLocation)) { - Storage::disk('uploads')->move($oldLocation, $newLocation); - foreach($files as $file) { - $file->location = $newLocation . DIRECTORY_SEPARATOR . $file->name; - $file->save(); - } - } - } - if($folder->isDirty('name')) { - if (!Storage::disk('uploads')->has($newLocation)) { - Storage::disk('uploads')->move($oldLocation, $newLocation); - foreach($files as $file) { - $file->location = $newLocation . DIRECTORY_SEPARATOR . $file->name; - $file->save(); - } - } - } - - $folder->department()->associate($department); - - $folder->location = $newLocation; - - if ($request->has('file_item')) { - foreach ($request->file_item as $file) { - $fileName = $folder->name . '-' . uniqid() . '.' . $file->getClientOriginalExtension(); - $file->storeAs($newLocation . DIRECTORY_SEPARATOR, $fileName); - $newFile = new File(); - $newFile->name = $fileName; - $newFile->location = $newLocation . DIRECTORY_SEPARATOR . $fileName; - $newFile->folder()->associate($folder); - $newFile->folder()->increment('no_of_files'); - $newFile->save(); - } - } - - $folder->save(); - - Alert::flash("Folder edited successfully"); - - return redirect()->back(); - } - - public function toggleImportant($id) - { - $folder = Folder::find($id); - $folder->is_important = !$folder->is_important; - $folder->save(); - - if ($folder->is_important == true) - Alert::flash("Folder marked as important successfully"); - else - Alert::flash("Folder marked as not important successfully"); - - return redirect()->back(); - } - - public function destroy($id) - { - $folder = Folder::find($id); - $files = File::where('folder_id', $id)->get(); - if (auth()->user()->hasPermission("delete_all_folders") && !$folder->is_important) { + if($files->count() > 0) { + Alert::flash($folder->name . " contains files", "error"); + return redirect()->back(); + } + + if (auth()->user()->hasPermission("delete_all_folders")) { foreach ($files as $file) { $file->delete(); } + $folder->delete(); $location = $folder->department->location . DIRECTORY_SEPARATOR . $folder->name; @@ -270,5 +217,5 @@ return redirect()->back(); } - Alert::flash($folder->name . " is important", "error"); + Alert::flash($folder->name . " cannot be deleted", "error"); return redirect()->back(); } @@ -337,5 +284,5 @@ "imageExt" => array("png", "jpg", "jpeg"), "folders" => $folders, - "fileTypes" => '.' . implode(',.', explode(',', FileType::find('1')->mimes)) + "fileTypes" => '.' . implode(',.', explode(',', FileType::find('1')->mimes)), ]); } Index: app/Http/Requests/Dashboard/FolderRequest.php =================================================================== --- app/Http/Requests/Dashboard/FolderRequest.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ app/Http/Requests/Dashboard/FolderRequest.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -35,5 +35,4 @@ "arch_id" => [ "required", - "unique:folders,arch_id,$this->id,id", function ($attribute, $value, $fail) { Index: app/Models/Folder.php =================================================================== --- app/Models/Folder.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ app/Models/Folder.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -11,5 +11,5 @@ protected $table = "folders"; - protected $fillable = ["arch_id", "name", "description", "location", "user_id", "department_id", "is_important"]; + protected $fillable = ["arch_id", "name", "description", "location", "user_id", "department_id", "version"]; Index: database/factories/FolderFactory.php =================================================================== --- database/factories/FolderFactory.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ database/factories/FolderFactory.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -27,8 +27,8 @@ public function definition() { - //$inputArray = [5, 15, 25, 35, 45, 55, 65, 75, 85, 95]; - //$deptId = Arr::random($inputArray); + $inputArray = [5, 15, 25, 35, 45, 55, 65, 75, 85, 95]; + $deptId = Arr::random($inputArray); - $deptId = $this->faker->numberBetween(1, 10); + //$deptId = $this->faker->numberBetween(1, 10); $deptCode = Department::find($deptId)->code; @@ -46,5 +46,5 @@ 'user_id' => 1, 'department_id' => $deptId, - 'is_important' => $this->faker->boolean, + 'version' => 1, 'created_at' => now() ]; Index: database/migrations/2021_10_06_103305_create_folders_table.php =================================================================== --- database/migrations/2021_10_06_103305_create_folders_table.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ database/migrations/2021_10_06_103305_create_folders_table.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -16,5 +16,5 @@ Schema::create('folders', function (Blueprint $table) { $table->bigIncrements('id')->startingValue(1); - $table->string("arch_id")->unique(); + $table->string("arch_id"); $table->string("name"); $table->text("note")->nullable(); @@ -23,5 +23,5 @@ $table->integer("user_id")->unsigned(); $table->integer("department_id")->unsigned(); - $table->boolean("is_important")->default(false); + $table->integer("version")->default(1); $table->timestamps(); Index: database/seeders/FoldersTableSeeder.php =================================================================== --- database/seeders/FoldersTableSeeder.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ database/seeders/FoldersTableSeeder.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -17,5 +17,5 @@ public function run() { - Folder::factory()->count(900)->create(); + Folder::factory()->count(15)->create(); $folders = Folder::all(); Index: resources/views/dashboard/files/index.blade.php =================================================================== --- resources/views/dashboard/files/index.blade.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ resources/views/dashboard/files/index.blade.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -107,7 +107,4 @@ @if(auth()->user()->hasPermission('manage_all_files')) - - - $file->id]) }}" class="text-danger ml-2"title="Download"> @@ -148,37 +145,4 @@ - @endforeach Index: resources/views/dashboard/folders/files.blade.php =================================================================== --- resources/views/dashboard/folders/files.blade.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ resources/views/dashboard/folders/files.blade.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -8,11 +8,4 @@
-
- @if(auth()->user()->hasPermission('manage_all_folders')) - - Edit folder - - @endif -
@@ -37,16 +30,4 @@
Index: resources/views/dashboard/folders/index.blade.php =================================================================== --- resources/views/dashboard/folders/index.blade.php (revision a55bb54bdbe921cbbfdf56ddb86371df92c249a7) +++ resources/views/dashboard/folders/index.blade.php (revision e78295cd8068c5cafb2b4988541373f115ca6443) @@ -31,9 +31,4 @@ Recents - - - - Important - {{ $countImportant }}
@@ -133,9 +128,7 @@
- {{$folder->name}} - @if($folder->is_important) - - @endif + + {{$folder->name}} +
@@ -144,22 +137,9 @@
- $folder->id]) }}" class="dropdown-item">View Files - @if(auth()->user()->hasPermission('manage_all_folders')) - Edit - @endif + $folder->id]) }}" class="dropdown-item">View files @if(auth()->user()->hasPermission('download_data')) $folder->id]) }}" class="dropdown-item">Download @endif @if(auth()->user()->hasPermission('manage_all_folders')) - - @endif - @if(auth()->user()->hasPermission('manage_all_folders')) Delete @endif @@ -168,5 +148,6 @@
Number of files: {{$folder->files->count()}}
-

{{$folder->arch_id}}

+

Version: {{$folder->version}}

+

Archive ID: {{$folder->arch_id}}

Note: {{$folder->note}}

@@ -179,75 +160,5 @@
Last updated: {{ date('d.m.Y H:i', strtotime($folder->updated_at)) }} -
-
-
- -
$folder->id]) }}" - method="post"> - @csrf - @method("patch") -
- - -
-
-
- - -
-
-

@@ -370,9 +271,3 @@ @yield('script') - - @endsection