Skip to content

2
2018_web_app
Commit d7fcdfe3 by David Villalba
Options

RECETARIO --> Terminado ! 

RECETA --> Terminada!
parent f25bce2a
Showing with 84 additions and 75 deletions
fuel/app/classes/controller/boletinsaludable/index.php
...@@ -69,12 +69,12 @@ class Controller_Boletinsaludable_Index extends \Controller_App{ ...@@ -69,12 +69,12 @@ class Controller_Boletinsaludable_Index extends \Controller_App{
//Paso de las opciones de menu que deben aparecer seleccionadas //Paso de las opciones de menu que deben aparecer seleccionadas
$view->option_menu = $this->_option_menu; $view->option_menu = $this->_option_menu;
// El form de la vista no pasa un objeto articulo como cadena de texto separada por |.
$article = explode('|',Input::post('article')); $article = explode('|',Input::post('article'));
$view->article_title = $article[1]; $view->article_title = $article[1];
$view->article_excerpt = $article[3]; $view->article_excerpt = $article[3];
// El texto esta en string y lo pasamos a array delimitado por salto de linea $view->article_body = $article[2];
$view->article_body = explode(PHP_EOL, $article[2]);
$view->article_published_at = $article[5]; $view->article_published_at = $article[5];
$view->article_highlight_photo = $article[4]; $view->article_highlight_photo = $article[4];
......
fuel/app/classes/controller/receta/index.php
...@@ -50,4 +50,25 @@ class Controller_Receta_Index extends \Controller_App{ ...@@ -50,4 +50,25 @@ class Controller_Receta_Index extends \Controller_App{
return Response::forge($view); return Response::forge($view);
} }
public function get_update($id){
$view = View::forge('receta/index.twig');
//Titulo de la vista
$view->title = "Receta";
//Paso de las migas de pan a la vista
$view->bc = $this->_bc;
//Paso de las opciones de menu que deben aparecer seleccionadas
$view->option_menu = $this->_option_menu;
$view->recipe = $this->ws_recipe_get($id);
return Response::forge($view);
}
} }
\ No newline at end of file
fuel/app/classes/controller/recetario/index.php
...@@ -46,6 +46,7 @@ class Controller_Recetario_Index extends \Controller_App{ ...@@ -46,6 +46,7 @@ class Controller_Recetario_Index extends \Controller_App{
//Paso de las opciones de menu que deben aparecer seleccionadas //Paso de las opciones de menu que deben aparecer seleccionadas
$view->option_menu = $this->_option_menu; $view->option_menu = $this->_option_menu;
$view->recipes = $this->ws_recipe_get();
return Response::forge($view); return Response::forge($view);
} }
......
fuel/app/classes/trait/inutraliaWS.php
...@@ -115,5 +115,15 @@ trait Trait_InutraliaWS { ...@@ -115,5 +115,15 @@ trait Trait_InutraliaWS {
} }
public function ws_recipe_get($id = null){
if(!$id){
return json_decode($this->request_generic('recipe'));
}else{
return json_decode($this->request_generic('recipe/'.$id));
}
}
} }
\ No newline at end of file
fuel/app/config/routes.php
...@@ -39,6 +39,7 @@ return array( ...@@ -39,6 +39,7 @@ return array(
// RECETA // RECETA
'receta-detalle' =>'receta/index', 'receta-detalle' =>'receta/index',
'receta-detalle/update/:id' =>'receta/index/update/$1',
// RECETARIO // RECETARIO
'recetario' =>'recetario/index', 'recetario' =>'recetario/index',
......
fuel/app/views/articulo/index.twig deleted 100644 → 0
{% extends 'layout/template.twig' %}
{% block content %}
<!-- barra superior titulo de pagina-->
<div class="div-title bg-color-other">
<div class="container">
<div class="row">
<div class="col-xs-10 col-sm-11">
{{ title }}
</div>
<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>
</div>
</div>
</div>
</div>
<!--contenido-->
<div class="container mt20 pb40" >
<div class="col-container">
{#imagen#}
<div class="col">
<img src="assets/img/articulo/articulo.jpg" class="img-responsive-custom">
</div>
{#titulo y fecha#}
<div class="col bg-color-other">
<div class="solid-box mt0">
<i class="fa fa-calendar"></i> 12-10-2018
<h3>Batch cooking:cocina un día para toda la semana</h3>
</div>
</div>
</div>
<!-- preparación receta-->
<p class="text-justify mt20">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vulputate sapien eu hendrerit hendrerit. Etiam nec leo in nibh sodales ultricies. Duis auctor urna at nisl porttitor, eget pretium quam faucibus. Sed velit tortor, luctus eget tempor vel, posuere quis arcu. Vestibulum finibus nibh sem, sit amet dapibus dui interdum in. Proin velit metus, ultricies id sapien semper, auctor ullamcorper nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Proin varius vulputate nulla, quis tempor velit interdum in. Sed vulputate dignissim aliquet. Cras pharetra tristique velit id semper. Vestibulum est tortor, varius id auctor nec, commodo ut est. Praesent ac tellus ligula. Duis ut neque aliquam libero sagittis pellentesque. Morbi varius ex ac lectus fermentum laoreet. Vivamus viverra erat molestie tempor volutpat. Curabitur in pharetra mi. Quisque non erat felis. Fusce lobortis, sem et ultricies elementum, odio felis condimentum urna, quis sagittis ante augue sit amet odio. Duis lacinia aliquam eros, a hendrerit ex suscipit a.
</p>
<!-- footer, firma inutralia-->
<div class="mt40">
publicado por: <img src="assets/img/logos/inutralia.png" class="img-responsive-custom">
</div>
</div>
{% endblock %}
fuel/app/views/boletinsaludable/ver.twig
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</div> </div>
</div> </div>
<!-- preparación receta--> <!-- preparación receta-->
{% for i in article_body %} {% for i in article_body|split('\n') %}
<p class="text-justify mt20">{{ i }}</p> <p class="text-justify mt20">{{ i }}</p>
{% endfor %} {% endfor %}
......
fuel/app/views/receta/content.twig
<h2>Nombre de la receta</h2>
<h2>{{ recipe.name }}</h2>
<!-- imagen mas caja negra--> <!-- imagen mas caja negra-->
<img src="assets/img/receta/receta.jpg" class="img-responsive-custom"> <img src="{{ recipe.image }}" class="img-responsive-custom">
<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-md-6">
<i class="fa fa-clock-o"></i> <i class="fa fa-clock-o"></i>
30.00 min {{ recipe.time }} min
</div> </div>
{#dificultad de recdeta#} {#dificultad de recdeta#}
<div class="col-md-6"> <div class="col-md-6">
<i class="fa fa-star-o"></i> Dificultad: <i class="fa fa-star-o"></i> Dificultad:
Media {{ recipe.difficulty }}
</div> </div>
</div> </div>
</div> </div>
<!-- preparación receta--> <!-- preparación receta-->
<p class="text-justify mt20"> {% for parrafo in recipe.description|split('\n') %}
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vulputate sapien eu hendrerit hendrerit. Etiam nec leo in nibh sodales ultricies. Duis auctor urna at nisl porttitor, eget pretium quam faucibus. Sed velit tortor, luctus eget tempor vel, posuere quis arcu. Vestibulum finibus nibh sem, sit amet dapibus dui interdum in. Proin velit metus, ultricies id sapien semper, auctor ullamcorper nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Proin varius vulputate nulla, quis tempor velit interdum in. Sed vulputate dignissim aliquet. Cras pharetra tristique velit id semper. Vestibulum est tortor, varius id auctor nec, commodo ut est. Praesent ac tellus ligula. Duis ut neque aliquam libero sagittis pellentesque. Morbi varius ex ac lectus fermentum laoreet. Vivamus viverra erat molestie tempor volutpat. Curabitur in pharetra mi. Quisque non erat felis. Fusce lobortis, sem et ultricies elementum, odio felis condimentum urna, quis sagittis ante augue sit amet odio. Duis lacinia aliquam eros, a hendrerit ex suscipit a. <p class="text-justify mt20">
</p> {{ parrafo}}
</p>
{% endfor %}
<!-- footer, firma inutralia--> <!-- footer, firma inutralia-->
<div class="mt40"> <div class="mt40">
......
fuel/app/views/receta/tables.twig
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
</div> </div>
<div class="container-box-border-box"> <div class="container-box-border-box">
{% for i in 0..14 %} {% for i in recipe.ingredients %}
<div class="row antirow mt10"> <div class="row antirow mt10">
<div class="col-md-8">Ingrediente {{ i }}</div> <div class="col-md-8"> {{ i.name }}</div>
<div class="col-md-4 text-right">100 g</div> <div class="col-md-4 text-right">{{ i.cuantity }}</div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
...@@ -23,11 +23,29 @@ ...@@ -23,11 +23,29 @@
</div> </div>
<div class="container-box-border-box"> <div class="container-box-border-box">
{% for i in 0..5 %} <div class="row antirow mt10">
<div class="row antirow mt10"> <div class="col-md-7">Energía </div>
<div class="col-md-7">Propiedad {{ i }}</div> <div class="col-md-5 text-right">{{ recipe.energy }}</div>
<div class="col-md-5 text-right">100 g</div> </div>
</div> <div class="row antirow mt10">
{% endfor %} <div class="col-md-7">Proteína </div>
<div class="col-md-5 text-right">{{ recipe.protein }}</div>
</div>
<div class="row antirow mt10">
<div class="col-md-7">Carbohidratos</div>
<div class="col-md-5 text-right">{{ recipe.carbohydrates }}</div>
</div>
<div class="row antirow mt10">
<div class="col-md-7">Lípidos</div>
<div class="col-md-5 text-right">{{ recipe.lipids }}</div>
</div>
<div class="row antirow mt10">
<div class="col-md-7">Fibra</div>
<div class="col-md-5 text-right">{{ recipe.fiber }}</div>
</div>
<div class="row antirow mt10">
<div class="col-md-7">Colesterol</div>
<div class="col-md-5 text-right">{{ recipe.cholesterol }}</div>
</div>
</div> </div>
</div> </div>
\ No newline at end of file
fuel/app/views/recetario/list.twig
{% for i in 0..11 %}
{% for recipe in recipes %}
<!--item lista, una receta--> <!--item lista, una receta-->
<div class="receta-and-articulo-item-list pointer mt10" style="background-image:url('assets/img/receta/receta.jpg')"> <div class="receta-and-articulo-item-list pointer mt10" style="background-image:url({{ recipe.image }})">
<a href="receta-detalle"> <a href="{{ url('receta-detalle/update/'~recipe.id) }}">
<div class="black-overlay"> <div class="black-overlay">
<div class="text-receta-and-articulo-item-list"> <div class="text-receta-and-articulo-item-list">
<h2><b>Titulo receta</b></h2> <h2><b>{{ recipe.name }}</b></h2>
<p>Frase especial de receta</p> <p>{{ recipe.excerpt}}</p>
</div> </div>
</div> </div>
</a> </a>
......
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