Changeset 4b7e2d3 for app/Exports


Ignore:
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/Exports
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • app/Exports/FilesExport.php

    rc6b84df r4b7e2d3  
    55use App\Models\File;
    66use App\Models\Folder;
    7 use App\Models\User;
    87use Maatwebsite\Excel\Concerns\FromCollection;
    98use Maatwebsite\Excel\Concerns\WithHeadings;
    … …  
    2625            $row->location,
    2726            $row->getSize($row->location) . ' MB',
    28             $row->Folder::find($row->folder_id)->name . ' - ' . Folder::find($row->folder_id)->arch_id,
     27            $row->folder_id . ' - ' . Folder::find($row->folder_id)->name . ' - ' . Folder::find($row->folder_id)->arch_id,
    2928            $row->created_at,
    3029            $row->updated_at
    … …  
    4039            'Location',
    4140            'Size',
    42             'Folder - Archive ID',
     41            'ID - Folder - Archive ID',
    4342            'Created at',
    4443            'Updated at'

  • app/Exports/FoldersExport.php

    rc6b84df r4b7e2d3  
    55use App\Models\Department;
    66use App\Models\Folder;
     7use App\Models\User;
    78use Maatwebsite\Excel\Concerns\FromCollection;
    89use Maatwebsite\Excel\Concerns\WithHeadings;
    … …  
    2627            $row->note,
    2728            $row->location,
    28             $row->User::find($row->user_id)->username,
     29            $row->user_id . ' - ' . User::find($row->user_id)->username,
    2930            $row->Department::find($row->department_id)->name . ' - ' . Department::find($row->department_id)->code,
    3031            $row->is_important,
    … …  
    4344            'Note',
    4445            'Location',
    45             'Created by',
     46            'Created by ID - Username',
    4647            'Department name - code',
    4748            'Is important',

  • app/Exports/UsersExport.php

    rc6b84df r4b7e2d3  
    2828            $row->phone_number,
    2929            $row->is_confirmed,
    30             $row->Role::find($row->role_id)->name,
     30            $row->role_id . ' - ' . Role::find($row->role_id)->name,
    3131            $row->where('id', $row->created_by)->pluck('username')->first(),
    3232            $row->created_at,
    … …  
    4646            'Phone number',
    4747            'Is confirmed',
    48             'Role',
     48            'Role ID - Username',
    4949            'Created by',
    5050            'Created at',
Note: See TracChangeset for help on using the changeset viewer.