diff --git a/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb index 1349d7d..bcd0ba9 100644 --- a/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb @@ -577,7 +577,7 @@ Public Class ClassDOC_SEARCH If IsNothing(result) Or IsDBNull(result) Then Return Nothing End If - LOGGER.Debug($"dwAccesRight for DocID [{DOC_ID}] is {result}") + LOGGER.Debug($"dwAccesRight for DocID [{DOC_ID}] is [{result}]") Select Case result Case 1 If USER_IS_ADMIN = False Then @@ -593,6 +593,10 @@ Public Class ClassDOC_SEARCH Return "RWA" Case 141 Return "RWA" + Case 263 + Return "RWA" + Case WM_RWA + Return "RWA" Case Else Return "R" End Select diff --git a/app/DD-Record-Organizer/Classes/ClassInit.vb b/app/DD-Record-Organizer/Classes/ClassInit.vb index b4dde67..e1bded9 100644 --- a/app/DD-Record-Organizer/Classes/ClassInit.vb +++ b/app/DD-Record-Organizer/Classes/ClassInit.vb @@ -168,8 +168,8 @@ Public Class ClassInit Throw New Exception("Find more information in the logfile.") End If - Dim sql = String.Format("SELECT * FROM TBPMO_KONFIGURATION WHERE GUID = 1") - Dim KONFIG_DT As DataTable = MYDB_ECM.GetDatatable(sql) + Dim oSql = String.Format("SELECT * FROM TBPMO_KONFIGURATION WHERE GUID = 1") + Dim KONFIG_DT As DataTable = MYDB_ECM.GetDatatable(oSql) If KONFIG_DT.Rows.Count = 1 Then Try MY_WIKISTRING = KONFIG_DT.Rows(0).Item("WIKI_STRING") @@ -189,28 +189,44 @@ Public Class ClassInit End If End If - sql = "SELECT * FROM TBDD_SQL_COMMANDS" - Dim oDTSQL_COMMANDS As DataTable = MYDB_ECM.GetDatatable(sql) + oSql = "SELECT * FROM TBDD_SQL_COMMANDS" + Dim oDTSQL_COMMANDS As DataTable = MYDB_ECM.GetDatatable(oSql) For Each oRow As DataRow In oDTSQL_COMMANDS.Rows If oRow.Item("TITLE") = "ADDI_DOC_SEARCH_RECORD" Then SQL_DOC_RESULT_RECORD = oRow.Item("SQL_COMMAND") LOGGER.Debug("SQL_DOC_RESULT_RECORD = " + SQL_DOC_RESULT_RECORD) End If Next - sql = "SELECT * FROM TBPMO_CONTROL" - CURRENT_TBPMO_CONTROL = MYDB_ECM.GetDatatable(sql) - sql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1") - DT_DOCSEARCH_RESULTLIST_CONFIG = MYDB_ECM.GetDatatable(sql) - sql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_VARIABLE_CONTROLS") - CURRENT_VARIABLE_CONTROLS = MYDB_ECM.GetDatatable(sql) - sql = String.Format("SELECT * FROM TBPMO_FORM_VIEW") - CURRENT_TBPMO_FORM_VIEW = MYDB_ECM.GetDatatable(sql) - sql = String.Format("select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID") - CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = MYDB_ECM.GetDatatable(sql) + Try + oSql = "SELECT * FROM TBDD_CATALOG" + Dim oDTTBDD_CATALOG As DataTable = MYDB_ECM.GetDatatable(oSql) + For Each oRow As DataRow In oDTTBDD_CATALOG.Rows + If oRow.Item("CAT_TITLE") = "DDSUPPORT_PORTAL" Then + CONF_SUPPORTPORTAL = oRow.Item("CAT_STRING") + LOGGER.Debug("CONF_SUPPORTPORTAL = " + CONF_SUPPORTPORTAL) + ElseIf oRow.Item("CAT_TITLE") = "WM_RWA" Then + WM_RWA = oRow.Item("CAT_STRING") + LOGGER.Debug("WM_RWA = " + WM_RWA) + End If + Next + Catch ex As Exception + LOGGER.Error(ex) + End Try + + oSql = "SELECT * FROM TBPMO_CONTROL" + CURRENT_TBPMO_CONTROL = MYDB_ECM.GetDatatable(oSql) + oSql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1") + DT_DOCSEARCH_RESULTLIST_CONFIG = MYDB_ECM.GetDatatable(oSql) + oSql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_VARIABLE_CONTROLS") + CURRENT_VARIABLE_CONTROLS = MYDB_ECM.GetDatatable(oSql) + oSql = String.Format("SELECT * FROM TBPMO_FORM_VIEW") + CURRENT_TBPMO_FORM_VIEW = MYDB_ECM.GetDatatable(oSql) + oSql = String.Format("select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID") + CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = MYDB_ECM.GetDatatable(oSql) clsCURRENT.LOG_ERRORS_ONLY = DEBUG - sql = String.Format("select* from TBPMO_FILE_FORMATS_CHANGE") - Dim oDTFF_CHANGE As DataTable = MYDB_ECM.GetDatatable(sql) + oSql = String.Format("select* from TBPMO_FILE_FORMATS_CHANGE") + Dim oDTFF_CHANGE As DataTable = MYDB_ECM.GetDatatable(oSql) For Each oRow As DataRow In oDTFF_CHANGE.Rows FILE_FORMATS_CHANGE_DURING_EDIT.Add(oRow.Item("FILE_EXT")) Next @@ -405,6 +421,9 @@ Public Class ClassInit LOGGER.Debug($"..Successfully connected to Modules.Windream!") End If Catch ex As Exception + If IsNothing(WMMOD) Then + MsgBox($"Could not connect to windream [{WM_SERVER}]! Check Your configuration and inform Your admin!", MsgBoxStyle.Exclamation) + End If LOGGER.Error(ex) LOGGER.Warn("Could not create the login for DigitalData.Modules.Windream.Windream! Setting WM_READ_ONLY = True") WM_READ_ONLY = True diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index 3e0e28b..9cae443 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -196,6 +196,8 @@ Module ModuleRuntimeVariables Public CURRENT_FILE_RIGHT As String Public SQL_DOC_RESULT_RECORD As String = "" + Public CONF_SUPPORTPORTAL As String = "https://www.digitaldata.works/Support'" + Public WM_RWA As String = "" Public CURRENT_DT_TBPMO_DOC_RECORD_LINK As DataTable Public Property MYDB_ECM As MSSQLServer diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 8478eb6..aaeac15 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb b/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb index 1eac067..9a0369f 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb +++ b/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb @@ -44,7 +44,6 @@ Partial Class frmConfig_Basic Me.txtPasswort = New System.Windows.Forms.TextBox() Me.BtnConnect = New System.Windows.Forms.Button() Me.TabPage2 = New System.Windows.Forms.TabPage() - Me.Button4 = New System.Windows.Forms.Button() Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.Label11 = New System.Windows.Forms.Label() Me.Label10 = New System.Windows.Forms.Label() @@ -56,6 +55,7 @@ Partial Class frmConfig_Basic Me.Button3 = New System.Windows.Forms.Button() Me.cmbLanguage = New System.Windows.Forms.ComboBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.Label7 = New System.Windows.Forms.Label() Me.cmbConstructor = New System.Windows.Forms.ComboBox() Me.CheckBox1 = New System.Windows.Forms.CheckBox() @@ -83,7 +83,6 @@ Partial Class frmConfig_Basic Me.btncheckWDFolderexists = New System.Windows.Forms.Button() Me.txtwdFolder = New System.Windows.Forms.TextBox() Me.Label12 = New System.Windows.Forms.Label() - Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -232,7 +231,6 @@ Partial Class frmConfig_Basic ' 'TabPage2 ' - Me.TabPage2.Controls.Add(Me.Button4) Me.TabPage2.Controls.Add(Me.GroupBox5) Me.TabPage2.Controls.Add(Me.GroupBox1) Me.TabPage2.Controls.Add(Me.GroupBox4) @@ -245,13 +243,6 @@ Partial Class frmConfig_Basic Me.TabPage2.Name = "TabPage2" Me.TabPage2.UseVisualStyleBackColor = True ' - 'Button4 - ' - Me.Button4.Image = Global.DD_Record_Organizer.My.Resources.Resources.email_go - resources.ApplyResources(Me.Button4, "Button4") - Me.Button4.Name = "Button4" - Me.Button4.UseVisualStyleBackColor = True - ' 'GroupBox5 ' Me.GroupBox5.Controls.Add(Me.Label11) @@ -328,6 +319,15 @@ Partial Class frmConfig_Basic Me.GroupBox3.Name = "GroupBox3" Me.GroupBox3.TabStop = False ' + 'CheckBox2 + ' + resources.ApplyResources(Me.CheckBox2, "CheckBox2") + Me.CheckBox2.Checked = Global.DD_Record_Organizer.My.MySettings.Default.EntFormsChild + Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked + Me.CheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.DD_Record_Organizer.My.MySettings.Default, "EntFormsChild", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.CheckBox2.Name = "CheckBox2" + Me.CheckBox2.UseVisualStyleBackColor = True + ' 'Label7 ' resources.ApplyResources(Me.Label7, "Label7") @@ -513,15 +513,6 @@ Partial Class frmConfig_Basic resources.ApplyResources(Me.Label12, "Label12") Me.Label12.Name = "Label12" ' - 'CheckBox2 - ' - resources.ApplyResources(Me.CheckBox2, "CheckBox2") - Me.CheckBox2.Checked = Global.DD_Record_Organizer.My.MySettings.Default.EntFormsChild - Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.DD_Record_Organizer.My.MySettings.Default, "EntFormsChild", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.CheckBox2.Name = "CheckBox2" - Me.CheckBox2.UseVisualStyleBackColor = True - ' 'frmConfig_Basic ' resources.ApplyResources(Me, "$this") @@ -589,7 +580,6 @@ Partial Class frmConfig_Basic Friend WithEvents Label11 As System.Windows.Forms.Label Friend WithEvents Label10 As System.Windows.Forms.Label Friend WithEvents txtTask_Popup As System.Windows.Forms.TextBox - Friend WithEvents Button4 As System.Windows.Forms.Button Friend WithEvents chkSubfolder As System.Windows.Forms.CheckBox Friend WithEvents rbConn_Proxy As System.Windows.Forms.RadioButton Friend WithEvents rbConnDefault As System.Windows.Forms.RadioButton diff --git a/app/DD-Record-Organizer/frmConfig_Basic.resx b/app/DD-Record-Organizer/frmConfig_Basic.resx index e526f13..87d44de 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.resx +++ b/app/DD-Record-Organizer/frmConfig_Basic.resx @@ -180,7 +180,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 - JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsSAAALEgHS3X78AAACLUlE + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsQAAALEAGtI711AAACLUlE QVQ4T52TvY/ScBjHuVIRKHA9JAgnL+VoC7TX0kLLS6EvFBTa0uj5J7gYF+PsfpOTMrg4ORgHY+LCYJwc TYyJiYuDLu7GxHgxd/Hnr5fA8TZcrsmnzfN9nufTNPnVBwDw2ZYljGzr3ciyTNu2EC87L75eb+DvD67f hU9g9vt/HNs5cMaOf9Owohro7YNbe8PhjfuzzBOgkDuabk6bbRXoxuBkNLIeus6yhKyIwY5umo5tHxmG @@ -628,39 +628,6 @@ 0 - - MiddleLeft - - - NoControl - - - 363, 13 - - - 133, 23 - - - 14 - - - Create Log-Email - - - MiddleRight - - - Button4 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 0 - True @@ -776,7 +743,7 @@ TabPage2 - 1 + 0 Segoe UI, 8.25pt @@ -878,7 +845,7 @@ TabPage2 - 2 + 1 Segoe UI, 8.25pt @@ -965,7 +932,7 @@ TabPage2 - 3 + 2 True @@ -1114,7 +1081,7 @@ in Hauptform aufrufen TabPage2 - 4 + 3 True @@ -1144,7 +1111,7 @@ in Hauptform aufrufen TabPage2 - 5 + 4 MiddleLeft @@ -1153,7 +1120,7 @@ in Hauptform aufrufen NoControl - 363, 42 + 372, 17 133, 23 @@ -1177,7 +1144,7 @@ in Hauptform aufrufen TabPage2 - 6 + 5 MiddleLeft @@ -1186,7 +1153,7 @@ in Hauptform aufrufen NoControl - 502, 42 + 511, 17 161, 23 @@ -1210,7 +1177,7 @@ in Hauptform aufrufen TabPage2 - 7 + 6 True @@ -1243,7 +1210,7 @@ in Hauptform aufrufen TabPage2 - 8 + 7 4, 22 diff --git a/app/DD-Record-Organizer/frmConfig_Basic.vb b/app/DD-Record-Organizer/frmConfig_Basic.vb index 7c955af..8806b4f 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.vb +++ b/app/DD-Record-Organizer/frmConfig_Basic.vb @@ -178,8 +178,14 @@ Public Class frmConfig_Basic Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked ' Specify that the link was visited. Me.LinkLabel1.LinkVisited = True - ' Navigate to a URL. - System.Diagnostics.Process.Start("http://www.didalog.de/Support") + Try + ' Navigate to a URL. + System.Diagnostics.Process.Start(CONF_SUPPORTPORTAL) + Catch ex As Exception + MsgBox(ex.Message) + Me.LinkLabel1.LinkVisited = False + End Try + End Sub Private Sub btnApplicationFolder_Click(sender As Object, e As EventArgs) Handles btnApplicationFolder.Click @@ -419,12 +425,7 @@ Public Class frmConfig_Basic End Sub - Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click - If email.Send_Log_Mail(" Log-/SupportMail Org-Flow.

", - "Support-Mail OrgFlow", "support@didalog.de", "mail.triplew.de", "support@didalog.de", "ddemail40", "support-flow@digitaldata.works") = True Then - MsgBox("Log Mail was sent to Digital Data!", MsgBoxStyle.Information, "Success!") - End If - End Sub + Private Sub txtScanFolderWatch_TextChanged(sender As Object, e As EventArgs) Handles txtScanFolderWatch.TextChanged CheckScanFolder(txtScanFolderWatch.Text, chkSubfolder.Checked) diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb index c95a415..fe07293 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb @@ -24,7 +24,7 @@ Partial Class frmNodeNavigation Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNodeNavigation)) - Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Me.ribbonNodeNavigation = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.bbtnitmRecEdit = New DevExpress.XtraBars.BarButtonItem() Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem() @@ -86,6 +86,7 @@ Partial Class frmNodeNavigation Me.TimerClearResultfiles = New System.Windows.Forms.Timer(Me.components) Me.SplitContainerDocView = New DevExpress.XtraEditors.SplitContainerControl() Me.DocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.tsitmDMSReadOnly = New DevExpress.XtraBars.BarStaticItem() CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerTreeList, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerTreeList.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -116,9 +117,9 @@ Partial Class frmNodeNavigation 'ribbonNodeNavigation ' Me.ribbonNodeNavigation.ExpandCollapseItem.Id = 0 - Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand, Me.checkShowPreview, Me.btnCreateNewNode}) + Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand, Me.checkShowPreview, Me.btnCreateNewNode, Me.tsitmDMSReadOnly}) Me.ribbonNodeNavigation.Location = New System.Drawing.Point(0, 0) - Me.ribbonNodeNavigation.MaxItemId = 22 + Me.ribbonNodeNavigation.MaxItemId = 24 Me.ribbonNodeNavigation.Name = "ribbonNodeNavigation" Me.ribbonNodeNavigation.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.ribbonNodeNavigation.PopupMenuAlignment = DevExpress.XtraBars.PopupMenuAlignment.Left @@ -306,6 +307,7 @@ Partial Class frmNodeNavigation Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDocID) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmRecordID) + Me.RibbonStatusBar1.ItemLinks.Add(Me.tsitmDMSReadOnly) Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemLocked) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmtInfoDoc) Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 788) @@ -416,8 +418,8 @@ Partial Class frmNodeNavigation Me.GridControlDocSearch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.GridControlDocSearch.ContextMenuStrip = Me.cmsResultFileDetail Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill - GridLevelNode1.RelationName = "Level1" - Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) + GridLevelNode2.RelationName = "Level1" + Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0) Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search Me.GridControlDocSearch.Name = "GridControlDocSearch" @@ -643,6 +645,16 @@ Partial Class frmNodeNavigation Me.DocumentViewer.Size = New System.Drawing.Size(0, 0) Me.DocumentViewer.TabIndex = 0 ' + 'tsitmDMSReadOnly + ' + Me.tsitmDMSReadOnly.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + Me.tsitmDMSReadOnly.Caption = "DMS Read Only" + Me.tsitmDMSReadOnly.Id = 23 + Me.tsitmDMSReadOnly.ImageOptions.Image = CType(resources.GetObject("BarStaticItem1.ImageOptions.Image"), System.Drawing.Image) + Me.tsitmDMSReadOnly.ImageOptions.LargeImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.LargeImage"), System.Drawing.Image) + Me.tsitmDMSReadOnly.Name = "tsitmDMSReadOnly" + Me.tsitmDMSReadOnly.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' 'frmNodeNavigation ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -747,4 +759,5 @@ Partial Class frmNodeNavigation Friend WithEvents btnCreateNewNode As DevExpress.XtraBars.BarButtonItem Friend WithEvents DokumentartÄndernToolStripMenuItem As ToolStripMenuItem Friend WithEvents SplitContainerDocumentSearch As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents tsitmDMSReadOnly As DevExpress.XtraBars.BarStaticItem End Class diff --git a/app/DD-Record-Organizer/frmNodeNavigation.resx b/app/DD-Record-Organizer/frmNodeNavigation.resx index d8040cb..3ea263d 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.resx +++ b/app/DD-Record-Organizer/frmNodeNavigation.resx @@ -466,6 +466,71 @@ Cjwvc3ZnPgs= + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAB90RVh0VGl0 + bGUAUHJvdGVjdERvY3VtZW50O1NlY3VyaXR5O5yDpqEAAAKtSURBVDhPjZFbSJNxGMaXlqVmkiVURnZh + VCBIUSTkTWEkGImSRWQpQtZQtLFybqbuIjtIUZhhSTlnYt1JOF0rT3mcm87DLPSmMs2cm1PTedh0T//3 + y31WFPTAD77T8zzv//0ETKvk5cY6+Ys+5JT3IrusF9ef9yCztAcyZTekJQZIig1If9YJ0eOWRva9BwCB + C5IbGf9Hoic6cnixy98C3LNYK0lSrP2FdmSUEDpIlTqMTc4jtVBLjvUuM0FanVnaTX5M2RyYtNkxMWOH + 9bsdlqkFmJnRNDmH0Yk5JBe0ksPHZSa4AGlJF/mRodDySBQr7bJSHUassxDmt5Bjw+HYdEFotJgPWJOu + 6OQCrNN2jE+z1uVmah21znHmrxYbku43ksM3NPqq4MBJER/gIX6q5wKk7Mw8XLMej6o+oFjTB1GuAmGn + pTgYdaWamQP2R6bxAWtpuyTz1Dy3LBNr/jY+ixHGMGtOlhfhnvI1BkzzyC1SYV9kakNIRAof4JnGtkuS + KfUrsPaHlUaU1fQh7JQY9YaPOBSVBlXbAILDkxaYz5vhTgFeyQVtXACdmc47bJnFkNmG/sExGArPwpgb + gm55MDqy9qJdshut4iCohYHa5RCBtzC/mQv4c4I7L7Uw3ggBJt7DaemAc7QZzuE3WPpUgTrhDpp/IxeQ + 9KCRC3A1D5pn8Nk0A0P/F3TlBLPldGCpJgbKM/5YVJ+AoyoCby8GUIAfBay7cFP9LvFuAxLy6hGfV4fz + t2sRd6sWsVkV0Mv2sOYmLGpOIvuoD2d2VB6DOmErH+DG8GT4MmgkeriJsZkRpL22C84hDRzVkXCojjNz + OOyvjqDqnP/PI7DJ/wmTt/ryzqb6lEDUXNoOTeI2VMdvgSrOH+Uxfk30/q9GF0z0m2jTrslc0D17LnD/ + AcNOfPqnudCoAAAAAElFTkSuQmCC + + + + + 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 + + + + 17, 17 + + + 483, 17 + 17, 17 @@ -477,9 +542,6 @@ ZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0cmVhbWVyAAAAAAIAAAAL - - 483, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 62a4b8f..4596a4e 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -177,7 +177,11 @@ Public Class frmNodeNavigation ' "GROUP BY T1.ENTITY_ID,T.GUID,T.TITLE,T.MANUALLY,T.CREATE_ON_REC_CREATE,T.CREATE_ON_FOLL_UP" 'DT_WORKFLOWS_MANUAL = MYDB_ECM.GetDatatable(sql_ResultList) Load_Datafor_Entity() - + If WM_READ_ONLY Then + tsitmDMSReadOnly.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + Else + tsitmDMSReadOnly.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End If FORM_LOADED = True Catch ex As Exception LOGGER.Error(ex) diff --git a/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj b/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj index f8c7cd3..065fd39 100644 --- a/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj +++ b/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj @@ -1,63 +1,81 @@ - - Debug - x86 - 3.10 - a7f7585a-c46a-4436-9f6e-17629325ce58 - 2.0 - Package - SetupVS19 - - - bin\$(Configuration)\ - Debug - + + Debug + x86 + 3.10 + a7f7585a-c46a-4436-9f6e-17629325ce58 + 2.0 + Package + SetupVS19 + + + bin\$(Configuration)\ + Debug + -b "$(SolutionDir)DD-Record-Organizer\bin\$(Configuration)" -b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)" -cultures:de-DE,en-US - - - bin\$(Configuration)\ - - - - - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + bin\$(Configuration)\ + + + + + + + + + + $(WixExtDir)\WixUtilExtension.dll + WixUtilExtension + + + $(WixExtDir)\WixUIExtension.dll + WixUIExtension + + + + + OrgFlow + {bdcc148b-4c84-4a48-80cf-4c56057294e0} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + RecordOrganizer_RightManager + {f1c8a9df-2452-4e3b-9c32-0c792f6ed2e6} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file