d2aura 26.0.17 → 26.0.19

package/d2configuration/edaManager/E.EM_NAVIGATOR_UNIT.xml

@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ROOT>
   <REFERENCES>
+    <HOBJ_REF>
+      <uid>1582F1424BBBC3C4E9108D2ADBE39B14</uid>
+      <name>DB.EDA_SkVektor</name>
+      <objType>DB_TABLE</objType>
+      <valType>NAN</valType>
+    </HOBJ_REF>
+    <HOBJ_REF>
+      <uid>C61792F974A5E574B8D1E152F59D5EA3</uid>
+      <name>DB.EDA_Vektor</name>
+      <objType>DB_TABLE</objType>
+      <valType>NAN</valType>
+    </HOBJ_REF>
     <HOBJ_REF>
       <uid>4C6512D86C4554429218AD7F8762440B</uid>
       <name>DB.EM_EDA_VectorScenario</name>
@@ -19,6 +31,37 @@
       <objType>EXT_FNCT</objType>
       <valType>Int</valType>
     </HOBJ_REF>
+    <HOBJ_REF>
+      <uid>D6A7BE448859E2A43A66BC1CEE02B037</uid>
+      <name>SD.EDA_SkVektor</name>
+      <objType>STRUCTDEF</objType>
+      <valType>NAN</valType>
+    </HOBJ_REF>
+    <COL_REF>
+      <col_idx>8</col_idx>
+      <col_name>Cesta</col_name>
+      <col_valType>Text</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>2</col_idx>
+      <col_name>EDA_ID_SkVektor</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>1</col_idx>
+      <col_name>ID_SkVektor</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>3</col_idx>
+      <col_name>Meno</col_name>
+      <col_valType>Text</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>10</col_idx>
+      <col_name>Zobraz_Meno</col_name>
+      <col_valType>Text</col_valType>
+    </COL_REF>
     <HOBJ_REF>
       <uid>04F7ECC2F596F14888234E96D5F17471</uid>
       <name>SD.EDA_UpdateVector_Params_V1</name>
@@ -35,6 +78,57 @@
       <col_name>structVersion</col_name>
       <col_valType>Int</col_valType>
     </COL_REF>
+    <HOBJ_REF>
+      <uid>7DF2A6EEB9076A84A8D20261E0CE5A10</uid>
+      <name>SD.EDA_Vektor</name>
+      <objType>STRUCTDEF</objType>
+      <valType>NAN</valType>
+    </HOBJ_REF>
+    <COL_REF>
+      <col_idx>13</col_idx>
+      <col_name>ID_SkVektor</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>1</col_idx>
+      <col_name>ID_Vektor</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>15</col_idx>
+      <col_name>Integral</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>2</col_idx>
+      <col_name>Meno</col_name>
+      <col_valType>Text</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>4</col_idx>
+      <col_name>Tech_jednotky</col_name>
+      <col_valType>Text</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>6</col_idx>
+      <col_name>Typ</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>19</col_idx>
+      <col_name>View_Dec_Pl</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>18</col_idx>
+      <col_name>View_Round</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>16</col_idx>
+      <col_name>Zobraz_Meno</col_name>
+      <col_valType>Text</col_valType>
+    </COL_REF>
     <HOBJ_REF>
       <uid>C510A5FAD9454C48B8845C0495EB7A02</uid>
       <name>SD.EM_EDA_VectorScenario</name>
@@ -108,6 +202,56 @@
       <objType>STRUCTDEF</objType>
       <valType>NAN</valType>
     </HOBJ_REF>
+    <COL_REF>
+      <col_idx>5</col_idx>
+      <col_name>DisplayName</col_name>
+      <col_valType>Text</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>1</col_idx>
+      <col_name>ID</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>11</col_idx>
+      <col_name>IsIntegral</col_name>
+      <col_valType>Bool</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>3</col_idx>
+      <col_name>Name</col_name>
+      <col_valType>Text</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>2</col_idx>
+      <col_name>ParentID</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>4</col_idx>
+      <col_name>Path</col_name>
+      <col_valType>Text</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>9</col_idx>
+      <col_name>RoundingPlaces</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>8</col_idx>
+      <col_name>RoundingType</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>6</col_idx>
+      <col_name>Type</col_name>
+      <col_valType>Int</col_valType>
+    </COL_REF>
+    <COL_REF>
+      <col_idx>7</col_idx>
+      <col_name>Units</col_name>
+      <col_valType>Text</col_valType>
+    </COL_REF>
     <HOBJ_REF>
       <uid>1AAA46C113C8E147889E3266B626D911</uid>
       <name>SELF.EVH</name>
