Skip to content

2
2018_web_app
Commit a9292f32 by gema
Options

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

parents 66f85bb6 e141011e
Showing with 58 additions and 31 deletions
fuel/app/classes/controller/menupersonalizado/index.php
...@@ -36,39 +36,55 @@ class Controller_Menupersonalizado_Index extends \Controller_App{ ...@@ -36,39 +36,55 @@ class Controller_Menupersonalizado_Index extends \Controller_App{
$view->auto_filter(false); $view->auto_filter(false);
// $view->Model_Recipe = new Model_Recipe(); $view->model_Recipe = new Model_Recipe();
return Response::forge($view); return Response::forge($view);
} }
public function post_update(){ public function post_update(){
$ids_recipes_selected = array(); try{
foreach (\Input::post('input') as $item){ DB::start_transaction();
array_push($ids_recipes_selected,$item['recipe_id']); $ids_recipes_selected = array();
$conditions = array( foreach (\Input::post('input') as $item){
'user_id' => \Session::get('user_id'),
'year' => date('Y'),
'week_year' => date("W"),
'recipe_id' => $item['recipe_id'],
'option' => $item['option'],
'day_week' => $item['day_week'],
);
$query = Model_Recipe::find('all',array('where' => $conditions)); array_push($ids_recipes_selected,$item['recipe_id']);
$conditions = array(
'user_id' => \Session::get('user_id'),
'year' => date('Y'),
'week_year' => date("W"),
'recipe_id' => $item['recipe_id'],
'option' => $item['option'],
'day_week' => $item['day_week'],
);
$query = Model_Recipe::find('all',array('where' => $conditions));
if(!$query){
Model_Recipe::forge($conditions)->save();
}
if(!$query){
Model_Recipe::forge($conditions)->save();
} }
// Borramos las que no esten seleccionadas.
\Model_Recipe::recipes_current_week()->where('recipe_id','NOT IN', $ids_recipes_selected)->delete();
DB::commit_transaction();
return json_encode(true);
}catch (\Exception $e){
\Fuel\Core\Log::error("Error al guardar el menu personalizado --> ".$e->getMessage().' - '.$e->getFile() .' - '. $e->getLine() );
DB::rollback_transaction();
return json_encode(false);
} }
// // Borramos las que no esten seleccionadas.
// \Model_Recipe::recipes_current_week()->where('recipe_id','NOT IN', $ids_recipes_selected)->delete();
//
} }
......
fuel/app/classes/model/recipe.php
...@@ -34,6 +34,15 @@ class Model_Recipe extends Model{ ...@@ -34,6 +34,15 @@ class Model_Recipe extends Model{
), ),
); );
protected static $_observers = array(
'Orm\\Observer_CreatedAt'=> array(
'events' => array('before_insert'),
'mysql_timestamp' => true,
'property' => 'created_at',
'overwrite' => true
)
);
public static function get_recipes_current_week() public static function get_recipes_current_week()
{ {
//Devolvemos recetas guardadas en la base de datos que correspondan a esta vista. //Devolvemos recetas guardadas en la base de datos que correspondan a esta vista.
...@@ -102,16 +111,17 @@ class Model_Recipe extends Model{ ...@@ -102,16 +111,17 @@ class Model_Recipe extends Model{
/** /**
* *
* Comprueba si exite una receta. * Comprueba si tiene seleccinoada una receta.
* *
* @param $recipe_id * @param $recipe_id
* @return Model * @return bool
*/ */
public static function exist_recipe($id){ public static function exist_recipe($recipe_id){
$return = self::recipes_current_week()->where('recipe_id',$recipe_id)->get_one();
// return self::recipes_current_week()->where('recipe_id',$recipe_id)->get_one(); return $return ? true : false;
return self::recipes_current_week()->get_one();
} }
} }
\ No newline at end of file
fuel/app/views/menupersonalizado/index.twig
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<a href="{{ url('receta-detalle/update/'~day.lunchFirst[0].id) }}" target="_blank"> <a href="{{ url('receta-detalle/update/'~day.lunchFirst[0].id) }}" target="_blank">
<div class="row"> <div class="row">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<input <input {% if model_Recipe.exist_recipe(day.lunchFirst[0].id) %} checked {% endif %}
id="{{ day.lunchFirst[0].id }}" id="{{ day.lunchFirst[0].id }}"
name="{{ day.ds }}_lunchFirst" name="{{ day.ds }}_lunchFirst"
value="{{ day.lunchFirst[0].id }}" value="{{ day.lunchFirst[0].id }}"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<a href="{{ url('receta-detalle/update/'~day.lunchFirst[1].id) }}" target="_blank"> <a href="{{ url('receta-detalle/update/'~day.lunchFirst[1].id) }}" target="_blank">
<div class="row mt20"> <div class="row mt20">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<input <input {% if model_Recipe.exist_recipe(day.lunchFirst[1].id) %} checked {% endif %}
id="{{ day.lunchFirst[1].id }}" id="{{ day.lunchFirst[1].id }}"
name="{{ day.ds }}_lunchFirst" name="{{ day.ds }}_lunchFirst"
value="{{ day.lunchFirst[1].id }}" value="{{ day.lunchFirst[1].id }}"
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<a href="{{ url('receta-detalle/update/'~day.lunchSecond[0].id) }}" target="_blank"> <a href="{{ url('receta-detalle/update/'~day.lunchSecond[0].id) }}" target="_blank">
<div class="row"> <div class="row">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<input <input {% if model_Recipe.exist_recipe(day.lunchSecond[0].id) %} checked {% endif %}
id="{{ day.lunchSecond[0].id }}" id="{{ day.lunchSecond[0].id }}"
name="{{ day.ds }}_lunchSecond" name="{{ day.ds }}_lunchSecond"
value="{{ day.lunchSecond[0].id }}" value="{{ day.lunchSecond[0].id }}"
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<a href="{{ url('receta-detalle/update/'~day.lunchSecond[1].id) }}" target="_blank"> <a href="{{ url('receta-detalle/update/'~day.lunchSecond[1].id) }}" target="_blank">
<div class="row mt20"> <div class="row mt20">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<input <input {% if model_Recipe.exist_recipe(day.lunchSecond[1].id) %} checked {% endif %}
id="{{ day.lunchSecond[1].id }}" id="{{ day.lunchSecond[1].id }}"
name="{{ day.ds }}_lunchSecond" name="{{ day.ds }}_lunchSecond"
value="{{ day.lunchSecond[1].id }}" value="{{ day.lunchSecond[1].id }}"
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<a href="{{ url('receta-detalle/update/'~day.dinnerFirst[0].id) }}" target="_blank"> <a href="{{ url('receta-detalle/update/'~day.dinnerFirst[0].id) }}" target="_blank">
<div class="row"> <div class="row">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<input <input {% if model_Recipe.exist_recipe(day.dinnerFirst[0].id) %} checked {% endif %}
id="{{ day.dinnerFirst[0].id }}" id="{{ day.dinnerFirst[0].id }}"
name="{{ day.ds }}_dinnerFirst" name="{{ day.ds }}_dinnerFirst"
value="{{ day.dinnerFirst[0].id }}" value="{{ day.dinnerFirst[0].id }}"
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
<a href="{{ url('receta-detalle/update/'~day.dinnerFirst[1].id) }}" target="_blank"> <a href="{{ url('receta-detalle/update/'~day.dinnerFirst[1].id) }}" target="_blank">
<div class="row mt20"> <div class="row mt20">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<input <input {% if model_Recipe.exist_recipe(day.dinnerFirst[1].id) %} checked {% endif %}
id="{{ day.dinnerFirst[1].id }}" id="{{ day.dinnerFirst[1].id }}"
name="{{ day.ds }}_dinnerFirst" name="{{ day.ds }}_dinnerFirst"
value="{{ day.dinnerFirst[1].id }}" value="{{ day.dinnerFirst[1].id }}"
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
<a href="{{ url('receta-detalle/update/'~day.dinnerSecond[0].id) }}" target="_blank"> <a href="{{ url('receta-detalle/update/'~day.dinnerSecond[0].id) }}" target="_blank">
<div class="row"> <div class="row">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<input <input {% if model_Recipe.exist_recipe(day.dinnerSecond[0].id) %} checked {% endif %}
id="{{ day.dinnerSecond[0].id }}" id="{{ day.dinnerSecond[0].id }}"
name="{{ day.ds }}_dinnerSecond" name="{{ day.ds }}_dinnerSecond"
value="{{ day.dinnerSecond[0].id }}" value="{{ day.dinnerSecond[0].id }}"
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
<a href="{{ url('receta-detalle/update/'~day.dinnerSecond[1].id) }}" target="_blank"> <a href="{{ url('receta-detalle/update/'~day.dinnerSecond[1].id) }}" target="_blank">
<div class="row mt20"> <div class="row mt20">
<div class="col-xs-11 plr0"> <div class="col-xs-11 plr0">
<input <input {% if model_Recipe.exist_recipe(day.dinnerSecond[1].id) %} checked {% endif %}
id="{{ day.dinnerSecond[1].id }}" id="{{ day.dinnerSecond[1].id }}"
name="{{ day.ds }}_dinnerSecond" name="{{ day.ds }}_dinnerSecond"
value="{{ day.dinnerSecond[1].id }}" value="{{ day.dinnerSecond[1].id }}"
......
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