diff --git a/js/modules/addingr/addingr.js b/js/modules/addingr/addingr.js index 6802b51..2d226fe 100644 --- a/js/modules/addingr/addingr.js +++ b/js/modules/addingr/addingr.js @@ -64,7 +64,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/addingr/addingrViewTem this.$el.find("#addIngrWindow").jqxWindow({ width: 350, - height: 230, + height: 280, resizable: false, isModal: true, autoOpen: false, @@ -85,16 +85,40 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/addingr/addingrViewTem var dataAdapter = new $.jqx.dataAdapter(source); $("#ingrediente").jqxDropDownList( { - width: 200, + width: 175, height: 25, source: dataAdapter, displayMember: "name", valueMember: "tipo_ingredienti_id" }); + $("#isNote").jqxCheckBox( + { + width: 75, + height: 25 + }); + + $("#isNote").on('change', function (event) { + var checked = event.args.checked; + if(checked) + { + var item = $("#ingrediente").jqxDropDownList('getItemByValue', 22); + $("#ingrediente").jqxDropDownList({selectedIndex: item.index}); + } + else + $("#ingrediente").jqxDropDownList({selectedIndex: -1}); + }); + + $("#isHeading").jqxCheckBox( + { + width: 75, + height: 25 + }); + $("#ingrediente").on('bindingComplete', function (event) { var item = $("#ingrediente").jqxDropDownList('getItemByValue', parseInt(self.modifyItem.id_tipo_ingredienti)); - $("#ingrediente").jqxDropDownList({selectedIndex: item.index}); + if(item) + $("#ingrediente").jqxDropDownList({selectedIndex: item.index}); }); var sourceunitMis = { @@ -114,11 +138,13 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/addingr/addingrViewTem height: 25, source: dataAdapterunitMis, displayMember: "name", - valueMember: "tipo_quantita_id" + valueMember: "tipo_quantita_id", + disabled: true }); $("#unitMis").on('bindingComplete', function (event) { var item = $("#unitMis").jqxDropDownList('getItemByValue', parseInt(self.modifyItem.id_tipo_quantita)); - $("#unitMis").jqxDropDownList({selectedIndex: item.index}); + if(item) + $("#unitMis").jqxDropDownList({selectedIndex: item.index}); }); $("#ingrediente").on('select', {scope: self}, function (event) { if (event.args) { @@ -137,8 +163,9 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/addingr/addingrViewTem } } }); - $("#qty").jqxNumberInput({width: '250px', height: 25, decimal: 0.0, min: 0, decimalDigits: 0, digits: 4, groupSeparator: ''}); + $("#qty").jqxNumberInput({width: '250px', height: 25, decimal: 0.0, min: 0, decimalDigits: 0, digits: 4, groupSeparator: '', disabled: true}); $("#nota").jqxInput({placeHolder: "Nota:", width: '250px', height: 45}); + $("#add").jqxButton({width: 25}); $("#addIngrBtn").jqxButton({width: '48%', height: 40}); $("#cancelIngrBtn").jqxButton({width: '48%', height: 40}); diff --git a/js/modules/addingr/addingrViewTemplate.html b/js/modules/addingr/addingrViewTemplate.html index 6c84dc3..c6ccedc 100644 --- a/js/modules/addingr/addingrViewTemplate.html +++ b/js/modules/addingr/addingrViewTemplate.html @@ -3,9 +3,13 @@
Aggiungi Ingrediente
+ + + + - +
Nota
Intestazione
Ingrediente
Quantità: