Changeset 4b7e2d3 for app

Timestamp:

10/23/21 04:03:46 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

develop, master

Children:

b39afb5

Parents:

c6b84df

Message:

bug fixes, edited export, added fileSeeder for DB testing

Location:

app

Files:

• Exports/DepartmentsExport.php (added)
• Exports/FilesExport.php (modified) (3 diffs)
• Exports/FoldersExport.php (modified) (3 diffs)
• Exports/UsersExport.php (modified) (2 diffs)
• Http/Controllers/Dashboard/DepartmentsController.php (modified) (3 diffs)
• Http/Controllers/Dashboard/ExportExcelController.php (modified) (2 diffs)
• Http/Controllers/Dashboard/FilesController.php (modified) (4 diffs)
• Http/Controllers/Dashboard/FoldersController.php (modified) (11 diffs)
• Http/Controllers/Dashboard/IndexController.php (modified) (2 diffs)
• Http/Controllers/Dashboard/SettingsController.php (modified) (1 diff)
• Models/Department.php (modified) (1 diff)
• Models/File.php (modified) (2 diffs)

app/Exports/FilesExport.php

@@ -5 +5 @@
 use App\Models\File;
 use App\Models\Folder;
-use App\Models\User;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\WithHeadings;
@@ -26 +25 @@
             $row->location,
             $row->getSize($row->location) . ' MB',
-            $row->Folder::find($row->folder_id)->name . ' - ' . Folder::find($row->folder_id)->arch_id,
+            $row->folder_id . ' - ' . Folder::find($row->folder_id)->name . ' - ' . Folder::find($row->folder_id)->arch_id,
             $row->created_at,
             $row->updated_at
@@ -40 +39 @@
             'Location',
             'Size',
-            'Folder - Archive ID',
+            'ID - Folder - Archive ID',
             'Created at',
             'Updated at'

app/Exports/FoldersExport.php

@@ -5 +5 @@
 use App\Models\Department;
 use App\Models\Folder;
+use App\Models\User;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\WithHeadings;
@@ -26 +27 @@
             $row->note,
             $row->location,
-            $row->User::find($row->user_id)->username,
+            $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,
@@ -43 +44 @@
             'Note',
             'Location',
-            'Created by',
+            'Created by ID - Username',
             'Department name - code',
             'Is important',

app/Exports/UsersExport.php

@@ -28 +28 @@
             $row->phone_number,
             $row->is_confirmed,
-            $row->Role::find($row->role_id)->name,
+            $row->role_id . ' - ' . Role::find($row->role_id)->name,
             $row->where('id', $row->created_by)->pluck('username')->first(),
             $row->created_at,
@@ -46 +46 @@
             'Phone number',
             'Is confirmed',
-            'Role',
+            'Role ID - Username',
             'Created by',
             'Created at',

app/Http/Controllers/Dashboard/DepartmentsController.php

@@ -147 +147 @@
         if(!$flag) {
             $zip->close();
-            $headers = array('Content-Type' => 'application/octet-stream',);
+            $headers = array('Content-Type' => 'application/octet-stream');
             $zip_new_name = Carbon::now()->format('d.m.Y - H:i') . '- Departments.zip';
             return response()->download($zip_file, $zip_new_name, $headers);
@@ -153 +153 @@
         else {
             Alert::flash("All departments are empty", "warning");
-            return redirect()->route("dashboard.departments.index");
+            return redirect()->back();
         }
     }
@@ -186 +186 @@
         else{
             Alert::flash("This department has no files", "warning");
-            return redirect()->route("dashboard.departments.index");
+            return redirect()->back();
         }
 

app/Http/Controllers/Dashboard/ExportExcelController.php

@@ -3 +3 @@
 namespace App\Http\Controllers\Dashboard;
 
+use App\Exports\DepartmentsExport;
 use App\Exports\FilesExport;
 use App\Exports\FoldersExport;
@@ -32 +33 @@
 
     }
