From a7d52e3d0b8a81b52fe02f8b8f62aaf882603e83 Mon Sep 17 00:00:00 2001
From: rats4final <rats4final@gmail.com>
Date: Thu, 24 Nov 2022 02:45:01 -0400
Subject: [PATCH 1/6] Mejoras en crud persona con sus relaciones asi como
 elcrud tipo relaciones

---
 app/Http/Controllers/PersonaController.php    |  6 ++++-
 .../Controllers/TipoRelacionController.php    |  5 ++++-
 app/Models/Persona.php                        | 11 +++++++++-
 app/Models/TipoSangre.php                     |  2 +-
 ...08_23_053433_create_tipo_sangres_table.php |  1 -
 .../2022_09_22_152240_create_personas.php     |  2 ++
 ...2022_09_26_151743_create_tipo_relacion.php |  2 +-
 .../views/admin/Persona/create.blade.php      | 22 ++++++++++++++-----
 resources/views/admin/Persona/index.blade.php |  2 ++
 resources/views/admin/Sedes/index.blade.php   |  6 +----
 .../admin/tipo_relacion/create.blade.php      | 21 ++++++++++++++----
 11 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/PersonaController.php b/app/Http/Controllers/PersonaController.php
index 27d7163..11cf931 100644
--- a/app/Http/Controllers/PersonaController.php
+++ b/app/Http/Controllers/PersonaController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Persona;
+use App\Models\TipoSangre;
 use Illuminate\Http\Request;
 use Psy\CodeCleaner\ReturnTypePass;
 
@@ -16,6 +17,7 @@ class PersonaController extends Controller
     public function index()
     {
         $personas = Persona::get();
+        //return $personas;
         return view('admin.Persona.index', compact('personas'));
     }
 
@@ -26,7 +28,9 @@ public function index()
      */
     public function create()
     {
-        return view('admin.Persona.create');
+        $personas = Persona::get();
+        $tipos_sangre = TipoSangre::get();
+        return view('admin.Persona.create', compact('tipos_sangre','personas'));
     }
 
     /**
diff --git a/app/Http/Controllers/TipoRelacionController.php b/app/Http/Controllers/TipoRelacionController.php
index 4916bd6..644aa3d 100644
--- a/app/Http/Controllers/TipoRelacionController.php
+++ b/app/Http/Controllers/TipoRelacionController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Persona;
 use App\Models\TipoRelacion;
 use Illuminate\Http\Request;
 
@@ -15,6 +16,7 @@ class TipoRelacionController extends Controller
     public function index()
     {
         $TipoRelaciones = TipoRelacion::get();
+        //return $TipoRelaciones;
         return view('admin.tipo_relacion.index', compact('TipoRelaciones'));
     }
 
@@ -25,7 +27,8 @@ public function index()
      */
     public function create()
     {
-        return view('admin.tipo_relacion.create');
+        $personas = Persona::get();
+        return view('admin.tipo_relacion.create', compact('personas'));
     }
 
     /**
diff --git a/app/Models/Persona.php b/app/Models/Persona.php
index c27fdae..c80556e 100644
--- a/app/Models/Persona.php
+++ b/app/Models/Persona.php
@@ -19,10 +19,19 @@ class Persona extends Model
         'fecha_nac',
         'num_seguro',
         'donante',
-        'id_tipo_sangre'
+        'id_tipo_sangre',
+        'id_pariente'
+    ];
+    protected $dates = [
+        'fecha_nac'
     ];
 
     public function tipo_sangre(){
         return $this->belongsTo(TipoSangre::class,'id_tipo_sangre','id_tipo_sangre');
     }
+
+    public function pariente(){
+        return $this->belongsTo(Persona::class,'id_pariente','id_persona');
+    }
+
 }
diff --git a/app/Models/TipoSangre.php b/app/Models/TipoSangre.php
index f26310b..58bd40d 100644
--- a/app/Models/TipoSangre.php
+++ b/app/Models/TipoSangre.php
@@ -9,7 +9,7 @@ class TipoSangre extends Model
 {
     use HasFactory;
 
-    protected $table = 'tipo_sangre';
+    protected $table = 'tipos_sangre';
     protected $primaryKey = 'id_tipo_sangre';
     protected $fillable = ['nombre_tipo_sangre','descripcion_tipo_sangre','rareza_tipo_sangre'];
 
diff --git a/database/migrations/2022_08_23_053433_create_tipo_sangres_table.php b/database/migrations/2022_08_23_053433_create_tipo_sangres_table.php
index c7a360d..2434997 100644
--- a/database/migrations/2022_08_23_053433_create_tipo_sangres_table.php
+++ b/database/migrations/2022_08_23_053433_create_tipo_sangres_table.php
@@ -13,7 +13,6 @@
      */
     public function up()
     {
-
         Schema::create('tipos_sangre', function (Blueprint $table) {
             $table->increments('id_tipo_sangre');
             $table->string('nombre_tipo_sangre')->unique();
diff --git a/database/migrations/2022_09_22_152240_create_personas.php b/database/migrations/2022_09_22_152240_create_personas.php
index d20801c..1810792 100644
--- a/database/migrations/2022_09_22_152240_create_personas.php
+++ b/database/migrations/2022_09_22_152240_create_personas.php
@@ -25,6 +25,8 @@ public function up()
             $table->date('fecha_nac');
             $table->Integer('id_tipo_sangre')->unsigned();
             $table->foreign('id_tipo_sangre')->references('id_tipo_sangre')->on('tipos_sangre');
+            $table->integer('id_pariente')->unsigned()->nullable();
+            $table->foreign('id_pariente')->references('id_persona')->on('personas');
             $table->timestamps();
         });
     }
