Browse Source

Fix roasting spec updates

Updates to roasting specifications were broken for roasted coffee items without a color spec. Now they aren't.
Neal Wilson 2 years ago
parent
commit
6ce6aa01b1
1 changed files with 31 additions and 14 deletions
  1. 31
    14
      config/Windows/roastspec.xml

+ 31
- 14
config/Windows/roastspec.xml View File

@@ -98,25 +98,42 @@
98 98
                     notes.plainText = query.value(2);
99 99
                     if(query.value(3).length > 0) {
100 100
                         var spec = JSON.parse(query.value(3));
101
-                        if(spec.color.whole.expected === undefined) {
101
+                        if(spec.color === undefined) {
102 102
                             wholecolor.text = "";
103
-                        } else {
104
-                            wholecolor.text = spec.color.whole.expected;
105
-                        }
106
-                        if(spec.color.whole.tolerance === undefined) {
107 103
                             wholetolerance.text = "";
108
-                        } else {
109
-                            wholetolerance.text = spec.color.whole.tolerance;
110
-                        }
111
-                        if(spec.color.ground.expected === undefined) {
112 104
                             groundcolor.text = "";
113
-                        } else {
114
-                            groundcolor.text = spec.color.ground.expected;
115
-                        }
116
-                        if(spec.color.ground.tolerance === undefined) {
117 105
                             groundtolerance.text = "";
118 106
                         } else {
119
-                            groundtolerance.text = spec.color.ground.tolerance;
107
+                            if(spec.color.whole === undefined) {
108
+                                wholecolor.text = "";
109
+                                wholetolerance.text = "";
110
+                            } else {
111
+                                if(spec.color.whole.expected === undefined) {
112
+                                    wholecolor.text = "";
113
+                                } else {
114
+                                    wholecolor.text = spec.color.whole.expected;
115
+                                }
116
+                                if(spec.color.whole.tolerance === undefined) {
117
+                                    wholetolerance.text = "";
118
+                                } else {
119
+                                    wholetolerance.text = spec.color.whole.tolerance;
120
+                                }
121
+                            }
122
+                            if(spec.color.ground === undefined) {
123
+                                groundcolor.text = "";
124
+                                groundtolerance.text = "";
125
+                            } else {
126
+                                if(spec.color.ground.expected === undefined) {
127
+                                    groundcolor.text = "";
128
+                                } else {
129
+                                    groundcolor.text = spec.color.ground.expected;
130
+                                }
131
+                                if(spec.color.ground.tolerance === undefined) {
132
+                                    groundtolerance.text = "";
133
+                                } else {
134
+                                    groundtolerance.text = spec.color.ground.tolerance;
135
+                                }
136
+                            }
120 137
                         }
121 138
                     }
122 139
                 } else {

Loading…
Cancel
Save