Merge branch 'main' of https://github.com/rats4final/citas

rats4final · Dec 1, 2022 · 1b91bf8 · 1b91bf8
2 parents 9d630bf + 742acbc
commit 1b91bf8
Show file tree

Hide file tree

Showing 26 changed files with 986 additions and 136 deletions.
diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php
@@ -21,7 +21,7 @@ class CreateNewUser implements CreatesNewUsers
     public function create(array $input)
     {
         Validator::make($input, [
-            'name' => ['required', 'string', 'max:255'],
+            //'name' => ['required', 'string', 'max:255'],
             'email' => [
                 'required',
                 'string',
@@ -34,10 +34,11 @@ public function create(array $input)
         ])->validate();
 
         return User::create([
-            'name' => $input['name'],
+            //'name' => $input['name'],
             'email' => $input['email'],
             'username' => $input['username'],
             'password' => Hash::make($input['password']),
+            'rol' => 1,
         ]);
     }
 }
diff --git a/app/Http/Controllers/HistorialController.php b/app/Http/Controllers/HistorialController.php
@@ -8,6 +8,10 @@
 use App\Models\User;
 use App\Models\Persona;
 use Illuminate\Http\Request;
+use App\Http\Requests\StoreHistorialRequest;
+use App\Http\Requests\EditHistorialRequest;
+
+
 
 class HistorialController extends Controller
 {
@@ -32,7 +36,7 @@ public function create()
         //return $Users;
     }
 
-    public function store(Request $request)
+    public function store(StoreHistorialRequest $request)
     {
         //
         $Datos_Historia=request()->except('_token');
@@ -70,7 +74,7 @@ public function edit($Historial)
     }
 
 
-    public function update(Request $request, $historial)
+    public function update(EditHistorialRequest $request, $historial)
     {
         //
         $input = $request->all();
@@ -89,9 +93,6 @@ public function destroy( $Historial)
     {
         //
         Historial::destroy($Historial);
-
-        // $Historial->delete();
-
         return redirect('/Historial');
     }
 }