diff --git a/database/migrations/2022_09_26_151743_create_tipo_relacion.php b/database/migrations/2022_09_26_151743_create_tipo_relacion.php
index 9a02dbd..af7710e 100644
--- a/database/migrations/2022_09_26_151743_create_tipo_relacion.php
+++ b/database/migrations/2022_09_26_151743_create_tipo_relacion.php
@@ -14,7 +14,7 @@
     public function up()
     {
         Schema::create('tipo_relacion', function (Blueprint $table) {
-            $table->increments('id_tipo_rel');
+            $table->increments('id_tipo_relacion');
             $table->string('relacion');
             $table->Integer('id_persona')->unsigned();
             $table->foreign('id_persona')->references('id_persona')->on('personas');
diff --git a/resources/views/admin/Persona/create.blade.php b/resources/views/admin/Persona/create.blade.php
index 7c4c528..fc85774 100644
--- a/resources/views/admin/Persona/create.blade.php
+++ b/resources/views/admin/Persona/create.blade.php
@@ -12,18 +12,28 @@
                 <label>Apellido Materno</label></br>
                 <input type="text" name="apellido_ma_per" class="form-control"></br>
                 <label>Carnet de Identidad</label></br>
-                <input type="text" name="ci_per" class="form-control"></br>
+                <input type="number" name="ci_per" class="form-control"></br>
                 <label>Celular</label></br>
-                <input type="text" name="cel_per" class="form-control"></br>
+                <input type="tel" name="cel_per" class="form-control"></br>
                 <label>Fecha Nacimiento</label></br>
                 <input type="date" name="fecha_nac" class="form-control"></br>
                 <label>Numero de Seguro</label></br>
-                <input type="text" name="num_seguro" class="form-control"></br>
+                <input type="number" name="num_seguro" class="form-control"></br>
+                <label>Tipo de Sangre</label></br>
+                <select class="form-control" name="id_tipo_sangre">
+                    @foreach($tipos_sangre as $tipo_sangre)
+                        <option value="{{ $tipo_sangre->id_tipo_sangre }}">{{$tipo_sangre->nombre_tipo_sangre}}</option>
+                    @endforeach
+                </select> <br>
+                <label>Pariente Donante</label></br>
+                <select class="form-control" name="id_pariente">
+                    @foreach($personas as $persona)
+                        <option value="{{ $persona->id_persona }}">{{$persona->nombre_per}}</option>
+                    @endforeach
+                </select> <br>
                 <label>Es donante</label></br>
                 <input type="text" name="donante" class="form-control"></br>
-                <label>Tipo de Sangre</label></br>
-                <input type="text" name="id_tipo_sangre" class="form-control"></br>
-                <input type="submit" value="Save" class="btn btn-success"></br>
+                <input type="submit" value="Guardar" class="btn btn-success"></br>
             </form>
 
         </div>
diff --git a/resources/views/admin/Persona/index.blade.php b/resources/views/admin/Persona/index.blade.php
index a591aac..cd1930c 100644
--- a/resources/views/admin/Persona/index.blade.php
+++ b/resources/views/admin/Persona/index.blade.php
@@ -25,6 +25,7 @@
                                         <th># Seguro</th>
                                         <th>Es donante</th>
                                         <th>Tipo Sangre</th>
+                                        <th>Pariente</th>
                                         <th>Acciones</th>
                                     </tr>
                                 </thead>
@@ -40,6 +41,7 @@
                                             <td>{{ $persona->num_seguro }}</td>
                                             <td>{{ $persona->donante }}</td>
                                             <td>{{ $persona->tipo_sangre->nombre_tipo_sangre }}</td>
+                                            <td>{{ $persona->pariente->nombre_per }}</td>
                                             <td>
                                                 <a href="{{ route('personas.show', $persona) }}"
                                                     title="View Student"><button class="btn btn-info btn-sm"><i
diff --git a/resources/views/admin/Sedes/index.blade.php b/resources/views/admin/Sedes/index.blade.php
index c17d730..ec94c41 100644
--- a/resources/views/admin/Sedes/index.blade.php
+++ b/resources/views/admin/Sedes/index.blade.php
@@ -1,7 +1,5 @@
 <x-layouts.app>
-
-<div class="container">
-    <div class="row">
+<div class="d-flex">
         <div class="col-md-9">
             <div class="card">
                 <div class="card-header">
@@ -48,7 +46,5 @@
                 </div>
             </div>
         </div>
-    </div>
 </div>
-
 </x-layouts.app>
diff --git a/resources/views/admin/tipo_relacion/create.blade.php b/resources/views/admin/tipo_relacion/create.blade.php
index 2c03c24..d4ef9a2 100644
--- a/resources/views/admin/tipo_relacion/create.blade.php
+++ b/resources/views/admin/tipo_relacion/create.blade.php
@@ -6,12 +6,25 @@
             <form action="{{ route('TipoRelacion.store') }}" method="post">
                 @csrf
                 <label>Relacion</label></br>
-                <input type="text" name="relacion" class="form-control"></br>
+                <select class="form-control" name="relacion">
+                    <option>Padre</option>
+                    <option>Madre</option>
+                    <option>Hermano(a)</option>
+                    <option>Tio(a)</option>
+                </select>
                 <label>Persona 1</label></br>
-                <input type="text" name="id_persona" class="form-control"></br>
+                <select class="form-control" name="id_persona">
+                    @foreach($personas as $persona)
+                        <option value="{{$persona->id_persona}}">{{$persona->nombre_per}}</option>
+                    @endforeach
+                </select>
                 <label>Persona 2</label></br>
-                <input type="text" name="id_pariente" class="form-control"></br>
-                <input type="submit" value="Save" class="btn btn-success"></br>
+                <select class="form-control" name="id_pariente">
+                    @foreach($personas as $pariente)
+                        <option value="{{$pariente->id_persona}}">{{$pariente->nombre_per}}</option>
+                    @endforeach
+                </select><br>
+                <input type="submit" value="Guardar" class="btn btn-success"></br>
             </form>
         </div>
     </div>

From e07c57554bce3c51688f9a5c6ba5d0d3ba2c8d2d Mon Sep 17 00:00:00 2001
From: rats4final <rats4final@gmail.com>
Date: Thu, 24 Nov 2022 02:56:57 -0400
Subject: [PATCH 2/6] protovalidaciones

---
 app/Http/Controllers/PersonaController.php |  3 +-
 app/Http/Requests/StorePersonaRequest.php  | 39 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Requests/StorePersonaRequest.php

diff --git a/app/Http/Controllers/PersonaController.php b/app/Http/Controllers/PersonaController.php
index 11cf931..aa858a0 100644
--- a/app/Http/Controllers/PersonaController.php
+++ b/app/Http/Controllers/PersonaController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Requests\StorePersonaRequest;
 use App\Models\Persona;
 use App\Models\TipoSangre;
 use Illuminate\Http\Request;
@@ -39,7 +40,7 @@ public function create()
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(StorePersonaRequest $request)
     {
         $datos = $request->all();
         Persona::create($datos);
diff --git a/app/Http/Requests/StorePersonaRequest.php b/app/Http/Requests/StorePersonaRequest.php
new file mode 100644
index 0000000..c88122d
--- /dev/null
+++ b/app/Http/Requests/StorePersonaRequest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+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 [
+            'nombre_per'=> 'required|string|max:255',
+            'apellido_pa_per'=> 'required|string|max:255',
+            'apellido_ma_per'=> 'required|string|max:255',
+            'ci_per'=> 'required',
+            'cel_per'=> 'required',
+            'fecha_nac'=> 'required|date',
+            'num_seguro'=> 'nullable',
+            'donante'=> 'required',
+            'id_tipo_sangre'=> 'required',
+            'id_pariente'=>'required'
+        ];
+    }
+}

From cf5dd21a88cb13be782a0fa74b82a7921d077c5d Mon Sep 17 00:00:00 2001
From: Marc15975 <91290441+Marc15975@users.noreply.github.com>
Date: Thu, 24 Nov 2022 03:48:40 -0400
Subject: [PATCH 3/6] aaaaaaaaaaa

---
 app/Http/Controllers/HistorialController.php  | 33 ++++++++--
 app/Models/Historial.php                      | 16 +++++
 app/Models/User.php                           |  4 ++
 .../views/admin/Historial/create.blade.php    | 60 +++++++++++++------
 .../views/admin/Historial/edit.blade.php      | 55 +++++++++++++----
 .../views/admin/Historial/index.blade.php     | 11 ++--
 .../views/admin/Historial/show.blade.php      |  7 ++-
 7 files changed, 141 insertions(+), 45 deletions(-)

diff --git a/app/Http/Controllers/HistorialController.php b/app/Http/Controllers/HistorialController.php
index 86d4677..444dd4a 100644
--- a/app/Http/Controllers/HistorialController.php
+++ b/app/Http/Controllers/HistorialController.php
@@ -3,6 +3,10 @@
 namespace App\Http\Controllers;
 
 use App\Models\Historial;
+
+use App\Models\Sede;
+use App\Models\User;
+use App\Models\Persona;
 use Illuminate\Http\Request;
 
 class HistorialController extends Controller
@@ -11,14 +15,21 @@ class HistorialController extends Controller
     public function index()
     {
         //
-        $Historias = Historial::all();
+        $Historias = Historial::with(['personas:id_persona,nombre_per,apellido_pa_per,apellido_ma_per','users.persona:id_persona,nombre_per,apellido_pa_per,apellido_ma_per','sede:id_sede,nombre_sede'])->get();
         return view('admin.Historial.index',compact('Historias'));
+
+        //return $Historias;
     }
 
     public function create()
     {
         //
-        return view('admin.Historial.create');
+        $Sedes = Sede::all();
+        $Users = User::with('persona')->get();
+
+        return view('admin.Historial.create',compact('Sedes','Users'));
+
+        //return $Users;
     }
 
     public function store(Request $request)
@@ -32,20 +43,30 @@ public function store(Request $request)
     }
 
 
-    public function show(Historial $Historial)
+    public function show($Historial)
     {
 
         // $Historia= Historial::find($Historial);
+        $Historial = Historial::with(['personas:id_persona,nombre_per,apellido_pa_per,apellido_ma_per','users.persona:id_persona,nombre_per,apellido_pa_per,apellido_ma_per','sede:id_sede,nombre_sede'])->find($Historial);
+
         return View ('admin.Historial.show',compact('Historial'));
 
+       //
+
     }
 
 
-    public function edit($historial)
+    public function edit($Historial)
     {
         //
-        $Historia= Historial::find($historial);
-        return View ('admin.Historial.edit',compact('Historia'));
+        $Sedes = Sede::all();
+        $Users = User::with('persona')->get();
+        $Historia = Historial::with(['personas:id_persona,nombre_per,apellido_pa_per,apellido_ma_per','users.persona:id_persona,nombre_per,apellido_pa_per,apellido_ma_per','sede:id_sede,nombre_sede'])->find($Historial);
+
+        return View ('admin.Historial.edit',compact('Historia','Sedes','Users'));
+
+        //return $Historia;
+
     }
 
 
diff --git a/app/Models/Historial.php b/app/Models/Historial.php
index 66aaa09..b7fe245 100644
--- a/app/Models/Historial.php
+++ b/app/Models/Historial.php
@@ -12,4 +12,20 @@ class Historial extends Model
     protected $table = 'historial';
     protected $primaryKey = 'id_historial';
     protected $fillable = ['id_persona','id_sede','id_medico','fecha_historial','detalles_historial'];
+    public function personas()
+    {
+        return $this->belongsTo(Persona::class,'id_persona');
+    }
+
+    public function users()
+    {
+        return $this->belongsTo(User::class,'id_medico');
+    }
+
+    public function sede()
+    {
+        return $this->belongsTo(Sede::class,'id_sede');
+    }
+
+
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 7ac239b..6665665 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -43,4 +43,8 @@ class User extends Authenticatable
     protected $casts = [
         'email_verified_at' => 'datetime',
     ];
+    public function persona()
+    {
+        return $this->belongsTo(Persona::class,'id_persona','id_persona');
+    }
 }
diff --git a/resources/views/admin/Historial/create.blade.php b/resources/views/admin/Historial/create.blade.php
index e325ee8..d00ca50 100644
--- a/resources/views/admin/Historial/create.blade.php
+++ b/resources/views/admin/Historial/create.blade.php
@@ -5,29 +5,52 @@
         <div class="card-header">Registro de Historias</div>
         <div class="card-body">
 
-            <form action="{{ url('Historial') }}" method="post">
+            <form action="{{ url('Historial') }}" class="was-validated" method="post">
               {!! csrf_field() !!}
-              <label>Persona</label></br>
-              <input type="text" name="id_persona" id="id_persona" class="form-control"></br>
-              <label>Sede</label></br>
-              <input type="text" name="id_sede" id="id_sede" class="form-control"></br>
-              <label>Medico</label></br>
-              <input type="text" name="id_medico" id="id_medico" class="form-control"></br>
+              {{-- <label>Persona</label></br>
+              <input type="text" name="id_persona" id="id_persona" class="form-control"></br> --}}
 
-              <label>Fecha de la historia</label></br>
-              <input type="date" name="fecha_historial" id="fecha_historial" class="form-control"></br>
+              <label>Pacientes</label><br><select name="id_persona" id="id_persona" class="form-select" required>
 
-              <label>Detalles de la historia</label></br>
-              <input type="text" name="detalles_historial" id="detalles_historial" class="form-control"></br>
+                <option value="">Por favor selecione un paciente</option>
+                @foreach ( $Users as $user)
+                @if ($user->rol == 2 )
+
+                <option value="{{$user->persona->id_persona}}"> {{$user->persona->nombre_per ." ". $user->persona->apellido_pa_per ." ". $user->persona->apellido_ma_per }}</option>
+                @endif
+                @endforeach
+
+            </select>
+
+
+              <label>Sedes</label><br><select name="id_sede" id="id_sede" class="form-select" required>
+
+                <option value=""> Selecione una Sede </option>
+                @foreach ( $Sedes as $sede)
+
+                <option value="{{$sede->id_sede}}"> {{$sede->nombre_sede}}</option>
+
+                @endforeach
 
+            </select>
 
-              {{-- <label>Ciudad Sede</label></br>
-              <select class="form-select"  name="ciudad_sede" id="ciudad_sede"  aria-label="Default select example">
-                <option selected>Selecione la ciudad</option>
-                <option value="La Paz">La Paz</option>
-                <option value="Santa Cruz">Santa cruz</option>
-                <option value="Cochabamba">Cochabamba</option>
-              </select> --}}
+
+              <label>Medicos</label><br><select name="id_medico" id="id_medico" class="form-select" required>
+
+                <option value="">Por favor selecione un medico</option>
+                @foreach ( $Users as $user)
+                @if ($user->rol == 1 )
+                <option value="{{$user->id}}"> {{$user->persona->nombre_per ." ". $user->persona->apellido_pa_per ." ". $user->persona->apellido_ma_per }}</option>
+                @endif
+                @endforeach
+
+            </select>
+
+              <label>Fecha de la historia</label></br>
+              <input type="datetime-local" name="fecha_historial" id="fecha_historial" 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="submit" value="Save" class="btn btn-success"></br>
           </form>
@@ -35,5 +58,4 @@
         </div>
       </div>
     </div>
-
 </x-layouts.app>
diff --git a/resources/views/admin/Historial/edit.blade.php b/resources/views/admin/Historial/edit.blade.php
index 75c1bf3..1fa554b 100644
--- a/resources/views/admin/Historial/edit.blade.php
+++ b/resources/views/admin/Historial/edit.blade.php
@@ -4,25 +4,58 @@
     <div class="card-header">Editar Sede</div>
     <div class="card-body">
 
-        <form action="{{ url('Historial/' .$Historia->id_historial) }}" method="post">
+        <form action="{{ url('Historial/' .$Historia->id_historial) }}" class="was-validated" method="post">
           {!! csrf_field() !!}
           @method("PATCH")
           <input type="hidden" name="Id_Sede" id="Id_Sede" value="{{$Historia->id_historial}}" />
 
-          <label>Persona</label></br>
-          <input type="text" name="id_persona" id="id_persona" value="{{$Historia->id_persona}}" class="form-control"></br>
-          <label>Sede</label></br>
-          <input type="text" name="id_sede" id="id_sede" value="{{$Historia->id_sede}}"  class="form-control"></br>
-          <label>Medico</label></br>
-          <input type="text" name="id_medico" id="id_medico" value="{{$Historia->id_medico}}"  class="form-control"></br>
+          <label>Paciente</label><br><select name="id_persona" id="id_persona" class="form-select" required>
 
-          <label>Fecha de la historia</label></br>
-          <input type="date" name="fecha_historial" id="fecha_historial" value="{{$Historia->fecha_historial}}"  class="form-control"></br>
+            <option value="">Por favor selecione un Paciente</option>
+            @foreach ( $Users as $user)
+            @if ($user->rol == 2 )
+            @if ($user->persona->id_persona == $Historia->personas->id_persona)
+            <option value="{{$user->persona->id_persona}}" selected> {{$user->persona->nombre_per ." ". $user->persona->apellido_pa_per ." ". $user->persona->apellido_ma_per }}</option>
+            @else
+            <option value="{{$user->persona->id_persona}}" > {{$user->persona->nombre_per ." ". $user->persona->apellido_pa_per ." ". $user->persona->apellido_ma_per }}</option>
+            @endif
+            @endif
+            @endforeach
+
+        </select>
+
+          <label>Sede</label><br><select name="id_sede" id="id_sede" class="form-select" required>
+
+            <option value="">Por favor selecione una Sede</option>
+            @foreach ( $Sedes as $sede)
+            @if ($sede->id_sede == $Historia->id_sede)
+            <option value="{{$sede->id_sede}}" selected> {{$sede->nombre_sede}}</option>
+            @else
+            <option value="{{$sede->id_sede}}" > {{$sede->nombre_sede}}</option>
+            @endif
+            @endforeach
+        </select>
 
-          <label>Detalles de la historia</label></br>
-          <input type="text" name="detalles_historial" id="detalles_historial" value="{{$Historia->detalles_historial}}"  class="form-control"></br>
 
+          <label>Medicos</label><br><select name="id_medico" id="id_medico" class="form-select" required>
 
+            <option value="">Por favor selecione un Medico</option>
+            @foreach ( $Users as $user)
+            @if ($user->rol == 1 )
+            @if ($user->id == $Historia->users->id)
+            <option value="{{$user->id}}" selected> {{$user->persona->nombre_per ." ". $user->persona->apellido_pa_per ." ". $user->persona->apellido_ma_per }}</option>
+            @else
+            <option value="{{$user->id}}" > {{$user->persona->nombre_per ." ". $user->persona->apellido_pa_per ." ". $user->persona->apellido_ma_per }}</option>
+            @endif
+            @endif
+            @endforeach
+        </select>
+
+          <label>Fecha de la historia</label></br>
+          <input required type="datetime-local" name="fecha_historial" id="fecha_historial" value="{{$Historia->fecha_historial}}"  class="form-control"></br>
+
+          <label>Detalles de la historia</label></br>
+          <input required type="text" name="detalles_historial" id="detalles_historial" value="{{$Historia->detalles_historial}}"  class="form-control"></br>
 
           <input type="submit" value="Update" class="btn btn-success"></br>
       </form>
diff --git a/resources/views/admin/Historial/index.blade.php b/resources/views/admin/Historial/index.blade.php
index dd5626c..c3fb968 100644
--- a/resources/views/admin/Historial/index.blade.php
+++ b/resources/views/admin/Historial/index.blade.php
@@ -28,12 +28,11 @@
                             <tbody>
                                 @foreach ($Historias as $Historia)
                                 <tr>
-
-                                    <td>{{ $Historia['id_persona'] }}</td>
-                                    <td>{{ $Historia['id_sede'] }}</td>
-                                    <td>{{ $Historia['id_medico'] }}</td>
-                                    <td>{{ $Historia['fecha_historial'] }}</td>
-                                    <td>{{ $Historia['detalles_historial'] }}</td>
+                                    <td>{{ $Historia->personas->nombre_per ." ".$Historia->personas->apellido_pa_per ." ".$Historia->personas->apellido_ma_per }}</td>
+                                    <td>{{ $Historia->sede->nombre_sede }}</td>
+                                    <td>{{ $Historia->users->persona->nombre_per ." ". $Historia->users->persona->apellido_pa_per  ." ". $Historia->users->persona->apellido_ma_per}}</td>
+                                    <td>{{ $Historia->fecha_historial}}</td>
+                                    <td>{{ $Historia->detalles_historial }}</td>
                                     <td>
                                         <a href="{{ url('/Historial' . '/' . $Historia['id_historial']) }}" title="View Student"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i> Mostrar</button></a>                                        <a href="{{ url('/Historial' . '/' . $Historia->id_historial . '/edit') }}" title="Edit Student"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Editar</button></a>
                                         <form method="POST" action="{{ url('/Historial' . '/' . $Historia->id_historial) }}" accept-charset="UTF-8" style="display:inline">
diff --git a/resources/views/admin/Historial/show.blade.php b/resources/views/admin/Historial/show.blade.php
index 27117f4..5fa0c33 100644
--- a/resources/views/admin/Historial/show.blade.php
+++ b/resources/views/admin/Historial/show.blade.php
@@ -4,9 +4,10 @@
     <div class="card-body">
 
           <div class="card-body">
-          <h5 class="card-title">Nombre de la Persona: {{ $Historial->id_persona }}</h5>
-          <p class="card-text">Nombre de la Sede : {{ $Historial->id_sede }}</p>
-          <p class="card-text">Nombre del Medico : {{ $Historial->id_medico }}</p>
+            <h5  class="card-title">Datos de la Historia</h5>
+          <p class="card-text">Nombre de la Persona: {{ $Historial->personas->nombre_per ." ".$Historial->personas->apellido_pa_per ." ".$Historial->personas->apellido_ma_per }}</p>
+          <p class="card-text">Nombre de la Sede : {{ $Historial->sede->nombre_sede }}</p>
+          <p class="card-text">Nombre del Medico : {{ $Historial->users->persona->nombre_per ." ". $Historial->users->persona->apellido_pa_per  ." ". $Historial->users->persona->apellido_ma_per }}</p>
           <p class="card-text">Fecha del Historial: {{ $Historial->fecha_historial }}</p>
           <p class="card-text">Detalles de la Historia: {{ $Historial->detalles_historial }}</p>
     </div>

From 832d9b23e5dbcc98126a7836d6ebc0c8b111fd63 Mon Sep 17 00:00:00 2001
From: Marc15975 <91290441+Marc15975@users.noreply.github.com>
Date: Thu, 24 Nov 2022 03:52:56 -0400
Subject: [PATCH 4/6] Sedes y Historial

---
 resources/views/admin/Sedes/create.blade.php | 12 ++++++------
 resources/views/admin/Sedes/edit.blade.php   | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/views/admin/Sedes/create.blade.php b/resources/views/admin/Sedes/create.blade.php
index bc83210..10a42f3 100644
--- a/resources/views/admin/Sedes/create.blade.php
+++ b/resources/views/admin/Sedes/create.blade.php
@@ -3,18 +3,18 @@
         <div class="card-header">Registro de Sedes</div>
         <div class="card-body">
 
-            <form action="{{ url('sedes') }}" method="post">
+            <form action="{{ url('sedes') }}" class="was-validated" method="post">
               {!! csrf_field() !!}
               <label>Nombre sede</label></br>
-              <input type="text" name="nombre_sede" id="nombre_sede" class="form-control"></br>
+              <input type="text" name="nombre_sede" id="nombre_sede" class="form-control" required></br>
               <label>Direccion de sede</label></br>
-              <input type="text" name="direccion_sede" id="direccion_sede" class="form-control"></br>
+              <input type="text" name="direccion_sede" id="direccion_sede" class="form-control" required></br>
               <label>Telefono de la Sede</label></br>
-              <input type="text" name="telefono_sede" id="telefono_sede" class="form-control"></br>
+              <input type="text" name="telefono_sede" id="telefono_sede" class="form-control" required></br>
 
               <label>Ciudad Sede</label></br>
-              <select class="form-select"  name="ciudad_sede" id="ciudad_sede"  aria-label="Default select example">
-                <option selected>Selecione la ciudad</option>
+              <select class="form-select"  name="ciudad_sede" id="ciudad_sede" required aria-label="Default select example">
+                <option selected value="">Selecione la ciudad</option>
                 <option value="La Paz">La Paz</option>
                 <option value="Santa Cruz">Santa cruz</option>
                 <option value="Cochabamba">Cochabamba</option>
diff --git a/resources/views/admin/Sedes/edit.blade.php b/resources/views/admin/Sedes/edit.blade.php
index 09dc43c..ddac5d7 100644
--- a/resources/views/admin/Sedes/edit.blade.php
+++ b/resources/views/admin/Sedes/edit.blade.php
@@ -4,19 +4,19 @@
     <div class="card-header">Editar Sede</div>
     <div class="card-body">
 
-        <form action="{{ url('sedes/' .$Sede->id_sede) }}" method="post">
+        <form action="{{ url('sedes/' .$Sede->id_sede) }}" class="was-validated" method="post">
           {!! csrf_field() !!}
           @method("PATCH")
           <input type="hidden" name="Id_Sede" id="Id_Sede" value="{{$Sede->id_sede}}" />
 
           <label>Name</label></br>
-          <input type="text" name="nombre_sede" id="nombre_sede" value="{{$Sede->nombre_sede}}" class="form-control"></br>
+          <input type="text" required name="nombre_sede" id="nombre_sede" value="{{$Sede->nombre_sede}}" class="form-control"></br>
           <label>Dirrecion de la sede</label></br>
-          <input type="text" name="direccion_sede" id="direccion_sede" value="{{$Sede->direccion_sede}}" class="form-control"></br>
+          <input type="text" required name="direccion_sede" id="direccion_sede" value="{{$Sede->direccion_sede}}" class="form-control"></br>
           <label>telefono_sede</label></br>
-          <input type="text" name="telefono_sede" id="telefono_sede" value="{{$Sede->telefono_sede}}" class="form-control"></br>
+          <input type="text" required name="telefono_sede" id="telefono_sede" value="{{$Sede->telefono_sede}}" class="form-control"></br>
           <label>Ciudad sede</label></br>
-          <select class="form-select"  name="ciudad_sede" id="ciudad_sede"  aria-label="Default select example">
+          <select class="form-select" required name="ciudad_sede" id="ciudad_sede"  aria-label="Default select example">
             <option selected>Selecione la ciudad</option>
             <option value="La Paz">La Paz</option>
             <option value="Santa Cruz">Santa cruz</option>

From 88126c3d997a77cdfd5356288beb5667c27c6fca Mon Sep 17 00:00:00 2001
From: Lara121801 <maidylan_t8@hotmail.com>
Date: Thu, 24 Nov 2022 10:57:58 -0400
Subject: [PATCH 5/6] CRUD-USER

---
 app/Http/Controllers/UsuarioController.php  | 83 +++++++++++++++++++++
 resources/views/admin/user/create.blade.php | 34 +++++++++
 resources/views/admin/user/edit.blade.php   |  0
 3 files changed, 117 insertions(+)
 create mode 100644 app/Http/Controllers/UsuarioController.php
 create mode 100644 resources/views/admin/user/create.blade.php
 create mode 100644 resources/views/admin/user/edit.blade.php

diff --git a/app/Http/Controllers/UsuarioController.php b/app/Http/Controllers/UsuarioController.php
new file mode 100644
index 0000000..2c656fa
--- /dev/null
+++ b/app/Http/Controllers/UsuarioController.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Usuario;
+use Illuminate\Http\Request;
+class UsuarioController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Models\Usuario  $usuario
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Usuario $usuario)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Models\Usuario  $usuario
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Usuario $usuario)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Models\Usuario  $usuario
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Usuario $usuario)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\Usuario  $usuario
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Usuario $usuario)
+    {
+        //
+    }
+}
diff --git a/resources/views/admin/user/create.blade.php b/resources/views/admin/user/create.blade.php
new file mode 100644
index 0000000..f765bf3
--- /dev/null
+++ b/resources/views/admin/user/create.blade.php
@@ -0,0 +1,34 @@
+<x-layouts.app>
+
+    <div class="col-md-9">
+    <div class="card">
+        <div class="card-header">Registro de Usuario</div>
+        <div class="card-body">
+            <form action="{{ url('Usuario') }}" method="post">
+              {!! csrf_field() !!}
+              <label>Usuario</label></br>
+              <input type="text" name="id" id="id" class="form-control"></br>
+
+              <label>Nombre</label></br>
+              <input type="text" name="name" id="name" class="form-control"></br>
+
+              <label>Nombre Usuario</label></br>
+              <input type="text" name="username" id="username" class="form-control"></br>
+
+              <label>Estado</label></br>
+              <input type="text" name="estado" id="estado" class="form-control"></br>
+
+              <label>Email</label></br>
+              <input type="text" name="email" id="email" class="form-control"></br>
+
+              <label>Password</label></br>
+              <input type="text" name="password" id="password" class="form-control"></br>
+
+              <input type="submit" value="Save" class="btn btn-success"></br>
+          </form>
+
+        </div>
+      </div>
+    </div>
+
+</x-layouts.app>
diff --git a/resources/views/admin/user/edit.blade.php b/resources/views/admin/user/edit.blade.php
new file mode 100644
index 0000000..e69de29

From ed3a2ddd913b7fe1671c539e8a67876457e4eea1 Mon Sep 17 00:00:00 2001
From: rats4final <80012704+rats4final@users.noreply.github.com>
Date: Thu, 24 Nov 2022 15:21:51 -0400
Subject: [PATCH 6/6] old tipos sangre

---
 app/Models/TipoSangre.php                     |  2 +-
 .../views/admin/tipo_relacion/index.blade.php | 66 ++++++++++---------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/app/Models/TipoSangre.php b/app/Models/TipoSangre.php
index f26310b..58bd40d 100644
--- a/app/Models/TipoSangre.php
+++ b/app/Models/TipoSangre.php
@@ -9,7 +9,7 @@ class TipoSangre extends Model
 {
     use HasFactory;
 
-    protected $table = 'tipo_sangre';
+    protected $table = 'tipos_sangre';
     protected $primaryKey = 'id_tipo_sangre';
     protected $fillable = ['nombre_tipo_sangre','descripcion_tipo_sangre','rareza_tipo_sangre'];
 
diff --git a/resources/views/admin/tipo_relacion/index.blade.php b/resources/views/admin/tipo_relacion/index.blade.php
index dfe488c..b7bd315 100644
--- a/resources/views/admin/tipo_relacion/index.blade.php
+++ b/resources/views/admin/tipo_relacion/index.blade.php
@@ -7,7 +7,8 @@
                         <h2>Tipo Relacion</h2>
                     </div>
                     <div class="card-body">
-                        <a href="{{ route('TipoRelacion.create') }}" class="btn btn-success btn-sm" title="Añadir nueva Persona">
+                        <a href="{{ route('TipoRelacion.create') }}" class="btn btn-success btn-sm"
+                            title="Añadir nueva Persona">
                             <i class="fa fa-plus" aria-hidden="true"></i> Nueva Relacion
                         </a>
                         <br>
@@ -16,41 +17,42 @@
                             <table class="table">
                                 <caption>Todas la relaciones</caption>
                                 <thead>
-                                <tr>
-                                    <th>Relacion</th>
-                                    <th>Persona 1</th>
-                                    <th>Persona 2</th>
-                                    <th>Acciones</th>
-                                </tr>
+                                    <tr>
+                                        <th>Relacion</th>
+                                        <th>Persona 1</th>
+                                        <th>Persona 2</th>
+                                        <th>Acciones</th>
+                                    </tr>
                                 </thead>
                                 <tbody>
-                                @foreach ($TipoRelaciones as $TipoRelacion)
-                                    <tr>
-                                        <td>{{ $TipoRelacion->relacion }}</td>
-                                        <td>{{ $TipoRelacion->persona->nombre_per }}</td>
-                                        <td>{{ $TipoRelacion->pariente->nombre_per }}</td>
-                                        <td>
-                                            <a href="{{ route('TipoRelacion.show', $TipoRelacion) }}"
-                                               title="View Student"><button class="btn btn-info btn-sm"><i
-                                                        class="fa fa-eye" aria-hidden="true"></i>
-                                                    Mostrar</button></a>
-                                            <a href="{{ route('TipoRelacion.edit', $TipoRelacion) }}"
-                                               title="Edit Student"><button class="btn btn-primary btn-sm"><i
-                                                        class="fa fa-pencil-square-o" aria-hidden="true"></i>
-                                                    Editar</button></a>
-                                            <form method="POST" action="{{ route('TipoRelacion.destroy', $TipoRelacion) }}"
-                                                  accept-charset="UTF-8" style="display:inline">
-                                                @method('DELETE')
-                                                @csrf
-                                                <button type="submit" class="btn btn-danger btn-sm"
+                                    @foreach ($TipoRelaciones as $TipoRelacion)
+                                        <tr>
+                                            <td>{{ $TipoRelacion->relacion }}</td>
+                                            <td>{{ $TipoRelacion->persona->nombre_per }}</td>
+                                            <td>{{ $TipoRelacion->pariente->nombre_per }}</td>
+                                            <td>
+                                                <a href="{{ route('TipoRelacion.show', $TipoRelacion) }}"
+                                                    title="View Student"><button class="btn btn-info btn-sm"><i
+                                                            class="fa fa-eye" aria-hidden="true"></i>
+                                                        Mostrar</button></a>
+                                                <a href="{{ route('TipoRelacion.edit', $TipoRelacion) }}"
+                                                    title="Edit Student"><button class="btn btn-primary btn-sm"><i
+                                                            class="fa fa-pencil-square-o" aria-hidden="true"></i>
+                                                        Editar</button></a>
+                                                <form method="POST"
+                                                    action="{{ route('TipoRelacion.destroy', $TipoRelacion) }}"
+                                                    accept-charset="UTF-8" style="display:inline">
+                                                    @method('DELETE')
+                                                    @csrf
+                                                    <button type="submit" class="btn btn-danger btn-sm"
                                                         title="Delete Student"
                                                         onclick="return confirm(&quot;Confirm delete?&quot;)"><i
-                                                        class="fa fa-trash-o" aria-hidden="true"></i>
-                                                    Borrar</button>
-                                            </form>
-                                        </td>
-                                    </tr>
-                                @endforeach
+                                                            class="fa fa-trash-o" aria-hidden="true"></i>
+                                                        Borrar</button>
+                                                </form>
+                                            </td>
+                                        </tr>
+                                    @endforeach
                                 </tbody>
                             </table>
                         </div>