Changeset d795fa6 for app/Http/Controllers/Dashboard

Timestamp:

10/17/21 18:39:50 (3 years ago)

Author:

Berat Kjufliju <kufliju@…>

Branches:

develop, master

Children:

bd9e8e3

Parents:

120759b

Message:

added validation to blades

Location:

app/Http/Controllers/Dashboard

Files:

• DepartmentsController.php (modified) (5 diffs)
• DocumentsController.php (modified) (3 diffs)
• NotificationsController.php (deleted)
• SettingsController.php (modified) (3 diffs)
• UsersController.php (modified) (4 diffs)

app/Http/Controllers/Dashboard/DepartmentsController.php

@@ -7 +7 @@
 use App\Http\Requests\Dashboard\UpdateDepartmentRequest;
 use App\Models\Department;
+use App\Models\Document;
 use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -25 +27 @@
     {
         return view("dashboard.departments.create");
-    }
-
-    public function editShow($id)
-    {
-        return view("dashboard.departments.edit")->with([
-            "department" => Department::findOrFail($id)
-        ]);
     }
 
@@ -55 +50 @@
     }
 
+    public function editShow($id)
+    {
+        return view("dashboard.departments.edit")->with([
+            "department" => Department::findOrFail($id)
+        ]);
+    }
+
     public function edit(UpdateDepartmentRequest $request, $id)
     {
@@ -63 +65 @@
         $department->name = $request->name;
         $department->code = $request->code;
+        $department->updated_at = Carbon::now();;
 
         $path = '/Departments/' . $request->code;
@@ -83 +86 @@
     }
 
-    public function destroy(Request $request, $id)
+    public function destroy($id)
     {
         $department = Department::find($id);
+        //$department->delete();
+        $documents = $department->document()->count();
 
-        $department->delete();
+        if($documents > 0){
+            Alert::flash($department->name . " has " . $documents . " document/s associated", "error");
+        }
+        else {
+            $department->delete();
 
-        Alert::flash($department->name . " deleted successfully");
+            Alert::flash($department->name . " deleted successfully");
+        }
 
         return redirect()->route("dashboard.departments.index");

app/Http/Controllers/Dashboard/DocumentsController.php

@@ -8 +8 @@
 use App\Models\Document;
 use App\Models\File;
-use App\Models\Files;
-use App\Models\User;
-use App\Notifications\NewDocumentCreated;
 use App\Services\UploadService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
-use Mews\Purifier\Facades\Purifier;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Notification;
 
 class DocumentsController extends Controller
 {
-    public function index()
+    public function index(Request $request)
     {
-        if (auth()->user()->hasPermission("manage_all_documents"))
+        if($request->department) {
+            $documents = Document::with('department')->where('department', function ($query) {
+                $query->where('id', $request->department)->get();
+            });
+        }
+        else{
             $documents = Document::all();
-        else
-            $documents = Document::where("user_id", auth()->user()->id)->get();
+        }
+
+        $departments = Department::all();
 
         return view("dashboard.documents.index")->with([
             "documents" => $documents,
             "currentUser" => auth()->user(),
-            "departments" => Department::all(),
+            "departments" => $departments,
             "docsCount" => Department::withCount('document')->get(),
             'totalDocs' => Document::all()->count()
         ]);
+
     }
 
@@ -66 +68 @@
         $document->arch_id = $request->arch_id;
         $document->description = $request->description;
+        $document->updated_at = $request->Carbon::now();;
 
         $document->save();
@@ -108 +111 @@
     }
 
-    public function getDocumentsInDepartment($id)
-    {
-        $documents = Department::findOrFail($id)->document()->get();
-        $department = Department::findOrFail($id);
-
-        return view('dashboard.documents.department')
-            ->with([
-                'documents' => $documents,
-                'departments' => Department::all(),
-                'totalDocs' => Document::all()->count(),
-                'department' => $department
-
-        ]);
-    }
-
 }

app/Http/Controllers/Dashboard/SettingsController.php

@@ -3 +3 @@
 namespace App\Http\Controllers\Dashboard;
 
-use App\Helpers\Alert;
 use App\Http\Requests\Dashboard\EmailSettingsRequest;
-use App\Http\Requests\Dashboard\NewUserRequest;
 use App\Http\Requests\Dashboard\PasswordSettingsRequest;
-use App\Http\Requests\Dashboard\PhotosSettingsRequest;
-use App\Http\Requests\Dashboard\SocialLinksSettingsRequest;
-use App\Http\Requests\Dashboard\UpdateUserData;
-use App\Http\Requests\Dashboard\UpdateUserRequest;
 use App\Http\Requests\Dashboard\UsernameSettingsRequest;
-use App\Http\Requests\Dashboard\UserProfileSettingsRequest;
-use App\Models\Post;
-use App\Models\Role;
 use App\Models\User;
-use App\Models\UserProfile;
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Hash;
 use App\Notifications\VerifyNewEmail;
-use Illuminate\Support\Facades\Storage;
-use Propaganistas\LaravelPhone\PhoneNumber;
-use Propaganistas\LaravelIntl\Facades\Country;
+use Carbon\Carbon;
 
 class SettingsController extends Controller
@@ -33 +17 @@
         return view("dashboard.settings.index")->with([
             "user" => auth()->user(),
-            "adminAndEditors" => User::where("role_id", 1)->orWhere("role_id", 2)->get()
+            "adminAndEditors" => User::where("role_id", 1)->orWhere("role_id", 2)->get(),
         ]);
     }
@@ -39 +23 @@
     public function updateUsername(UsernameSettingsRequest $request)
     {
-        $user = auth()->user();
-        $user->username = $request->username;
-        $user->save();
-
-        auth()->logout();
-        session()->flush();
-
-        return redirect()->route("auth.loginShow");
+//        if($request->validated()){
+//        $user = auth()->user();
+//        $user->username = $request->username;
+//        $user->save();
+//
+//        auth()->logout();
+//        session()->flush();
+//
+//        return redirect()->route("auth.loginShow");
+//        }
+//        else {
+            return back()->withInput(['tab'=>'security']);
+       // }
     }
 

app/Http/Controllers/Dashboard/UsersController.php

@@ -8 +8 @@
 use App\Http\Requests\Dashboard\UpdateUserRequest;
 use App\Models\Avatar;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\File;
 use App\Models\Role;
@@ -41 +42 @@
         $user->surname = $request->surname;
         $user->email = $request->email;
-        $user->mobile_number = $request->mobile_number;
+        $user->phone_number = $request->phone_number;
         $user->username = $request->username;
         $user->password = $user->generateTemporaryPassword();
@@ -85 +86 @@
         $user->username = $request->username;
         $user->email = $request->email;
-        $user->mobile_number = $request->mobile_number;
+        $user->phone_number = $request->phone_number;
         $user->role_id = $request->userRole;
+        $user->updated_at = $request->Carbon::now();;
 
         if ($request->hasFile("avatar")) {
@@ -152 +154 @@
         $user->name = $request->name;
         $user->surname = $request->surname;
-        $user->mobile_number = $request->mobile_number;
+        $user->phone_number = $request->phone_number;
 
         if ($request->hasFile("avatar")) {