Eleccion de encuesta a visualizar para Navieras

elsoftpy · Sep 7, 2017 · 1cd7e6f · 1cd7e6f
1 parent 69b31e5
commit 1cd7e6f
Show file tree

Hide file tree

Showing 19 changed files with 990 additions and 218 deletions.
diff --git a/app/Cargo.php b/app/Cargo.php
@@ -8,7 +8,7 @@ class Cargo extends Model
 {
     protected $table = "cargos";
 
-    protected $fillable = ["descripcion", "area_id", "nivel_id", "detalle"];
+    protected $fillable = ["descripcion", "area_id", "nivel_id", "is_temporal", "detalle"];
 
     public function encuestasCargo(){
         return $this->hasMany("App\Encuestas_cargo");

diff --git a/app/Http/Controllers/CargosController.php b/app/Http/Controllers/CargosController.php
@@ -25,6 +25,12 @@ public function create(){
 
     public function store(Request $request){
     	$dbData = new Cargo($request->all());
+        if(!is_null($request->is_temporal)){
+            $dbData->is_temporal = 1;
+        }else{
+            $dbData->is_temporal = 0;
+        }
+
     	$dbData->save();
     	return redirect()->route('cargos.index');
     }
@@ -47,6 +53,11 @@ public function update(Request $request, $id){
 
     	$dbData = Cargo::find($id);
     	$dbData->fill($request->all());
+        if(!is_null($request->is_temporal)){
+            $dbData->is_temporal = 1;
+        }else{
+            $dbData->is_temporal = 0;
+        }
     	$dbData->save();
 		return redirect()->route('cargos.index');
     }

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -29,8 +29,12 @@ public function index()
             return view('home');    
         }else{
             $dbEmpresa = Auth::user()->empresa;
-            $dbEncuesta = Cabecera_encuesta::where('empresa_id', $dbEmpresa->id)->whereRaw('id = (select max(id) from cabecera_encuestas where empresa_id = '. $dbEmpresa->id.')')->first();
-            return view('clientes.home')->with('dbEmpresa', $dbEmpresa)->with('dbEncuesta', $dbEncuesta);    
+            $dbEncuestas = Cabecera_encuesta::where('empresa_id', $dbEmpresa->id)->orderBy('id', 'DESC')->get();
+            $dbEncuesta = $dbEncuestas->first();
+            $dbEncuestaAnt = $dbEncuestas->get(1);
+            return view('clientes.home')->with('dbEmpresa', $dbEmpresa)
+                                        ->with('dbEncuesta', $dbEncuesta)
+                                        ->with('dbEncuestaAnt' , $dbEncuestaAnt);    
         }
 
     }

diff --git a/app/Http/Controllers/ReporteController.php b/app/Http/Controllers/ReporteController.php
diff --git a/composer.json b/composer.json
@@ -6,7 +6,9 @@
     "type": "project",
     "require": {
         "php": ">=5.6.4",
-        "laravel/framework": "5.3.*"
+        "laravel/framework": "5.3.*",
+        "maatwebsite/excel": "^2.1",
+        "barryvdh/laravel-dompdf": "^0.8.1"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",