Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
CAUN94 committed Apr 24, 2016
1 parent ff9ae34 commit 38fbca3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/Http/Controllers/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function Alumnos()
public function AlumnosMostrar($estado)
{

$Inscrito = Inscrito::where('Solicitud', $estado)->orderBy('curso_id', 'desc')->get();
$Inscrito = Inscrito::where('Solicitud', $estado)->orderBy('curso_id', 'desc')->orderBy('horario')->get();
$Uni=Uni::all();
$Curso=Curso::all();

Expand Down
8 changes: 4 additions & 4 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
|
*/

'debug' => env('APP_DEBUG', false),
'debug' => env('APP_DEBUG', true),

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -91,9 +91,9 @@
|
*/

'key' => env('APP_KEY'),

'cipher' => 'AES-256-CBC',
'key' => 'fxJWZesyZ0szn4mD',
'cipher' => 'AES-128-CBC',
//'cipher' => MCRYPT_RIJNDAEL_128,

/*
|--------------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion resources/views/alumnos.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


<table class="table table-striped">
<tr> <td>Nombre</td><td>Universidad</td><td>Carrera</td><td>Ramo</td><td>Mail</td><td>Telefono</td><td>Borrar</td></tr>
<tr> <td>Nombre</td><td>Universidad</td><td>Carrera</td><td>Ramo</td><td>horario</td><td>Mail</td><td>Telefono</td><td>Borrar</td></tr>


@foreach($Curso as $C)
Expand All @@ -26,6 +26,7 @@
<td>{{$C->Uni->Nombre}}</td>
<td>{{$C->carrera}}</td>
<td>{{$C->curso}}</td>
<td>{{$C->horario}}<td>
<td>{{$ins->Mail}}</td>
<td>{{$ins->Telefono}}</td>
<td><a class="btn btn-danger" href="/admin/alumnos/borrar/{{$ins->id}}" role="button">Borrar</a></td>
Expand Down

0 comments on commit 38fbca3

Please sign in to comment.