Commit 600db0b4 by gema

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

parents 627a029b bfbb32b7
......@@ -36,6 +36,8 @@ class Controller_Menupersonalizado_Index extends \Controller_App{
$view->auto_filter(false);
// $view->Model_Recipe = new Model_Recipe();
return Response::forge($view);
}
......@@ -63,7 +65,10 @@ class Controller_Menupersonalizado_Index extends \Controller_App{
}
}
// // Borramos las que no esten seleccionadas.
// \Model_Recipe::recipes_current_week()->where('recipe_id','NOT IN', $ids_recipes_selected)->delete();
//
}
......
......@@ -40,6 +40,9 @@ class Model_Recipe extends Model{
return self::recipes_current_week()->get();
}
/**
* @return \Orm\Query
*/
public static function recipes_current_week()
{
//Devolvemos recetas guardadas en la base de datos que correspondan a esta vista.
......@@ -96,4 +99,19 @@ class Model_Recipe extends Model{
}
/**
*
* Comprueba si exite una receta.
*
* @param $recipe_id
* @return Model
*/
public static function exist_recipe($id){
// return self::recipes_current_week()->where('recipe_id',$recipe_id)->get_one();
return self::recipes_current_week()->get_one();
}
}
\ No newline at end of file
......@@ -9,6 +9,10 @@ $(window).load(function() {
var height_screen =jQuery(window).height(); // return height of browser viewport
$(".cs-loader").css("min-height", height_screen);
// Control Checked inputs
control_inputs_checked();
});
......@@ -70,3 +74,84 @@ $(function () {
})
/**
* Busca los input seleccionados.
*/
function control_inputs_checked() {
$(':input:checked').map(function () {
diff_input_checked(this);
});
}
/**
* Identidica el tipo de input seleccionado
*
* @param el
*/
function diff_input_checked(el) {
var class_separate = $(el).closest("form").attr('class').split(' ');
var class_type = class_separate[class_separate.length-1];
var type_separate = class_type.split('-');
var type = type_separate[type_separate.length -1];
switch (type) {
case 'cross' :
case 'checkmark' :
case 'boxfill' :
case 'diagonal' :
case 'list' :
print_checkbox_checked(el,type);
break;
case 'fill' :
case 'circle' :
case 'swirl' :
print_radio_checked(el,type);
break;
}
}
/**
* Marca los input de tipo checkbox
*
* @param el
* @param type
*/
function print_checkbox_checked(el,type) {
if( el.checked ) {
draw( el, type );
}
else {
reset( el );
}
}
/**
*
* Marca los inputs de tipo radio.
*
* @param el
* @param type
*/
function print_radio_checked(el,type) {
resetRadio( el );
draw( el, type );
}
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