@@ -184,94 +328,119 @@ INT _TYPE_DATE_WITHOUT_TIME = 6
 ; GetGroupChildren
 ;*********************************************************
 
-PUBLIC PROCEDURE GetGroupChildren(IN DB_HANDLE _hndl, IN INT _id, IN BOOL _showOmitted, IN INT _count, IN INT _offset, RECORD NOALIAS (SD.EM_Tree_Item) _items, INT _leftCount, BOOL _isOk, TEXT _errorMsg)
-  INT _totalCount
+PUBLIC PROCEDURE GetGroupChildren(IN INT _id, IN BOOL _showOmitted, IN INT _pageSize, IN INT _pageNr, RECORD NOALIAS (SD.EM_Tree_Item) _items, INT _totalCount, BOOL _isOk, TEXT _errorMsg)
+  INT _handle
+  INT _retCode
+  INT _i
   TEXT _sql
+  RECORD NOALIAS (SD.EDA_SkVektor) _tmpData
 
-  CALL [E.EM_NAVIGATOR_SQL] GetGroupCountSql(_id, _showOmitted, _sql, _isOk, _errorMsg) ON (%GetParentProcessHBJ())
+  CALL [E.EM_NAVIGATOR_SQL] GetGroupChildrenSql(_id, _showOmitted, _sql, _isOk, _errorMsg) ON (%GetParentProcessHBJ())
 
   IF !_isOk THEN
     RETURN
   ENDIF
 
-  CALL GetCount(_hndl, _sql, _totalCount, _isOk, _errorMsg)
-
-  IF !_isOk | _totalCount <= _offset THEN
-    _leftCount := 0
-    RETURN
+  IF !_id\VLD THEN
+    _pageSize := 1000
   ENDIF
 
-  IF _id\VLD THEN
-    IF _count + _offset < _totalCount THEN
-      _leftCount := _totalCount - _count - _offset
-    ELSE
-      _count := _totalCount - _offset
-      _leftCount := 0
-    ENDIF
-  ELSE
-    _count := _totalCount
-    _offset := 0
-    _leftCount := 0
+  PG_CONNECT DB.EDA_SkVektor, _DB_READ, _handle, _pageSize, _sql, "Zobraz_Meno", _totalCount, _retCode
+
+  IF _retCode # _ERR_NO_ERROR & _retCode # _ERR_NO_DATA THEN
+    _isOk := @FALSE
+    _errorMsg := "Error PG_CONNECT [" + %IToStr(_retCode) + "] WHERE: " + _sql
+    LOG _errorMsg PRIORITY _LOG_PRTY_ERROR
+    RETURN
   ENDIF
 
-  CALL [E.EM_NAVIGATOR_SQL] GetGroupItemsSql(_id, _showOmitted, _sql, _isOk, _errorMsg) ON (%GetParentProcessHBJ())
+  PG_READ _handle, _pageNr, _tmpData, _retCode
 
-  IF !_isOk THEN
+  IF _retCode # _ERR_NO_ERROR & _retCode # _ERR_NO_DATA THEN
+    _isOk := @FALSE
+    _errorMsg := "Error PG_READ [" + %IToStr(_retCode) + "] WHERE: " + _sql
+    LOG _errorMsg PRIORITY _LOG_PRTY_ERROR
     RETURN
   ENDIF
   
-  CALL GetItems(_hndl, _sql, _count, _offset, _items, _isOk, _errorMsg)
+  REDIM _items[_tmpData\DIM]
+
+  IF _tmpData\DIM > 0 THEN
+    FOR _i RANGE _tmpData DO_LOOP
+      _items[_i]^ID := _tmpData[_i]^ID_SkVektor
+      _items[_i]^ParentID := _tmpData[_i]^EDA_ID_SkVektor
+      _items[_i]^Name := _tmpData[_i]^Meno
+      _items[_i]^Path := _tmpData[_i]^Cesta
+      _items[_i]^DisplayName := _tmpData[_i]^Zobraz_Meno
+      _items[_i]^Type := 0
+    END_LOOP
+  ENDIF
+
+  PG_DISCONNECT _handle
+  _isOk := @TRUE
 END GetGroupChildren
 
 ;*********************************************************
 ; GetGroupVectors
 ;*********************************************************
 
