hexstudy/IlLievitario-Gestore
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: https://msi/svn/firstRepo/Management/trunk@69 0f545695-f87b-41b6-9a03-7f16563b5454

Browse Source
This commit is contained in:
hexstudy
2016-02-17 16:34:01 +00:00
parent 8e5dd7387a
commit f555d88936
4 changed files with 115 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/manifest.js
+1 -1
View File
@@ -1,7 +1,7 @@
var myManifest = { var myManifest = {
Debug: (window.location.port !== ""), Debug: (window.location.port !== ""),
Name: "Il Management", Name: "Il Management",
Version: "0.3.0.1", Version: "0.3.2.0",
Author: "Denis Ironi", Author: "Denis Ironi",
Settings: { Settings: {
DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"), DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"),
js/modules/addingr/addingr.js
+106 -55
View File
@@ -29,20 +29,32 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/addingr/addingrViewTem
validate: function () { validate: function () {
if ($("#ingrediente").val() === "22" && $("#nota").val() !== "") if ($("#ingrediente").val() === "22" && $("#nota").val() !== "")
return true; return true;
if ($("#ingrediente").val() === "152" && $("#nota").val() !== "")
return true;
if ($("#ingrediente").val() > 0 && if ($("#ingrediente").val() > 0 &&
$("#ingrediente").val() !== "22" && ($("#ingrediente").val() !== "22" || $("#ingrediente").val() !== "152") &&
$("#qty").val() > 0 && $("#qty").val() != "" &&
$("#unitMis").val() > 0) $("#unitMis").val() > 0)
return true; return true;
return false; return false;
}, },
addBtnFn: undefined, addBtnFn: undefined,
_updateUI: function (item) { _updateUI: function (item) {
var itemIngr = $("#ingrediente").jqxDropDownList('getItemByValue', parseInt(item.id_tipo_ingredienti)); if(item.id_tipo_ingredienti == "22"){
if (itemIngr !== undefined) { $("#isHeading").jqxCheckBox({ checked:false });
$("#ingrediente").jqxDropDownList({selectedIndex: itemIngr.index}); $("#isNote").jqxCheckBox({ checked:true });
$("#ingrediente").jqxDropDownList({disabled: true});
}else if (item.id_tipo_ingredienti == "152"){
$("#isNote").jqxCheckBox({ checked:false });
$("#isHeading").jqxCheckBox({ checked:true });
$("#ingrediente").jqxDropDownList({disabled: true});
}else{ }else{
$("#ingrediente").jqxDropDownList({selectedIndex: -1}); var itemIngr = $("#ingrediente").jqxDropDownList('getItemByValue', parseInt(item.id_tipo_ingredienti));
if (itemIngr !== undefined) {
$("#ingrediente").jqxDropDownList({selectedIndex: itemIngr.index});
}else{
$("#ingrediente").jqxDropDownList({selectedIndex: -1});
}
} }
var itemUnMis = $("#unitMis").jqxDropDownList('getItemByValue', parseInt(item.id_tipo_quantita)); var itemUnMis = $("#unitMis").jqxDropDownList('getItemByValue', parseInt(item.id_tipo_quantita));
@@ -51,7 +63,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/addingr/addingrViewTem
} else { } else {
$("#unitMis").jqxDropDownList({selectedIndex: -1}); $("#unitMis").jqxDropDownList({selectedIndex: -1});
} }
$("#qty").jqxNumberInput('val', this.modifyItem.quantita); $("#qty").jqxInput('val', this.modifyItem.quantita);
$("#nota").val(this.modifyItem.note); $("#nota").val(this.modifyItem.note);
}, },
//render the content into div of view //render the content into div of view
@@ -64,24 +76,23 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/addingr/addingrViewTem
this.$el.find("#addIngrWindow").jqxWindow({ this.$el.find("#addIngrWindow").jqxWindow({
width: 350, width: 350,
height: 280, height: 300,
resizable: false, resizable: false,
isModal: true, isModal: true,
autoOpen: false, autoOpen: false,
cancelButton: this.$el.find("#cancelIngrBtn"), cancelButton: this.$el.find("#cancelIngrBtn"),
modalOpacity: 0.01, modalOpacity: 0.01,
initContent: function () { initContent: function () {
var source = var source = {
{ datatype: "jsonp",
datatype: "jsonp", datafields: [
datafields: [ {name: 'tipo_ingredienti_id'},
{name: 'tipo_ingredienti_id'}, {name: 'name'}
{name: 'name'} ],
], url: myManifest.Settings.DefaultURL + "/backend/typeingredients",
url: myManifest.Settings.DefaultURL + "/backend/typeingredients", data: {
data: { }
} };
};
var dataAdapter = new $.jqx.dataAdapter(source); var dataAdapter = new $.jqx.dataAdapter(source);
$("#ingrediente").jqxDropDownList( $("#ingrediente").jqxDropDownList(
{ {
@@ -89,58 +100,84 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/addingr/addingrViewTem
height: 25, height: 25,
source: dataAdapter, source: dataAdapter,
displayMember: "name", displayMember: "name",
valueMember: "tipo_ingredienti_id" valueMember: "tipo_ingredienti_id",
renderer: function (index, label, value){return unescape(label);},
selectionRenderer: function () {
var item = $('#ingrediente').jqxDropDownList('getSelectedItem');
if (item) {
return unescape(item.label);
}
return "Please Choose:";
}
}); });
$("#isNote").jqxCheckBox( $("#isNote").jqxCheckBox(
{ {
width: 75, width: 75,
height: 25 height: 16
}); });
$("#isNote").on('change', function (event) { $("#isNote").on('change', function (event) {
var checked = event.args.checked; var checked = event.args.checked;
if(checked) if(checked)
{ {
$("#isHeading").jqxCheckBox({ checked:false });
var item = $("#ingrediente").jqxDropDownList('getItemByValue', 22); var item = $("#ingrediente").jqxDropDownList('getItemByValue', 22);
$("#ingrediente").jqxDropDownList({selectedIndex: item.index}); $("#ingrediente").jqxDropDownList({selectedIndex: item.index});
$("#ingrediente").jqxDropDownList({disabled: true});
} }
else else{
$("#ingrediente").jqxDropDownList({selectedIndex: -1}); $("#ingrediente").jqxDropDownList({selectedIndex: -1});
$("#ingrediente").jqxDropDownList({disabled: false});
}
}); });
$("#isHeading").jqxCheckBox( $("#isHeading").jqxCheckBox(
{ {
width: 75, width: 75,
height: 25 height: 16
}); });
$("#isHeading").on('change', function (event) {
var checked = event.args.checked;
if(checked)
{
$("#isNote").jqxCheckBox({ checked:false });
var item = $("#ingrediente").jqxDropDownList('getItemByValue', 152);
$("#ingrediente").jqxDropDownList({selectedIndex: item.index});
$("#ingrediente").jqxDropDownList({disabled: true});
}
else{
$("#ingrediente").jqxDropDownList({selectedIndex: -1});
$("#ingrediente").jqxDropDownList({disabled: false});
}
});
$("#ingrediente").on('bindingComplete', function (event) { $("#ingrediente").on('bindingComplete', function (event) {
var item = $("#ingrediente").jqxDropDownList('getItemByValue', parseInt(self.modifyItem.id_tipo_ingredienti)); var item = $("#ingrediente").jqxDropDownList('getItemByValue', parseInt(self.modifyItem.id_tipo_ingredienti));
if(item) if(item)
$("#ingrediente").jqxDropDownList({selectedIndex: item.index}); $("#ingrediente").jqxDropDownList({selectedIndex: item.index});
}); });
var sourceunitMis = var sourceunitMis ={
{ datatype: "jsonp",
datatype: "jsonp", datafields: [
datafields: [ {name: 'tipo_quantita_id'},
{name: 'tipo_quantita_id'}, {name: 'name'}
{name: 'name'} ],
], url: myManifest.Settings.DefaultURL + "/backend/typeqtys",
url: myManifest.Settings.DefaultURL + "/backend/typeqtys", data: {
data: { }
} };
};
var dataAdapterunitMis = new $.jqx.dataAdapter(sourceunitMis); var dataAdapterunitMis = new $.jqx.dataAdapter(sourceunitMis);
$("#unitMis").jqxDropDownList( $("#unitMis").jqxDropDownList(
{ {
width: 200, width: 200,
height: 25, height: 25,
source: dataAdapterunitMis, source: dataAdapterunitMis,
displayMember: "name", displayMember: "name",
valueMember: "tipo_quantita_id", valueMember: "tipo_quantita_id",
disabled: true disabled: true
}); });
$("#unitMis").on('bindingComplete', function (event) { $("#unitMis").on('bindingComplete', function (event) {
var item = $("#unitMis").jqxDropDownList('getItemByValue', parseInt(self.modifyItem.id_tipo_quantita)); var item = $("#unitMis").jqxDropDownList('getItemByValue', parseInt(self.modifyItem.id_tipo_quantita));
if(item) if(item)
@@ -150,22 +187,36 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/addingr/addingrViewTem
if (event.args) { if (event.args) {
var item = event.args.item; var item = event.args.item;
if (item) { if (item) {
if (item.value === "22") if (item.value === "22" || item.value === "152")
{ {
$("#qty").jqxNumberInput({disabled: true}); $("#qty").jqxInput({disabled: true});
$("#qty").parents("tr").hide();
$("#unitMis").jqxDropDownList({disabled: true}); $("#unitMis").jqxDropDownList({disabled: true});
$("#unitMis").parents("tr").hide()
} }
else else
{ {
$("#qty").jqxNumberInput({disabled: false}); $("#qty").parents("tr").show();
$("#qty").jqxInput({disabled: false});
$("#unitMis").parents("tr").show();
$("#unitMis").jqxDropDownList({disabled: false}); $("#unitMis").jqxDropDownList({disabled: false});
} }
} }
else
{
$("#qty").parents("tr").show();
$("#qty").jqxInput({disabled: false});
$("#unitMis").parents("tr").show();
$("#unitMis").jqxDropDownList({disabled: false});
}
} }
}); });
$("#qty").jqxNumberInput({width: '250px', height: 25, decimal: 0.0, min: 0, decimalDigits: 0, digits: 4, groupSeparator: '', disabled: true}); $("#qty").jqxInput({placeHolder: "Quantità:", width: '250px', height: 25, minLength: 1, disabled: true});
$("#nota").jqxInput({placeHolder: "Nota:", width: '250px', height: 45}); $("#nota").jqxInput({placeHolder: "Nota:", width: '250px', height: 25});
$("#add").jqxButton({width: 25}); $("#addTypeIngr").jqxButton({width: '100%'});
$("#addTypeIngr").on('click', function () {
});
$("#addIngrBtn").jqxButton({width: '48%', height: 40}); $("#addIngrBtn").jqxButton({width: '48%', height: 40});
$("#cancelIngrBtn").jqxButton({width: '48%', height: 40}); $("#cancelIngrBtn").jqxButton({width: '48%', height: 40});
@@ -175,7 +226,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/addingr/addingrViewTem
var newItem = { var newItem = {
"id_tipo_ingredienti": $("#ingrediente").jqxDropDownList('getSelectedItem').value, "id_tipo_ingredienti": $("#ingrediente").jqxDropDownList('getSelectedItem').value,
"nome_ingrediente": $("#ingrediente").jqxDropDownList('getSelectedItem').label, "nome_ingrediente": $("#ingrediente").jqxDropDownList('getSelectedItem').label,
"quantita": $("#qty").jqxNumberInput('val'), "quantita": $("#qty").jqxInput('val'),
"id_tipo_quantita": null, "id_tipo_quantita": null,
"unita": null, "unita": null,
"note": $("#nota").val() "note": $("#nota").val()
js/modules/addingr/addingrViewTemplate.html
+7 -4
View File
@@ -3,19 +3,22 @@
<div>Aggiungi Ingrediente</div> <div>Aggiungi Ingrediente</div>
<div> <div>
<table> <table>
<tr style="display: none;">
<td align="left" colspan="2"><input id="addTypeIngr" style="margin-right: 1%;" type="button" value="Aggiungi"/></td>
</tr>
<tr> <tr>
<td align="right"><div id="isNote">Nota</div></td> <td align="right"><div id="isNote">Nota</div></td>
<td align="left"><div id="isHeading">Intestazione</div></td> <td align="left"><div id="isHeading">Intestazione</div></td>
</tr> </tr>
<tr> <tr>
<td align="right">Ingrediente</td> <td align="right">Ingrediente</td>
<td align="left"><div id="ingrediente"></div><input id="add" style="margin-right: 1%;" type="button" value="Agg."/></td> <td align="left"><div id="ingrediente"></div></td>
</tr> </tr>
<tr> <tr style="display: none;">
<td align="right">Quantità:</td> <td align="right">Quantità:</td>
<td align="left"><div id="qty"></div></td> <td align="left"><input id="qty"/></td>
</tr> </tr>
<tr> <tr style="display: none;">
<td align="right">Unità di Misura:</td> <td align="right">Unità di Misura:</td>
<td align="left"><div id='unitMis'></div></td> <td align="left"><div id='unitMis'></div></td>
</tr> </tr>
js/modules/editricetta/editricetta.js
+1 -1
View File
@@ -151,7 +151,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricett
{ {
datarecord.note = unescape(datarecord.note); datarecord.note = unescape(datarecord.note);
var div = ''; var div = '';
if (datarecord.id_tipo_ingredienti === "22") if (datarecord.id_tipo_ingredienti === "22" || datarecord.id_tipo_ingredienti === "152")
{ {
div = '<div><b>' + datarecord.nome_ingrediente + '</b>: <i>' + datarecord.note + '</i></div>'; div = '<div><b>' + datarecord.nome_ingrediente + '</b>: <i>' + datarecord.note + '</i></div>';
} }