AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj 06.03.17

Browse Source
This commit is contained in:
JenneJ
2017-03-06 15:42:42 +01:00
parent 4fbf33d5ab
commit 97eb1abd78
6 changed files with 160 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/DD-Record-Organizer/frmLevel_Designer.vb
View File

@@ -666,7 +666,8 @@
Try
Dim controlId = DirectCast(ctrl.Tag, ClassControlMetadata).Id
Dim sql As String = String.Format("SELECT * FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_ID = {0}", ControlId)
Dim sql As String = String.Format("SELECT T.*, dbo.FNPMO_GET_CONTROL_CAPTION ('{0}',{1},{2}) AS 'CAPTION_TRANSLATED' FROM VWPMO_CONTROL_SCREEN T WHERE CONTROL_ID = {2}", USER_LANGUAGE, CURRENT_SCREEN_ID, controlId)
'Dim sql As String = String.Format("SELECT * FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_ID = {0}", controlId)
'Dim sqlHint As String = String.Format("SELECT HINT FROM TBPMO_CONTROL_LANGUAGE WHERE CONTROL_SCREEN_ID = {0} AND LANGUAGE_TYPE = '{1}'", controlId, USER_LANGUAGE)
Dim sqlHint = String.Format("SELECT HINT FROM TBPMO_CONTROL_LANGUAGE WHERE CONTROL_SCREEN_ID = (SELECT GUID FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID = {0} AND SCREEN_ID = {1}) AND LANGUAGE_TYPE = '{2}'", controlId, CURRENT_SCREEN_ID, USER_LANGUAGE)
@@ -726,7 +727,9 @@
CType(r.Item("CTRLSCR_FONT_SIZE"), Single),
CType(r.Item("CTRLSCR_FONT_STYLE"), FontStyle))
props.ColumnTitle = r.Item("CONTROL_COL_NAME")
props.Caption = r.Item("CTRLSCR_CAPTION")
props.Caption = r.Item("CAPTION_TRANSLATED")
'props.Caption = r.Item("CTRLSCR_CAPTION")
props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))