1064 dataRecord.w2_amount = newval; |
1064 dataRecord.w2_amount = newval; |
1065 console.log("new: "+event.args.value+" w1: "+dataRecord.w1_amount+" w2: "+dataRecord.w2_amount); |
1065 console.log("new: "+event.args.value+" w1: "+dataRecord.w1_amount+" w2: "+dataRecord.w2_amount); |
1066 calcWater(); |
1066 calcWater(); |
1067 }); |
1067 }); |
1068 $('#wa_cacl2').on('change', function (event) { |
1068 $('#wa_cacl2').on('change', function (event) { |
1069 setWaterAgent('CaCl2', event.args.value); |
1069 if (event.args) { |
1070 calcWater(); |
1070 setWaterAgent('CaCl2', 0); // This can prevent double entries. |
|
1071 setWaterAgent('CaCl2', event.args.value); |
|
1072 calcWater(); |
|
1073 } |
1071 }); |
1074 }); |
1072 $('#wa_caso4').on('change', function (event) { |
1075 $('#wa_caso4').on('change', function (event) { |
1073 setWaterAgent('CaSO4', event.args.value); |
1076 if (event.args) { |
1074 calcWater(); |
1077 setWaterAgent('CaSO4', 0); |
|
1078 setWaterAgent('CaSO4', event.args.value); |
|
1079 calcWater(); |
|
1080 } |
1075 }); |
1081 }); |
1076 $('#wa_mgso4').on('change', function (event) { |
1082 $('#wa_mgso4').on('change', function (event) { |
1077 setWaterAgent('MgSO4', event.args.value); |
1083 if (event.args) { |
1078 calcWater(); |
1084 setWaterAgent('MgSO4', 0); |
|
1085 setWaterAgent('MgSO4', event.args.value); |
|
1086 calcWater(); |
|
1087 } |
1079 }); |
1088 }); |
1080 $('#wa_nacl').on('change', function (event) { |
1089 $('#wa_nacl').on('change', function (event) { |
1081 setWaterAgent('NaCl', event.args.value); |
1090 if (event.args) { |
1082 calcWater(); |
1091 setWaterAgent('NaCl', 0); |
|
1092 setWaterAgent('NaCl', event.args.value); |
|
1093 calcWater(); |
|
1094 } |
1083 }); |
1095 }); |
1084 $('#wa_base_name').on('change', function (event) { |
1096 $('#wa_base_name').on('change', function (event) { |
1085 if (event.args) { |
1097 if (event.args) { |
1086 var index = event.args.index; |
1098 var index = event.args.index; |
1087 console.log("wa_base_name "+index); |
1099 console.log("wa_base_name "+index); |
3038 var data = datarecord.steps[i]; |
3050 var data = datarecord.steps[i]; |
3039 var row = {}; |
3051 var row = {}; |
3040 row["step_name"] = data.step_name; |
3052 row["step_name"] = data.step_name; |
3041 row["step_type"] = data.step_type; |
3053 row["step_type"] = data.step_type; |
3042 // For now, but this must be smarter. |
3054 // For now, but this must be smarter. |
|
3055 if (mash_infuse == 0 && dataRecord.w1_amount > 0) |
|
3056 mash_infuse = dataRecord.w1_amount; |
3043 if (i == 0) |
3057 if (i == 0) |
3044 row["step_infuse_amount"] = mash_infuse; |
3058 row["step_infuse_amount"] = mash_infuse; |
3045 else |
3059 else |
3046 row["step_infuse_amount"] = 0; |
3060 row["step_infuse_amount"] = 0; |
3047 row["step_temp"] = data.step_temp; |
3061 row["step_temp"] = data.step_temp; |