Skip to content

2
2018_web_app
Commit 0d6e04c5 by David Villalba
Options

Merge branch 'master' into dev_villa

parents 846b36c6 9fda1425
Showing with 155 additions and 80 deletions
fuel/app/classes/controller/listacompra/index.php
...@@ -22,7 +22,12 @@ class Controller_Listacompra_Index extends \Controller_App{ ...@@ -22,7 +22,12 @@ class Controller_Listacompra_Index extends \Controller_App{
public function before() public function before()
{ {
$recipes = Model_Recipe::get_recipes_current_week();
//Se cargan funciones de javascript especificas de esta funcionalidad
Casset::js('listacompra/index.js');
$recipes = Model_Recipe::get_recipes_current_week();
//PEDIR INGREDIENTES //PEDIR INGREDIENTES
//Recorremos las recetas para obtener los ingredientes. //Recorremos las recetas para obtener los ingredientes.
......
fuel/app/classes/controller/recetario/index.php
...@@ -14,7 +14,11 @@ use Auth\Auth; ...@@ -14,7 +14,11 @@ use Auth\Auth;
class Controller_Recetario_Index extends \Controller_App{ class Controller_Recetario_Index extends \Controller_App{
public function before(){
//Se cargan funciones de javascript especificas de esta funcionalidad
Casset::js('recetario/index.js');
parent::before();
}
public function get_index(){ public function get_index(){
......
fuel/app/config/routes.php
...@@ -54,6 +54,7 @@ return array( ...@@ -54,6 +54,7 @@ return array(
'lista-compra' => 'listacompra/index', 'lista-compra' => 'listacompra/index',
'lista-compra/delete_all' => 'listacompra/index/delete_all', 'lista-compra/delete_all' => 'listacompra/index/delete_all',
'lista-compra/delete' => 'listacompra/index/delete_ingredients',
......
fuel/app/views/layout/template.twig
...@@ -34,15 +34,16 @@ ...@@ -34,15 +34,16 @@
<div class="cs-loader"> <div class="cs-loader">
<div class="cs-loader-logo" > <div class="cs-loader-logo" >
<img src="assets/img/logos/inutralia.png" class="img-responsive-custom"> <img src="assets/img/logos/inutralia.png" class="img-responsive-custom">
<div class="cs-loader-inner">
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
</div>
</div> </div>
<div class="cs-loader-inner">
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
</div>
</div> </div>
<!--menú vertical y horizontal--> <!--menú vertical y horizontal-->
{% include 'layout/menu.twig' %} {% include 'layout/menu.twig' %}
......
fuel/app/views/layout/template_dashboard.twig
...@@ -34,15 +34,16 @@ ...@@ -34,15 +34,16 @@
<div class="cs-loader"> <div class="cs-loader">
<div class="cs-loader-logo" > <div class="cs-loader-logo" >
<img src="assets/img/logos/inutralia.png" class="img-responsive-custom"> <img src="assets/img/logos/inutralia.png" class="img-responsive-custom">
<div class="cs-loader-inner">
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
</div>
</div> </div>
<div class="cs-loader-inner">
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
<label> ●</label>
</div>
</div> </div>
<!--menú vertical y horizontal--> <!--menú vertical y horizontal-->
......
fuel/app/views/listacompra/index.twig
...@@ -25,16 +25,18 @@ ...@@ -25,16 +25,18 @@
</div> </div>
<div class="container-box-border-box"> <div class="container-box-border-box">
<form class="ac-custom ac-checkbox" autocomplete="off"> <div class="div-scrollable-lista">
<ul class="text-left ml0"> <form class="ac-custom ac-checkmark" autocomplete="off">
{% if count(ingredients) == 0 %} <ul class="text-left ml0">
<h4>Sin Ingredientes</h4> {% if count(ingredients) == 0 %}
{% endif %} <h4>Sin Ingredientes</h4>
{% for i in ingredients %} {% endif %}
<li> <input id="check_{{ i.id }}" name="check_{{ i.id }}" type="checkbox" checked="true"/><label for="check_{{ i.id }}">{{ i.desc }}</label></li> {% for i in ingredients %}
{% endfor %} <li> <input id="check_{{ i.id }}" name="check_{{ i.id }}" type="checkbox" rel="{{ i.id }}"/><label for="check_{{ i.id }}">{{ i.desc }}</label></li>
</ul> {% endfor %}
</form> </ul>
</form>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -42,10 +44,10 @@ ...@@ -42,10 +44,10 @@
<h3 class="mt40" >Puedes editar tu lista de la compra borrando y añadiendo productos.</h3> <h3 class="mt40" >Puedes editar tu lista de la compra borrando y añadiendo productos.</h3>
<!--botones--> <!--botones-->
<div class="row "> <div class="row ">
<div class="col-md-6"> <div class="col-xs-6">
<button class="btn btn-custom btn-delete mt20" data-toggle="modal" data-target="#modalDelete" ><i class="fa fa-trash"></i> Todos</button> <button class="btn btn-custom btn-delete mt20" data-toggle="modal" data-target="#modalDelete" ><i class="fa fa-trash"></i> Todos</button>
</div> </div>
<div class="col-md-6"> <div class="col-xs-6">
<button class="btn btn-custom btn-delete mt20" data-toggle="modal" data-target="#modalDelete"><i class="fa fa-trash"></i> Marcados</button> <button class="btn btn-custom btn-delete mt20" data-toggle="modal" data-target="#modalDelete"><i class="fa fa-trash"></i> Marcados</button>
</div> </div>
</div> </div>
......
fuel/app/views/listacompra/modal_add_product.twig
...@@ -8,13 +8,14 @@ ...@@ -8,13 +8,14 @@
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center"> <div class="text-center">
<img src="assets/img/listacompra/add_producto.png" class="img-responsive-custom"/> <img src="assets/img/listacompra/add_producto.png" class="img-responsive-custom mt40"/>
<h2>AÑADIR PRODUCTO</h2> <h2>AÑADIR PRODUCTO</h2>
<p>Los productos que añadas manualmente no se enviarán a DelSuper en el caso de que elijas esta opción de compra.</p>
</div> </div>
<div class="content pb40"> <div class="content pb40 mt40">
<form> <form>
<p>Producto</p> <label>Producto</label>
<input type="text" class="form-control" name="product" id="product" value=""/> <input type="text" class="form-control" name="product" id="product" value=""/>
<div class="mt20"> <div class="mt20">
......
fuel/app/views/listacompra/modal_delete.twig
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="modal-body"> <div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center"> <div class="text-center">
<img src="assets/img/listacompra/delete.png" class="img-responsive-custom"/> <img src="assets/img/listacompra/delete.png" class="img-responsive-custom mt40"/>
</div> </div>
<h2 class="text-center">¿BORRAR?</h2> <h2 class="text-center">¿BORRAR?</h2>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<button type="button" class="btn btn-custom btn-other" data-dismiss="modal">Cancelar</button> <button type="button" class="btn btn-custom btn-other" data-dismiss="modal">Cancelar</button>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<button type="button" class="btn btn-custom btn-danger">Sí, borrarlos</button> <button type="button" class="btn btn-custom btn-danger btn-delete-checked">Sí, borrarlos</button>
</div> </div>
</div> </div>
</div> </div>
......
fuel/app/views/listacompra/modal_delete_all.twig
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="modal-body"> <div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center"> <div class="text-center">
<img src="assets/img/listacompra/delete.png" class="img-responsive-custom"/> <img src="assets/img/listacompra/delete.png" class="img-responsive-custom mt40"/>
</div> </div>
<h2 class="text-center">¿BORRAR?</h2> <h2 class="text-center">¿BORRAR?</h2>
......
fuel/app/views/menupersonalizado/index.twig
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="container mt20" > <div class="container mt20 pb80" >
<div id="exTab2" class="container"> <div id="exTab2" class="container">
<ul class="nav nav-tabs nav-tabs-menu-personalizado"> <ul class="nav nav-tabs nav-tabs-menu-personalizado">
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
data-option="lunchFirst"> data-option="lunchFirst">
<label for="{{ day.lunchFirst[0].id }}">{{ day.lunchFirst[0].name }}</label> <label for="{{ day.lunchFirst[0].id }}">{{ day.lunchFirst[0].name }}</label>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i> <i class="fa fa-search pointer a-black"></i>
</div> </div>
</div> </div>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<label for="{{ day.lunchFirst[1].id }}">{{ day.lunchFirst[1].name }}</label> <label for="{{ day.lunchFirst[1].id }}">{{ day.lunchFirst[1].name }}</label>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i> <i class="fa fa-search pointer a-black"></i>
</div> </div>
</div> </div>
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<label for="{{ day.lunchSecond[0].id }}">{{ day.lunchSecond[0].name }}</label> <label for="{{ day.lunchSecond[0].id }}">{{ day.lunchSecond[0].name }}</label>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i> <i class="fa fa-search pointer a-black"></i>
</div> </div>
</div> </div>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<label for="{{ day.lunchSecond[1].id }}">{{ day.lunchSecond[1].name }}</label> <label for="{{ day.lunchSecond[1].id }}">{{ day.lunchSecond[1].name }}</label>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i> <i class="fa fa-search pointer a-black"></i>
</div> </div>
</div> </div>
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
<label for="{{ day.dinnerFirst[0].id }}">{{ day.dinnerFirst[0].name }}</label> <label for="{{ day.dinnerFirst[0].id }}">{{ day.dinnerFirst[0].name }}</label>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i> <i class="fa fa-search pointer a-black"></i>
</div> </div>
</div> </div>
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<label for="{{ day.dinnerFirst[1].id }}">{{ day.dinnerFirst[1].name }}</label> <label for="{{ day.dinnerFirst[1].id }}">{{ day.dinnerFirst[1].name }}</label>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i> <i class="fa fa-search pointer a-black"></i>
</div> </div>
</div> </div>
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
<label for="{{ day.dinnerSecond[0].id }}">{{ day.dinnerSecond[0].name }}</label> <label for="{{ day.dinnerSecond[0].id }}">{{ day.dinnerSecond[0].name }}</label>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i> <i class="fa fa-search pointer a-black"></i>
</div> </div>
</div> </div>
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
<label for="{{ day.dinnerSecond[1].id }}">{{ day.dinnerSecond[1].name }}</label> <label for="{{ day.dinnerSecond[1].id }}">{{ day.dinnerSecond[1].name }}</label>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<i class="fa fa-search pointer a-black"></i> <i class="fa fa-search pointer a-black"></i>
</div> </div>
</div> </div>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
<div class="row"> <div class="row">
<div class="col-md-6 col-md-offset-6"> <div class="col-md-6 col-md-offset-6">
<button class="btn btn-custom btn-menu-personalizado-light mt20" data-toggle="modal" data-target="#modalRecomendaciones"> Recomendaciones resto del día <i class="fa fa-angle-double-right"></i> </button> <button class="btn btn-custom btn-menu-personalizado-light mt20" data-toggle="modal" data-target="#modalRecomendaciones"> Resto del día <i class="fa fa-angle-double-right"></i> </button>
</div> </div>
</div> </div>
</div> </div>
......
fuel/app/views/menupersonalizado/modal_resto_dia.twig
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="modal-body"> <div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center"> <div class="text-center">
<img src="assets/img/menu_personalizado/recomendaciones.png" class="img-responsive-custom"/> <img src="assets/img/menu_personalizado/recomendaciones.png" class="img-responsive-custom mt40"/>
<h2>RECOMENDACIONES</h2> <h2>RECOMENDACIONES</h2>
</div> </div>
......
fuel/app/views/menussaludables/menu/index.twig
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
<div class="col-xs-10 col-sm-11"> <div class="col-xs-10 col-sm-11">
{{ title }} {{ title }}
</div> </div>
<div class="col-xs-2 col-sm-1 text-right" data-toggle="tooltip" data-placement="bottom" title="¿Como funciona?"> <div class="col-xs-2 col-sm-1 text-right" data-toggle="tooltip-info" data-placement="bottom" title="¿Como funciona?">
<i class="fa fa-info-circle" data-toggle="modal" data-target="#modalInfo"></i> <i class="fa fa-info-circle" data-toggle="modal" data-target="#modalInfo"></i>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="container mt20" > <div class="container mt20 pb80" >
<h2 class="name-menu-saludable">Menú {{ name_menu }}</h2> <h2 class="name-menu-saludable">Menú {{ name_menu }}</h2>
...@@ -55,12 +55,12 @@ ...@@ -55,12 +55,12 @@
PRIMER PLATO PRIMER PLATO
</div> </div>
<div class="container-box-border-box plr-recipe-generales"> <div class="container-box-border-box plr-recipe-generales">
<a href={{ "receta-detalle/update/" ~ i.lunchFirst[0].id }}> <a href={{ "receta-detalle/update/" ~ i.lunchFirst[0].id }} data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<div class="row pointer a-black"> <div class="row pointer a-black">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<p class="color-other">{{ i.lunchFirst[0].name }}</p> <p class="color-other">{{ i.lunchFirst[0].name }}</p>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" >
<i class="fa fa-search"></i> <i class="fa fa-search"></i>
</div> </div>
</div> </div>
...@@ -72,12 +72,12 @@ ...@@ -72,12 +72,12 @@
SEGUNDO PLATO SEGUNDO PLATO
</div> </div>
<div class="container-box-border-box plr-recipe-generales"> <div class="container-box-border-box plr-recipe-generales">
<a href={{ "receta-detalle/update/"~ i.lunchSecond[0].id }}> <a href={{ "receta-detalle/update/"~ i.lunchSecond[0].id }} data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<div class="row pointer a-black"> <div class="row pointer a-black">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<p class="color-other">{{ i.lunchSecond[0].name }}</p> <p class="color-other">{{ i.lunchSecond[0].name }}</p>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" >
<i class="fa fa-search "></i> <i class="fa fa-search "></i>
</div> </div>
</div> </div>
...@@ -95,12 +95,12 @@ ...@@ -95,12 +95,12 @@
</div> </div>
<div class="container-box-border-box plr-recipe-generales"> <div class="container-box-border-box plr-recipe-generales">
<a href={{ "receta-detalle/update/"~ i.dinnerFirst[0].id }}> <a href={{ "receta-detalle/update/"~ i.dinnerFirst[0].id }} data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<div class="row pointer a-black"> <div class="row pointer a-black">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<p class="color-other" >{{ i.dinnerFirst[0].name }}</p> <p class="color-other" >{{ i.dinnerFirst[0].name }}</p>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" >
<i class="fa fa-search "></i> <i class="fa fa-search "></i>
</div> </div>
</div> </div>
...@@ -112,12 +112,12 @@ ...@@ -112,12 +112,12 @@
SEGUNDO PLATO SEGUNDO PLATO
</div> </div>
<div class="container-box-border-box plr-recipe-generales"> <div class="container-box-border-box plr-recipe-generales">
<a href={{ "receta-detalle/update/"~ i.dinnerSecond[0].id }}> <a href={{ "receta-detalle/update/"~ i.dinnerSecond[0].id }} data-toggle="tooltip-info" data-placement="bottom" title="ver receta">
<div class="row pointer a-black"> <div class="row pointer a-black">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<p class="color-other" > {{ i.dinnerSecond[0].name }} </p> <p class="color-other" > {{ i.dinnerSecond[0].name }} </p>
</div> </div>
<div class="col-xs-1 plr0"> <div class="col-xs-1 plr0" >
<i class="fa fa-search "></i> <i class="fa fa-search "></i>
</div> </div>
</div> </div>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6 col-md-offset-6"> <div class="col-md-6 col-md-offset-6">
<button class="btn btn-custom btn-menus-saludables-light mt20" data-toggle="modal" data-target="#modalRecomendaciones"> Recomendaciones resto del día <i class="fa fa-angle-double-right"></i> </button> <button class="btn btn-custom btn-menus-saludables-light mt20" data-toggle="modal" data-target="#modalRecomendaciones"> Resto del día <i class="fa fa-angle-double-right"></i> </button>
</div> </div>
</div> </div>
</div> </div>
......
fuel/app/views/menussaludables/menu/modal_resto_dia.twig
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="modal-body"> <div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center"> <div class="text-center">
<img src="assets/img/menus_saludables/recomendaciones.png" class="img-responsive-custom"/> <img src="assets/img/menus_saludables/recomendaciones.png" class="img-responsive-custom mt40"/>
<h2>RECOMENDACIONES</h2> <h2>RECOMENDACIONES</h2>
</div> </div>
......
fuel/app/views/modals/modal_saved.twig
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="modal-body"> <div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center"> <div class="text-center">
<img src="assets/img/save.png" class="img-responsive-custom"/> <img src="assets/img/save.png" class="img-responsive-custom mt40"/>
</div> </div>
<div class="content text-center pb40"> <div class="content text-center pb40">
......
fuel/app/views/receta/content.twig
<h2>{{ recipe.shortName }}</h2> <h2><strong>{{ recipe.shortName }}</strong></h2>
<!-- imagen mas caja negra--> <!-- imagen mas caja negra-->
<img src="{{ recipe.image }}" class="img-responsive-custom w100pc"> <img src="{{ recipe.image }}" class="img-responsive-custom w100pc">
<div class="solid-box bg-color-other mt0"> <div class="solid-box bg-color-other mt0">
<div class="row "> <div class="row ">
{#tiempo de receta#} {#tiempo de receta#}
<div class="col-md-6"> <div class="col-xs-5">
<i class="fa fa-clock-o"></i> <i class="fa fa-clock-o"></i>
{{ recipe.time }} min {{ recipe.time }} min
</div> </div>
{#dificultad de recdeta#} {#dificultad de recdeta#}
<div class="col-md-6 text-right"> <div class="col-xs-7 text-right">
<i class="fa fa-star-o"></i> Dificultad: <i class="fa fa-star-o"></i> Dificultad:
{{ recipe.difficulty }} {{ recipe.difficulty }}
</div> </div>
......
fuel/app/views/receta/tables.twig
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
Ingredientes (4 personas) Ingredientes (4 personas)
</div> </div>
<div class="container-box-border-box"> <div class="container-box-border-box text-tables-recipe">
{% for i in recipe.ingredients %} {% for i in recipe.ingredients %}
<div class="row antirow mt10"> <div class="row antirow mt10">
<div class="col-md-8"> {{ i.name }}</div> <div class="col-xs-8"> {{ i.name }}</div>
<div class="col-md-4 text-right">{{ i.cuantity }}</div> <div class="col-xs-4 text-right">{{ i.cuantity }}</div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
...@@ -22,30 +22,30 @@ ...@@ -22,30 +22,30 @@
Información Nutricional por Ración Información Nutricional por Ración
</div> </div>
<div class="container-box-border-box"> <div class="container-box-border-box text-tables-recipe">
<div class="row antirow mt10"> <div class="row antirow mt10">
<div class="col-md-7">Energía </div> <div class="col-xs-7">Energía </div>
<div class="col-md-5 text-right">{{ recipe.energy }}</div> <div class="col-xs-5 text-right">{{ recipe.energy }}</div>
</div> </div>
<div class="row antirow mt10"> <div class="row antirow mt10">
<div class="col-md-7">Proteína </div> <div class="col-xs-7">Proteína </div>
<div class="col-md-5 text-right">{{ recipe.protein }}</div> <div class="col-xs-5 text-right">{{ recipe.protein }}</div>
</div> </div>
<div class="row antirow mt10"> <div class="row antirow mt10">
<div class="col-md-7">Carbohidratos</div> <div class="col-xs-7">Carbohidratos</div>
<div class="col-md-5 text-right">{{ recipe.carbohydrates }}</div> <div class="col-xs-5 text-right">{{ recipe.carbohydrates }}</div>
</div> </div>
<div class="row antirow mt10"> <div class="row antirow mt10">
<div class="col-md-7">Lípidos</div> <div class="col-xs-7">Lípidos</div>
<div class="col-md-5 text-right">{{ recipe.lipids }}</div> <div class="col-xs-5 text-right">{{ recipe.lipids }}</div>
</div> </div>
<div class="row antirow mt10"> <div class="row antirow mt10">
<div class="col-md-7">Fibra</div> <div class="col-xs-7">Fibra</div>
<div class="col-md-5 text-right">{{ recipe.fiber }}</div> <div class="col-xs-5 text-right">{{ recipe.fiber }}</div>
</div> </div>
<div class="row antirow mt10"> <div class="row antirow mt10">
<div class="col-md-7">Colesterol</div> <div class="col-xs-7">Colesterol</div>
<div class="col-md-5 text-right">{{ recipe.cholesterol }}</div> <div class="col-xs-5 text-right">{{ recipe.cholesterol }}</div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
fuel/app/views/recetario/index.twig
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<!--contenido--> <!--contenido-->
<div class="container mt20"> <div class="container mt20 pb80">
<div> <div>
{% include 'filters.twig' %} {% include 'filters.twig' %}
</div> </div>
......
public/assets/js/listacompra/index.js 0 → 100644
var ids =[];
$(document).ready(function() {
$(':input:checked').each(function () {
ids += $(this).attr('rel');
})
$('.btn-lista-compra').on('click', function (e) {
get_checkeds();
window.location.href = 'http://www.delsuper.es/inutralia?ids='+ids.toString()
})
$('.btn-delete-checked').on('click', function (e) {
get_checkeds();
$.ajax({
url: "listacompra/delete",
type: "POST",
method:"post",
data: {
id: $('#profile_id').val(),
inputs: inputs
},
success: function (data) {
if(data != "" && data != 0){
// Modal success
$('#modalSuccess').modal('show');
}else{
// Modal error
}
setTimeout(function(){
location.reload();
}, 2000);
}
})
})
});
function get_checkeds()
{
$(':input:checked').each(function () {
let id_val = $(this).attr('rel');
if( jQuery.inArray(id_val, ids)<0)
{
ids.push(id_val);
}
});
}
\ No newline at end of file
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