Changeset 1f7c934

Timestamp:

11/11/21 21:36:24 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

master

Children:

4d73966

Parents:

90ab388

Message:

bug fixes

Files:

• app/Exports/FoldersExport.php (modified) (2 diffs)
• app/Http/Controllers/Dashboard/DepartmentsController.php (modified) (3 diffs)
• app/Http/Controllers/Dashboard/FoldersController.php (modified) (1 diff)
• database/factories/FolderFactory.php (modified) (1 diff)
• resources/views/dashboard/users/index.blade.php (modified) (3 diffs)

app/Exports/FoldersExport.php

@@ -29 +29 @@
             $row->user_id . ' - ' . User::find($row->user_id)->username,
             $row->Department::find($row->department_id)->name . ' - ' . Department::find($row->department_id)->code,
+            $row->version,
             $row->created_at,
             $row->updated_at
@@ -45 +46 @@
             'Created by ID - Username',
             'Department name - code',
-            'Is important',
+            'Version',
             'Created at',
             'Updated at'

app/Http/Controllers/Dashboard/DepartmentsController.php

@@ -158 +158 @@
             $zip->close();
             $headers = array('Content-Type' => 'application/octet-stream');
-            $zip_new_name = Carbon::now()->format('d.m.Y - H:i') . '- Departments.zip';
+            $zip_new_name = Carbon::now()->format('d.m.Y - ') . 'Departments.zip';
             return response()->download($zip_file, $zip_new_name, $headers);
                 }
@@ -188 +188 @@
 
             $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
+
             foreach ($files as $file) {
 
@@ -198 +199 @@
                 }
             }
+
             $zip->close();
             $headers = array('Content-Type' => 'application/octet-stream');
-            $zip_new_name = Carbon::now()->format('d.m.Y - H:i') . '- Departments.zip';
+            $zip_new_name = Carbon::now()->format('d.m.Y - ') . $department->name . '.zip';
             return response()->download($zip_file, $zip_new_name, $headers);
                 }

app/Http/Controllers/Dashboard/FoldersController.php

@@ -286 +286 @@
                     }
                 }
+
                 $zip->close();
                 $headers = array('Content-Type' => 'application/octet-stream',);
-                $zip_new_name = Carbon::now()->format('d.m.Y - H:i') . $folder->name . '.zip';
+                $zip_new_name = Carbon::now()->format('d.m.Y - ') . $folder->name . '.zip';
                 return response()->download($zip_file, $zip_new_name, $headers);
             }

database/factories/FolderFactory.php

@@ -27 +27 @@
     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;

resources/views/dashboard/users/index.blade.php

@@ -4 +4 @@
 
 @section('head')
-    <!-- Datatable -->
-{{--    <link rel="stylesheet" href="{{ url('vendors/dataTable/dataTables.min.css') }}" type="text/css">--}}
 
 @endsection
@@ -92 +90 @@
                                     <td>
                                         @if(Cache::has('is_online' . $user->id))
-                                            <span data-toggle="tooltip" data-placement="bottom" title="{{ $user->last_seen }}" style="cursor: pointer;" class="text-success">Online</span>
+                                            <span data-toggle="tooltip" data-placement="bottom" title="{{ \Carbon\Carbon::parse($user->last_seen)->format('d.m.Y - H:i') }}" class="text-success">Online</span>
                                         @else
+                                            @if($user->last_seen == null)
                                             <span data-toggle="tooltip" data-placement="bottom" title="{{ $user->last_seen }}" class="text-secondary">Offline</span>
+                                           @else
+                                            <span data-toggle="tooltip" data-placement="bottom" title="{{ \Carbon\Carbon::parse($user->last_seen)->format('d.m.Y - H:i') }}" class="text-secondary">Offline</span>
+                                            @endif
                                         @endif
                                     </td>
@@ -322 +324 @@
     </div>
 
-
-
 @endsection