MS_29012016

This commit is contained in:
SchreiberM
2016-01-29 14:46:32 +01:00
parent 3cc10569ad
commit 66b70f44b9
28 changed files with 3998 additions and 1981 deletions

View File

@@ -266,7 +266,9 @@
End Sub
Public Sub LoadControls()
Dim dt As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM VWPMO_CONTROL_SCREEN where FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID)
Dim sql = String.Format("SELECT T.*, dbo.FNPMO_GET_CONTROL_CAPTION ('{0}', {1},T.CONTROL_ID) AS 'CAPTION' FROM VWPMO_CONTROL_SCREEN T" & _
" where T.FORM_ID = {2} and T.SCREEN_ID = {3}", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_FORM_ID, CURRENT_SCREEN_ID)
Dim dt As DataTable = ClassDatabase.Return_Datatable(sql)
For Each dr As DataRow In dt.Rows
@@ -280,7 +282,7 @@
Case 1 ' Label
CtrlBuilder.AddLabel(dr.Item("CONTROL_ID"),
dr.Item("CONTROL_NAME"),
dr.Item("CTRLSCR_CAPTION"),
dr.Item("CAPTION"),
dr.Item("CTRLSCR_X_LOC"),
dr.Item("CTRLSCR_Y_LOC"),
dr.Item("CTRLSCR_FONT_FAMILY"),