-PUBLIC PROCEDURE GetGroupVectors(IN DB_HANDLE _hndl, IN INT _id, IN BOOL _showOmitted, IN INT _count, IN INT _offset, RECORD NOALIAS (SD.EM_Tree_Item) _items, INT _leftCount, BOOL _isOk, TEXT _errorMsg)
-  INT _totalCount
+PUBLIC PROCEDURE GetGroupVectors(IN INT _id, IN BOOL _showOmitted, IN INT _pageSize, IN INT _pageNr, RECORD NOALIAS (SD.EM_Tree_Item) _items, INT _totalCount, BOOL _isOk, TEXT _errorMsg)
+  INT _handle
+  INT _retCode
+  INT _i
   TEXT _sql
+  RECORD NOALIAS (SD.EDA_Vektor) _tmpData
 
-  CALL [E.EM_NAVIGATOR_SQL] GetGroupVectorsCountSql(_id, _showOmitted, _sql, _isOk, _errorMsg) ON (%GetParentProcessHBJ())
+  CALL [E.EM_NAVIGATOR_SQL] GetGroupVectorsSql(_id, _showOmitted, _sql, _isOk, _errorMsg) ON (%GetParentProcessHBJ())
 
   IF !_isOk THEN
     RETURN
   ENDIF
+  
+  PG_CONNECT DB.EDA_Vektor, _DB_READ, _handle, _pageSize, _sql, "Zobraz_Meno", _totalCount, _retCode
 
-  CALL GetCount(_hndl, _sql, _totalCount, _isOk, _errorMsg)
-
-  IF !_isOk | _totalCount <= _offset THEN
-    _leftCount := 0
+  IF _retCode # _ERR_NO_ERROR & _retCode # _ERR_NO_DATA THEN
+    _isOk := @FALSE
+    _errorMsg := "Error PG_CONNECT [" + %IToStr(_retCode) + "] WHERE: " + _sql
+    LOG _errorMsg PRIORITY _LOG_PRTY_ERROR
     RETURN
   ENDIF
 
-  IF _id\VLD THEN
-    IF _count + _offset < _totalCount THEN
-      _leftCount := _totalCount - _count - _offset
-    ELSE
-      _count := _totalCount - _offset
-      _leftCount := 0
-    ENDIF
-  ELSE
-    _count := _totalCount
-    _offset := 0
-    _leftCount := 0
-  ENDIF
+  PG_READ _handle, _pageNr, _tmpData, _retCode
 
-  CALL [E.EM_NAVIGATOR_SQL] GetGroupVectorItemsSql(_id, _showOmitted, _sql, _isOk, _errorMsg) ON (%GetParentProcessHBJ())
-
-  IF !_isOk THEN
+  IF _retCode # _ERR_NO_ERROR & _retCode # _ERR_NO_DATA THEN
+    _isOk := @FALSE
+    _errorMsg := "Error PG_READ [" + %IToStr(_retCode) + "] WHERE: " + _sql
+    LOG _errorMsg PRIORITY _LOG_PRTY_ERROR
     RETURN
   ENDIF
   
-  CALL GetItems(_hndl, _sql, _count, _offset, _items, _isOk, _errorMsg)
+  REDIM _items[_tmpData\DIM]
+
+  IF _tmpData\DIM > 0 THEN
+    FOR _i RANGE _tmpData DO_LOOP
+      _items[_i]^ID := _tmpData[_i]^ID_Vektor
+      _items[_i]^ParentID := _tmpData[_i]^ID_SkVektor
+      _items[_i]^Name := _tmpData[_i]^Meno
+      _items[_i]^DisplayName := _tmpData[_i]^Zobraz_Meno
+      _items[_i]^Type := _tmpData[_i]^Typ
+      _items[_i]^Units := _tmpData[_i]^Tech_jednotky
+      _items[_i]^RoundingType := _tmpData[_i]^View_Round
+      _items[_i]^RoundingPlaces := _tmpData[_i]^View_Dec_Pl
+      _items[_i]^IsIntegral := _tmpData[_i]^Integral = 2
+    END_LOOP
+  ENDIF
+
+  PG_DISCONNECT _handle
+  _isOk := @TRUE
 END GetGroupVectors
 
 ;*********************************************************
 ; GetScenarioChildren
 ;*********************************************************
 
-PUBLIC PROCEDURE GetScenarioChildren(IN DB_HANDLE _hndl, IN INT _id, IN BOOL _showOmitted, IN INT _count, IN INT _offset, RECORD NOALIAS (SD.EM_Tree_Item) _items, INT _leftCount, BOOL _isOk, TEXT _errorMsg)
-  INT _totalCount
+PUBLIC PROCEDURE GetScenarioChildren(IN DB_HANDLE _hndl, IN INT _id, IN BOOL _showOmitted, IN INT _pageSize, IN INT _pageNr, RECORD NOALIAS (SD.EM_Tree_Item) _items, INT _totalCount, BOOL _isOk, TEXT _errorMsg)
+  INT _offset = (_pageNr - 1) * _pageSize
   TEXT _sql
 
   CALL [E.EM_NAVIGATOR_SQL] GetScenarioCountSql(_id, _showOmitted, _sql, _isOk, _errorMsg) ON (%GetParentProcessHBJ())
@@ -282,22 +451,12 @@ PUBLIC PROCEDURE GetScenarioChildren(IN DB_HANDLE _hndl, IN INT _id, IN BOOL _sh
   
   CALL GetCount(_hndl, _sql, _totalCount, _isOk, _errorMsg)
 
-  IF !_isOk | _totalCount <= _offset THEN
-    _leftCount := 0
+  IF !_isOk THEN
     RETURN
   ENDIF
 
-  IF _id\VLD THEN
-    IF _count + _offset < _totalCount THEN
-      _leftCount := _totalCount - _count - _offset
-    ELSE
-      _count := _totalCount - _offset
-      _leftCount := 0
-    ENDIF
-  ELSE
-    _count := _totalCount
-    _offset := 0
-    _leftCount := 0
+  IF !_id\VLD THEN
+    _pageSize := 1000
   ENDIF
 
   CALL [E.EM_NAVIGATOR_SQL] GetScenarioItemsSql(_id, _showOmitted, _sql, _isOk, _errorMsg) ON (%GetParentProcessHBJ())
@@ -306,15 +465,15 @@ PUBLIC PROCEDURE GetScenarioChildren(IN DB_HANDLE _hndl, IN INT _id, IN BOOL _sh
     RETURN
   ENDIF
   
-  CALL GetItems(_hndl, _sql, _count, _offset, _items, _isOk, _errorMsg)
+  CALL GetItems(_hndl, _sql, _pageSize, _offset, _items, _isOk, _errorMsg)
 END GetScenarioChildren
 
 ;*********************************************************
 ; GetScenarioVectors
 ;*********************************************************
 
-PUBLIC PROCEDURE GetScenarioVectors(IN DB_HANDLE _hndl, IN INT _id, IN BOOL _showOmitted, IN BOOL _showDynamic, IN INT _count, IN INT _offset, RECORD NOALIAS (SD.EM_Tree_Item) _items, INT _leftCount, BOOL _isOk, TEXT _errorMsg)
-  INT _totalCount
+PUBLIC PROCEDURE GetScenarioVectors(IN DB_HANDLE _hndl, IN INT _id, IN BOOL _showOmitted, IN BOOL _showDynamic, IN INT _pageSize, IN INT _pageNr, RECORD NOALIAS (SD.EM_Tree_Item) _items, INT _totalCount, BOOL _isOk, TEXT _errorMsg)
+  INT _offset = (_pageNr - 1) * _pageSize
   TEXT _sql
 
   IF !_id\VLD THEN
@@ -329,31 +488,17 @@ PUBLIC PROCEDURE GetScenarioVectors(IN DB_HANDLE _hndl, IN INT _id, IN BOOL _sho
   
   CALL GetCount(_hndl, _sql, _totalCount, _isOk, _errorMsg)
 
-  IF !_isOk | _totalCount <= _offset THEN
-    _leftCount := 0
+  IF !_isOk THEN
     RETURN
   ENDIF
 
-  IF _id\VLD THEN
-    IF _count + _offset < _totalCount THEN
-      _leftCount := _totalCount - _count - _offset
-    ELSE
-      _count := _totalCount - _offset
-      _leftCount := 0
-    ENDIF
-  ELSE
-    _count := _totalCount
-    _offset := 0
-    _leftCount := 0
-  ENDIF
-
   CALL [E.EM_NAVIGATOR_SQL] GetScenarioVectorItemsSql(_id, _showOmitted, _showDynamic, _sql, _isOk, _errorMsg) ON (%GetParentProcessHBJ())
 
   IF !_isOk THEN
     RETURN
   ENDIF
   
-  CALL GetItems(_hndl, _sql, _count, _offset, _items, _isOk, _errorMsg)
+  CALL GetItems(_hndl, _sql, _pageSize, _offset, _items, _isOk, _errorMsg)
 END GetScenarioVectors
 
 ;*********************************************************

package/d2configuration/edaManager/E.EM_VECTOR_IMPL.xml

@@ -25,6 +25,18 @@
       <objType>STRUCTDEF</objType>
       <valType>NAN</valType>
     </HOBJ_REF>
+    <HOBJ_REF>
+      <uid>86C261600314754490468DDFB6FDF800</uid>
+      <name>SD.EM_EDA_CalcFunction_Params_V2</name>
+      <objType>STRUCTDEF</objType>
+      <valType>NAN</valType>
+    </HOBJ_REF>
+    <HOBJ_REF>
+      <uid>D07C5D523E2EE947AA8C503BC5ECBB3B</uid>
+      <name>SD.EM_EDA_ReadValuesFromVector_Params_V2</name>
+      <objType>STRUCTDEF</objType>
+      <valType>NAN</valType>
+    </HOBJ_REF>
     <HOBJ_REF>
       <uid>88D757FB3AD367478EDD36D2EC77BC26</uid>
       <name>SD.EM_EDA_VectorStats</name>
@@ -93,8 +105,8 @@
 
 UNIT (E.EM_VECTOR_UNIT) _unit
 
-RPC 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)
-  CALL [_unit] ReadValuesFromVector(_id, _from, _to, _step, _data, _stats, _isOk, _errorMsg)
+RPC PROCEDURE ReadValuesFromVector(IN INT _id, IN TIME _from, IN TIME _to, IN INT _step, IN RECORD NOALIAS (SD.EM_EDA_ReadValuesFromVector_Params_V2) _readParams, RECORD NOALIAS(SD.EDA_VectorData) _data, RECORD NOALIAS(SD.EM_EDA_VectorStats) _stats, BOOL _isOk, TEXT _errorMsg)
+  CALL [_unit] ReadValuesFromVector(_id, _from, _to, _step, _readParams, _data, _stats, _isOk, _errorMsg)
 END ReadValuesFromVector
 
 RPC PROCEDURE InsertValuesToVector(IN INT _id, IN RECORD NOALIAS(SD.EDA_VectorData) _data, BOOL _isOk, TEXT _errorMsg)
@@ -109,6 +121,10 @@ RPC PROCEDURE GetValuesForDescriptiveVector(IN RECORD NOALIAS(SD.EDA_Descriptive
   CALL [_unit] GetValuesForDescriptiveVector(_definition, _from, _to, _step, _integral, _values, _isOk, _errorMsg)
 END GetValuesForDescriptiveVector
 
+RPC PROCEDURE CalcValuesForUnsavedVector(IN INT _type, IN TEXT _prescription, IN TIME _from, IN TIME _to, IN INT _step, RECORD NOALIAS (SD.EM_EDA_CalcFunction_Params_V2) _calcParams, RECORD NOALIAS(SD.EDA_VectorData) _data, RECORD NOALIAS(SD.EM_EDA_VectorStats) _stats, BOOL _isOk, TEXT _errorMsg)
+  CALL [_unit] CalcValuesForUnsavedVector(_type, _prescription, _from, _to, _step, _calcParams, _data, _stats, _isOk, _errorMsg)
+END CalcValuesForUnsavedVector
+
 BEGIN
   PRAGMA "ENABLE_INOUT_BY_REF"
 END