Merge pull request #178 from JuanVqz/manage_schools

responsibilities separate schools and academic settings
changeweb · Jul 26, 2019 · b381939 · b381939
2 parents cec56f9 + 2cdfcdb
commit b381939
Show file tree

Hide file tree

Showing 27 changed files with 837 additions and 573 deletions.
diff --git a/app/Http/Controllers/SchoolController.php b/app/Http/Controllers/SchoolController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers;
 
+use App\User;
 use App\School;
 use App\Myclass;
 use App\Section;
-use App\User;
 use App\Department;
-//use App\Http\Resources\SchoolResource;
 use Illuminate\Http\Request;
+use App\Http\Requests\SchoolRequest;
 
 class SchoolController extends Controller
 {
@@ -17,28 +17,10 @@ class SchoolController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function index()
-    {
-      $schools = School::all();
-      $classes = Myclass::all();
-      $sections = Section::all();
-      $teachers = User::join('departments', 'departments.id', '=', 'users.department_id')
-                            ->where('role', 'teacher')
-                            ->orderBy('name','ASC')
-                            ->where('active', 1)
-                            ->get();
-      $departments = Department::bySchool(\Auth::user()->school_id)->get();
-      return view('school.create-school', compact('schools', 'classes', 'sections', 'teachers', 'departments'));
-    }
+    public function index() {
+      $schools = School::orderBy('created_at', 'desc')->paginate();
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
+      return view('schools.index', compact('schools'));
     }
 
     /**
@@ -47,23 +29,18 @@ public function create()
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(SchoolRequest $request)
     {
-      $request->validate([
-        'school_name' => 'required|string|max:255',
-        'school_medium' => 'required',
-        'school_about' => 'required',
-        'school_established' => 'required',
-      ]);
-      $tb = new School;
-      $tb->name = $request->school_name;
-      $tb->established = $request->school_established;
-      $tb->about = $request->school_about;
-      $tb->medium = $request->school_medium;
-      $tb->code = date("y").substr(number_format(time() * mt_rand(),0,'',''),0,6);
-      $tb->theme = 'flatly';
-      $tb->save();
-      return back()->with('status', __('Created'));
+        School::create([
+            'name'        => $request->name,
+            'established' => $request->established,
+            'about'       => $request->about,
+            'medium'      => $request->medium,
+            'code'        => date("y").substr(number_format(time() * mt_rand(), 0, '', ''), 0, 6),
+            'theme'       => 'flatly'
+        ]);
+
+        return redirect()->route('schools.index')->with('status', __('Created'));
     }
 
     /**
@@ -78,25 +55,16 @@ public function show($school_id)
       return view('school.admin-list',compact('admins'));
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(Request $request, $school_id)
-    {
-      $school = School::find($school_id);
-      if (!$school) {
-        abort(404);
-      }
-      if ($request->isMethod('post')) {
+    public function edit(School $school) {
+        return view('schools.edit', compact('school'));
+    }
+
+    public function update(Request $request, School $school) {
         $school->name = $request->name;
         $school->about = $request->about;
-        $school->theme = $request->school_theme;
         $school->save();
-      }
-      return view('school.edit-school',compact('school'));
+
+        return redirect()->route('schools.index');
     }
 
     public function addDepartment(Request $request){
@@ -116,25 +84,6 @@ public function changeTheme(Request $request){
       $tb->save();
       return back();
     }
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-      $tb = School::find($id);
-      $tb->name = $request->name;
-      $tb->about = $request->about;
-      //$tb->code = $request->code;
-      return ($tb->save())?response()->json([
-        'status' => 'success'
-      ]):response()->json([
-        'status' => 'error'
-      ]);
-    }
 
     /**
      * Remove the specified resource from storage.

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\User;
+use App\School;
+use App\Myclass;
+use App\Section;
+use App\Department;
+use Illuminate\Http\Request;
+
+class SettingController extends Controller
+{
+    public function index() {
+        $school      = \Auth::user()->school;
+        $classes     = Myclass::all();
+        $sections    = Section::all();
+        $departments = Department::bySchool(\Auth::user()->school_id)->get();
+        $teachers = User::join('departments', 'departments.id', '=', 'users.department_id')
+            ->where('role', 'teacher')
+            ->orderBy('name', 'ASC')
+            ->where('active', 1)
+            ->get();
+
+        return view('settings.index', compact('school', 'classes', 'sections', 'departments', 'teachers'));
+    }
+}
diff --git a/app/Http/Requests/SchoolRequest.php b/app/Http/Requests/SchoolRequest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SchoolRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name'        => 'required|string|max:255',
+            'medium'      => 'required',
+            'about'       => 'required',
+            'established' => 'required',
+        ];
+    }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use Laravel\Dusk\DuskServiceProvider;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Http\Resources\Json\Resource;
@@ -26,6 +27,8 @@ public function boot()
      */
     public function register()
     {
-        //
+        if ($this->app->environment('local', 'testing')) {
+            $this->app->register(DuskServiceProvider::class);
+        }
     }
 }