+
+    public function ExportDepartments()
+    {
+        return Excel::download(new DepartmentsExport(), Carbon::now()->format('d.m.Y - H:i') . ' - departments.xlsx');
+
+    }
+
 }

app/Http/Controllers/Dashboard/FilesController.php

@@ -26 +26 @@
             "textExt" => array("txt", "doc", "docx"),
             "imageExt" => array("png", "jpg", "jpeg"),
-            "fileTypes" => '.' . implode(',.', explode(',', explode(':', FileType::find('1')->mimes)[1]))
+            "fileTypes" => '.' . implode(',.', explode(',', FileType::find('1')->mimes))
         ]);
     }
@@ -35 +35 @@
         $file->delete();
         Storage::disk('uploads')->delete($file->location);
+        $file->folder()->decrement('no_of_files');
 
         Alert::flash($file->name . " deleted successfully");
@@ -59 +60 @@
                 $newFile->location = $location . DIRECTORY_SEPARATOR . $fileName;
                 $newFile->folder()->associate($folder);
+                $newFile->folder()->increment('no_of_files');
                 $newFile->save();
             }
@@ -65 +67 @@
             Alert::flash("New files added successfully");
 
-            return redirect()->route("dashboard.files.index");
+            return redirect()->back();
         }
         else {
             Alert::flash("No files were uploaded", "error");
 
-            return redirect()->route("dashboard.files.index");
+            return redirect()->back();
         }
     }

app/Http/Controllers/Dashboard/FoldersController.php

@@ -39 +39 @@
                 $folders = $foldersInDeptSort->orderBy('name', 'asc')->paginate(12);
             }
+            else if ($request->query('sort') == 'no_of_files') {
+                $folders = $foldersInDeptSort->orderBy('no_of_files', 'desc')->paginate(12);
+            }
             else if($request->query('sort') == 'count'){
                 $total = $foldersInDeptSort->folder->files->count();
@@ -52 +55 @@
             else if ($request->query('sort') == 'name') {
                 $folders = Folder::orderBy('name', 'asc')->paginate(12);
+            }
+            else if ($request->query('sort') == 'no_of_files') {
+                $folders = Folder::orderBy('no_of_files', 'desc')->paginate(12);
             }
             else if ($request->query('sort') == 'important') {
@@ -97 +103 @@
             "deptName" => $deptName,
             "deptCode" => $deptCode,
-            "fileTypes" => '.' . implode(',.', explode(',', explode(':', FileType::find('1')->mimes)[1]))
+            "fileTypes" => '.' . implode(',.', explode(',', FileType::find('1')->mimes))
         ]);
 
@@ -117 +123 @@
         $folder->user()->associate($user);
         $folder->department()->associate($department);
+        $folder->department()->increment('no_of_folders');
 
         $folder->arch_id = $request->arch_id;
@@ -149 +156 @@
                 $newFile->location = $location . DIRECTORY_SEPARATOR . $fileName;
                 $newFile->folder()->associate($folder);
+                $newFile->folder()->increment('no_of_files');
                 $newFile->save();
             }
@@ -155 +163 @@
         Alert::flash("New folder created successfully");
 
-        return redirect()->route("dashboard.folders.index");
+        return redirect()->back();
     }
 
@@ -177 +185 @@
         $department = Department::find($request->department);
 
-        $folder->department()->associate($department);
-
-        $oldLocation = $folder->department->location . DIRECTORY_SEPARATOR . $folder->name;
+        $folder->department()->increment('no_of_folders');
+
+        $oldLocation = $folder->location;
 
         $folder->name = $request->name;
@@ -186 +194 @@
         $folder->updated_at = Carbon::now();
 
