Treeview Logistik angepasst, RestServer mit preparedSQL statt ActiveRecord im LogistikTree

This commit is contained in:
Hilmer, Carsten
2016-04-28 10:33:32 +02:00
parent 5acd887179
commit 9e48806124
9 changed files with 2670 additions and 64 deletions

View File

@@ -6934,7 +6934,7 @@
</WindowState>
</block>
<block type="Module" ID="801328863">
<block type="Module" ID="1545846755">
<ObjName>BKS_ActiveRecordConfig</ObjName>
<ObjContainerID>0</ObjContainerID>
<IsClass>0</IsClass>
@@ -7012,7 +7012,7 @@
<ItemFlags>1</ItemFlags>
</Constant>
</block>
<block type="Module" ID="1226391017">
<block type="Module" ID="1354395688">
<ObjName>DataFile</ObjName>
<ObjContainerID>0</ObjContainerID>
<IsClass>0</IsClass>
@@ -7101,18 +7101,18 @@
<SourceLine></SourceLine>
<SourceLine>//Register the tables with ActiveRecord</SourceLine>
<SourceLine>Register( gdb )</SourceLine>
<SourceLine></SourceLine>
<SourceLine></SourceLine>
<SourceLine>return true</SourceLine>
<SourceLine>End Function</SourceLine>
<SourceLine>End Function</SourceLine>
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<AliasName></AliasName>
<ItemFlags>0</ItemFlags>
<Shared>0</Shared>
<ItemParams></ItemParams>
<ItemResult>Boolean</ItemResult>
<ItemResult>Boolean</ItemResult>
</Method>
<Method>
<Method>
<ItemName>CloseDB</ItemName>
<Compatibility></Compatibility>
<Visible>1</Visible>
@@ -7308,9 +7308,9 @@
<Compatibility/>
<Visible>1</Visible>
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<TextEncoding>134217984</TextEncoding>
<SourceLine> Shared Function List(sCriteria as string = "", sOrderBy as string = "") As DataFile.tbl_auslieferungsliste()</SourceLine>
<SourceLine>//Usage:</SourceLine>
<SourceLine>//Usage:</SourceLine>
<SourceLine>// dim arotbl_auslieferungsliste() as DataFile.tbl_auslieferungsliste = DataFile.tbl_auslieferungsliste.List("fieldName = somevalue", "fieldName")</SourceLine>
<SourceLine/>
<SourceLine>dim arotbl_auslieferungsliste() as DataFile.tbl_auslieferungsliste</SourceLine>
@@ -8178,9 +8178,9 @@
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<ItemDeclaration>active As Integer</ItemDeclaration>
<ItemFlags>0</ItemFlags>
<ItemFlags>0</ItemFlags>
<Shared>0</Shared>
</Property>
</Property>
<Property>
<ItemName>system_created</ItemName>
<Compatibility></Compatibility>
@@ -9034,9 +9034,9 @@
<Property>
<ItemName>auslieferungsschein_titel</ItemName>
<Compatibility></Compatibility>
<Visible>1</Visible>
<Visible>1</Visible>
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<TextEncoding>134217984</TextEncoding>
<SourceLine>auslieferungsschein_titel As String</SourceLine>
<SourceLine></SourceLine>
</ItemSource>
@@ -9344,9 +9344,9 @@
<SourceLine>durchwahl As String</SourceLine>
<SourceLine></SourceLine>
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<TextEncoding>134217984</TextEncoding>
<ItemDeclaration>durchwahl As String</ItemDeclaration>
<ItemFlags>0</ItemFlags>
<ItemFlags>0</ItemFlags>
<Shared>0</Shared>
</Property>
<Property>
@@ -9612,9 +9612,9 @@
<Shared>0</Shared>
</Property>
<Property>
<ItemName>auslieferungsschein_uid</ItemName>
<ItemName>auslieferungsschein_uid</ItemName>
<Compatibility></Compatibility>
<Visible>1</Visible>
<Visible>1</Visible>
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<SourceLine>auslieferungsschein_uid As Integer</SourceLine>
@@ -9852,9 +9852,9 @@
<SourceLine>End Function</SourceLine>
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<AliasName/>
<AliasName/>
<ItemFlags>0</ItemFlags>
<Shared>1</Shared>
<Shared>1</Shared>
<ItemParams>sCriteria as string = "", sOrderBy as string = ""</ItemParams>
<ItemResult>DataFile.tbl_bestellungen()</ItemResult>
</Method>
@@ -10022,9 +10022,9 @@
<SourceLine>lastuser_uid As Integer</SourceLine>
<SourceLine></SourceLine>
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<TextEncoding>134217984</TextEncoding>
<ItemDeclaration>lastuser_uid As Integer</ItemDeclaration>
<ItemFlags>0</ItemFlags>
<ItemFlags>0</ItemFlags>
<Shared>0</Shared>
</Property>
<Property>
@@ -10206,9 +10206,9 @@
<Shared>0</Shared>
</Property>
<Property>
<ItemName>hilfswerte_coa_uid</ItemName>
<ItemName>hilfswerte_coa_uid</ItemName>
<Compatibility></Compatibility>
<Visible>1</Visible>
<Visible>1</Visible>
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<SourceLine>hilfswerte_coa_uid As Integer</SourceLine>
@@ -10362,9 +10362,9 @@
<SourceLine>End Function</SourceLine>
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<AliasName/>
<AliasName/>
<ItemFlags>0</ItemFlags>
<Shared>1</Shared>
<Shared>1</Shared>
<ItemParams>sCriteria as string = "", sOrderBy as string = ""</ItemParams>
<ItemResult>DataFile.tbl_coa()</ItemResult>
</Method>
@@ -10616,9 +10616,9 @@
<SourceLine/>
<SourceLine>dim rs as RecordSet = gDB.SQLSelect(s)</SourceLine>
<SourceLine/>
<SourceLine>if gdb.error then</SourceLine>
<SourceLine>if gdb.error then</SourceLine>
<SourceLine>System.debugLog gDB.ErrorMessage</SourceLine>
<SourceLine>return nil</SourceLine>
<SourceLine>return nil</SourceLine>
<SourceLine>end</SourceLine>
<SourceLine>if rs.RecordCount = 0 then return nil</SourceLine>
<SourceLine/>
@@ -10954,9 +10954,9 @@
<Compatibility></Compatibility>
<Visible>1</Visible>
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<TextEncoding>134217984</TextEncoding>
<SourceLine>kontrakt_intern As String</SourceLine>
<SourceLine></SourceLine>
<SourceLine></SourceLine>
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<ItemDeclaration>kontrakt_intern As String</ItemDeclaration>
@@ -11124,9 +11124,9 @@
<SourceLine>dim s as string</SourceLine>
<SourceLine>s = "Select * from tbl_kunden WHERE uid = " + str(id)</SourceLine>
<SourceLine/>
<SourceLine>dim rs as RecordSet = gDB.SQLSelect(s)</SourceLine>
<SourceLine>dim rs as RecordSet = gDB.SQLSelect(s)</SourceLine>
<SourceLine/>
<SourceLine>if gdb.error then</SourceLine>
<SourceLine>if gdb.error then</SourceLine>
<SourceLine>System.debugLog gDB.ErrorMessage</SourceLine>
<SourceLine>return nil</SourceLine>
<SourceLine>end</SourceLine>
@@ -11280,9 +11280,9 @@
<ItemDeclaration>strasse As String</ItemDeclaration>
<ItemFlags>0</ItemFlags>
<Shared>0</Shared>
</Property>
</Property>
<Property>
<ItemName>telefon</ItemName>
<ItemName>telefon</ItemName>
<Compatibility></Compatibility>
<Visible>1</Visible>
<ItemSource>
@@ -11478,9 +11478,9 @@
<SourceLine>break</SourceLine>
<SourceLine>System.debugLog gDB.ErrorMessage</SourceLine>
<SourceLine>return arotbl_kunden_adressen</SourceLine>
<SourceLine>end</SourceLine>
<SourceLine>end</SourceLine>
<SourceLine/>
<SourceLine>do until rs.EOF</SourceLine>
<SourceLine>do until rs.EOF</SourceLine>
<SourceLine>dim oRecord as new DataFile.tbl_kunden_adressen</SourceLine>
<SourceLine>oRecord.ReadRecord(rs)</SourceLine>
<SourceLine/>
@@ -11676,9 +11676,9 @@
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<SourceLine> Shared Function List(sCriteria as string = "", sOrderBy as string = "") As DataFile.tbl_laenderkennungen()</SourceLine>
<SourceLine>//Usage:</SourceLine>
<SourceLine>//Usage:</SourceLine>
<SourceLine>// dim arotbl_laenderkennungen() as DataFile.tbl_laenderkennungen = DataFile.tbl_laenderkennungen.List("fieldName = somevalue", "fieldName")</SourceLine>
<SourceLine/>
<SourceLine/>
<SourceLine>dim arotbl_laenderkennungen() as DataFile.tbl_laenderkennungen</SourceLine>
<SourceLine>dim s as string</SourceLine>
<SourceLine/>
@@ -11846,9 +11846,9 @@
<ItemDeclaration>system_created As Date</ItemDeclaration>
<ItemFlags>0</ItemFlags>
<Shared>0</Shared>
</Property>
</Property>
<Property>
<ItemName>system_deleted</ItemName>
<ItemName>system_deleted</ItemName>
<Compatibility></Compatibility>
<Visible>1</Visible>
<ItemSource>
@@ -12086,9 +12086,9 @@
<Compatibility></Compatibility>
<Visible>1</Visible>
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<TextEncoding>134217984</TextEncoding>
<SourceLine>system_created As Date</SourceLine>
<SourceLine></SourceLine>
<SourceLine></SourceLine>
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<ItemDeclaration>system_created As Date</ItemDeclaration>
@@ -12368,9 +12368,9 @@
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<ItemDeclaration>system_lastedit As Date</ItemDeclaration>
<ItemFlags>0</ItemFlags>
<ItemFlags>0</ItemFlags>
<Shared>0</Shared>
</Property>
</Property>
<Method>
<ItemName>List</ItemName>
<Compatibility/>
@@ -12720,9 +12720,9 @@
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<SourceLine>email1 As String</SourceLine>
<SourceLine></SourceLine>
<SourceLine></SourceLine>
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<TextEncoding>134217984</TextEncoding>
<ItemDeclaration>email1 As String</ItemDeclaration>
<ItemFlags>0</ItemFlags>
<Shared>0</Shared>
@@ -12904,9 +12904,9 @@
<SourceLine>if sOrderBy.trim &lt;&gt; "" then </SourceLine>
<SourceLine>s = s + " ORDER BY " + sOrderBy</SourceLine>
<SourceLine>end</SourceLine>
<SourceLine/>
<SourceLine/>
<SourceLine>dim rs as RecordSet = gDB.SQLSelect(s)</SourceLine>
<SourceLine>If gdb.error then</SourceLine>
<SourceLine>If gdb.error then</SourceLine>
<SourceLine>break</SourceLine>
<SourceLine>System.debugLog gDB.ErrorMessage</SourceLine>
<SourceLine>return arotbl_speditionen</SourceLine>
@@ -13144,9 +13144,9 @@
<Shared>0</Shared>
</Property>
<Property>
<ItemName>active</ItemName>
<ItemName>active</ItemName>
<Compatibility></Compatibility>
<Visible>1</Visible>
<Visible>1</Visible>
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<SourceLine>active As Integer</SourceLine>
@@ -13258,15 +13258,29 @@
<SourceLine>End Function</SourceLine>
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<AliasName/>
<AliasName/>
<ItemFlags>0</ItemFlags>
<Shared>1</Shared>
<Shared>1</Shared>
<ItemParams>sCriteria as string = "", sOrderBy as string = ""</ItemParams>
<ItemResult>DataFile.tbl_speditionen_adressen()</ItemResult>
</Method>
<Method>
<ItemName>FindByID</ItemName>
<Compatibility/>
<Visible>1</Visible>
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<SourceLine> Shared Function FindByID(id as Integer) As DataFile.tbl_speditionen_adressen</SourceLine>
<SourceLine>//Usage:</SourceLine>
<SourceLine>//dim tbl_speditionen_adressen as DataFile.tbl_speditionen_adressen = DataFile.tbl_speditionen_adressen.FindByID( id )</SourceLine>
<SourceLine>dim s as string</SourceLine>
<SourceLine>s = "Select * from tbl_speditionen_adressen WHERE uid = " + str(id)</SourceLine>
<SourceLine/>
<SourceLine>dim rs as RecordSet = gDB.SQLSelect(s)</SourceLine>
<SourceLine/>
<SourceLine>if gdb.error then</SourceLine>
<SourceLine>System.debugLog gDB.ErrorMessage</SourceLine>
<SourceLine>return nil</SourceLine>
<SourceLine>end</SourceLine>
<SourceLine>if rs.RecordCount = 0 then return nil</SourceLine>
<SourceLine/>
@@ -13335,20 +13349,6 @@
<ItemFlags>0</ItemFlags>
<Shared>0</Shared>
</Property>
<Property>
<ItemName>spedition_uid</ItemName>
<Compatibility></Compatibility>
<Visible>1</Visible>
<ItemSource>
<TextEncoding>134217984</TextEncoding>
<SourceLine>spedition_uid As Integer</SourceLine>
<SourceLine></SourceLine>
</ItemSource>
<TextEncoding>134217984</TextEncoding>
<ItemDeclaration>spedition_uid As Integer</ItemDeclaration>
<ItemFlags>0</ItemFlags>
<Shared>0</Shared>
</Property>
<Property>
<ItemName>benutzerwerk_uid</ItemName>
<Compatibility></Compatibility>