diff --git a/database/factories/SchoolFactory.php b/database/factories/SchoolFactory.php
@@ -5,10 +5,11 @@
 
 $factory->define(School::class, function (Faker $faker) {
     return [
-        'name'   => $faker->name,
-        'about'  => $faker->sentences(3, true),
-        'medium' => $faker->randomElement(['bangla', 'english']),
-        'code'   => date("y").substr(number_format(time() * mt_rand(),0,'',''),0,6),
-        'theme'  => 'flatly',
+        'name'        => $faker->name,
+        'about'       => $faker->sentences(3, true),
+        'medium'      => $faker->randomElement(['bangla', 'english']),
+        'code'        => date("y").substr(number_format(time() * mt_rand(),0,'',''),0,6),
+        'established' => $faker->name,
+        'theme'       => 'flatly',
     ];
 });
diff --git a/resources/lang/es-MX.json b/resources/lang/es-MX.json
@@ -601,6 +601,7 @@
 	"out of": "de",
 	"print": "imprimir",
 	"row No": "fila Num.",
-	"section": "sección",
-	"uploaded": "cargado"
-}
+	"section": "Sección",
+	"uploaded": "Cargado",
+	"Academic Settings": "Configuración Académica"
+}
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -14,7 +14,7 @@
         <div class="col-md-3" id="side-navbar">
             <ul class="nav flex-column">
                 <li class="nav-item active">
-                    <a class="nav-link" href="{{ url('create-school') }}"><i class="material-icons">gamepad</i> <span class="nav-link-text">@lang('Back to Manage School')</span></a>
+                    <a class="nav-link" href="{{ route('schools.index') }}"><i class="material-icons">gamepad</i> <span class="nav-link-text">@lang('Back to Manage School')</span></a>
                 </li>
             </ul>
         </div>
@@ -547,4 +547,4 @@
         $("#registerForm").submit();
     });
 </script>
-@endsection
+@endsection
diff --git a/resources/views/layouts/leftside-menubar.blade.php b/resources/views/layouts/leftside-menubar.blade.php
@@ -102,7 +102,7 @@ class="nav-link-text">@lang('Active Exams')</span></a>
   </li>
   <li class="nav-item" style="border-bottom: 1px solid #dbd8d8;"></li>
   <li class="nav-item">
-    <a class="nav-link" href="{{ url('create-school') }}"><i class="material-icons">settings</i> <span class="nav-link-text">@lang('Academic Settings')</span></a>
+    <a class="nav-link" href="{{ route('settings.index') }}"><i class="material-icons">settings</i> <span class="nav-link-text">@lang('Academic Settings')</span></a>
   </li>
   <li class="nav-item dropdown">
     <a role="button" href="#" class="nav-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i

diff --git a/resources/views/layouts/master/create-school-form.blade.php b/resources/views/layouts/master/create-school-form.blade.php
diff --git a/resources/views/masters/index.blade.php b/resources/views/masters/index.blade.php
@@ -8,7 +8,9 @@
                 <div class="page-panel-title">@lang('Dashboard')</div>
 
                 <div class="panel-body">
-                    <a class="btn btn-danger btn-lg btn-block" href="{{url('create-school')}}" role="button">@lang('Manage Schools')</a>
+                    <a class="btn btn-danger btn-lg btn-block" href="{{ route('schools.index') }}" role="button">
+                        @lang('Manage Schools')
+                    </a>
                 </div>
             </div>
         </div>

diff --git a/resources/views/school/admin-list.blade.php b/resources/views/school/admin-list.blade.php
@@ -13,7 +13,7 @@
             @endif
             <ul class="nav flex-column">
                 <li class="nav-item">
-                    <a class="nav-link" href="{{url('create-school')}}"><i class="material-icons">gamepad</i> @lang('Manage School')</a>
+                    <a class="nav-link" href="{{ route('schools.index') }}"><i class="material-icons">gamepad</i> @lang('Manage School')</a>
                 </li>
             </ul>
         </div>
@@ -75,4 +75,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection