Changeset 1f7c934 for app

Timestamp:

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

Author:

beratkjufliju <kufliju@…>

Branches:

master

Children:

4d73966

Parents:

90ab388

Message:

bug fixes

Location:

app

Files:

• Exports/FoldersExport.php (modified) (2 diffs)
• Http/Controllers/Dashboard/DepartmentsController.php (modified) (3 diffs)
• Http/Controllers/Dashboard/FoldersController.php (modified) (1 diff)

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);
             }