Merge branch 'develop'

elsoftpy · Oct 26, 2018 · 85037b9 · 85037b9
2 parents c4e68d4 + ef89313
commit 85037b9
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 17 deletions.
diff --git a/app/Http/Controllers/BeneficiosController.php b/app/Http/Controllers/BeneficiosController.php
@@ -354,11 +354,20 @@ public function getChartData(Request $request){
                                        ->pluck('beneficios_opcion_id');            
 
         // Recuperamos las opciones de Respuesta de la pregunta para las leyendas del gráfico
-        $labels = $pregunta->beneficiosOpcion
-                           ->whereIn('id', $opcionesRespId)
-                           ->sortBy('id')
-                           ->pluck('opcion');
-
+        if($pregunta->id == 66){
+          $labels = Autos_marca::whereIn('id', $opcionesRespId)
+          ->orderBy('id')
+          ->pluck('descripcion');
+        }else if($pregunta->id == 67){
+          $labels = Autos_modelo::whereIn('id', $opcionesRespId)
+          ->orderBy('id')
+          ->pluck('descripcion');
+        }else{
+          $labels = $pregunta->beneficiosOpcion
+          ->whereIn('id', $opcionesRespId)
+          ->sortBy('id')
+          ->pluck('opcion');
+        }
         // tabulamos las respuestas
         $respuestas = collect();
         $encuestasResp = beneficios_respuesta::where('beneficios_pregunta_id', $id)

diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
@@ -17,5 +17,7 @@
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
     'user_label' => 'Username',
     'password_label' => 'Password',
+    'button_login'      =>  'Login',
+    'button_forgot'     =>  'Forgot your password?',
 
 ];
diff --git a/resources/lang/en/homepage.php b/resources/lang/en/homepage.php
@@ -12,4 +12,6 @@
     "button_done"       =>  "End",
     "modal_survey"      =>  "Select Survey",
     "modal_button_close"=>  "Close",
+    "table_data_local"  =>  "Local",
+    "table_data_inter"  =>  "International",
 ];
diff --git a/resources/lang/es/auth.php b/resources/lang/es/auth.php
@@ -13,8 +13,10 @@
     |
     */
 
-    'failed' => 'Los datos no corresponden a nuestros registros',
-    'throttle' => 'Demasiados intentos de autenticación. Por favor intétalo en :seconds segundos.',
-    'user_label' => 'Usuario',
-    'password_label' => 'Contraseña',
+    'failed'            =>  'Los datos no corresponden a nuestros registros',
+    'throttle'          =>  'Demasiados intentos de autenticación. Por favor intétalo en :seconds segundos.',
+    'user_label'        =>  'Usuario',
+    'password_label'    =>  'Contraseña',
+    'button_login'      =>  'Login',
+    'button_forgot'     =>  'Olvidaste tu contraseña?',
 ];
diff --git a/resources/lang/es/homepage.php b/resources/lang/es/homepage.php
@@ -12,4 +12,7 @@
     "button_done"       =>  "Finalizar",
     "modal_survey"      =>  "Seleccionar Encuesta",
     "modal_button_close"=>  "Cerrar",
+    "table_data_local"  =>  "Nacional",
+    "table_data_inter"  =>  "Internacional",
+
 ];
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -37,11 +37,11 @@
                         <div class="form-group">
                             <div class="col-md-8 col-md-offset-4">
                                 <button type="submit" class="btn btn-primary">
-                                    Login
+                                    @lang('auth.button_login')
                                 </button>
 
                                 <a class="btn btn-link" href="{{ url('/password/reset') }}">
-                                    Olvidaste tu contraseña?
+                                    @lang('auth.button_forgot')
                                 </a>
                             </div>
                         </div>

diff --git a/resources/views/clientes/home.blade.php b/resources/views/clientes/home.blade.php
@@ -13,7 +13,6 @@
 	                  	 <th>Id</th>
 	                  	 <th>@lang('homepage.table_description')</th>
 	                  	 <th>@lang('homepage.table_club')</th>
-	                  	 <th>@lang('homepage.table_segment')</th>
 	                  	 <th>@lang('homepage.table_branches')</th>
 	                  	 <th>@lang('homepage.table_headcount')</th>
 	                  	 <th>@lang('homepage.table_origin')</th>
@@ -26,14 +25,13 @@
                 		<tr>
                     		<td>{{ $dbEmpresa->id }}</td>
                     		<td>{{ $dbEmpresa->descripcion}}</td>
-                    		<td>{{ $dbEmpresa->rubro->descripcion}}</td>
-                    		<td>{{ $dbEmpresa->subrubro->descripcion}}</td>
+                    		<td>{{ $club}}</td>
                     		<td>{{ $dbEmpresa->cantidad_sucursales}}</td>
                     		<td>{{ $dbEmpresa->cantidad_empleados}}</td>
                     		<td>@if($dbEmpresa->tipo == 0)
-                    				{{"Nacional"}}
+                    				@lang('homepage.table_data_local')
                     			@else
-                    				{{"Internacional"}}
+                    				@lang('homepage.table_data_inter')
                     			@endif
                     		</td>
                     		<td>

diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
@@ -160,6 +160,8 @@
                     @if (!Auth::user()->is_admin)
                       @include('includes.translation')        
                     @endif
+                @else
+                  @include('includes.translation')
                 @endif
 
               </div>

diff --git a/resources/views/report/home.blade.php b/resources/views/report/home.blade.php
@@ -8,7 +8,12 @@
 			<div class="hoverable bordered">
 				<div class="card">
 					<div class="card-content white-text" style="text-align: center;">
-						<img src="{{asset($imagen)}}">
+						@if ($dbEmpresa == 95)
+							<img src="{{asset($imagen)}}" width="45%">
+						@else
+							<img src="{{asset($imagen)}}">	
+						@endif
+
 					</div>
 				</div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -160,6 +160,8 @@ @@
                         @if (!Auth::user()->is_admin)
                           @include('includes.translation')
                         @endif
+                    @else
+                      @include('includes.translation')
                     @endif
                   </div>
@@ Expand Down @@