Merge branch 'develop'

app/Http/Controllers/Auth/RegisterController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Auth;
 
+use App\Role;
 use App\User;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Validator;
@@ -62,10 +63,14 @@ protected function validator(array $data)
      */
     protected function create(array $data)
     {
-        return User::create([
+        $user = User::create([
             'name' => $data['name'],
             'email' => $data['email'],
             'password' => bcrypt($data['password']),
         ]);
+
+        $user->toggleRole('user');
+
+        return $user;
     }
 }

app/Http/Controllers/DashboardController.php

@@ -36,6 +36,7 @@ public function index(Request $request)
         else {
             $reporteT = ReporteTrimestral::latest()
                 ->with('trimestre', 'seccional', 'ingreso', 'egreso')
+                ->orderBy('fecha', 'desc')
                 ->paginate(6);
         }
 

app/Http/Controllers/ReporteEgresoController.php

@@ -26,6 +26,7 @@ public function index()
     {
         $reportesEgresos = ReporteEgreso::latest()
             ->with('reporteTrimestral.trimestre', 'reporteTrimestral.seccional')
+            ->orderBy('created_at', 'desc')
             ->paginate(6);
 
         return view('egresos.index', compact('reportesEgresos'));

app/Http/Controllers/ReporteIngresoController.php

@@ -26,6 +26,7 @@ public function index()
     {
         $reportesIngresos = ReporteIngreso::latest()
             ->with('reporteTrimestral.trimestre', 'reporteTrimestral.seccional')
+            ->orderBy('created_at', 'desc')
             ->paginate(6);
 
         return view('ingresos.index', compact('reportesIngresos'));

app/Http/Controllers/ReporteTrimestralController.php

@@ -35,6 +35,7 @@ public function index(Request $request)
         else {
             $reporteT = ReporteTrimestral::latest()
                 ->with('trimestre', 'seccional', 'ingreso', 'egreso')
+                ->orderBy('fecha', 'desc')
                 ->paginate(6);
         }
 
@@ -99,11 +100,12 @@ public function update(Request $request, $id)
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int  $id
+     * @param  \App\ReporteTrimestral  $reporteT
      * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy(ReporteTrimestral $reporteT)
     {
-        //
+        $reporteT->delete();
+        return redirect(route('reportes.index'));
     }
 }

app/Http/Controllers/UserController.php

@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\User;
+use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
+
+class UserController extends Controller
+{
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $users = User::latest()->with('roles')->paginate(6);
+
+        return view('users.index', compact('users'));
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return view('users.create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->validate($request, [
+            'name' => 'required|max:255',
+            'email' => 'required|email|max:255|unique:users',
+            'password' => 'required|min:6|confirmed',
+            'roles' => 'required',
+        ]);
+
+        $user = User::create([
+            'name' => $request->get('name'),
+            'email' => $request->get('email'),
+            'password' => bcrypt($request->get('password')),
+        ]);
+
+        foreach ($request->get('roles') as $role => $id) {
+            $user->toggleRole($role);
+        }
+
+        return redirect(route('usuarios.index'));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\User  $user
+     * @return \Illuminate\Http\Response
+     */
+    public function show(User $user)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\User  $userEdit
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(User $userEdit)
+    {
+        return view('users.edit', compact('userEdit'));
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\User  $userEdit
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, User $userEdit)
+    {
+        $this->validate($request, [
+            'name' => 'required|max:255',
+            'email' => ['required', 'email', 'max:255', Rule::unique('users')->ignore($userEdit->email, 'email')],
+            'password' => 'sometimes|nullable|min:6|confirmed',
+            'roles' => 'required',
+        ]);
+
+        $userEdit->name = $request->get('name');
+        $userEdit->email = $request->get('email');
+        $request->get('password') ? $userEdit->password = bcrypt($request->get('password')) : '';
+
+        $userEdit->assignRoles(array_keys($request->get('roles')));
+
+        $userEdit->save();
+
+        return redirect(route('usuarios.index'));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\User  $usuario
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(User $usuario)
+    {
+        $usuario->delete();
+        return redirect(route('usuarios.index'));
+    }
+}

app/Policies/ReporteTrimestralPolicy.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Policies;
+
+use App\User;
+use App\ReporteTrimestral;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class ReporteTrimestralPolicy
+{
+    use HandlesAuthorization;
+
+    /**
+     * Determine whether the user can view the reporteTrimestral.
+     *
+     * @param  \App\User  $user
+     * @param  \App\ReporteTrimestral  $reporteTrimestral
+     * @return mixed
+     */
+    public function view(User $user, ReporteTrimestral $reporteTrimestral)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can create reporteTrimestrals.
+     *
+     * @param  \App\User  $user
+     * @return mixed
+     */
+    public function create(User $user)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can update the reporteTrimestral.
+     *
+     * @param  \App\User  $user
+     * @param  \App\ReporteTrimestral  $reporteTrimestral
+     * @return mixed
+     */
+    public function update(User $user, ReporteTrimestral $reporteTrimestral)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can delete the reporteTrimestral.
+     *
+     * @param  \App\User  $user
+     * @param  \App\ReporteTrimestral  $reporteTrimestral
+     * @return mixed
+     */
+    public function delete(User $user, ReporteTrimestral $reporteTrimestral)
+    {
+        return $user->hasRole('admin');
+    }
+}

app/Policies/UserPolicy.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Policies;
+
+use App\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class UserPolicy
+{
+    use HandlesAuthorization;
+
+    /**
+     * Determine whether the user can access index method.
+     *
+     * @param  \App\User  $user
+     * @return mixed
+     */
+    public function index(User $user)
+    {
+        return $user->hasRole('admin');
+    }
+
+
+    /**
+     * Determine whether the user can view the user.
+     *
+     * @param  \App\User  $user
+     * @param  \App\User  $userEdit
+     * @return mixed
+     */
+    public function view(User $user, User $userEdit)
+    {
+        return $user->hasRole('admin') || $user->id == $userEdit->id;
+    }
+
+    /**
+     * Determine whether the user can create users.
+     *
+     * @param  \App\User  $user
+     * @return mixed
+     */
+    public function create(User $user)
+    {
+        return $user->hasRole('admin');
+    }
+
+    /**
+     * Determine whether the user can update the user.
+     *
+     * @param  \App\User  $user
+     * @param  \App\User  $userEdit
+     * @return mixed
+     */
+    public function update(User $user, User $userEdit)
+    {
+        return $user->hasRole('admin') || $user->id == $userEdit->id;
+    }
+
+    /**
+     * Determine whether the user can delete the user.
+     *
+     * @param  \App\User  $user
+     * @param  \App\User  $userEdit
+     * @return mixed
+     */
+    public function delete(User $user, User $userEdit)
+    {
+        return $user->hasRole('admin') || $user->id == $userEdit->id;
+    }
+}

app/Presenters/GraficoPresenter.php

@@ -24,7 +24,7 @@ public function setChart($parameters)
 
         switch ($parameters['grafico']) {
             case "ingreso/egreso":
-                $data = ReporteTrimestral::getIngresosEgresos($parameters['seccional'], $fechaDesde, $fechaHasta);
+                $data = ReporteTrimestral::getReportes($parameters['seccional'], $fechaDesde, $fechaHasta);
 
                 if ( count($data) == 0 )
                     break;
@@ -132,7 +132,7 @@ public function setChart($parameters)
                 return $charts;
 
             case "saldos":
-                $data = ReporteTrimestral::getSaldos($parameters['seccional'], $fechaDesde, $fechaHasta);
+                $data = ReporteTrimestral::getReportes($parameters['seccional'], $fechaDesde, $fechaHasta);
 
                 if ( count($data) == 0 )
                     break;

app/Providers/AuthServiceProvider.php

@@ -14,6 +14,8 @@ class AuthServiceProvider extends ServiceProvider
      */
     protected $policies = [
         'App\Model' => 'App\Policies\ModelPolicy',
+        'App\User' => 'App\Policies\UserPolicy',
+        'App\ReporteTrimestral' => 'App\Policies\ReporteTrimestralPolicy',
     ];
 
     /**

app/ReporteIngresoMensual.php

@@ -50,6 +50,7 @@ public static function getIngresos($seccional, $fechaDesde, $fechaHasta)
                     ->where('fecha', '<=', $fechaHasta);
                 })
             ->with('reporteIngreso.reporteTrimestral.seccional')
+            ->orderBy('mes', 'asc')
             ->get();
     }
 }

app/ReporteTrimestral.php

@@ -77,25 +77,17 @@ public function path()
     public function scopeSearch($query, $parameters)
     {
         return $query->where('trimestre_id', $parameters['trimestre'])
-            ->where('fecha', 'LIKE', $parameters['año'].'-%') // TODO Check
+            ->where('fecha', 'LIKE', $parameters['año'].'-%')
             ->where('seccional_id', $parameters['seccional']);
     }
 
-    public static function getIngresosEgresos($seccional, $fechaDesde, $fechaHasta)
-    {
-        return self::where('seccional_id', $seccional)
-            ->where('fecha', '>=', $fechaDesde)
-            ->where('fecha', '<=', $fechaHasta)
-            ->with('trimestre', 'seccional')
-            ->get();
-    }
-
-    public static function getSaldos($seccional, $fechaDesde, $fechaHasta)
+    public static function getReportes($seccional, $fechaDesde, $fechaHasta)
     {
         return self::where('seccional_id', $seccional)
             ->where('fecha', '>=', $fechaDesde)
             ->where('fecha', '<=', $fechaHasta)
             ->with('trimestre', 'seccional')
+            ->orderBy('fecha', 'asc')
             ->get();
     }
 }