diff --git a/app/Http/Controllers/PersonaController.php b/app/Http/Controllers/PersonaController.php
@@ -66,7 +66,9 @@ public function show(Persona $persona)
      */
     public function edit(Persona $persona)
     {
-        return view('admin.Persona.edit', compact('persona'));
+        $personas = Persona::get();
+        $tipos_sangre = TipoSangre::get();
+        return view('admin.Persona.edit', compact('tipos_sangre','personas','persona'));
     }
 
     /**

diff --git a/app/Http/Controllers/SedeController.php b/app/Http/Controllers/SedeController.php
@@ -5,6 +5,9 @@
 use Illuminate\Http\Request;
 
 use App\Models\Sede;
+use App\Http\Requests\StoreSedeRequest;
+use App\Http\Requests\EditSedeRequest;
+
 
 class SedeController extends Controller
 {
@@ -24,7 +27,7 @@ public function create()
     }
 
 
-    public function store(Request $request)
+    public function store(StoreSedeRequest $request)
     {
         //
         $Datos_Sedes=request()->except('_token');
@@ -50,7 +53,7 @@ public function edit($Id_Sede)
         return View ('admin.Sedes.edit',compact('Sede'));
     }
 
-    public function update(Request $request, $Id_Sede)
+    public function update(EditSedeRequest $request, $Id_Sede)
     {
         //
 

diff --git a/app/Http/Controllers/UsuarioController.php b/app/Http/Controllers/UsuarioController.php
@@ -2,7 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Usuario;
+//use App\Models\Usuario;
+use App\Models\User;
+use App\Models\Persona;
+use App\Models\TipoSangre;
+
 use Illuminate\Http\Request;
 class UsuarioController extends Controller
 {
@@ -13,7 +17,9 @@ class UsuarioController extends Controller
      */
     public function index()
     {
-        //
+        $usuarios = user::with(['persona'])->get();
+        return view('admin.user.index', compact('usuarios'));
+        //return $usuario;
     }
     /**
      * Show the form for creating a new resource.
@@ -22,7 +28,9 @@ public function index()
      */
     public function create()
     {
-        //
+        $personas = Persona::get();
+        $tipos_sangre = TipoSangre::get();
+        return view('admin.user.create', compact('tipos_sangre','personas'));
     }
 
     /**
@@ -33,7 +41,16 @@ public function create()
      */
     public function store(Request $request)
     {
-        //
+        $datos = $request->all();
+        Persona::create($datos);
+        $id = Persona::latest('id_persona')->first();
+        //return to_route('personas.index');
+        $datos1 = ['rol'=>"1", 'estado'=>1, 'id_persona'=>$id->id_persona];
+        $datosUser = array_merge($datos, $datos1);
+        User::create($datosUser);
+        return redirect('/Usuario');
+
+
     }
 
     /**
@@ -76,8 +93,17 @@ public function update(Request $request, Usuario $usuario)
      * @param  \App\Models\Usuario  $usuario
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Usuario $usuario)
+    public function destroy(Request $request, $usuario)
     {
-        //
+        $input = $request->all();
+
+        $usuarios = User::find($usuario);
+
+        $estado = ['estado'=>0];
+
+        $usuarios->update($estado);
+
+    //Redirecionas para no bugear el jalar de datos con reddirect para recargar la vista totalmente
+    return redirect('/Usuario');
     }
 }
diff --git a/app/Http/Requests/EditHistorialRequest.php b/app/Http/Requests/EditHistorialRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class EditHistorialRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'detalles_historial' => 'required|string|min:20|max:255',
+        ];
+    }
+    public function messages()
+{
+    return [
+        'detalles_historial.required' => 'Es necesesario que tenga datos en estte campo',
+        'detalles_historial.min' => 'Los detalles minimamente deben tener mas de 20 caracteres',
+        'detalles_historial.max' => 'Los detalles no deben superar los 255 caracteres'
+    ];
+}
+}
diff --git a/app/Http/Requests/EditSedeRequest.php b/app/Http/Requests/EditSedeRequest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class EditSedeRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'nombre_sede' => 'required|string|min:10|max:100',
+            'direccion_sede' => 'required|string|min:10|max:120',
+            'telefono_sede' => 'required|integer|min:8'
+
+        ];
+    }
+    public function messages()
+{
+    return [
+        'nombre_sede.required' => 'Es neceserio que este campo este llenado',
+        'nombre_sede.min' => 'El nombre minimamente debe tener mas de 10 caracteres',
+        'nombre_sede.max' => 'El nombre no debe superar los 120 caracteres',
+
+        'direccion_sede.required' => 'Es neceserio que este campo este llenado',
+        'direccion_sede.min' => 'La dirrecion minimamente debe tener mas de 10 caracteres',
+        'direccion_sede.max' => 'La dirrecion no debe superar los 120 caracteres',
+
+        'telefono_sede.required' => 'Es neceserio que este campo este llenado',
+        'telefono_sede.integer' => 'Debe ser un numero no una palabra',
+        'telefono_sede.min' => 'El telefono minimamente debe tener 8 numeros',
+        'telefono_sede.max' => 'El telefono maximo debe tener 10 numeros'
+
+    ];
+}
+}
diff --git a/app/Http/Requests/StoreHistorialRequest.php b/app/Http/Requests/StoreHistorialRequest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreHistorialRequest extends FormRequest
+{
+
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'detalles_historial' => 'required|string|min:20|max:255',
+        ];
+    }
+    public function messages()
+{
+    return [
+        'detalles_historial.required' => 'Es necesesario que tenga datos en estte campo',
+        'detalles_historial.min' => 'Los detalles minimamente deben tener mas de 20 caracteres',
+        'detalles_historial.max' => 'Los detalles no deben superar los 255 caracteres'
+    ];
+}
+}
diff --git a/app/Http/Requests/StorePersonaRequest.php b/app/Http/Requests/StorePersonaRequest.php
@@ -6,21 +6,11 @@
 
 class StorePersonaRequest 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<string, mixed>
-     */
     public function rules()
     {
         return [

diff --git a/app/Http/Requests/StoreSedeRequest.php b/app/Http/Requests/StoreSedeRequest.php
@@ -3,28 +3,41 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-
+use Illuminate\Http\Request;
 class StoreSedeRequest 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<string, mixed>
-     */
     public function rules()
     {
         return [
-            //
+            'nombre_sede' => 'required|string|min:10|max:100',
+            'direccion_sede' => 'required|string|min:10|max:120',
+            'telefono_sede' => 'required|integer|min:8'
+
         ];
     }
+    public function messages()
+{
+    return [
+        'nombre_sede.required' => 'Es neceserio que este campo este llenado',
+        'nombre_sede.min' => 'El nombre minimamente debe tener mas de 10 caracteres',
+        'nombre_sede.max' => 'El nombre no debe superar los 120 caracteres',
+
+        'direccion_sede.required' => 'Es neceserio que este campo este llenado',
+        'direccion_sede.min' => 'La dirrecion minimamente debe tener mas de 10 caracteres',
+        'direccion_sede.max' => 'La dirrecion no debe superar los 120 caracteres',
+
+        'telefono_sede.required' => 'Es neceserio que este campo este llenado',
+        'telefono_sede.integer' => 'Debe ser un numero no una palabra',
+        'telefono_sede.min' => 'El telefono minimamente debe tener 8 numeros',
+        'telefono_sede.max' => 'El telefono maximo debe tener 10 numeros'
+
+    ];
 }
+}
+
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -22,6 +22,9 @@ class User extends Authenticatable
         'name',
         'email',
         'username',
+        'id_persona',
+        'rol',
+        'estado',
         'password',
     ];
 

diff --git a/database/migrations/2022_11_24_044401_add_id_persona_columm_to_users_table.php b/database/migrations/2022_11_24_044401_add_id_persona_columm_to_users_table.php
@@ -14,7 +14,7 @@
     public function up()
     {
         Schema::table('users', function (Blueprint $table) {
-            $table->Integer('id_persona')->unsigned();
+            $table->Integer('id_persona')->unsigned()->nullable();
             $table->foreign('id_persona')->references('id_persona')->on('personas');
         });
     }

diff --git a/resources/views/admin/Historial/create.blade.php b/resources/views/admin/Historial/create.blade.php
@@ -47,12 +47,17 @@
             </select>
 
               <label>Fecha de la historia</label></br>
-              <input type="datetime-local" name="fecha_historial" id="fecha_historial" class="form-control" required></br>
+              <input type="datetime-local" name="fecha_historial" id="fecha_historial" min="2022-11-26 00:00" max="2022-12-30 10:00" class="form-control" required></br>
 
               <label>Detalles de la historia</label></br>
-              <input type="text" name="detalles_historial" id="detalles_historial" class="form-control" required></br>
+              <input type="text" name="detalles_historial" id="detalles_historial" class="form-control" required>
+              @error('detalles_historial')
+              <li class="text-danger">{{$message}}</li><br>
+              @enderror
+            </br>
 
-              <input type="submit" value="Save" class="btn btn-success"></br>
+
+              <input type="submit" value="Subir la Historia" class="btn btn-success"></br>
           </form>
 
         </div>