Skip to content

2
2018_web_app
Commit a96009d1 by gema
Options

Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app into gemis_dev

parents 1e0fad17 acfece0c
Showing with 63 additions and 23 deletions
fuel/app/classes/controller/menupersonalizado/index.php
......@@ -33,7 +33,7 @@ class Controller_Menupersonalizado_Index extends \Controller_App{
parent::before();
}
public function action_index(){
public function get_index(){
$view = View::forge('menupersonalizado/index.twig');
......@@ -49,6 +49,10 @@ class Controller_Menupersonalizado_Index extends \Controller_App{
//Pasar la leyenda para la info funcionamiento de la página
$view->leyenda = "Una vez estudiado tu perfil te proponemos este menú semanal que se ajusta a tus necesidades. Elije entre las dos opciones que te proponemos de primero y segundo. Puedes acceder a las recetas de los platos pulsando sobre la lupa. ";
$view->menu = $this->ws_menu_get();
$view->auto_filter(false);
return Response::forge($view);
}
......
fuel/app/classes/trait/inutraliaWS.php
......@@ -148,6 +148,12 @@ trait Trait_InutraliaWS {
return json_decode($this->request_generic('recipes',"post",1,$extra_options,array('Content-Length: ' . strlen($data_json))));
}
public function ws_menu_get(){
return $this->ws_get('menu');
}
public function ws_get($url)
{
return json_decode($this->request_generic($url));
......
fuel/app/views/menupersonalizado/index.twig
......@@ -43,12 +43,12 @@
</ul>
<div class="tab-content tab-content-menu-persoanlizado">
{% for i in 1..6 %}
<div class="tab-pane {% if i == 1 %}active {% endif %}" id="{{ i }}">
{% for day in menu.days %}
<div class="tab-pane {% if loop.index == 1 %}active {% endif %}" id="{{ loop.index }}">
<div class="row">
{#comida#}
<div class="col-md-6">
<h2 class="color-menu-personalizado">COMIDA {{ i }}</h2>
<h2 class="color-menu-personalizado">COMIDA </h2>
<div class="border-box border-menu-personalizado-light">
<div class="title-box-border-box bg-color-menu-personalizado-light">
......@@ -57,20 +57,20 @@
<div class="container-box-border-box">
<form class="ac-custom ac-radio ac-fill" autocomplete="off">
<a href="receta-detalle">
<a href="{{ url('receta-detalle/update/'~day.lunchFirst[0].id) }}" target="_blank">
<div class="row">
<div class="col-xs-11 plr0">
<input id="comida_primer_1_{{ i }}" name="comida_primer{{ i }}" value="1" type="radio"><label for="comida_primer_1_{{ i }}">sopa de verduras</label>
<input id="{{ day.ds }}_lunchFirst" name="{{ day.ds }}_lunchFirst" value="{{ day.lunchFirst[0].id }}" type="radio"><label for="{{ day.ds }}_lunchFirst">{{ day.lunchFirst[0].name }}</label>
</div>
<div class="col-xs-1 plr0">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
</a>
<a href="receta-detalle">
<a href="{{ url('receta-detalle/update/'~day.lunchFirst[1].id) }}" target="_blank">
<div class="row mt20">
<div class="col-xs-11 plr0">
<input id="comida_primer_2_{{ i }}" name="comida_primer{{ i }}" value="0" type="radio"><label for="comida_primer_2_{{ i }}">crema de calabaza </label>
<input id="{{ day.ds }}_lunchFirst" name="{{ day.ds }}_lunchFirst" value="{{ day.lunchFirst[1].id }}" type="radio"><label for="{{ day.ds }}_lunchFirst">{{ day.lunchFirst[1].name }}</label>
</div>
<div class="col-xs-1 plr0">
<i class="fa fa-search pointer a-black"></i>
......@@ -88,20 +88,20 @@
<div class="container-box-border-box">
<form class="ac-custom ac-radio ac-fill" autocomplete="off">
<a href="receta-detalle">
<a href="{{ url('receta-detalle/update/'~day.lunchSecond[0].id) }}" target="_blank">
<div class="row">
<div class="col-xs-11 plr0">
<input id="comida_segun_1_{{ i }}" name="comida_segun{{ i }}" value="1" type="radio"><label for="comida_segun_1_{{ i }}">pollo con verduras al vapor </label>
<input id="{{ day.ds }}_lunchSecond" name="{{ day.ds }}_lunchSecond" value="{{ day.lunchSecond[0].id }}" type="radio"><label for="{{ day.ds }}_lunchSecond">{{ day.lunchSecond[0].name }}</label>
</div>
<div class="col-xs-1 plr0">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
</a>
<a href="receta-detalle">
<a href="{{ url('receta-detalle/update/'~day.lunchSecond[1].id) }}" target="_blank">
<div class="row mt20">
<div class="col-xs-11 plr0">
<input id="comida_segun_2_{{ i }}" name="comida_segun{{ i }}" value="0" type="radio"><label for="comida_segun_2_{{ i }}">merluza al vapor </label>
<input id="{{ day.ds }}_lunchSecond" name="{{ day.ds }}_lunchSecond" value="{{ day.lunchSecond[1].id }}" type="radio"><label for="{{ day.ds }}_lunchSecond">{{ day.lunchSecond[1].name }}</label>
</div>
<div class="col-xs-1 plr0">
<i class="fa fa-search pointer a-black"></i>
......@@ -114,7 +114,7 @@
</div>
{#cena#}
<div class="col-md-6">
<h2 class="color-menu-personalizado">CENA {{ i }}</h2>
<h2 class="color-menu-personalizado">CENA</h2>
<div class="border-box border-menu-personalizado-light">
<div class="title-box-border-box bg-color-menu-personalizado-light">
......@@ -123,20 +123,20 @@
<div class="container-box-border-box">
<form class="ac-custom ac-radio ac-fill" autocomplete="off">
<a href="receta-detalle">
<a href="{{ url('receta-detalle/update/'~day.dinnerFirst[0].id) }}" target="_blank">
<div class="row">
<div class="col-xs-11 plr0">
<input id="cena_primer_1_{{ i }}" name="cena_primer{{ i }}" value="1" type="radio"><label for="cena_primer_1_{{ i }}">ensalada </label>
<input id="{{ day.ds }}_dinnerFirst" name="{{ day.ds }}_dinnerFirst" value="{{ day.dinnerFirst[0].id }}" type="radio"><label for="{{ day.ds }}_dinnerFirst">{{ day.dinnerFirst[0].name }}</label>
</div>
<div class="col-xs-1 plr0">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
</a>
<a href="receta-detalle">
<a href="{{ url('receta-detalle/update/'~day.dinnerFirst[1].id) }}" target="_blank">
<div class="row mt20">
<div class="col-xs-11 plr0">
<input id="cena_primer_2_{{ i }}" name="cena_primer{{ i }}" value="0" type="radio"><label for="cena_primer_2_{{ i }}">sopa</label>
<input id="{{ day.ds }}_dinnerFirst" name="{{ day.ds }}_dinnerFirst" value="{{ day.dinnerFirst[1].id }}" type="radio"><label for="{{ day.ds }}_dinnerFirst">{{ day.dinnerFirst[1].name }}</label>
</div>
<div class="col-xs-1 plr0">
<i class="fa fa-search pointer a-black"></i>
......@@ -154,20 +154,20 @@
<div class="container-box-border-box">
<form class="ac-custom ac-radio ac-fill" autocomplete="off">
<a href="receta-detalle">
<a href="{{ url('receta-detalle/update/'~day.dinnerSecond[0].id) }}" target="_blank">
<div class="row">
<div class="col-xs-11 plr0">
<input id="cena_segun_1_{{ i }}" name="cena_segun{{ i }}" value="1" type="radio"><label for="cena_segun_1_{{ i }}">coliflor </label>
<input id="{{ day.ds }}_dinnerSecond" name="{{ day.ds }}_dinnerSecond" value="{{ day.dinnerSecond[0].id }}" type="radio"><label for="{{ day.ds }}_dinnerSecond">{{ day.dinnerSecond[0].name }}</label>
</div>
<div class="col-xs-1 plr0">
<i class="fa fa-search pointer a-black"></i>
</div>
</div>
</a>
<a href="receta-detalle">
<a href="{{ url('receta-detalle/update/'~day.dinnerSecond[1].id) }}" target="_blank">
<div class="row mt20">
<div class="col-xs-11 plr0">
<input id="cena_segun_2_{{ i }}" name="cena_segun{{ i }}" type="radio"><label for="cena_segun_2_{{ i }}">tortilla francesa </label>
<input id="{{ day.ds }}_dinnerSecond" name="{{ day.ds }}_dinnerSecond" value="{{ day.dinnerSecond[1].id }}" type="radio"><label for="{{ day.ds }}_dinnerSecond">{{ day.dinnerSecond[1].name }}</label>
</div>
<div class="col-xs-1 plr0">
<i class="fa fa-search pointer a-black"></i>
......
fuel/app/views/menupersonalizado/modal_resto_dia.twig
......@@ -12,7 +12,37 @@
</div>
<div class="content text-center pb40">
Texto recomendaciones de comidas para el menú
{#BLOQUE DESAYUNO #}
{#intro#}
{{ menu.recBreakfastBase|raw }}
{#opciones#}
{{ menu.recBreakfastExt|raw }}
{#BLOQUE MEDIA MAÑANA#}
{#intro#}
{{ menu.recMorningBase|raw }}
{#optiones#}
{{ menu.recMorningExt|raw }}
{#BLOQUE MERIENDA#}
{#intro#}
{{ menu.recAfternoonBase|raw }}
{#opciones#}
{{ menu.recAfternoonExt|raw }}
{#Bloque Consejos genneral#}
{#intro#}
{{ menu.rec1GeneralBase|raw }}
{#opciones#}
{{ menu.recGeneralExt|raw }}
</div>
</div>
......
fuel/app/views/recetario/list.twig
......@@ -5,7 +5,7 @@
<a href="{{ url('receta-detalle/update/'~recipe.id) }}">
<div class="black-overlay">
<div class="text-receta-and-articulo-item-list">
<h2><b>{{ recipe.name }}</b></h2>
<h2><b>{{ recipe.shortName }}</b></h2>
<p>{{ recipe.excerpt}}</p>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment