d2aura 26.0.17 → 26.0.18
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.
- package/api/eda/edaManagerApi.d.ts +5 -3
- package/api/eda/edaManagerApi.js +36 -2
- package/api/eda/edaManagerApi.js.map +1 -1
- package/api/eda/generated/events.d.ts +63 -61
- package/api/eda/generated/events.js +143 -141
- package/api/eda/generated/events.js.map +1 -1
- package/api/eda/generated/structures.d.ts +35 -6
- package/api/eda/generated/structures.js.map +1 -1
- package/api/webAuthn/webAuthnManageApi.js +2 -2
- package/api/webAuthn/webAuthnManageApi.js.map +1 -1
- package/core/i18n/d2aura.sk.json +4 -0
- package/coreui/components/edaManagerComponent/constants/edaTypes.d.ts +2 -1
- package/coreui/components/edaManagerComponent/constants/edaTypes.js.map +1 -1
- package/coreui/components/edaManagerComponent/context/edaVectorDataContext.d.ts +4 -1
- package/coreui/components/edaManagerComponent/context/edaVectorDataContext.js.map +1 -1
- package/coreui/components/edaManagerComponent/context/edaVectorDataProvider.js +57 -46
- package/coreui/components/edaManagerComponent/context/edaVectorDataProvider.js.map +1 -1
- package/coreui/components/edaManagerComponent/dialogs/exportDialog.js +2 -2
- package/coreui/components/edaManagerComponent/dialogs/exportDialog.js.map +1 -1
- package/coreui/components/edaManagerComponent/dialogs/importDialog.js +55 -4
- package/coreui/components/edaManagerComponent/dialogs/importDialog.js.map +1 -1
- package/coreui/components/edaManagerComponent/dialogs/importExport/import.d.ts +7 -0
- package/coreui/components/edaManagerComponent/dialogs/importExport/import.js.map +1 -1
- package/coreui/components/edaManagerComponent/dialogs/importExport/vectorTypeSelection.d.ts +8 -1
- package/coreui/components/edaManagerComponent/dialogs/importExport/vectorTypeSelection.js +10 -4
- package/coreui/components/edaManagerComponent/dialogs/importExport/vectorTypeSelection.js.map +1 -1
- package/coreui/components/edaManagerComponent/edaDetail.d.ts +2 -3
- package/coreui/components/edaManagerComponent/edaDetail.js.map +1 -1
- package/coreui/components/edaManagerComponent/utils/utils.d.ts +1 -2
- package/coreui/components/edaManagerComponent/utils/utils.js.map +1 -1
- package/d2configuration/edaManager/E.EM_DETAIL_IMPL.xml +4 -0
- package/d2configuration/edaManager/E.EM_DETAIL_UNIT.xml +34 -0
- package/d2configuration/edaManager/E.EM_NAVIGATOR_SQL.xml +5 -5
- package/d2configuration/edaManager/E.EM_VECTOR_IMPL.xml +18 -2
- package/d2configuration/edaManager/E.EM_VECTOR_UNIT.xml +377 -16
- package/d2configuration/edaManager/SD.EM_Tree_Item.xml +22 -0
- package/package.json +2 -2
|
@@ -7,6 +7,24 @@
|
|
|
7
7
|
<objType>EVENT</objType>
|
|
8
8
|
<valType>Int</valType>
|
|
9
9
|
</HOBJ_REF>
|
|
10
|
+
<HOBJ_REF>
|
|
11
|
+
<uid>67321664F0AFE6489DA2C3BD848DC4FA</uid>
|
|
12
|
+
<name>EDA_CalcFunctionRec</name>
|
|
13
|
+
<objType>EXT_FNCT</objType>
|
|
14
|
+
<valType>Int</valType>
|
|
15
|
+
</HOBJ_REF>
|
|
16
|
+
<HOBJ_REF>
|
|
17
|
+
<uid>7FF86B12C81CE5439C3E317CDB8535CC</uid>
|
|
18
|
+
<name>EDA_CloseCacheRec</name>
|
|
19
|
+
<objType>EXT_FNCT</objType>
|
|
20
|
+
<valType>Int</valType>
|
|
21
|
+
</HOBJ_REF>
|
|
22
|
+
<HOBJ_REF>
|
|
23
|
+
<uid>4E261B7C402FD847A301525F8E040B39</uid>
|
|
24
|
+
<name>EDA_CreateCache</name>
|
|
25
|
+
<objType>EXT_FNCT</objType>
|
|
26
|
+
<valType>Int</valType>
|
|
27
|
+
</HOBJ_REF>
|
|
10
28
|
<HOBJ_REF>
|
|
11
29
|
<uid>8BC8537806DC6D4DB512C139B854530A</uid>
|
|
12
30
|
<name>EDA_InsertValuesToVektorRec</name>
|
|
@@ -25,6 +43,12 @@
|
|
|
25
43
|
<objType>EXT_FNCT</objType>
|
|
26
44
|
<valType>Int</valType>
|
|
27
45
|
</HOBJ_REF>
|
|
46
|
+
<HOBJ_REF>
|
|
47
|
+
<uid>5E07767561D8E242927BFDC41CA99AA7</uid>
|
|
48
|
+
<name>EDA_StatCalcFunctionRec</name>
|
|
49
|
+
<objType>EXT_FNCT</objType>
|
|
50
|
+
<valType>Int</valType>
|
|
51
|
+
</HOBJ_REF>
|
|
28
52
|
<HOBJ_REF>
|
|
29
53
|
<uid>E83122D975FFAA44AB26DCCC9038E10F</uid>
|
|
30
54
|
<name>EDA_StatVectorRec</name>
|
|
@@ -37,6 +61,98 @@
|
|
|
37
61
|
<objType>EXT_FNCT</objType>
|
|
38
62
|
<valType>Int</valType>
|
|
39
63
|
</HOBJ_REF>
|
|
64
|
+
<HOBJ_REF>
|
|
65
|
+
<uid>E92291268519484FBF88946B2BE13785</uid>
|
|
66
|
+
<name>SD.EDA_CalcFunction_Params_V2</name>
|
|
67
|
+
<objType>STRUCTDEF</objType>
|
|
68
|
+
<valType>NAN</valType>
|
|
69
|
+
</HOBJ_REF>
|
|
70
|
+
<COL_REF>
|
|
71
|
+
<col_idx>6</col_idx>
|
|
72
|
+
<col_name>cacheId</col_name>
|
|
73
|
+
<col_valType>Int</col_valType>
|
|
74
|
+
</COL_REF>
|
|
75
|
+
<COL_REF>
|
|
76
|
+
<col_idx>10</col_idx>
|
|
77
|
+
<col_name>decimalPlaces</col_name>
|
|
78
|
+
<col_valType>Int</col_valType>
|
|
79
|
+
</COL_REF>
|
|
80
|
+
<COL_REF>
|
|
81
|
+
<col_idx>14</col_idx>
|
|
82
|
+
<col_name>envName</col_name>
|
|
83
|
+
<col_valType>Text</col_valType>
|
|
84
|
+
</COL_REF>
|
|
85
|
+
<COL_REF>
|
|
86
|
+
<col_idx>8</col_idx>
|
|
87
|
+
<col_name>isIntegral</col_name>
|
|
88
|
+
<col_valType>Bool</col_valType>
|
|
89
|
+
</COL_REF>
|
|
90
|
+
<COL_REF>
|
|
91
|
+
<col_idx>15</col_idx>
|
|
92
|
+
<col_name>paramBlockId</col_name>
|
|
93
|
+
<col_valType>Int</col_valType>
|
|
94
|
+
</COL_REF>
|
|
95
|
+
<COL_REF>
|
|
96
|
+
<col_idx>2</col_idx>
|
|
97
|
+
<col_name>periodBeginTime</col_name>
|
|
98
|
+
<col_valType>TimA</col_valType>
|
|
99
|
+
</COL_REF>
|
|
100
|
+
<COL_REF>
|
|
101
|
+
<col_idx>3</col_idx>
|
|
102
|
+
<col_name>periodStepBase</col_name>
|
|
103
|
+
<col_valType>Int</col_valType>
|
|
104
|
+
</COL_REF>
|
|
105
|
+
<COL_REF>
|
|
106
|
+
<col_idx>4</col_idx>
|
|
107
|
+
<col_name>periodStepCount</col_name>
|
|
108
|
+
<col_valType>Int</col_valType>
|
|
109
|
+
</COL_REF>
|
|
110
|
+
<COL_REF>
|
|
111
|
+
<col_idx>5</col_idx>
|
|
112
|
+
<col_name>periodTimeZone</col_name>
|
|
113
|
+
<col_valType>Text</col_valType>
|
|
114
|
+
</COL_REF>
|
|
115
|
+
<COL_REF>
|
|
116
|
+
<col_idx>9</col_idx>
|
|
117
|
+
<col_name>roundType</col_name>
|
|
118
|
+
<col_valType>Int</col_valType>
|
|
119
|
+
</COL_REF>
|
|
120
|
+
<COL_REF>
|
|
121
|
+
<col_idx>1</col_idx>
|
|
122
|
+
<col_name>structVersion</col_name>
|
|
123
|
+
<col_valType>Int</col_valType>
|
|
124
|
+
</COL_REF>
|
|
125
|
+
<COL_REF>
|
|
126
|
+
<col_idx>12</col_idx>
|
|
127
|
+
<col_name>userName</col_name>
|
|
128
|
+
<col_valType>Text</col_valType>
|
|
129
|
+
</COL_REF>
|
|
130
|
+
<COL_REF>
|
|
131
|
+
<col_idx>7</col_idx>
|
|
132
|
+
<col_name>valueType</col_name>
|
|
133
|
+
<col_valType>Int</col_valType>
|
|
134
|
+
</COL_REF>
|
|
135
|
+
<COL_REF>
|
|
136
|
+
<col_idx>11</col_idx>
|
|
137
|
+
<col_name>version</col_name>
|
|
138
|
+
<col_valType>HOBJ_Type</col_valType>
|
|
139
|
+
</COL_REF>
|
|
140
|
+
<HOBJ_REF>
|
|
141
|
+
<uid>91DD0BE1B0C0064090D659B017B9C72E</uid>
|
|
142
|
+
<name>SD.EDA_CloseCache_Params_V1</name>
|
|
143
|
+
<objType>STRUCTDEF</objType>
|
|
144
|
+
<valType>NAN</valType>
|
|
145
|
+
</HOBJ_REF>
|
|
146
|
+
<COL_REF>
|
|
147
|
+
<col_idx>2</col_idx>
|
|
148
|
+
<col_name>applyChanges</col_name>
|
|
149
|
+
<col_valType>Bool</col_valType>
|
|
150
|
+
</COL_REF>
|
|
151
|
+
<COL_REF>
|
|
152
|
+
<col_idx>1</col_idx>
|
|
153
|
+
<col_name>structVersion</col_name>
|
|
154
|
+
<col_valType>Int</col_valType>
|
|
155
|
+
</COL_REF>
|
|
40
156
|
<HOBJ_REF>
|
|
41
157
|
<uid>D28BD988FC3A474E8989005B31979309</uid>
|
|
42
158
|
<name>SD.EDA_DescriptiveData2</name>
|
|
@@ -77,22 +193,148 @@
|
|
|
77
193
|
<objType>STRUCTDEF</objType>
|
|
78
194
|
<valType>NAN</valType>
|
|
79
195
|
</HOBJ_REF>
|
|
196
|
+
<COL_REF>
|
|
197
|
+
<col_idx>2</col_idx>
|
|
198
|
+
<col_name>cacheId</col_name>
|
|
199
|
+
<col_valType>Int</col_valType>
|
|
200
|
+
</COL_REF>
|
|
201
|
+
<COL_REF>
|
|
202
|
+
<col_idx>8</col_idx>
|
|
203
|
+
<col_name>envName</col_name>
|
|
204
|
+
<col_valType>Text</col_valType>
|
|
205
|
+
</COL_REF>
|
|
206
|
+
<COL_REF>
|
|
207
|
+
<col_idx>9</col_idx>
|
|
208
|
+
<col_name>paramBlockId</col_name>
|
|
209
|
+
<col_valType>Int</col_valType>
|
|
210
|
+
</COL_REF>
|
|
80
211
|
<COL_REF>
|
|
81
212
|
<col_idx>1</col_idx>
|
|
82
213
|
<col_name>structVersion</col_name>
|
|
83
214
|
<col_valType>Int</col_valType>
|
|
84
215
|
</COL_REF>
|
|
216
|
+
<COL_REF>
|
|
217
|
+
<col_idx>3</col_idx>
|
|
218
|
+
<col_name>useRounding</col_name>
|
|
219
|
+
<col_valType>Bool</col_valType>
|
|
220
|
+
</COL_REF>
|
|
221
|
+
<COL_REF>
|
|
222
|
+
<col_idx>5</col_idx>
|
|
223
|
+
<col_name>version</col_name>
|
|
224
|
+
<col_valType>HOBJ_Type</col_valType>
|
|
225
|
+
</COL_REF>
|
|
226
|
+
<HOBJ_REF>
|
|
227
|
+
<uid>CA231E5BB77EAD4399C8FDF526A5ABFA</uid>
|
|
228
|
+
<name>SD.EDA_StatCalcFunction_Params_V1</name>
|
|
229
|
+
<objType>STRUCTDEF</objType>
|
|
230
|
+
<valType>NAN</valType>
|
|
231
|
+
</HOBJ_REF>
|
|
232
|
+
<COL_REF>
|
|
233
|
+
<col_idx>2</col_idx>
|
|
234
|
+
<col_name>cacheId</col_name>
|
|
235
|
+
<col_valType>Int</col_valType>
|
|
236
|
+
</COL_REF>
|
|
237
|
+
<COL_REF>
|
|
238
|
+
<col_idx>14</col_idx>
|
|
239
|
+
<col_name>envName</col_name>
|
|
240
|
+
<col_valType>Text</col_valType>
|
|
241
|
+
</COL_REF>
|
|
242
|
+
<COL_REF>
|
|
243
|
+
<col_idx>8</col_idx>
|
|
244
|
+
<col_name>isIntegral</col_name>
|
|
245
|
+
<col_valType>Bool</col_valType>
|
|
246
|
+
</COL_REF>
|
|
247
|
+
<COL_REF>
|
|
248
|
+
<col_idx>15</col_idx>
|
|
249
|
+
<col_name>paramBlockId</col_name>
|
|
250
|
+
<col_valType>Int</col_valType>
|
|
251
|
+
</COL_REF>
|
|
252
|
+
<COL_REF>
|
|
253
|
+
<col_idx>1</col_idx>
|
|
254
|
+
<col_name>structVersion</col_name>
|
|
255
|
+
<col_valType>Int</col_valType>
|
|
256
|
+
</COL_REF>
|
|
257
|
+
<COL_REF>
|
|
258
|
+
<col_idx>12</col_idx>
|
|
259
|
+
<col_name>userName</col_name>
|
|
260
|
+
<col_valType>Text</col_valType>
|
|
261
|
+
</COL_REF>
|
|
262
|
+
<COL_REF>
|
|
263
|
+
<col_idx>3</col_idx>
|
|
264
|
+
<col_name>valueType</col_name>
|
|
265
|
+
<col_valType>Int</col_valType>
|
|
266
|
+
</COL_REF>
|
|
267
|
+
<COL_REF>
|
|
268
|
+
<col_idx>4</col_idx>
|
|
269
|
+
<col_name>vectorPeriodBeginTime</col_name>
|
|
270
|
+
<col_valType>TimA</col_valType>
|
|
271
|
+
</COL_REF>
|
|
272
|
+
<COL_REF>
|
|
273
|
+
<col_idx>5</col_idx>
|
|
274
|
+
<col_name>vectorPeriodStepBase</col_name>
|
|
275
|
+
<col_valType>Int</col_valType>
|
|
276
|
+
</COL_REF>
|
|
277
|
+
<COL_REF>
|
|
278
|
+
<col_idx>6</col_idx>
|
|
279
|
+
<col_name>vectorPeriodStepCount</col_name>
|
|
280
|
+
<col_valType>Int</col_valType>
|
|
281
|
+
</COL_REF>
|
|
282
|
+
<COL_REF>
|
|
283
|
+
<col_idx>7</col_idx>
|
|
284
|
+
<col_name>vectorPeriodTimeZone</col_name>
|
|
285
|
+
<col_valType>HOBJ_Type</col_valType>
|
|
286
|
+
</COL_REF>
|
|
287
|
+
<COL_REF>
|
|
288
|
+
<col_idx>13</col_idx>
|
|
289
|
+
<col_name>version</col_name>
|
|
290
|
+
<col_valType>HOBJ_Type</col_valType>
|
|
291
|
+
</COL_REF>
|
|
292
|
+
<COL_REF>
|
|
293
|
+
<col_idx>10</col_idx>
|
|
294
|
+
<col_name>viewRoundDecPlaces</col_name>
|
|
295
|
+
<col_valType>Int</col_valType>
|
|
296
|
+
</COL_REF>
|
|
297
|
+
<COL_REF>
|
|
298
|
+
<col_idx>9</col_idx>
|
|
299
|
+
<col_name>viewRoundType</col_name>
|
|
300
|
+
<col_valType>Int</col_valType>
|
|
301
|
+
</COL_REF>
|
|
85
302
|
<HOBJ_REF>
|
|
86
303
|
<uid>E2C4AB24F7D92A458BB33E36C0C9BEAD</uid>
|
|
87
304
|
<name>SD.EDA_StatVector_Params_V1</name>
|
|
88
305
|
<objType>STRUCTDEF</objType>
|
|
89
306
|
<valType>NAN</valType>
|
|
90
307
|
</HOBJ_REF>
|
|
308
|
+
<COL_REF>
|
|
309
|
+
<col_idx>2</col_idx>
|
|
310
|
+
<col_name>cacheId</col_name>
|
|
311
|
+
<col_valType>Int</col_valType>
|
|
312
|
+
</COL_REF>
|
|
313
|
+
<COL_REF>
|
|
314
|
+
<col_idx>6</col_idx>
|
|
315
|
+
<col_name>envName</col_name>
|
|
316
|
+
<col_valType>Text</col_valType>
|
|
317
|
+
</COL_REF>
|
|
318
|
+
<COL_REF>
|
|
319
|
+
<col_idx>7</col_idx>
|
|
320
|
+
<col_name>paramBlockId</col_name>
|
|
321
|
+
<col_valType>Int</col_valType>
|
|
322
|
+
</COL_REF>
|
|
91
323
|
<COL_REF>
|
|
92
324
|
<col_idx>1</col_idx>
|
|
93
325
|
<col_name>structVersion</col_name>
|
|
94
326
|
<col_valType>Int</col_valType>
|
|
95
327
|
</COL_REF>
|
|
328
|
+
<COL_REF>
|
|
329
|
+
<col_idx>3</col_idx>
|
|
330
|
+
<col_name>useViewRounding</col_name>
|
|
331
|
+
<col_valType>Bool</col_valType>
|
|
332
|
+
</COL_REF>
|
|
333
|
+
<COL_REF>
|
|
334
|
+
<col_idx>5</col_idx>
|
|
335
|
+
<col_name>version</col_name>
|
|
336
|
+
<col_valType>HOBJ_Type</col_valType>
|
|
337
|
+
</COL_REF>
|
|
96
338
|
<HOBJ_REF>
|
|
97
339
|
<uid>4388DB083FCC164BBCB0DF4C79593FC1</uid>
|
|
98
340
|
<name>SD.EDA_VectorData</name>
|
|
@@ -185,17 +427,43 @@
|
|
|
185
427
|
; LAST CHANGE:
|
|
186
428
|
;*********************************************************
|
|
187
429
|
|
|
188
|
-
PUBLIC PROCEDURE ReadValuesFromVector(IN INT _id, IN TIME _from, IN TIME _to, IN INT _step, RECORD NOALIAS(SD.EDA_VectorData) _data, RECORD NOALIAS(SD.EM_EDA_VectorStats) _stats, BOOL _isOk, TEXT _errorMsg)
|
|
430
|
+
PUBLIC PROCEDURE ReadValuesFromVector(IN INT _id, IN TIME _from, IN TIME _to, IN INT _step, IN RECORD NOALIAS (SD.EDA_ReadValuesFromVector_Params_V2) _readParams, RECORD NOALIAS(SD.EDA_VectorData) _data, RECORD NOALIAS(SD.EM_EDA_VectorStats) _stats, BOOL _isOk, TEXT _errorMsg)
|
|
189
431
|
RECORD NOALIAS (SD.EDA_ReadValuesFromVector_Params_V2) _params
|
|
190
432
|
RECORD NOALIAS (SD.EDA_StatVector_Params_V1) _statParams
|
|
191
|
-
|
|
433
|
+
RECORD NOALIAS (SD.EDA_CloseCache_Params_V1) _cacheParams
|
|
192
434
|
INT _errorCode
|
|
435
|
+
INT _cacheID
|
|
193
436
|
INT _parent = %GetParentProcessHBJ()
|
|
194
437
|
INT _sessionId = %GetRPCCallerProcess()
|
|
195
438
|
REAL _value
|
|
196
439
|
|
|
440
|
+
REDIM _data[0]
|
|
441
|
+
REDIM _stats[1]
|
|
442
|
+
|
|
443
|
+
CALL %EDA_CreateCache(0, 100000000, _cacheID, _errorCode)
|
|
444
|
+
|
|
445
|
+
IF _errorCode # _ERR_NO_ERROR THEN
|
|
446
|
+
_errorMsg := "Error creating cache [" + %IToStr(_errorCode) + "]"
|
|
447
|
+
GOTO error
|
|
448
|
+
ENDIF
|
|
449
|
+
|
|
450
|
+
IF _readParams\VLD & _readParams\DIM = 1 THEN
|
|
451
|
+
COPYSTRUCT _params, 1, _readParams
|
|
452
|
+
ENDIF
|
|
453
|
+
|
|
197
454
|
_params^structVersion := 2
|
|
455
|
+
_params^cacheId := _cacheID
|
|
456
|
+
|
|
198
457
|
_statParams^structVersion := 1
|
|
458
|
+
_statParams^cacheId := _params^cacheId
|
|
459
|
+
_statParams^useViewRounding := _params^useRounding
|
|
460
|
+
;_statParams^useAbsValues UNSET
|
|
461
|
+
_statParams^version := _params^version
|
|
462
|
+
_statParams^envName := _params^envName
|
|
463
|
+
_statParams^paramBlockId := _params^paramBlockId
|
|
464
|
+
|
|
465
|
+
_cacheParams^structVersion := 1
|
|
466
|
+
_cacheParams^applyChanges := @FALSE
|
|
199
467
|
|
|
200
468
|
CALL [E.EM_VECTOR_MANAGER] InsertSession(_sessionId) SYNC ON (_parent)
|
|
201
469
|
CALL %EDA_ReadValuesFromVektorRec(_id, _from, _to, _step, _params, _data, 1, _errorCode)
|
|
@@ -203,21 +471,15 @@ PUBLIC PROCEDURE ReadValuesFromVector(IN INT _id, IN TIME _from, IN TIME _to, IN
|
|
|
203
471
|
|
|
204
472
|
IF _errorCode # _ERR_NO_ERROR THEN
|
|
205
473
|
_errorMsg := "Error reading vector data [" + %IToStr(_errorCode) + "]"
|
|
206
|
-
|
|
207
|
-
RETURN
|
|
208
|
-
ELSE
|
|
209
|
-
_isOk := @TRUE
|
|
474
|
+
GOTO error
|
|
210
475
|
ENDIF
|
|
211
476
|
|
|
212
|
-
REDIM _stats[1]
|
|
213
|
-
|
|
214
477
|
CALL %EDA_StatVectorRec(0, _id, _from, _to, _step, _statParams, _value, _errorCode)
|
|
215
478
|
_stats^Sum := _value
|
|
216
479
|
|
|
217
480
|
IF _errorCode # _ERR_NO_ERROR THEN
|
|
218
481
|
_errorMsg := "Error reading vector SUM stat data [" + %IToStr(_errorCode) + "]"
|
|
219
|
-
|
|
220
|
-
RETURN
|
|
482
|
+
GOTO error
|
|
221
483
|
ENDIF
|
|
222
484
|
|
|
223
485
|
CALL %EDA_StatVectorRec(1, _id, _from, _to, _step, _statParams, _value, _errorCode)
|
|
@@ -225,8 +487,7 @@ PUBLIC PROCEDURE ReadValuesFromVector(IN INT _id, IN TIME _from, IN TIME _to, IN
|
|
|
225
487
|
|
|
226
488
|
IF _errorCode # _ERR_NO_ERROR THEN
|
|
227
489
|
_errorMsg := "Error reading vector MIN stat data [" + %IToStr(_errorCode) + "]"
|
|
228
|
-
|
|
229
|
-
RETURN
|
|
490
|
+
GOTO error
|
|
230
491
|
ENDIF
|
|
231
492
|
|
|
232
493
|
CALL %EDA_StatVectorRec(2, _id, _from, _to, _step, _statParams, _value, _errorCode)
|
|
@@ -234,8 +495,7 @@ PUBLIC PROCEDURE ReadValuesFromVector(IN INT _id, IN TIME _from, IN TIME _to, IN
|
|
|
234
495
|
|
|
235
496
|
IF _errorCode # _ERR_NO_ERROR THEN
|
|
236
497
|
_errorMsg := "Error reading vector MAX stat data [" + %IToStr(_errorCode) + "]"
|
|
237
|
-
|
|
238
|
-
RETURN
|
|
498
|
+
GOTO error
|
|
239
499
|
ENDIF
|
|
240
500
|
|
|
241
501
|
CALL %EDA_StatVectorRec(3, _id, _from, _to, _step, _statParams, _value, _errorCode)
|
|
@@ -243,9 +503,15 @@ PUBLIC PROCEDURE ReadValuesFromVector(IN INT _id, IN TIME _from, IN TIME _to, IN
|
|
|
243
503
|
|
|
244
504
|
IF _errorCode # _ERR_NO_ERROR THEN
|
|
245
505
|
_errorMsg := "Error reading vector AVG stat data [" + %IToStr(_errorCode) + "]"
|
|
246
|
-
|
|
247
|
-
RETURN
|
|
506
|
+
GOTO error
|
|
248
507
|
ENDIF
|
|
508
|
+
|
|
509
|
+
_isOk := @TRUE
|
|
510
|
+
CALL %EDA_CloseCacheRec(_cacheID, _cacheParams, _errorCode)
|
|
511
|
+
EXCEPTION_HANDLER
|
|
512
|
+
error:
|
|
513
|
+
CALL %EDA_CloseCacheRec(_cacheID, _cacheParams, _errorCode)
|
|
514
|
+
_isOk := @FALSE
|
|
249
515
|
END ReadValuesFromVector
|
|
250
516
|
|
|
251
517
|
PUBLIC PROCEDURE InsertValuesToVector(IN INT _id, IN RECORD NOALIAS(SD.EDA_VectorData) _data, BOOL _isOk, TEXT _errorMsg)
|
|
@@ -299,6 +565,101 @@ PUBLIC PROCEDURE GetValuesForDescriptiveVector(IN RECORD NOALIAS(SD.EDA_Descript
|
|
|
299
565
|
ENDIF
|
|
300
566
|
END GetValuesForDescriptiveVector
|
|
301
567
|
|
|
568
|
+
PUBLIC PROCEDURE CalcValuesForUnsavedVector(IN INT _type, IN TEXT _prescription, IN TIME _from, IN TIME _to, IN INT _step, RECORD NOALIAS (SD.EDA_CalcFunction_Params_V2) _calcParams, RECORD NOALIAS(SD.EDA_VectorData) _data, RECORD NOALIAS(SD.EM_EDA_VectorStats) _stats, BOOL _isOk, TEXT _errorMsg)
|
|
569
|
+
RECORD NOALIAS (SD.EDA_CalcFunction_Params_V2) _params
|
|
570
|
+
RECORD NOALIAS (SD.EDA_StatCalcFunction_Params_V1) _statParams
|
|
571
|
+
RECORD NOALIAS (SD.EDA_CloseCache_Params_V1) _cacheParams
|
|
572
|
+
INT _errorCode
|
|
573
|
+
INT _cacheID
|
|
574
|
+
INT _parent = %GetParentProcessHBJ()
|
|
575
|
+
INT _sessionId = %GetRPCCallerProcess()
|
|
576
|
+
REAL _value
|
|
577
|
+
|
|
578
|
+
REDIM _data[0]
|
|
579
|
+
REDIM _stats[1]
|
|
580
|
+
|
|
581
|
+
CALL %EDA_CreateCache(0, 100000000, _cacheID, _errorCode)
|
|
582
|
+
|
|
583
|
+
IF _errorCode # _ERR_NO_ERROR THEN
|
|
584
|
+
_errorMsg := "Error creating cache [" + %IToStr(_errorCode) + "]"
|
|
585
|
+
GOTO error
|
|
586
|
+
ENDIF
|
|
587
|
+
|
|
588
|
+
IF _calcParams\VLD & _calcParams\DIM = 1 THEN
|
|
589
|
+
COPYSTRUCT _params, 1, _calcParams
|
|
590
|
+
ENDIF
|
|
591
|
+
|
|
592
|
+
_params^structVersion := 2
|
|
593
|
+
_params^cacheId := _cacheID
|
|
594
|
+
|
|
595
|
+
_statParams^structVersion := 1
|
|
596
|
+
_statParams^cacheId := _params^cacheId
|
|
597
|
+
_statParams^valueType := _params^valueType
|
|
598
|
+
_statParams^vectorPeriodBeginTime := _params^periodBeginTime
|
|
599
|
+
_statParams^vectorPeriodStepBase := _params^periodStepBase
|
|
600
|
+
_statParams^vectorPeriodStepCount := _params^periodStepCount
|
|
601
|
+
_statParams^vectorPeriodTimeZone := _params^periodTimeZone
|
|
602
|
+
_statParams^isIntegral := _params^isIntegral
|
|
603
|
+
_statParams^viewRoundType := _params^roundType
|
|
604
|
+
_statParams^viewRoundDecPlaces := _params^decimalPlaces
|
|
605
|
+
; _statParams^useAbsValues UNSET
|
|
606
|
+
_statParams^userName := _params^userName
|
|
607
|
+
_statParams^version := _params^version
|
|
608
|
+
_statParams^envName := _params^envName
|
|
609
|
+
_statParams^paramBlockId := _params^paramBlockId
|
|
610
|
+
|
|
611
|
+
_cacheParams^structVersion := 1
|
|
612
|
+
_cacheParams^applyChanges := @FALSE
|
|
613
|
+
|
|
614
|
+
CALL [E.EM_VECTOR_MANAGER] InsertSession(_sessionId) SYNC ON (_parent)
|
|
615
|
+
CALL %EDA_CalcFunctionRec(_type, _prescription, _from, _to, _step, _params, _data, 1, _errorCode)
|
|
616
|
+
CALL [E.EM_VECTOR_MANAGER] RemoveSession(_sessionId) SYNC ON (_parent)
|
|
617
|
+
|
|
618
|
+
IF _errorCode # _ERR_NO_ERROR THEN
|
|
619
|
+
_errorMsg := "Error calculating unsaved vector data [" + %IToStr(_errorCode) + "]"
|
|
620
|
+
GOTO error
|
|
621
|
+
ENDIF
|
|
622
|
+
|
|
623
|
+
CALL %EDA_StatCalcFunctionRec(0, _type, _prescription, _from, _to, _step, _statParams, _value, _errorCode)
|
|
624
|
+
_stats^Sum := _value
|
|
625
|
+
|
|
626
|
+
IF _errorCode # _ERR_NO_ERROR THEN
|
|
627
|
+
_errorMsg := "Error calculating unsaved vector SUM stat data [" + %IToStr(_errorCode) + "]"
|
|
628
|
+
GOTO error
|
|
629
|
+
ENDIF
|
|
630
|
+
|
|
631
|
+
CALL %EDA_StatCalcFunctionRec(1, _type, _prescription, _from, _to, _step, _statParams, _value, _errorCode)
|
|
632
|
+
_stats^Min := _value
|
|
633
|
+
|
|
634
|
+
IF _errorCode # _ERR_NO_ERROR THEN
|
|
635
|
+
_errorMsg := "Error calculating unsaved vector MIN stat data [" + %IToStr(_errorCode) + "]"
|
|
636
|
+
GOTO error
|
|
637
|
+
ENDIF
|
|
638
|
+
|
|
639
|
+
CALL %EDA_StatCalcFunctionRec(2, _type, _prescription, _from, _to, _step, _statParams, _value, _errorCode)
|
|
640
|
+
_stats^Max := _value
|
|
641
|
+
|
|
642
|
+
IF _errorCode # _ERR_NO_ERROR THEN
|
|
643
|
+
_errorMsg := "Error calculating unsaved vector MAX stat data [" + %IToStr(_errorCode) + "]"
|
|
644
|
+
GOTO error
|
|
645
|
+
ENDIF
|
|
646
|
+
|
|
647
|
+
CALL %EDA_StatCalcFunctionRec(3, _type, _prescription, _from, _to, _step, _statParams, _value, _errorCode)
|
|
648
|
+
_stats^Avg := _value
|
|
649
|
+
|
|
650
|
+
IF _errorCode # _ERR_NO_ERROR THEN
|
|
651
|
+
_errorMsg := "Error calculating unsaved vector AVG stat data [" + %IToStr(_errorCode) + "]"
|
|
652
|
+
GOTO error
|
|
653
|
+
ENDIF
|
|
654
|
+
|
|
655
|
+
_isOk := @TRUE
|
|
656
|
+
CALL %EDA_CloseCacheRec(_cacheID, _cacheParams, _errorCode)
|
|
657
|
+
EXCEPTION_HANDLER
|
|
658
|
+
error:
|
|
659
|
+
CALL %EDA_CloseCacheRec(_cacheID, _cacheParams, _errorCode)
|
|
660
|
+
_isOk := @FALSE
|
|
661
|
+
END CalcValuesForUnsavedVector
|
|
662
|
+
|
|
302
663
|
BEGIN
|
|
303
664
|
PRAGMA "ENABLE_INOUT_BY_REF"
|
|
304
665
|
END
|
|
@@ -140,6 +140,28 @@
|
|
|
140
140
|
<StatusText/>
|
|
141
141
|
<TransPalIdx>0</TransPalIdx>
|
|
142
142
|
</tStructItemData>
|
|
143
|
+
<tStructItemData>
|
|
144
|
+
<ItemNr>10</ItemNr>
|
|
145
|
+
<Name>Prescription</Name>
|
|
146
|
+
<Descript/>
|
|
147
|
+
<Typ>Text</Typ>
|
|
148
|
+
<UseStartVal>False</UseStartVal>
|
|
149
|
+
<UseLimits>False</UseLimits>
|
|
150
|
+
<UsePrAlarm>False</UsePrAlarm>
|
|
151
|
+
<StatusText/>
|
|
152
|
+
<TransPalIdx>0</TransPalIdx>
|
|
153
|
+
</tStructItemData>
|
|
154
|
+
<tStructItemData>
|
|
155
|
+
<ItemNr>11</ItemNr>
|
|
156
|
+
<Name>IsIntegral</Name>
|
|
157
|
+
<Descript/>
|
|
158
|
+
<Typ>Bool</Typ>
|
|
159
|
+
<UseStartVal>False</UseStartVal>
|
|
160
|
+
<UseLimits>False</UseLimits>
|
|
161
|
+
<UsePrAlarm>False</UsePrAlarm>
|
|
162
|
+
<StatusText/>
|
|
163
|
+
<TransPalIdx>0</TransPalIdx>
|
|
164
|
+
</tStructItemData>
|
|
143
165
|
</CFGRECORDS>
|
|
144
166
|
<MEMBEROFRESGROUP>
|
|
145
167
|
</MEMBEROFRESGROUP>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "d2aura",
|
|
3
|
-
"version": "26.0.
|
|
3
|
+
"version": "26.0.18",
|
|
4
4
|
"description": "D2 AURA - Advanced User Interface Resource Architecture",
|
|
5
5
|
"author": "Ipesoft s.r.o.",
|
|
6
6
|
"license": "MIT",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"@types/xml2js": "0.4.14",
|
|
46
46
|
"antd": "5.29.3",
|
|
47
47
|
"d2core": "23.0.16",
|
|
48
|
-
"d2coreui": "23.0.
|
|
48
|
+
"d2coreui": "23.0.40",
|
|
49
49
|
"d2jsapi": "26.0.10",
|
|
50
50
|
"echarts": "5.5.1",
|
|
51
51
|
"echarts-for-react": "3.0.2",
|