manelgavalda / enrollment_mobile

src/Http/Requests/EnrollmentCreateRequest.php

Doc Comments -21 removed lines

@@ -18,24 +18,3 @@
     public function authorize()
     {
 <<<<<<< HEAD
-        //return false; //Per defecte
-=======
-        //De moment true
->>>>>>> 92a55437464d45d8f28bae26a5a84fc695a03898
-        return true;
-    }
-
-
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

Unused Use Statements -21 removed lines

@@ -18,24 +18,3 @@
     public function authorize()
     {
 <<<<<<< HEAD
-        //return false; //Per defecte
-=======
-        //De moment true
->>>>>>> 92a55437464d45d8f28bae26a5a84fc695a03898
-        return true;
-    }
-
-
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

src/Models/Enrollment.php

Doc Comments +1 added lines, -4 removed lines

@@ -28,7 +28,4 @@
 
     //public $timestamps = false;
     //all camps
-    protected $fillable = ['id','name','validated','finished','study_id','course_id','classroom_id','updated_at','created_at'];
-    //TODO: mirar estats (enrollment). Implementar i definir estats(exemple porta(esborrany,valida,feta).
->>>>>>> 92a55437464d45d8f28bae26a5a84fc695a03898
-}
+    protected $fillable
\ No newline at end of file

Unused Use Statements +1 added lines, -4 removed lines

@@ -28,7 +28,4 @@
 
     //public $timestamps = false;
     //all camps
-    protected $fillable = ['id','name','validated','finished','study_id','course_id','classroom_id','updated_at','created_at'];
-    //TODO: mirar estats (enrollment). Implementar i definir estats(exemple porta(esborrany,valida,feta).
->>>>>>> 92a55437464d45d8f28bae26a5a84fc695a03898
-}
+    protected $fillable
\ No newline at end of file