query-layers-expression 1.0.8 → 1.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/build/index.d.ts +3 -1
  2. package/build/index.js +158 -144
  3. package/package.json +2 -2
  4. package/src/index.ts +139 -170
package/build/index.d.ts CHANGED
@@ -7,6 +7,7 @@ interface queryExpressionType {
7
7
  status?: number | null;
8
8
  statusField?: any;
9
9
  qExpression?: any;
10
+ q2Expression?: any;
10
11
  }
11
12
  declare class QueryExpressionLayers implements queryExpressionType {
12
13
  qValues?: [any?, any?, any?] | any;
@@ -17,7 +18,8 @@ declare class QueryExpressionLayers implements queryExpressionType {
17
18
  status?: number | null;
18
19
  statusField?: any;
19
20
  qExpression?: any;
20
- constructor(qValues: any, qFields: any, chartCategory: any, chartCategoryField: any, chartCategoryType: "number" | "string", status: number, statusField: any, qExpression: any);
21
+ q2Expression?: any;
22
+ constructor(qValues: any, qFields: any, chartCategory: any, chartCategoryField: any, chartCategoryType: "number" | "string", status: number, statusField: any, qExpression: any, q2Expression: any);
21
23
  queryExpression: () => string;
22
24
  }
23
25
  export default QueryExpressionLayers;
package/build/index.js CHANGED
@@ -1,21 +1,20 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  class QueryExpressionLayers {
4
- constructor(qValues, qFields, chartCategory, chartCategoryField, chartCategoryType, status, statusField, qExpression) {
4
+ constructor(qValues, qFields, chartCategory, chartCategoryField, chartCategoryType, status, statusField, qExpression, q2Expression) {
5
5
  //--- Method ---//
6
6
  //--- Query Expression
7
7
  this.queryExpression = () => {
8
8
  //--- Basic query expression
9
- this.qValues;
10
- const query1 = typeof this.qValues?.[0] === "number"
11
- ? `${this.qFields?.[0]} = ${this.qValues?.[0]}`
12
- : `${this.qFields?.[0]} = '${this.qValues?.[0]}'`;
13
- const query2 = typeof this.qValues?.[1] === "number"
14
- ? `${this.qFields?.[1]} = ${this.qValues?.[1]}`
15
- : `${this.qFields?.[1]} = '${this.qValues?.[1]}'`;
16
- const query3 = typeof this.qValues?.[2] === "number"
17
- ? `${this.qFields?.[2]} = ${this.qValues?.[2]}`
18
- : `${this.qFields?.[2]} = '${this.qValues?.[2]}'`;
9
+ const query1 = typeof this.qValues[0] === "number"
10
+ ? `${this.qFields[0]} = ${this.qValues[0]}`
11
+ : `${this.qFields[0]} = '${this.qValues[0]}'`;
12
+ const query2 = typeof this.qValues[1] === "number"
13
+ ? `${this.qFields[1]} = ${this.qValues[1]}`
14
+ : `${this.qFields[1]} = '${this.qValues[1]}'`;
15
+ const query3 = typeof this.qValues[2] === "number"
16
+ ? `${this.qFields[2]} = ${this.qValues[2]}`
17
+ : `${this.qFields[2]} = '${this.qValues[2]}'`;
19
18
  const query12 = `${query1} AND ${query2}`;
20
19
  const query123 = `${query1} AND ${query2} AND ${query3}`;
21
20
  const q_status = `${this.statusField} = ${this.status}`;
@@ -52,85 +51,93 @@ class QueryExpressionLayers {
52
51
  if (this.qExpression) {
53
52
  if (this.chartCategoryField) {
54
53
  if (this.statusField) {
55
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
56
- expression = q_status_chartC_qE;
57
- }
58
- else if (this.qValues?.[0] &&
59
- !this.qValues?.[1] &&
60
- !this.qValues?.[2]) {
61
- expression = query1_status_chartC_qE;
62
- }
63
- else if (this.qValues?.[0] &&
64
- this.qValues?.[1] &&
65
- !this.qValues?.[2]) {
66
- expression = query12_status_chartC_qE;
67
- }
68
- else if (this.qValues?.[0] &&
69
- this.qValues?.[1] &&
70
- this.qValues?.[2]) {
71
- expression = query123_status_chartC_qE;
54
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
55
+ expression = !this.q2Expression
56
+ ? q_status_chartC_qE
57
+ : `${q_status_chartC_qE} AND ${this.q2Expression}`;
58
+ }
59
+ else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
60
+ expression = !this.q2Expression
61
+ ? query1_status_chartC_qE
62
+ : `${query1_status_chartC_qE} AND ${this.q2Expression}`;
63
+ }
64
+ else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
65
+ expression = !this.q2Expression
66
+ ? query12_status_chartC_qE
67
+ : `${query12_status_chartC_qE} AND ${this.q2Expression}`;
68
+ }
69
+ else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
70
+ expression = !this.q2Expression
71
+ ? query123_status_chartC_qE
72
+ : `${query123_status_chartC_qE} AND ${this.q2Expression}`;
72
73
  }
73
74
  }
74
75
  else if (!this.statusField) {
75
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
76
- expression = q_chartC_qE;
77
- }
78
- else if (this.qValues?.[0] &&
79
- !this.qValues?.[1] &&
80
- !this.qValues?.[2]) {
81
- expression = query1_chartC_qE;
82
- }
83
- else if (this.qValues?.[0] &&
84
- this.qValues?.[1] &&
85
- !this.qValues?.[2]) {
86
- expression = query12_chartC_qE;
87
- }
88
- else if (this.qValues?.[0] &&
89
- this.qValues?.[1] &&
90
- this.qValues?.[2]) {
91
- expression = query123_chartC_qE;
76
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
77
+ expression = !this.q2Expression
78
+ ? q_chartC_qE
79
+ : `${q_chartC_qE} AND ${this.q2Expression}`;
80
+ }
81
+ else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
82
+ expression = !this.q2Expression
83
+ ? query1_chartC_qE
84
+ : `${query1_chartC_qE} AND ${this.q2Expression}`;
85
+ }
86
+ else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
87
+ expression = !this.q2Expression
88
+ ? query12_chartC_qE
89
+ : `${query12_chartC_qE} AND ${this.q2Expression}`;
90
+ }
91
+ else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
92
+ expression = !this.q2Expression
93
+ ? query123_chartC_qE
94
+ : `${query123_chartC_qE} AND ${this.q2Expression}`;
92
95
  }
93
96
  }
94
97
  }
95
98
  else if (!this.chartCategoryField) {
96
99
  if (this.statusField) {
97
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
98
- expression = q_status_qE;
99
- }
100
- else if (this.qValues?.[0] &&
101
- !this.qValues?.[1] &&
102
- !this.qValues?.[2]) {
103
- expression = query1_status_qE;
104
- }
105
- else if (this.qValues?.[0] &&
106
- this.qValues?.[1] &&
107
- !this.qValues?.[2]) {
108
- expression = query12_status_qE;
109
- }
110
- else if (this.qValues?.[0] &&
111
- this.qValues?.[1] &&
112
- this.qValues?.[2]) {
113
- expression = query123_status_qE;
100
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
101
+ expression = !this.q2Expression
102
+ ? q_status_qE
103
+ : `${q_status_qE} AND ${this.q2Expression}`;
104
+ }
105
+ else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
106
+ expression = !this.q2Expression
107
+ ? query1_status_qE
108
+ : `${query1_status_qE} AND ${this.q2Expression}`;
109
+ }
110
+ else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
111
+ expression = !this.q2Expression
112
+ ? query12_status_qE
113
+ : `${query12_status_qE} AND ${this.q2Expression}`;
114
+ }
115
+ else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
116
+ expression = !this.q2Expression
117
+ ? query123_status_qE
118
+ : `${query123_status_qE} AND ${this.q2Expression}`;
114
119
  }
115
120
  }
116
121
  else if (!this.statusField) {
117
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
118
- expression = this.qExpression;
119
- }
120
- else if (this.qValues?.[0] &&
121
- !this.qValues?.[1] &&
122
- !this.qValues?.[2]) {
123
- expression = query1_qE;
124
- }
125
- else if (this.qValues?.[0] &&
126
- this.qValues?.[1] &&
127
- !this.qValues?.[2]) {
128
- expression = query12_qE;
129
- }
130
- else if (this.qValues?.[0] &&
131
- this.qValues?.[1] &&
132
- this.qValues?.[2]) {
133
- expression = query123_qE;
122
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
123
+ expression = !this.q2Expression
124
+ ? this.qExpression
125
+ : `${this.qExpression} AND ${this.q2Expression}`;
126
+ }
127
+ else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
128
+ expression = !this.q2Expression
129
+ ? query1_qE
130
+ : `${query1_qE} AND ${this.q2Expression}`;
131
+ }
132
+ else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
133
+ expression = !this.q2Expression
134
+ ? query12_qE
135
+ : `${query12_qE} AND ${this.q2Expression}`;
136
+ }
137
+ else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
138
+ expression = !this.q2Expression
139
+ ? query123_qE
140
+ : `${query123_qE} AND ${this.q2Expression}`;
134
141
  }
135
142
  }
136
143
  }
@@ -138,85 +145,91 @@ class QueryExpressionLayers {
138
145
  else if (!this.qExpression) {
139
146
  if (this.chartCategoryField) {
140
147
  if (this.statusField) {
141
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
142
- expression = q_status_chartC;
143
- }
144
- else if (this.qValues?.[0] &&
145
- !this.qValues?.[1] &&
146
- !this.qValues?.[2]) {
147
- expression = query1_status_chartC;
148
- }
149
- else if (this.qValues?.[0] &&
150
- this.qValues?.[1] &&
151
- !this.qValues?.[2]) {
152
- expression = query12_status_chartC;
153
- }
154
- else if (this.qValues?.[0] &&
155
- this.qValues?.[1] &&
156
- this.qValues?.[2]) {
157
- expression = query123_status_chartC;
148
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
149
+ expression = !this.q2Expression
150
+ ? q_status_chartC
151
+ : `${q_status_chartC} AND ${this.q2Expression}`;
152
+ }
153
+ else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
154
+ expression = !this.q2Expression
155
+ ? query1_status_chartC
156
+ : `${query1_status_chartC} AND ${this.q2Expression}`;
157
+ }
158
+ else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
159
+ expression = !this.q2Expression
160
+ ? query12_status_chartC
161
+ : `${query12_status_chartC} AND ${this.q2Expression}`;
162
+ }
163
+ else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
164
+ expression = !this.q2Expression
165
+ ? query123_status_chartC
166
+ : `${query123_status_chartC} AND ${this.q2Expression}`;
158
167
  }
159
168
  }
160
169
  else if (!this.statusField) {
161
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
162
- expression = q_chartC;
163
- }
164
- else if (this.qValues?.[0] &&
165
- !this.qValues?.[1] &&
166
- !this.qValues?.[2]) {
167
- expression = query1_chartC;
168
- }
169
- else if (this.qValues?.[0] &&
170
- this.qValues?.[1] &&
171
- !this.qValues?.[2]) {
172
- expression = query12_chartC;
173
- }
174
- else if (this.qValues?.[0] &&
175
- this.qValues?.[1] &&
176
- this.qValues?.[2]) {
177
- expression = query123_chartC;
170
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
171
+ expression = !this.q2Expression
172
+ ? q_chartC
173
+ : `${q_chartC} AND ${this.q2Expression}`;
174
+ }
175
+ else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
176
+ expression = !this.q2Expression
177
+ ? query1_chartC
178
+ : `${query1_chartC} AND ${this.q2Expression}`;
179
+ }
180
+ else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
181
+ expression = !this.q2Expression
182
+ ? query12_chartC
183
+ : `${query12_chartC} AND ${this.q2Expression}`;
184
+ }
185
+ else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
186
+ expression = !this.q2Expression
187
+ ? query123_chartC
188
+ : `${query123_chartC} AND ${this.q2Expression}`;
178
189
  }
179
190
  }
180
191
  }
181
192
  else if (!this.chartCategoryField) {
182
193
  if (this.statusField) {
183
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
184
- expression = q_status;
185
- }
186
- else if (this.qValues?.[0] &&
187
- !this.qValues?.[1] &&
188
- !this.qValues?.[2]) {
189
- expression = query1_status;
190
- }
191
- else if (this.qValues?.[0] &&
192
- this.qValues?.[1] &&
193
- !this.qValues?.[2]) {
194
- expression = query12_status;
195
- }
196
- else if (this.qValues?.[0] &&
197
- this.qValues?.[1] &&
198
- this.qValues?.[2]) {
199
- expression = query123_status;
194
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
195
+ expression = !this.q2Expression
196
+ ? q_status
197
+ : `${q_status} AND ${this.q2Expression}`;
198
+ }
199
+ else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
200
+ expression = !this.q2Expression
201
+ ? query1_status
202
+ : `${query1_status} AND ${this.q2Expression}`;
203
+ }
204
+ else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
205
+ expression = !this.q2Expression
206
+ ? query12_status
207
+ : `${query12_status} AND ${this.q2Expression}`;
208
+ }
209
+ else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
210
+ expression = !this.q2Expression
211
+ ? query123_status
212
+ : `${query123_status} AND ${this.q2Expression}`;
200
213
  }
201
214
  }
202
215
  else if (!this.statusField) {
203
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
204
- expression = "1=1";
216
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
217
+ expression = !this.q2Expression ? "1=1" : this.q2Expression;
205
218
  }
206
- else if (this.qValues?.[0] &&
207
- !this.qValues?.[1] &&
208
- !this.qValues?.[2]) {
209
- expression = query1;
219
+ else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
220
+ expression = !this.q2Expression
221
+ ? query1
222
+ : `${query1} AND ${this.q2Expression}`;
210
223
  }
211
- else if (this.qValues?.[0] &&
212
- this.qValues?.[1] &&
213
- !this.qValues?.[2]) {
214
- expression = query12;
224
+ else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
225
+ expression = !this.q2Expression
226
+ ? query12
227
+ : `${query12} AND ${this.q2Expression}`;
215
228
  }
216
- else if (this.qValues?.[0] &&
217
- this.qValues?.[1] &&
218
- this.qValues?.[2]) {
219
- expression = query123;
229
+ else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
230
+ expression = !this.q2Expression
231
+ ? query123
232
+ : `${query123} AND ${this.q2Expression}`;
220
233
  }
221
234
  }
222
235
  }
@@ -231,6 +244,7 @@ class QueryExpressionLayers {
231
244
  this.status = status;
232
245
  this.statusField = statusField;
233
246
  this.qExpression = qExpression;
247
+ this.q2Expression = q2Expression;
234
248
  }
235
249
  }
236
250
  exports.default = QueryExpressionLayers;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "query-layers-expression",
3
- "version": "1.0.8",
4
- "description": "",
3
+ "version": "1.0.10",
4
+ "description": "Added q2Expression for superurgent for N2 Land",
5
5
  "license": "ISC",
6
6
  "author": "Eiji Matsuzaki",
7
7
  "type": "commonjs",
package/src/index.ts CHANGED
@@ -7,6 +7,7 @@ interface queryExpressionType {
7
7
  status?: number | null;
8
8
  statusField?: any;
9
9
  qExpression?: any;
10
+ q2Expression?: any;
10
11
  }
11
12
 
12
13
  class QueryExpressionLayers implements queryExpressionType {
@@ -18,6 +19,7 @@ class QueryExpressionLayers implements queryExpressionType {
18
19
  status?: number | null;
19
20
  statusField?: any;
20
21
  qExpression?: any;
22
+ q2Expression?: any;
21
23
 
22
24
  constructor(
23
25
  qValues: any,
@@ -28,6 +30,7 @@ class QueryExpressionLayers implements queryExpressionType {
28
30
  status: number,
29
31
  statusField: any,
30
32
  qExpression: any,
33
+ q2Expression: any,
31
34
  ) {
32
35
  this.qValues = qValues;
33
36
  this.qFields = qFields;
@@ -37,25 +40,25 @@ class QueryExpressionLayers implements queryExpressionType {
37
40
  this.status = status;
38
41
  this.statusField = statusField;
39
42
  this.qExpression = qExpression;
43
+ this.q2Expression = q2Expression;
40
44
  }
41
45
 
42
46
  //--- Method ---//
43
47
  //--- Query Expression
44
48
  queryExpression = () => {
45
49
  //--- Basic query expression
46
- this.qValues;
47
50
  const query1 =
48
- typeof this.qValues?.[0] === "number"
49
- ? `${this.qFields?.[0]} = ${this.qValues?.[0]}`
50
- : `${this.qFields?.[0]} = '${this.qValues?.[0]}'`;
51
+ typeof this.qValues[0] === "number"
52
+ ? `${this.qFields[0]} = ${this.qValues[0]}`
53
+ : `${this.qFields[0]} = '${this.qValues[0]}'`;
51
54
  const query2 =
52
- typeof this.qValues?.[1] === "number"
53
- ? `${this.qFields?.[1]} = ${this.qValues?.[1]}`
54
- : `${this.qFields?.[1]} = '${this.qValues?.[1]}'`;
55
+ typeof this.qValues[1] === "number"
56
+ ? `${this.qFields[1]} = ${this.qValues[1]}`
57
+ : `${this.qFields[1]} = '${this.qValues[1]}'`;
55
58
  const query3 =
56
- typeof this.qValues?.[2] === "number"
57
- ? `${this.qFields?.[2]} = ${this.qValues?.[2]}`
58
- : `${this.qFields?.[2]} = '${this.qValues?.[2]}'`;
59
+ typeof this.qValues[2] === "number"
60
+ ? `${this.qFields[2]} = ${this.qValues[2]}`
61
+ : `${this.qFields[2]} = '${this.qValues[2]}'`;
59
62
  const query12 = `${query1} AND ${query2}`;
60
63
  const query123 = `${query1} AND ${query2} AND ${query3}`;
61
64
  const q_status = `${this.statusField} = ${this.status}`;
@@ -95,188 +98,154 @@ class QueryExpressionLayers implements queryExpressionType {
95
98
  if (this.qExpression) {
96
99
  if (this.chartCategoryField) {
97
100
  if (this.statusField) {
98
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
99
- expression = q_status_chartC_qE;
100
- } else if (
101
- this.qValues?.[0] &&
102
- !this.qValues?.[1] &&
103
- !this.qValues?.[2]
104
- ) {
105
- expression = query1_status_chartC_qE;
106
- } else if (
107
- this.qValues?.[0] &&
108
- this.qValues?.[1] &&
109
- !this.qValues?.[2]
110
- ) {
111
- expression = query12_status_chartC_qE;
112
- } else if (
113
- this.qValues?.[0] &&
114
- this.qValues?.[1] &&
115
- this.qValues?.[2]
116
- ) {
117
- expression = query123_status_chartC_qE;
101
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
102
+ expression = !this.q2Expression
103
+ ? q_status_chartC_qE
104
+ : `${q_status_chartC_qE} AND ${this.q2Expression}`;
105
+ } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
106
+ expression = !this.q2Expression
107
+ ? query1_status_chartC_qE
108
+ : `${query1_status_chartC_qE} AND ${this.q2Expression}`;
109
+ } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
110
+ expression = !this.q2Expression
111
+ ? query12_status_chartC_qE
112
+ : `${query12_status_chartC_qE} AND ${this.q2Expression}`;
113
+ } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
114
+ expression = !this.q2Expression
115
+ ? query123_status_chartC_qE
116
+ : `${query123_status_chartC_qE} AND ${this.q2Expression}`;
118
117
  }
119
118
  } else if (!this.statusField) {
120
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
121
- expression = q_chartC_qE;
122
- } else if (
123
- this.qValues?.[0] &&
124
- !this.qValues?.[1] &&
125
- !this.qValues?.[2]
126
- ) {
127
- expression = query1_chartC_qE;
128
- } else if (
129
- this.qValues?.[0] &&
130
- this.qValues?.[1] &&
131
- !this.qValues?.[2]
132
- ) {
133
- expression = query12_chartC_qE;
134
- } else if (
135
- this.qValues?.[0] &&
136
- this.qValues?.[1] &&
137
- this.qValues?.[2]
138
- ) {
139
- expression = query123_chartC_qE;
119
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
120
+ expression = !this.q2Expression
121
+ ? q_chartC_qE
122
+ : `${q_chartC_qE} AND ${this.q2Expression}`;
123
+ } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
124
+ expression = !this.q2Expression
125
+ ? query1_chartC_qE
126
+ : `${query1_chartC_qE} AND ${this.q2Expression}`;
127
+ } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
128
+ expression = !this.q2Expression
129
+ ? query12_chartC_qE
130
+ : `${query12_chartC_qE} AND ${this.q2Expression}`;
131
+ } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
132
+ expression = !this.q2Expression
133
+ ? query123_chartC_qE
134
+ : `${query123_chartC_qE} AND ${this.q2Expression}`;
140
135
  }
141
136
  }
142
137
  } else if (!this.chartCategoryField) {
143
138
  if (this.statusField) {
144
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
145
- expression = q_status_qE;
146
- } else if (
147
- this.qValues?.[0] &&
148
- !this.qValues?.[1] &&
149
- !this.qValues?.[2]
150
- ) {
151
- expression = query1_status_qE;
152
- } else if (
153
- this.qValues?.[0] &&
154
- this.qValues?.[1] &&
155
- !this.qValues?.[2]
156
- ) {
157
- expression = query12_status_qE;
158
- } else if (
159
- this.qValues?.[0] &&
160
- this.qValues?.[1] &&
161
- this.qValues?.[2]
162
- ) {
163
- expression = query123_status_qE;
139
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
140
+ expression = !this.q2Expression
141
+ ? q_status_qE
142
+ : `${q_status_qE} AND ${this.q2Expression}`;
143
+ } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
144
+ expression = !this.q2Expression
145
+ ? query1_status_qE
146
+ : `${query1_status_qE} AND ${this.q2Expression}`;
147
+ } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
148
+ expression = !this.q2Expression
149
+ ? query12_status_qE
150
+ : `${query12_status_qE} AND ${this.q2Expression}`;
151
+ } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
152
+ expression = !this.q2Expression
153
+ ? query123_status_qE
154
+ : `${query123_status_qE} AND ${this.q2Expression}`;
164
155
  }
165
156
  } else if (!this.statusField) {
166
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
167
- expression = this.qExpression;
168
- } else if (
169
- this.qValues?.[0] &&
170
- !this.qValues?.[1] &&
171
- !this.qValues?.[2]
172
- ) {
173
- expression = query1_qE;
174
- } else if (
175
- this.qValues?.[0] &&
176
- this.qValues?.[1] &&
177
- !this.qValues?.[2]
178
- ) {
179
- expression = query12_qE;
180
- } else if (
181
- this.qValues?.[0] &&
182
- this.qValues?.[1] &&
183
- this.qValues?.[2]
184
- ) {
185
- expression = query123_qE;
157
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
158
+ expression = !this.q2Expression
159
+ ? this.qExpression
160
+ : `${this.qExpression} AND ${this.q2Expression}`;
161
+ } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
162
+ expression = !this.q2Expression
163
+ ? query1_qE
164
+ : `${query1_qE} AND ${this.q2Expression}`;
165
+ } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
166
+ expression = !this.q2Expression
167
+ ? query12_qE
168
+ : `${query12_qE} AND ${this.q2Expression}`;
169
+ } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
170
+ expression = !this.q2Expression
171
+ ? query123_qE
172
+ : `${query123_qE} AND ${this.q2Expression}`;
186
173
  }
187
174
  }
188
175
  }
189
176
  } else if (!this.qExpression) {
190
177
  if (this.chartCategoryField) {
191
178
  if (this.statusField) {
192
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
193
- expression = q_status_chartC;
194
- } else if (
195
- this.qValues?.[0] &&
196
- !this.qValues?.[1] &&
197
- !this.qValues?.[2]
198
- ) {
199
- expression = query1_status_chartC;
200
- } else if (
201
- this.qValues?.[0] &&
202
- this.qValues?.[1] &&
203
- !this.qValues?.[2]
204
- ) {
205
- expression = query12_status_chartC;
206
- } else if (
207
- this.qValues?.[0] &&
208
- this.qValues?.[1] &&
209
- this.qValues?.[2]
210
- ) {
211
- expression = query123_status_chartC;
179
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
180
+ expression = !this.q2Expression
181
+ ? q_status_chartC
182
+ : `${q_status_chartC} AND ${this.q2Expression}`;
183
+ } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
184
+ expression = !this.q2Expression
185
+ ? query1_status_chartC
186
+ : `${query1_status_chartC} AND ${this.q2Expression}`;
187
+ } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
188
+ expression = !this.q2Expression
189
+ ? query12_status_chartC
190
+ : `${query12_status_chartC} AND ${this.q2Expression}`;
191
+ } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
192
+ expression = !this.q2Expression
193
+ ? query123_status_chartC
194
+ : `${query123_status_chartC} AND ${this.q2Expression}`;
212
195
  }
213
196
  } else if (!this.statusField) {
214
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
215
- expression = q_chartC;
216
- } else if (
217
- this.qValues?.[0] &&
218
- !this.qValues?.[1] &&
219
- !this.qValues?.[2]
220
- ) {
221
- expression = query1_chartC;
222
- } else if (
223
- this.qValues?.[0] &&
224
- this.qValues?.[1] &&
225
- !this.qValues?.[2]
226
- ) {
227
- expression = query12_chartC;
228
- } else if (
229
- this.qValues?.[0] &&
230
- this.qValues?.[1] &&
231
- this.qValues?.[2]
232
- ) {
233
- expression = query123_chartC;
197
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
198
+ expression = !this.q2Expression
199
+ ? q_chartC
200
+ : `${q_chartC} AND ${this.q2Expression}`;
201
+ } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
202
+ expression = !this.q2Expression
203
+ ? query1_chartC
204
+ : `${query1_chartC} AND ${this.q2Expression}`;
205
+ } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
206
+ expression = !this.q2Expression
207
+ ? query12_chartC
208
+ : `${query12_chartC} AND ${this.q2Expression}`;
209
+ } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
210
+ expression = !this.q2Expression
211
+ ? query123_chartC
212
+ : `${query123_chartC} AND ${this.q2Expression}`;
234
213
  }
235
214
  }
236
215
  } else if (!this.chartCategoryField) {
237
216
  if (this.statusField) {
238
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
239
- expression = q_status;
240
- } else if (
241
- this.qValues?.[0] &&
242
- !this.qValues?.[1] &&
243
- !this.qValues?.[2]
244
- ) {
245
- expression = query1_status;
246
- } else if (
247
- this.qValues?.[0] &&
248
- this.qValues?.[1] &&
249
- !this.qValues?.[2]
250
- ) {
251
- expression = query12_status;
252
- } else if (
253
- this.qValues?.[0] &&
254
- this.qValues?.[1] &&
255
- this.qValues?.[2]
256
- ) {
257
- expression = query123_status;
217
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
218
+ expression = !this.q2Expression
219
+ ? q_status
220
+ : `${q_status} AND ${this.q2Expression}`;
221
+ } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
222
+ expression = !this.q2Expression
223
+ ? query1_status
224
+ : `${query1_status} AND ${this.q2Expression}`;
225
+ } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
226
+ expression = !this.q2Expression
227
+ ? query12_status
228
+ : `${query12_status} AND ${this.q2Expression}`;
229
+ } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
230
+ expression = !this.q2Expression
231
+ ? query123_status
232
+ : `${query123_status} AND ${this.q2Expression}`;
258
233
  }
259
234
  } else if (!this.statusField) {
260
- if (!this.qValues?.[0] && !this.qValues?.[1] && !this.qValues?.[2]) {
261
- expression = "1=1";
262
- } else if (
263
- this.qValues?.[0] &&
264
- !this.qValues?.[1] &&
265
- !this.qValues?.[2]
266
- ) {
267
- expression = query1;
268
- } else if (
269
- this.qValues?.[0] &&
270
- this.qValues?.[1] &&
271
- !this.qValues?.[2]
272
- ) {
273
- expression = query12;
274
- } else if (
275
- this.qValues?.[0] &&
276
- this.qValues?.[1] &&
277
- this.qValues?.[2]
278
- ) {
279
- expression = query123;
235
+ if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
236
+ expression = !this.q2Expression ? "1=1" : this.q2Expression;
237
+ } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
238
+ expression = !this.q2Expression
239
+ ? query1
240
+ : `${query1} AND ${this.q2Expression}`;
241
+ } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
242
+ expression = !this.q2Expression
243
+ ? query12
244
+ : `${query12} AND ${this.q2Expression}`;
245
+ } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
246
+ expression = !this.q2Expression
247
+ ? query123
248
+ : `${query123} AND ${this.q2Expression}`;
280
249
  }
281
250
  }
282
251
  }