Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
2
2018_web_app
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
inutralia
2018_web_app
Commits
600db0b4
Commit
600db0b4
authored
Dec 11, 2018
by
gema
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://git.setisl.com/inutraliaapp/2018_web_app
into gemis_dev
parents
627a029b
bfbb32b7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
110 additions
and
1 deletions
+110
-1
index.php
fuel/app/classes/controller/menupersonalizado/index.php
+6
-1
recipe.php
fuel/app/classes/model/recipe.php
+19
-0
main.js
public/assets/js/main.js
+85
-0
No files found.
fuel/app/classes/controller/menupersonalizado/index.php
View file @
600db0b4
...
...
@@ -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();
//
}
...
...
fuel/app/classes/model/recipe.php
View file @
600db0b4
...
...
@@ -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
public/assets/js/main.js
View file @
600db0b4
...
...
@@ -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
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment