Changeset 0a1fb54 for app/Models

Timestamp:

11/23/21 22:01:52 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

master

Children:

dbc5976

Parents:

4d73966

Message:

bug fixes

Location:

app/Models

Files:

• Department.php (modified) (2 diffs)
• File.php (modified) (2 diffs)
• User.php (modified) (2 diffs)

app/Models/Department.php

@@ -9 +9 @@
 class Department extends Model
 {
-    use Notifiable;
     use HasFactory;
 
@@ -20 +19 @@
     ];
 
-    public function getCreatedByName()
-    {
-        return User::where('id', $this->user_id)->pluck('username')->first();
-    }
-
     public function folder(){
         return $this->hasMany(Folder::class);
     }
 
-//    public function getDeptId(){
-//        return Department::where('id', $this->id)->get();
-//    }
+    public function user(){
+        return $this->belongsTo(User::class);
+    }
+
 }

app/Models/File.php

@@ -12 +12 @@
 
     protected $table = "files";
-    protected $fillable = ["name", "location", "document_id"];
+    protected $fillable = ["name", "location", "folder_id"];
 
     public function folder()
@@ -21 +21 @@
     public function getSize($location)
     {
-        $fileSize = Storage::disk('uploads')->size($location) / 1024 / 1024;
+        $fileSize = Storage::disk('local')->size($location) / 1024 / 1024;
         $fileSize = round($fileSize, 2);
         return $fileSize;

app/Models/User.php

@@ -134 +134 @@
     }
 
+    public function getCreatedByUsername()
+    {
+        return User::where('id', $this->created_by)->pluck('username')->first();
+    }
+
     public function getCreatedByName()
     {
-        return User::where('id', $this->created_by)->pluck('username')->first();
+        $name = User::where('id', $this->created_by)->pluck('name')->first();
+        $surname = User::where('id', $this->created_by)->pluck('surname')->first();
+
+        return $name . " " . $surname;
     }
 
@@ -142 +150 @@
         return $this->hasMany(Folder::class);
     }
+
+    public function department() {
+        return $this->hasMany(Department::class);
+    }
 }