diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 9fe0483..c216866 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -1166,6 +1166,7 @@ + diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index c62f518..3696448 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -1330,6 +1330,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property NetworkPipes_32xLG() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("NetworkPipes_32xLG", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index ed2658d..cc795df 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -136,8 +136,8 @@ ..\Resources\DD_Icons-ADDI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Home_5699_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\brainpool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -184,12 +184,18 @@ ..\Resources\f6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\windream-Logo-transparent1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\userAccounts.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\user_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -208,9 +214,6 @@ ..\Resources\112_RefreshArrow_Blue_24x24_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\module_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -238,12 +241,12 @@ ..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\changechartlegendalignment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\page_excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\dtp.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -253,8 +256,11 @@ ..\Resources\application_view_tile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\application_view_detail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Home_5699_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -277,8 +283,8 @@ ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mail.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -304,12 +310,6 @@ ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -358,6 +358,9 @@ ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\database_lightning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -418,15 +421,12 @@ ..\Resources\database_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\windream-Logo-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Men6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -436,9 +436,6 @@ ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\brainpool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -457,6 +454,9 @@ ..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -466,6 +466,9 @@ ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WebUserControl(ascx)_11270_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -487,6 +490,9 @@ ..\Resources\email_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\mail.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\bricks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -505,6 +511,9 @@ ..\Resources\folder_Open_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -535,8 +544,8 @@ ..\Resources\keinbild.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\changechartlegendalignment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -547,8 +556,8 @@ ..\Resources\f1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -586,8 +595,8 @@ ..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -598,6 +607,9 @@ ..\Resources\EditLabel_13239.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\application_view_detail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\HomeHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -610,16 +622,7 @@ ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\windream-Logo-transparent1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\NetworkPipes_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD-Record-Organiser/Resources/NetworkPipes_32xLG.png b/app/DD-Record-Organiser/Resources/NetworkPipes_32xLG.png new file mode 100644 index 0000000..4463625 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/NetworkPipes_32xLG.png differ diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 0374d6b..61f810b 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -500,11 +500,11 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAJQAAAAIB - AAAAAQAAAAAAAAAAAAAAABAAAAAAAAEAcC8AAAYNAAAAAAAACw== + AAAAAQAAAAAAAAAAAAAAABAAAAAAAAEAIS8AAJwMAAAAAAAACw== - 459, 126 + 456, 122 6 diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index c54c14a..6953e58 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -95,6 +95,7 @@ Public Class frmConstructor_Main Private RIGHT_DELETE_DOC As Boolean = False Private RIGHT_ONLY_READ As Boolean = False + Private RIGHT_WINDREAM_FORBIDDEN As Boolean = False Private windream_Docshow As Boolean = False Private WD_Suche As String @@ -123,6 +124,7 @@ Public Class frmConstructor_Main Private RECORD_ID As Integer Private PARENT_ID As Integer Private SQL_RIGHT_READ_AND_VIEW_ONLY As String = "" + Private SQL_RIGHT_WINDREAM_FORBIDDEN As String = "" Private FORM_TYPE As Integer Private ENTITY_ID As Integer @@ -751,6 +753,7 @@ Public Class frmConstructor_Main Show_Selected_Record_Data(Grid_RecordID, False) RIGHT_ONLY_READ = False + RIGHT_WINDREAM_FORBIDDEN = False tsmi_RecordDelete.Enabled = True DeleteToolStripMenuItem.Enabled = True CopyToolStripMenuItem.Enabled = True @@ -758,6 +761,9 @@ Public Class frmConstructor_Main PropertiesToolStripMenuItem.Enabled = True tslblLocked.Visible = False TabFollowUp.PageEnabled = True + + TabWindream.PageEnabled = True + WindreamsucheNeuLadenToolStripMenuItem.Enabled = True Dim tempsql If SQL_RIGHT_READ_AND_VIEW_ONLY <> "" Then Try @@ -809,6 +815,47 @@ Public Class frmConstructor_Main ClassLogger.Add("TempSQL so far: " & tempsql) End Try End If + If SQL_RIGHT_WINDREAM_FORBIDDEN <> "" Then + Try + tempsql = SQL_RIGHT_WINDREAM_FORBIDDEN + tempsql = tempsql.Replace("@RECORDID", RECORD_ID) + tempsql = tempsql.Replace("@RECORD_ID", RECORD_ID) + tempsql = tempsql.Replace("@USER_ID", USER_GUID) + tempsql = tempsql.Replace("@USER_GUID", USER_GUID) + + ''Regulären Ausdruck zum Auslesen der windream-Indexe definieren + 'Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" + '' einen Regulären Ausdruck laden + 'Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg) + '' die Vorkommen im SQL-String auslesen + 'Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(tempsql) + '' alle Vorkommen der windream-Indexe im SQL-String durchlaufen + ''##### + '' alle Vorkommen der windream-Indexe im SQL-String durchlaufen + 'For Each element As System.Text.RegularExpressions.Match In elemente + ' Dim elementohneSZ = element.Value.Replace("[%", "") + ' elementohneSZ = elementohneSZ.Replace("]", "") + ' ' den Platzhalter für den auszulesenden View durch den Viewnamen ersetzen + ' tempsql = tempsql.Replace(element.Value, controlvalue.ToString) + 'Next + + Try + RIGHT_WINDREAM_FORBIDDEN = CBool(ClassDatabase.Execute_Scalar(tempsql)) + Catch ex As Exception + RIGHT_WINDREAM_FORBIDDEN = False + End Try + If RIGHT_WINDREAM_FORBIDDEN = True Then + ' Hinzufügen sollte auch bei RIGHT_ONLY_READ verfügbar sein + TabWindream.PageEnabled = False + WindreamsucheNeuLadenToolStripMenuItem.Enabled = False + End If + + Catch ex As Exception + MsgBox("unexpected Error in Check Read-Limitations WINDREAM:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ClassLogger.Add("Unexpected Error in Check Read-Limitations WINDREAM: " & ex.Message) + ClassLogger.Add("TempSQL so far: " & tempsql) + End Try + End If If TCDetails.SelectedTabPage Is Nothing Then Exit Sub @@ -1650,6 +1697,7 @@ Public Class frmConstructor_Main POS_ENTITY = ClassDatabase.Execute_Scalar("SELECT POS_ENTITY FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID) CONTROL_DOCTYPE_MATCH = ClassDatabase.Execute_Scalar("SELECT CONTROL_DOCTYPE_MATCH FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID) SQL_RIGHT_READ_AND_VIEW_ONLY = ClassDatabase.Execute_Scalar("SELECT SQL_RIGHT_READ_AND_VIEW_ONLY FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID) + SQL_RIGHT_WINDREAM_FORBIDDEN = ClassDatabase.Execute_Scalar("SELECT SQL_RIGHT_WINDREAM_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID) If VIEW_ID_RUNTIME <> -1 Then GRID_TYPE_ID = VIEW_ID_RUNTIME Else @@ -3812,13 +3860,15 @@ Public Class frmConstructor_Main Load_POSGrid_Layout() End If If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("windr") Then - Load_DocGrid_Layout() - tsButtonEdit.Enabled = False - If RECORD_ID = 0 Then - RUN_WD_SEARCH(WD_Suche, "ENTITY") - Else - ' RUN_WD_SEARCH(WD_Suche, "RECORD") - RUN_WDSEARCH_GRID() + If RIGHT_WINDREAM_FORBIDDEN = False Then + Load_DocGrid_Layout() + tsButtonEdit.Enabled = False + If RECORD_ID = 0 Then + RUN_WD_SEARCH(WD_Suche, "ENTITY") + Else + ' RUN_WD_SEARCH(WD_Suche, "RECORD") + RUN_WDSEARCH_GRID() + End If End If End If If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("wieder") Or TCDetails.SelectedTabPage.Text.ToLower.StartsWith("follo") Then @@ -3863,7 +3913,7 @@ Public Class frmConstructor_Main End If End Sub Sub Drag_Drop(e As DragEventArgs) - If act_FormViewID <> 0 And RIGHT_ONLY_READ = False Then + If act_FormViewID <> 0 And RIGHT_ONLY_READ = False And RIGHT_WINDREAM_FORBIDDEN = False Then Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & FORMVIEW_ID If ClassDatabase.Execute_Scalar(sql, True) = 0 Then MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation) @@ -3922,6 +3972,9 @@ Public Class frmConstructor_Main If RIGHT_ONLY_READ = True Then ClassLogger.Add(">> RIGHT_ONLY_READ is set! No DragDrop allowed", False) End If + If RIGHT_WINDREAM_FORBIDDEN = True Then + ClassLogger.Add(">> RIGHT_WD_FORBIDDEN is set! No DragDrop allowed", False) + End If End If End Sub diff --git a/app/DD-Record-Organiser/frmMain.Designer.vb b/app/DD-Record-Organiser/frmMain.Designer.vb index ddd4dd7..a144336 100644 --- a/app/DD-Record-Organiser/frmMain.Designer.vb +++ b/app/DD-Record-Organiser/frmMain.Designer.vb @@ -78,6 +78,7 @@ Partial Class frmMain Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem() Me.TimerClose3Minutes = New System.Windows.Forms.Timer(Me.components) Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.LabelIP = New DevExpress.XtraBars.BarStaticItem() Me.cmsSystray.SuspendLayout() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -170,9 +171,9 @@ Partial Class frmMain Me.ribbonMain.ApplicationButtonDropDownControl = Me.MainMenu Me.ribbonMain.BackColor = System.Drawing.Color.DarkGray Me.ribbonMain.ExpandCollapseItem.Id = 0 - Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelUser, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.LabelLanguage, Me.BarButtonItem20}) + Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelUser, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.LabelLanguage, Me.BarButtonItem20, Me.LabelIP}) resources.ApplyResources(Me.ribbonMain, "ribbonMain") - Me.ribbonMain.MaxItemId = 35 + Me.ribbonMain.MaxItemId = 36 Me.ribbonMain.Name = "ribbonMain" Me.ribbonMain.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.pageHome, Me.pageForms, Me.pageAdmin}) Me.ribbonMain.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013 @@ -487,6 +488,7 @@ Partial Class frmMain 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelMachine) + Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelIP) Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelUser) Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelLoggedIn) Me.RibbonStatusBar1.ItemLinks.Add(Me.LabelVersion) @@ -516,6 +518,14 @@ Partial Class frmMain Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") ' + 'LabelIP + ' + resources.ApplyResources(Me.LabelIP, "LabelIP") + Me.LabelIP.Glyph = Global.DD_Record_Organiser.My.Resources.Resources.NetworkPipes_32xLG + Me.LabelIP.Id = 35 + Me.LabelIP.Name = "LabelIP" + Me.LabelIP.TextAlignment = System.Drawing.StringAlignment.Near + ' 'frmMain ' Me.Appearance.BackColor = CType(resources.GetObject("frmMain.Appearance.BackColor"), System.Drawing.Color) @@ -594,5 +604,6 @@ Partial Class frmMain Friend WithEvents CockpitAnzeigenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents LabelLanguage As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarButtonItem20 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents LabelIP As DevExpress.XtraBars.BarStaticItem End Class diff --git a/app/DD-Record-Organiser/frmMain.resx b/app/DD-Record-Organiser/frmMain.resx index 573ed1c..33bcd2d 100644 --- a/app/DD-Record-Organiser/frmMain.resx +++ b/app/DD-Record-Organiser/frmMain.resx @@ -124,18 +124,6 @@ 442, 56 - - 165, 22 - - - ADDI beenden - - - 165, 22 - - - Cockpit anzeigen - 166, 48 @@ -1044,6 +1032,18 @@ True + + 165, 22 + + + ADDI beenden + + + 165, 22 + + + Cockpit anzeigen + 190, 56 @@ -1898,53 +1898,32 @@ Konfiguration Mo2gQ5ClxGkN/D+QoPYNyjCHoEagDiHUZ/F/wv8lADB+B3eE88Zb5X+IAAAAAElFTkSuQmCC + + BarStaticItem1 + 0, 0 - - Kalender - - - Views/Sichten - Home Yellow - - Views/Sichten - Weitere Sichten - - Programm Konfiguration - - - Tasks und Wiedervorlagen - - - Menü Konfiguration - - - Windream Konfiguration - - - SQL Konfiguration - Administration - 1554, 150 + 1562, 150 - 0, 683 + 0, 687 - 1554, 23 + 1562, 23 RibbonStatusBar1 @@ -1970,6 +1949,30 @@ Konfiguration 3 + + Kalender + + + Views/Sichten + + + Views/Sichten + + + Programm Konfiguration + + + Tasks und Wiedervorlagen + + + Menü Konfiguration + + + Windream Konfiguration + + + SQL Konfiguration + 242, 17 @@ -1995,7 +1998,7 @@ Konfiguration 6, 13 - 1554, 706 + 1562, 710 Segoe UI, 8.25pt @@ -3201,6 +3204,12 @@ Konfiguration DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + LabelIP + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmMain diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index b85724b..174b6aa 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -4,6 +4,8 @@ Imports DevExpress.XtraBars Imports System.ComponentModel Imports System.Threading Imports System.Globalization +Imports System.Net +Imports System.Net.Sockets Public Class frmMain @@ -59,6 +61,44 @@ Public Class frmMain TIMER_SCAN.Enabled = False End Try End Sub + Private Sub GetIPAddress() + Try + Dim strHostName As String + + Dim strIPAddress As String + + strHostName = System.Net.Dns.GetHostName() + Try + strIPAddress = System.Net.Dns.GetHostEntry(strHostName).AddressList(3).ToString() + Catch ex As Exception + strIPAddress = System.Net.Dns.GetHostEntry(strHostName).AddressList(2).ToString() + End Try + + + 'For Each adr In System.Net.Dns.GetHostEntry(strHostName).AddressList() + ' MessageBox.Show(adr.ToString) + 'Next + LabelIP.Caption = "IP Address: " & strIPAddress + Catch ex As Exception + LabelIP.Caption = "error getting IP" + End Try + + + End Sub + 'Private Function GetIPv4Address() As String + ' GetIPv4Address = String.Empty + ' Dim strHostName As String = System.Net.Dns.GetHostName() + ' Dim iphe As System.Net.IPHostEntry = System.Net.Dns.GetHostEntry(strHostName) + + ' For Each ipheal As System.Net.IPAddress In iphe.AddressList + ' If ipheal.AddressFamily = System.Net.Sockets.AddressFamily.InterNetwork Then + ' GetIPv4Address = ipheal.ToString() + ' End If + ' Next + + 'End Function + + Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load ' Referenz zu frmMain speichern MAIN_FORM = Me @@ -67,7 +107,8 @@ Public Class frmMain ' Form Titel setzen ClassWindowLocation.LoadFormLocationSize(Me, 1, CURRENT_SCREEN_ID, "frmMain") Dim i = My.Application.UICulture.ToString() - + GetIPAddress() + ' GetIPv4Address() 'Dim splash As New frmSplash() 'splash.ShowDialog() @@ -77,6 +118,7 @@ Public Class frmMain Me.Text = Application.ProductName LabelVersion.Caption = String.Format("Version {0}", My.Application.Info.Version.ToString) LabelUser.Caption = Environment.UserName + LabelMachine.Caption = My.Computer.Name LabelLanguage.Caption = "Language: " & USER_LANGUAGE Load_Connection_Dep_Data() @@ -491,7 +533,7 @@ Public Class frmMain MsgBox("Application will close now!", MsgBoxStyle.Critical) Me.Close() End If - + 'If DOCTYPE_COUNT_ACTUAL > LICENSE_DOCTYPE_COUNT Then ' If CURRENT_USER_IS_ADMIN = True Then ' ClassLogger.Add(">> User is Admin - Timer will be started", False) @@ -577,7 +619,7 @@ Public Class frmMain TimerTasks.Enabled = False TimerTasks.Stop() End If - + End Sub Private Sub BarButtonItem3_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem3.ItemClick