@@ -33,26 +33,21 @@ from bb.ui.crumbs.hobpages import HobPage
class RecipeSelectionPage (HobPage):
pages = [
{
- 'name' : 'Recipe',
- 'filter' : { RecipeListModel.COL_TYPE : ['recipe'] },
+ 'name' : 'Included',
+ 'filter' : { RecipeListModel.COL_INC : [True],
+ RecipeListModel.COL_TYPE : ['recipe', 'task'] },
'columns' : [{
- 'col_name' : 'Recipe',
+ 'col_name' : 'Recipe Name',
'col_id' : RecipeListModel.COL_NAME,
'col_style': 'text',
'col_min' : 100,
'col_max' : 400
}, {
- 'col_name' : 'License',
- 'col_id' : RecipeListModel.COL_LIC,
- 'col_style': 'text',
- 'col_min' : 100,
- 'col_max' : 400
- }, {
- 'col_name' : 'Group',
- 'col_id' : RecipeListModel.COL_GROUP,
+ 'col_name' : 'Brought in by',
+ 'col_id' : RecipeListModel.COL_BINB,
'col_style': 'text',
'col_min' : 100,
- 'col_max' : 400
+ 'col_max' : 500
}, {
'col_name' : 'Included',
'col_id' : RecipeListModel.COL_INC,
@@ -61,17 +56,23 @@ class RecipeSelectionPage (HobPage):
'col_max' : 50
}]
}, {
- 'name' : 'Recipe Collection',
- 'filter' : { RecipeListModel.COL_TYPE : ['task'] },
+ 'name' : 'All recipes',
+ 'filter' : { RecipeListModel.COL_TYPE : ['recipe'] },
'columns' : [{
- 'col_name' : 'Recipe Collection',
+ 'col_name' : 'Recipe Name',
'col_id' : RecipeListModel.COL_NAME,
'col_style': 'text',
'col_min' : 100,
'col_max' : 400
}, {
- 'col_name' : 'Description',
- 'col_id' : RecipeListModel.COL_DESC,
+ 'col_name' : 'License',
+ 'col_id' : RecipeListModel.COL_LIC,
+ 'col_style': 'text',
+ 'col_min' : 100,
+ 'col_max' : 400
+ }, {
+ 'col_name' : 'Group',
+ 'col_id' : RecipeListModel.COL_GROUP,
'col_style': 'text',
'col_min' : 100,
'col_max' : 400
@@ -83,21 +84,20 @@ class RecipeSelectionPage (HobPage):
'col_max' : 50
}]
}, {
- 'name' : 'Included',
- 'filter' : { RecipeListModel.COL_INC : [True],
- RecipeListModel.COL_TYPE : ['recipe', 'task'] },
+ 'name' : 'Tasks',
+ 'filter' : { RecipeListModel.COL_TYPE : ['task'] },
'columns' : [{
- 'col_name' : 'Recipe',
+ 'col_name' : 'Task Name',
'col_id' : RecipeListModel.COL_NAME,
'col_style': 'text',
'col_min' : 100,
'col_max' : 400
}, {
- 'col_name' : 'Brought by',
- 'col_id' : RecipeListModel.COL_BINB,
+ 'col_name' : 'Description',
+ 'col_id' : RecipeListModel.COL_DESC,
'col_style': 'text',
'col_min' : 100,
- 'col_max' : 500
+ 'col_max' : 400
}, {
'col_name' : 'Included',
'col_id' : RecipeListModel.COL_INC,