Merge pull request #130 from lageIBUSP/ordering

Ordering

app/Http/Controllers/ExercicioController.php

@@ -31,7 +31,7 @@ class ExercicioController extends Controller
 	public function index()
 	{
     $topicos = Topico::orderBy('order');
-    $semTopico = Exercicio::whereDoesntHave('topico')->orderBy('name');
+    $semTopico = Exercicio::whereDoesntHave('topico');
     /** @var \App\Models\User */
     $user = Auth::user();
     if (optional($user)->isAdmin()) {
@@ -55,7 +55,7 @@ public function create()
 		$this->authorize('create', Exercicio::class);
 		return View('exercicio.create')
 			->with('pacotesR', $this->getInstalledPackages())
-			->with('topicos', Topico::orderBy('order'));
+			->with('topicos', Topico::all());
 	}
 
 	/**

app/Models/Exercicio.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Stephenjude\DefaultModelSorting\Traits\DefaultOrderBy;
 use Symfony\Component\Yaml\Yaml as Yaml;
 
 class Exercicio extends Model
@@ -25,6 +26,12 @@ class Exercicio extends Model
         'id'
     ];
 
+    /**
+     * Set a default ordering for this model
+     */
+    use DefaultOrderBy;
+    protected static $orderByColumn = 'name';
+
     /**
     * Scope a query to only include active users.
     *

app/Models/Prazo.php

@@ -5,13 +5,18 @@
 use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Support\Carbon;
+use Stephenjude\DefaultModelSorting\Traits\DefaultOrderBy;
 
 class Prazo extends Pivot
 {
     use HasFactory;
     protected $table = 'prazos';
 
-    protected $guarded = [];
+    /**
+     * Set a default ordering for this model
+     */
+    use DefaultOrderBy;
+    protected static $orderByColumn = 'prazo';
 
     // relationships
     public function turma()
@@ -24,13 +29,13 @@ public function exercicio()
     }
 
     // passado/futuro
-    public function getPassadoAttribute() 
+    public function getPassadoAttribute()
     {
-        return $this->prazo < now(); 
+        return $this->prazo < now();
     }
-    public function getFuturoAttribute() 
+    public function getFuturoAttribute()
     {
-        return !$this->passado; 
+        return !$this->passado;
     }
 
   public function scopeFuturos($query) {

app/Models/Topico.php

@@ -4,13 +4,20 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Stephenjude\DefaultModelSorting\Traits\DefaultOrderBy;
 
 class Topico extends Model
 {
     use HasFactory;
     protected $table = 'topicos';
     protected $guarded = [];
 
+    /**
+     * Set a default ordering for this model
+     */
+    use DefaultOrderBy;
+    protected static $orderByColumn = 'order';
+
     // relationships
     public function exercicios()
     {

app/Models/Turma.php

@@ -32,12 +32,12 @@ public function prazos()
 
     public function prazosOrdered()
     {
-        // THIS WILL ALWAYS BE ORDERED BY EX-NAME
+        // THIS WILL ALWAYS BE ORDERED BY PRAZO AND EX-NAME
         return $this->prazos()
             ->join('exercicios', 'prazos.exercicio_id', '=', 'exercicios.id')
             ->select('prazos.*','exercicios.name as exercicio_name')
-            ->orderBy('exercicio_name')
             ->orderBy('prazo')
+            ->orderBy('exercicio_name')
             ;
     }
 }

app/Models/User.php

@@ -7,11 +7,18 @@
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Hash;
+use Stephenjude\DefaultModelSorting\Traits\DefaultOrderBy;
 
 class User extends Authenticatable
 {
     use HasFactory, Notifiable;
 
+    /**
+     * Set a default ordering for this model
+     */
+    use DefaultOrderBy;
+    protected static $orderByColumn = 'name';
+
     /**
     * Sets a hashed password
     */

composer.json

@@ -14,6 +14,7 @@
         "laravel/framework": "^11.0",
         "laravel/tinker": "^2.9",
         "neitanod/forceutf8": "~2.0",
+        "stephenjude/default-model-sorting": "^3.0",
         "symfony/yaml": "^6.0"
     },
     "require-dev": {