-        $location = $folder->department->location . DIRECTORY_SEPARATOR . $request->name;
-
-        if ($folder->isDirty('name')) {
-            if (!Storage::disk('uploads')->has($location)) {
-                Storage::disk('uploads')->move($oldLocation, $location);
-                foreach($files as $file){
-                    $file->location = $location . DIRECTORY_SEPARATOR . $file->name;
+       $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($location . DIRECTORY_SEPARATOR, $fileName);
+                    $file->storeAs($newLocation . DIRECTORY_SEPARATOR, $fileName);
                     $newFile = new File();
                     $newFile->name = $fileName;
-                    $newFile->location = $location . DIRECTORY_SEPARATOR . $fileName;
+                    $newFile->location = $newLocation . DIRECTORY_SEPARATOR . $fileName;
                     $newFile->folder()->associate($folder);
+                    $newFile->folder()->increment('no_of_files');
                     $newFile->save();
             }
         }
 
-        $folder->location = $location;
-
         $folder->save();
-
 
         Alert::flash("Folder edited successfully");
@@ -246 +266 @@
             $location = $folder->department->location . DIRECTORY_SEPARATOR . $folder->name;
             Storage::disk('uploads')->deleteDirectory($location);
+            $folder->department()->decrement('no_of_folders');
             Alert::flash($folder->name . " deleted successfully");
+            return redirect()->back();
         }
         Alert::flash($folder->name . " is important", "error");
-        return redirect()->route("dashboard.folders.index");
+        return redirect()->back();
     }
 
@@ -306 +328 @@
         }
         else {
-            $files = File::where('folder_id', $id)->paginate(10);
+            $files = File::where('folder_id', $id)->paginate(12);
         }
 
@@ -317 +339 @@
             "imageExt" => array("png", "jpg", "jpeg"),
             "folders" => $folders,
-            "fileTypes" => '.' . implode(',.', explode(',', explode(':', FileType::find('1')->mimes)[1]))
+            "fileTypes" => '.' . implode(',.', explode(',', FileType::find('1')->mimes))
         ]);
     }

app/Http/Controllers/Dashboard/IndexController.php

@@ -9 +9 @@
 use App\Models\User;
 use App\Http\Controllers\Controller;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
 
 class IndexController extends Controller
@@ -18 +20 @@
         );
 
+        $date = Carbon::today()->subDays(5);
+        $recentFiles = File::where('created_at', '>=', $date)->get();
+
+        $year = ['2021','2022','2023','2024', '2025'];
+
+        $file = [];
+        foreach ($year as $key => $value) {
+            $file[] = File::where(DB::raw("DATE_FORMAT(created_at, '%Y')"),$value)->count();
+        }
+
         return view("dashboard.index")->with([
             "counters" => $counters,
+            "largestDepartments" => Department::orderBy('no_of_folders', 'desc')->limit(10)->get(),
+            "folders" => Folder::all(),
+            "files" => File::all(),
+            "recentFiles" => $recentFiles,
+            "year" => json_encode($year,JSON_NUMERIC_CHECK),
+            "file" => json_encode($file,JSON_NUMERIC_CHECK),
             "departments" => Department::all(),
-            "folders" => Folder::all(),
-            "files" => File::all()
-        ]);
+            "excelExt" => array("xls", "xlsx", "xls", "csv"),
+            "textExt" => array("txt", "doc", "docx"),
+            "imageExt" => array("png", "jpg", "jpeg"),
+
+         ]);
     }
 }

app/Http/Controllers/Dashboard/SettingsController.php

@@ -77 +77 @@
     }
 
-
-
     public function fileTypes(FileTypeRequest $request)
     {

app/Models/Department.php

@@ -14 +14 @@
     protected $table = "departments";
 
-    protected $fillable = ["name", "code", "location", "user_id"];
+    protected $fillable = ["name", "code", "location", "user_id", "no_of_folders"];
 
     protected $casts = [

app/Models/File.php

@@ -3 +3 @@
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;
@@ -8 +9 @@
 class File extends Model
 {
+    use HasFactory;
+
     protected $table = "files";
     protected $fillable = ["name", "location", "document_id"];