From 445554295dfe637d160d052a1300375fa3717102 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 31 Mar 2021 14:25:08 +0200 Subject: [PATCH] MS Globix Verwaltung Integration --- GUIs.ZooFlow/Administration/frmAdmin_Start.vb | 18 + GUIs.ZooFlow/ClassDragDrop.vb | 95 ++++++ GUIs.ZooFlow/Globix/GlobixDataset.Designer.vb | 42 ++- GUIs.ZooFlow/Globix/GlobixDataset.xsc | 6 +- GUIs.ZooFlow/Globix/GlobixDataset.xsd | 23 +- GUIs.ZooFlow/Globix/GlobixDataset.xss | 2 +- .../frmGlobixAdministration.Designer.vb | 313 ++++++++++++++++++ .../Globix/frmGlobixAdministration.resx | 156 +++++++++ .../Globix/frmGlobixAdministration.vb | 146 ++++++++ GUIs.ZooFlow/ZooFlow.vbproj | 10 + GUIs.ZooFlow/frmtest.Designer.vb | 13 + GUIs.ZooFlow/frmtest.vb | 18 +- GUIs.ZooFlow/modCurrent.vb | 1 + Modules.EDMIAPI/Client.vb | 7 +- .../DigitalData.Services.EDMIService.xsd | 2 + .../EDMIServiceReference/Reference.vb | 12 +- Modules.EDMIAPI/My Project/AssemblyInfo.vb | 4 +- Service.EDMIService/EDMIService.vb | 15 +- Service.EDMIService/IEDMIService.vb | 2 +- .../My Project/AssemblyInfo.vb | 4 +- 20 files changed, 859 insertions(+), 30 deletions(-) create mode 100644 GUIs.ZooFlow/ClassDragDrop.vb create mode 100644 GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb create mode 100644 GUIs.ZooFlow/Globix/frmGlobixAdministration.resx create mode 100644 GUIs.ZooFlow/Globix/frmGlobixAdministration.vb diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index eb8d1f3c..25e1bcbf 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -334,6 +334,9 @@ Public Class frmAdmin_Start Case Else ShowError($"Scope {oItem.Scope} is not implemented!") End Select + Case TreeList_GLOBIXProfiles.Name + GLOBIX_JUMP_DOCTYPE_ID = oItem.RealGuid + Load_GLOBIXProfile(oItem.RealGuid) End Select End If Catch ex As Exception @@ -387,6 +390,21 @@ Public Class frmAdmin_Start ShowError(ex) End Try End Sub + Private Sub Load_GLOBIXProfile(PrimaryKey As Integer) + Try + Dim oForm As New frmGlobixAdministration(PrimaryKey) + oForm.ShowDialog() + + If oForm.HasChanges Then + Load_SQLData() + Dim oItems As List(Of AdminItem) = AdminItems.Where(AddressOf IsCWItem).ToList + + Load_Tree(oItems, TreeList_CWProfiles) + End If + Catch ex As Exception + ShowError(ex) + End Try + End Sub Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick Try diff --git a/GUIs.ZooFlow/ClassDragDrop.vb b/GUIs.ZooFlow/ClassDragDrop.vb new file mode 100644 index 00000000..5154e5f6 --- /dev/null +++ b/GUIs.ZooFlow/ClassDragDrop.vb @@ -0,0 +1,95 @@ +Imports DevExpress.XtraGrid +Imports DevExpress.XtraGrid.Views.Grid +Imports DevExpress.XtraGrid.Views.Grid.ViewInfo +Imports DigitalData.Modules.Logging + +Public Class ClassDragDrop + Private downHitInfo As GridHitInfo = Nothing + Private _Logger As Logger + Public Sub New() + _Logger = My.LogConfig.GetLogger + End Sub + + Public Sub AddGridView(view As GridView) + AddHandler view.MouseDown, AddressOf view_MouseDown + AddHandler view.MouseMove, AddressOf view_MouseMove + AddHandler view.GridControl.DragOver, AddressOf grid_DragOver + End Sub + + Private Sub view_MouseDown(sender As Object, e As MouseEventArgs) + Dim view As GridView = sender + downHitInfo = Nothing + Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y)) + + If Control.ModifierKeys <> Keys.None Then + Return + End If + + If e.Button = MouseButtons.Left And hitInfo.RowHandle >= 0 Then + downHitInfo = hitInfo + End If + End Sub + + Private Sub view_MouseMove(sender As Object, e As MouseEventArgs) + Try + Dim view As GridView = sender + Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y)) + + If e.Button = MouseButtons.Left And Not IsNothing(downHitInfo) Then + Dim dragSize As Size = SystemInformation.DragSize + Dim dragRect As New Rectangle(New Point(downHitInfo.HitPoint.X - dragSize.Width / 2, downHitInfo.HitPoint.Y - dragSize.Height / 2), dragSize) + + ' DragRect ist ein kleines Rechteck, dessen Mitte der Punkt ist, wo die Maus geklickt wurde. + ' Es soll verhindern, dass durch schnelles Klicken unbeabsichtigt Drag'n'Drop Operationen initiiert werden + ' Siehe: https://msdn.microsoft.com/en-us/library/system.windows.forms.systeminformation.dragsize(v=vs.110).aspx + If Not dragRect.Contains(New Point(e.X, e.Y)) Then + ' dragDropData enhält eine einzelne Row oder den kompletten View, + ' jenachdem, wie die Drag'n'Drop Operation gestartet wurde. + Dim dragDropData As String + + ' Wenn keine Zeile markiert ist + If downHitInfo.RowHandle < 0 Then + Exit Sub + End If + + ' Wenn zwar eine Zeile markiert ist, aber keine über die Checkbox angehakt wurde, + ' wird die markierte Zeile übergeben. + ' Wenn 1 oder n Zeilen über die Checkbox angehakt wurde, werden diese übergeben + Dim row As DataRow = view.GetDataRow(downHitInfo.RowHandle) + Dim source As String = view.GridControl.Name + + If Not IsNothing(row) Then + Try + dragDropData = row.Item("GUID") & "|" & source + + view.GridControl.DoDragDrop(dragDropData, DragDropEffects.Move) + downHitInfo = Nothing + + DevExpress.Utils.DXMouseEventArgs.GetMouseArgs(e).Handled = True + Catch ex As Exception + _Logger.Error(ex) + End Try + End If + End If + End If + Catch ex As Exception + _Logger.Error(ex) + MsgBox("Error in view_MouseMove: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub grid_DragOver(sender As Object, e As DragEventArgs) + If e.Data.GetDataPresent(DataFormats.Text) Then + Dim data As String = e.Data.GetData(DataFormats.Text) + Dim source = data.Split("|")(1) + + Dim grid As GridControl = sender + + If grid.Name <> source Then + e.Effect = DragDropEffects.Move + End If + Else + e.Effect = DragDropEffects.None + End If + End Sub +End Class diff --git a/GUIs.ZooFlow/Globix/GlobixDataset.Designer.vb b/GUIs.ZooFlow/Globix/GlobixDataset.Designer.vb index db3cda0a..666a8218 100644 --- a/GUIs.ZooFlow/Globix/GlobixDataset.Designer.vb +++ b/GUIs.ZooFlow/Globix/GlobixDataset.Designer.vb @@ -1783,7 +1783,7 @@ Namespace GlobixDatasetTableAdapters _ Private Sub InitCommandCollection() - Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, "& _ @@ -1793,6 +1793,22 @@ Namespace GlobixDatasetTableAdapters " (GUID = @GUID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(1).Connection = Me.Connection + Me._commandCollection(1).CommandText = "SELECT TBDD_DOKUMENTART.GUID, TBDD_DOKUMENTART.BEZEICHNUNG, TBDD_DOKUMENTA"& _ + "RT.OBJEKTTYP, TBDD_DOKUMENTART.EINGANGSART_ID, TBDD_DOKUMENTART.KURZNAME, TBDD_D"& _ + "OKUMENTART.ZIEL_PFAD, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBDD_DOKUMENTART.BESCHREIBUNG, "& _ + "TBDD_DOKUMENTART.WINDREAM_DIRECT, TBDD_DOKUMENTART.FOLDER_FOR_INDEX, TBDD_DOKUME"& _ + "NTART.DUPLICATE_HANDLING, TBDD_DOKUMENTART.AKTIV, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBD"& _ + "D_DOKUMENTART.LANGUAGE, TBDD_DOKUMENTART.SEQUENCE, TBDD_DOKUMENTART.NAMENKONVENT"& _ + "ION, TBDD_DOKUMENTART.ERSTELLTWER, TBDD_DOKUMENTART.ERSTELLTWANN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " TBDD_DOKUMENTART.GEANDERTWER, TBDD_DOKUMENTART.GEAENDERTWANN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ + " TBDD_DOKUMENTART INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBDD_DOKUMENTAR"& _ + "T_MODULE ON TBDD_DOKUMENTART.GUID = TBDD_DOKUMENTART_MODULE.DOKART_ID INNER JOIN"& _ + ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBDD_MODULES ON TBDD_DOKUMENTART_MODULE.MODULE_ID = T"& _ + "BDD_MODULES.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (TBDD_MODULES.SHORT_NAME = 'GLOBIX')"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY TB"& _ + "DD_DOKUMENTART.BEZEICHNUNG" + Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text End Sub _ + Public Overloads Overridable Function FillAllDoctypes(ByVal dataTable As GlobixDataset.TBDD_DOKUMENTARTDataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(1) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetDataDoctypes() As GlobixDataset.TBDD_DOKUMENTARTDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(1) + Dim dataTable As GlobixDataset.TBDD_DOKUMENTARTDataTable = New GlobixDataset.TBDD_DOKUMENTARTDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + _ diff --git a/GUIs.ZooFlow/Globix/GlobixDataset.xsc b/GUIs.ZooFlow/Globix/GlobixDataset.xsc index cc169863..00e2e4e4 100644 --- a/GUIs.ZooFlow/Globix/GlobixDataset.xsc +++ b/GUIs.ZooFlow/Globix/GlobixDataset.xsc @@ -9,11 +9,9 @@ - - + - - + diff --git a/GUIs.ZooFlow/Globix/GlobixDataset.xsd b/GUIs.ZooFlow/Globix/GlobixDataset.xsd index 7783ebc5..77614492 100644 --- a/GUIs.ZooFlow/Globix/GlobixDataset.xsd +++ b/GUIs.ZooFlow/Globix/GlobixDataset.xsd @@ -102,7 +102,24 @@ SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHR - + + + + + SELECT TBDD_DOKUMENTART.GUID, TBDD_DOKUMENTART.BEZEICHNUNG, TBDD_DOKUMENTART.OBJEKTTYP, TBDD_DOKUMENTART.EINGANGSART_ID, TBDD_DOKUMENTART.KURZNAME, TBDD_DOKUMENTART.ZIEL_PFAD, + TBDD_DOKUMENTART.BESCHREIBUNG, TBDD_DOKUMENTART.WINDREAM_DIRECT, TBDD_DOKUMENTART.FOLDER_FOR_INDEX, TBDD_DOKUMENTART.DUPLICATE_HANDLING, TBDD_DOKUMENTART.AKTIV, + TBDD_DOKUMENTART.LANGUAGE, TBDD_DOKUMENTART.SEQUENCE, TBDD_DOKUMENTART.NAMENKONVENTION, TBDD_DOKUMENTART.ERSTELLTWER, TBDD_DOKUMENTART.ERSTELLTWANN, + TBDD_DOKUMENTART.GEANDERTWER, TBDD_DOKUMENTART.GEAENDERTWANN +FROM TBDD_DOKUMENTART INNER JOIN + TBDD_DOKUMENTART_MODULE ON TBDD_DOKUMENTART.GUID = TBDD_DOKUMENTART_MODULE.DOKART_ID INNER JOIN + TBDD_MODULES ON TBDD_DOKUMENTART_MODULE.MODULE_ID = TBDD_MODULES.GUID +WHERE (TBDD_MODULES.SHORT_NAME = 'GLOBIX') +ORDER BY TBDD_DOKUMENTART.BEZEICHNUNG + + + + + @@ -112,7 +129,7 @@ SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHR - + @@ -121,7 +138,7 @@ SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHR - + diff --git a/GUIs.ZooFlow/Globix/GlobixDataset.xss b/GUIs.ZooFlow/Globix/GlobixDataset.xss index 1bd33e24..937e37e6 100644 --- a/GUIs.ZooFlow/Globix/GlobixDataset.xss +++ b/GUIs.ZooFlow/Globix/GlobixDataset.xss @@ -6,7 +6,7 @@ --> - + diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb new file mode 100644 index 00000000..275e75d8 --- /dev/null +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb @@ -0,0 +1,313 @@ + _ +Partial Class frmGlobixAdministration + Inherits DevExpress.XtraBars.Ribbon.RibbonForm + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGlobixAdministration)) + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupManualIndex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupManualIndexFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupAutoIndex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.AKTIVCheckBox = New System.Windows.Forms.CheckBox() + Me.TBDD_DOKUMENTARTBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.GlobixDataset = New DigitalData.GUIs.ZooFlow.GlobixDataset() + Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() + Me.TBDD_DOKUMENTARTTableAdapter = New DigitalData.GUIs.ZooFlow.GlobixDatasetTableAdapters.TBDD_DOKUMENTARTTableAdapter() + Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.GlobixDatasetTableAdapters.TableAdapterManager() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colBEZEICHNUNG = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colBESCHREIBUNG = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage() + Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage() + Me.Label32 = New System.Windows.Forms.Label() + Me.ComboBox3 = New System.Windows.Forms.ComboBox() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.XtraTabPage1.SuspendLayout() + CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GlobixDataset, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl2.SuspendLayout() + Me.SuspendLayout() + ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 1 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.Size = New System.Drawing.Size(1243, 159) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupManualIndex, Me.RibbonPageGroupManualIndexFunctions, Me.RibbonPageGroupAutoIndex}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Profil-Verwaltung" + ' + 'RibbonPageGroupManualIndex + ' + Me.RibbonPageGroupManualIndex.Name = "RibbonPageGroupManualIndex" + Me.RibbonPageGroupManualIndex.Text = "Manuelle Indexe" + ' + 'RibbonPageGroupManualIndexFunctions + ' + Me.RibbonPageGroupManualIndexFunctions.Name = "RibbonPageGroupManualIndexFunctions" + Me.RibbonPageGroupManualIndexFunctions.Text = "Nachbearbeitungsfunktionen" + ' + 'RibbonPageGroupAutoIndex + ' + Me.RibbonPageGroupAutoIndex.Name = "RibbonPageGroupAutoIndex" + Me.RibbonPageGroupAutoIndex.Text = "Automatische Indexe" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 698) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1243, 22) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + Me.RibbonPageGroup3.Text = "Profil-Verwaltung" + ' + 'XtraTabControl1 + ' + Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl1.Location = New System.Drawing.Point(174, 159) + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 + Me.XtraTabControl1.Size = New System.Drawing.Size(1069, 539) + Me.XtraTabControl1.TabIndex = 3 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) + ' + 'XtraTabPage1 + ' + Me.XtraTabPage1.Controls.Add(Me.Label32) + Me.XtraTabPage1.Controls.Add(Me.ComboBox3) + Me.XtraTabPage1.Controls.Add(Me.XtraTabControl2) + Me.XtraTabPage1.Controls.Add(Me.AKTIVCheckBox) + Me.XtraTabPage1.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.XtraTabPage1.Name = "XtraTabPage1" + Me.XtraTabPage1.Size = New System.Drawing.Size(1067, 497) + Me.XtraTabPage1.Text = "Profil-Verwaltung" + ' + 'AKTIVCheckBox + ' + Me.AKTIVCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_DOKUMENTARTBindingSource, "AKTIV", True)) + Me.AKTIVCheckBox.Location = New System.Drawing.Point(5, 3) + Me.AKTIVCheckBox.Name = "AKTIVCheckBox" + Me.AKTIVCheckBox.Size = New System.Drawing.Size(104, 24) + Me.AKTIVCheckBox.TabIndex = 1 + Me.AKTIVCheckBox.Text = "CheckBox1" + Me.AKTIVCheckBox.UseVisualStyleBackColor = True + ' + 'TBDD_DOKUMENTARTBindingSource + ' + Me.TBDD_DOKUMENTARTBindingSource.DataMember = "TBDD_DOKUMENTART" + Me.TBDD_DOKUMENTARTBindingSource.DataSource = Me.GlobixDataset + ' + 'GlobixDataset + ' + Me.GlobixDataset.DataSetName = "GlobixDataset" + Me.GlobixDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' + 'XtraTabPage2 + ' + Me.XtraTabPage2.Name = "XtraTabPage2" + Me.XtraTabPage2.Size = New System.Drawing.Size(624, 276) + Me.XtraTabPage2.Text = "XtraTabPage2" + ' + 'TBDD_DOKUMENTARTTableAdapter + ' + Me.TBDD_DOKUMENTARTTableAdapter.ClearBeforeFill = True + ' + 'TableAdapterManager + ' + Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Me.TBDD_DOKUMENTARTTableAdapter + Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.GlobixDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + ' + 'GridView1 + ' + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colBEZEICHNUNG, Me.colBESCHREIBUNG}) + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridView1.OptionsView.EnableAppearanceEvenRow = True + Me.GridView1.OptionsView.ShowAutoFilterRow = True + Me.GridView1.OptionsView.ShowColumnHeaders = False + Me.GridView1.OptionsView.ShowGroupPanel = False + ' + 'colBEZEICHNUNG + ' + Me.colBEZEICHNUNG.FieldName = "BEZEICHNUNG" + Me.colBEZEICHNUNG.Name = "colBEZEICHNUNG" + Me.colBEZEICHNUNG.Visible = True + Me.colBEZEICHNUNG.VisibleIndex = 0 + ' + 'colBESCHREIBUNG + ' + Me.colBESCHREIBUNG.FieldName = "BESCHREIBUNG" + Me.colBESCHREIBUNG.Name = "colBESCHREIBUNG" + Me.colBESCHREIBUNG.Visible = True + Me.colBESCHREIBUNG.VisibleIndex = 1 + ' + 'GridControl1 + ' + Me.GridControl1.DataSource = Me.TBDD_DOKUMENTARTBindingSource + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Left + Me.GridControl1.Location = New System.Drawing.Point(0, 159) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.MenuManager = Me.RibbonControl1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(174, 539) + Me.GridControl1.TabIndex = 2 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'XtraTabControl2 + ' + Me.XtraTabControl2.Dock = System.Windows.Forms.DockStyle.Bottom + Me.XtraTabControl2.Location = New System.Drawing.Point(0, 222) + Me.XtraTabControl2.Name = "XtraTabControl2" + Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3 + Me.XtraTabControl2.Size = New System.Drawing.Size(1067, 275) + Me.XtraTabControl2.TabIndex = 2 + Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage3, Me.XtraTabPage4}) + ' + 'XtraTabPage3 + ' + Me.XtraTabPage3.Name = "XtraTabPage3" + Me.XtraTabPage3.Size = New System.Drawing.Size(1065, 252) + Me.XtraTabPage3.Text = "XtraTabPage3" + ' + 'XtraTabPage4 + ' + Me.XtraTabPage4.Name = "XtraTabPage4" + Me.XtraTabPage4.Size = New System.Drawing.Size(298, 277) + Me.XtraTabPage4.Text = "XtraTabPage4" + ' + 'Label32 + ' + Me.Label32.AutoSize = True + Me.Label32.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label32.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label32.Location = New System.Drawing.Point(448, 29) + Me.Label32.Name = "Label32" + Me.Label32.Size = New System.Drawing.Size(209, 13) + Me.Label32.TabIndex = 98 + Me.Label32.Text = "Verhalten, wenn Datei bereits vorhanden:" + ' + 'ComboBox3 + ' + Me.ComboBox3.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBDD_DOKUMENTARTBindingSource, "DUPLICATE_HANDLING", True)) + Me.ComboBox3.DisplayMember = "DISPLAY_TEXT" + Me.ComboBox3.FormattingEnabled = True + Me.ComboBox3.Items.AddRange(New Object() {"New version", "Default", "Question"}) + Me.ComboBox3.Location = New System.Drawing.Point(451, 45) + Me.ComboBox3.Name = "ComboBox3" + Me.ComboBox3.Size = New System.Drawing.Size(235, 21) + Me.ComboBox3.TabIndex = 97 + Me.ComboBox3.ValueMember = "VALUE_TEXT" + ' + 'frmGlobixAdministration + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1243, 720) + Me.Controls.Add(Me.XtraTabControl1) + Me.Controls.Add(Me.GridControl1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.Name = "frmGlobixAdministration" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "Global Indexer - Administration" + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.XtraTabPage1.ResumeLayout(False) + Me.XtraTabPage1.PerformLayout() + CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GlobixDataset, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl2.ResumeLayout(False) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupManualIndex As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupManualIndexFunctions As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupAutoIndex As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents GlobixDataset As GlobixDataset + Friend WithEvents TBDD_DOKUMENTARTBindingSource As BindingSource + Friend WithEvents TBDD_DOKUMENTARTTableAdapter As GlobixDatasetTableAdapters.TBDD_DOKUMENTARTTableAdapter + Friend WithEvents TableAdapterManager As GlobixDatasetTableAdapters.TableAdapterManager + Friend WithEvents AKTIVCheckBox As CheckBox + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents colBEZEICHNUNG As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colBESCHREIBUNG As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents XtraTabControl2 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents XtraTabPage3 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents XtraTabPage4 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents Label32 As Label + Friend WithEvents ComboBox3 As ComboBox +End Class diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx b/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx new file mode 100644 index 00000000..5cbd3e57 --- /dev/null +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 144, 17 + + + 17, 17 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALoDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs + YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy + Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iUGFnZVNldHVwIj4NCiAgICA8cGF0aCBkPSJNMTkuMiwyNkg4VjZoMTB2NWMwLDAu + NiwwLjQsMSwxLDFoNXY5LjJsMiwyVjExbC03LTdIN0M2LjQsNCw2LDQuNCw2LDV2MjJjMCwwLjYsMC40 + LDEsMSwxaDE0LjJMMTkuMiwyNnoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMjcuNiwy + Ny42bC02LjItNi4yYzAuNC0wLjcsMC42LTEuNSwwLjYtMi40YzAtMi44LTIuMi01LTUtNWMtMC44LDAt + MS41LDAuMi0yLjEsMC41bDIuNywyLjcgICBjMC42LDAuNiwwLjYsMS43LDAsMi40cy0xLjcsMC42LTIu + NCwwbC0yLjctMi43QzEyLjIsMTcuNSwxMiwxOC4yLDEyLDE5YzAsMi44LDIuMiw1LDUsNWMwLjksMCwx + LjctMC4yLDIuNC0wLjZsNi4yLDYuMiAgIGMwLjYsMC42LDEuNCwwLjYsMiwwbDAsMEMyOC4xLDI5LDI4 + LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + 399, 17 + + + 648, 17 + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb new file mode 100644 index 00000000..90d09267 --- /dev/null +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb @@ -0,0 +1,146 @@ +Imports DigitalData.Modules.Logging +Public Class frmGlobixAdministration + + Implements frmAdmin_Interface + Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey + Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges + Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert + Private Logger As Logger + Public Sub New(PrimaryKey As Integer) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Logger = My.LogConfig.GetLogger() + Me.PrimaryKey = PrimaryKey + Me.IsInsert = IsInsert + End Sub + Public Shared _Namenkonvention As String + Public Shared _aktDokart_Id As Integer + + Private SourceAttributes As List(Of String) + Private SourceObjectTypes As List(Of String) + + Private Current_ObjectType As String = "" + + Private GroupToDelete As Integer = Nothing + Dim frmloaded As Boolean = False + Private Sub frmGlobixAdministration_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + Me.TBDD_DOKUMENTARTTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString + 'Me.TBDD_EINGANGSARTENTableAdapter.Connection.ConnectionString = MyConnectionString + 'Me.TBDD_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString + 'Me.TBDD_DOKART_MODULETableAdapter.Connection.ConnectionString = MyConnectionString + 'TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString + 'TBDD_INDEX_AUTOMTableAdapter.Connection.ConnectionString = MyConnectionString + 'Me.TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString + 'Me.TBGI_CONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString + 'Me.TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter.Connection.ConnectionString = MyConnectionString + 'Me.TBWHDD_INDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString + 'Me.VWGI_USER_GROUPS_RELATIONTableAdapter.Connection.ConnectionString = MyConnectionString + 'Me.TBGI_REGEX_DOCTYPETableAdapter.Connection.ConnectionString = MyConnectionString + Catch ex As Exception + MsgBox("Error in load Connection-Strings - Check Database Connection - Form will be closed: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) + Me.Close() + End Try + + Dim oDragDropManager As New ClassDragDrop() + 'oDragDropManager.AddGridView(viewAssignedGroups) + 'oDragDropManager.AddGridView(viewAvailableGroups) + 'oDragDropManager.AddGridView(viewAssignedUsers) + 'oDragDropManager.AddGridView(viewAvailableUsers) + + Dim oDatatable As New DataTable() + oDatatable.Columns.Add("VALUE_TEXT") + oDatatable.Columns.Add("DISPLAY_TEXT") + + oDatatable.Rows.Add("Default", "Datei Überschreiben") + oDatatable.Rows.Add("New version", "Neue Version erstellen") + oDatatable.Rows.Add("Question", "Nachfragen") + + ComboBox3.DataSource = oDatatable + + Try + + Load_Dokart() + Logger.Debug("...Done Load_Dokart") + 'Me.TBDD_EINGANGSARTENTableAdapter.Fill(Me.MyDataset.TBDD_EINGANGSARTEN) + Logger.Debug("...Done TBDD_EINGANGSARTEN") + ' Me.TBDD_MODULESTableAdapter.Fill(Me.MyDataset.TBDD_MODULES) + Logger.Debug("...Done TBDD_MODULES") + Catch ex As Exception + Logger.Error(ex) + MsgBox("Error in frmAdministration_Load: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) + End Try + + 'If GI_withWindream = True Then + ' If ClassWindream.Init() = True Then + ' End If + 'End If + End Sub + Sub Load_Dokart() + Try + If PrimaryKey > 0 Then + Me.TBDD_DOKUMENTARTTableAdapter.Fill(Me.GlobixDataset.TBDD_DOKUMENTART, PrimaryKey) + GridControl1.Visible = False + Else + Me.TBDD_DOKUMENTARTTableAdapter.FillAllDoctypes(Me.GlobixDataset.TBDD_DOKUMENTART) + GridControl1.Visible = True + End If + + + If GlobixDataset.TBDD_DOKUMENTART.Rows.Count > 0 Then + GridView1.SelectRow(1) + 'EnableControls(XtraTabPageProfiles) + End If + 'If Me.DOKART_GUIDTextBox.Text <> "" Then + 'Load_TabData() + ' End If + + Catch ex As Exception + MsgBox("Error in Load_Dokart: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) + End Try + End Sub + Sub Load_TabData() + If frmloaded = False Then + Exit Sub + End If + + ' RibbonPageGroupProfileRegex.Enabled = False + RibbonPageGroupManualIndex.Enabled = False + RibbonPageGroupManualIndexFunctions.Enabled = False + RibbonPageGroupAutoIndex.Enabled = False + + 'Select Case XtraTabControl2.SelectedTabPage.Name + ' Case XtraTabPageManualIndex.Name + ' RibbonPageGroupManualIndex.Enabled = True + + ' If DOKART_GUIDTextBox.Text <> "" Then + ' Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) + ' End If + ' Case XtraTabPageManualIndexFunctions.Name + ' RibbonPageGroupManualIndexFunctions.Enabled = True + + ' Load_PostProcessing(Me.DOKART_GUIDTextBox.Text) + ' Case XtraTabPageAutoIndex.Name + ' Load_INDEXE_AUTO(Me.DOKART_GUIDTextBox.Text) + + ' RibbonPageGroupAutoIndex.Enabled = True + ' Case XtraTabPageFolderPath.Name + ' Try + ' Dim Dt As DataTable = ClassDatabase.Return_Datatable("select NAME from VWDDINDICES_MAN_AUTO_ACTIVE where DOCTYPE_ID = " & DOKART_GUIDTextBox.Text & " order by NAME") + ' cmbCrFolderIndex.DataSource = Dt + ' cmbCrFolderIndex.DisplayMember = Dt.Columns(0).ColumnName + ' Catch ex As Exception + ' MsgBox("Error in Load Data TabData 4: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) + ' End Try + ' Case XtraTabPageProfileRegex.Name + ' TBGI_REGEX_DOCTYPETableAdapter.Fill(MyDataset.TBGI_REGEX_DOCTYPE, DOKART_GUIDTextBox.Text) + ' RibbonPageGroupProfileRegex.Enabled = True + 'End Select + End Sub + + Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Throw New NotImplementedException() + End Function +End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index a35e5464..fa36f2ce 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -151,6 +151,7 @@ + @@ -172,6 +173,12 @@ Form + + frmGlobixAdministration.vb + + + Form + True True @@ -319,6 +326,9 @@ frmtest.vb + + frmGlobixAdministration.vb + frmGlobixBasicConfig.vb diff --git a/GUIs.ZooFlow/frmtest.Designer.vb b/GUIs.ZooFlow/frmtest.Designer.vb index be41bd4a..093de79b 100644 --- a/GUIs.ZooFlow/frmtest.Designer.vb +++ b/GUIs.ZooFlow/frmtest.Designer.vb @@ -35,6 +35,7 @@ Partial Class frmtest Me.Label1 = New System.Windows.Forms.Label() Me.Button4 = New System.Windows.Forms.Button() Me.Button5 = New System.Windows.Forms.Button() + Me.CheckBoxKeepExtension = New System.Windows.Forms.CheckBox() Me.SuspendLayout() ' 'txtFilestoreType @@ -147,11 +148,22 @@ Partial Class frmtest Me.Button5.Text = "Button5" Me.Button5.UseVisualStyleBackColor = True ' + 'CheckBoxKeepExtension + ' + Me.CheckBoxKeepExtension.AutoSize = True + Me.CheckBoxKeepExtension.Location = New System.Drawing.Point(307, 62) + Me.CheckBoxKeepExtension.Name = "CheckBoxKeepExtension" + Me.CheckBoxKeepExtension.Size = New System.Drawing.Size(100, 17) + Me.CheckBoxKeepExtension.TabIndex = 15 + Me.CheckBoxKeepExtension.Text = "Keep Extension" + Me.CheckBoxKeepExtension.UseVisualStyleBackColor = True + ' 'frmtest ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.CheckBoxKeepExtension) Me.Controls.Add(Me.Button5) Me.Controls.Add(Me.Button4) Me.Controls.Add(Me.Label1) @@ -184,4 +196,5 @@ Partial Class frmtest Friend WithEvents Label1 As Label Friend WithEvents Button4 As Button Friend WithEvents Button5 As Button + Friend WithEvents CheckBoxKeepExtension As CheckBox End Class diff --git a/GUIs.ZooFlow/frmtest.vb b/GUIs.ZooFlow/frmtest.vb index a715a09e..ec775c8d 100644 --- a/GUIs.ZooFlow/frmtest.vb +++ b/GUIs.ZooFlow/frmtest.vb @@ -8,8 +8,18 @@ Public Class frmtest Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click My.Settings.Save() Dim oString As String - oString = _Client.NewFileStoreObject(txtIDB_OBJ_ID.Text, txtFilestoreType.Text, txtDate.Text) + Dim oextension = "" + Dim oKeepExtension As Boolean = False + If CheckBoxKeepExtension.Checked Then + If txtFile2Import.Text <> String.Empty Then + oextension = Path.GetExtension(txtFile2Import.Text) + oKeepExtension = True + End If + + End If + oString = _Client.NewFileStoreObject(txtIDB_OBJ_ID.Text, txtFilestoreType.Text, txtDate.Text, oextension, oKeepExtension) txtIDBFOPath.Text = oString + End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click @@ -24,7 +34,7 @@ Public Class frmtest Using oStream As New FileStream(txtFile2Import.Text, FileMode.Open, FileAccess.Read) Dim oContents(oStream.Length) As Byte - oStream.Read(oContents, 0, oStream.Length) + oStream.Read(oContents, 0, System.Convert.ToInt32(oStream.Length)) oResult = Await _Client.ImportIDBFOAsync(oContents, My.Application.User.UserName, txtIDB_OBJ_ID.Text, 1, txtIDBFOPath.Text) End Using @@ -42,12 +52,14 @@ Public Class frmtest Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click Try Using oInputStream As New FileStream(txtIDBFOPath.Text, FileMode.Open) + Dim oextension = Path.GetExtension(txtFile2Import.Text) + Dim oContents(oInputStream.Length) As Byte oInputStream.Read(oContents, 0, oInputStream.Length) ' convert string to stream Using oMemoryStream As New MemoryStream(oContents) - Using oFileStream As New FileStream("d:\file.pdf", FileMode.Create, FileAccess.Write) + Using oFileStream As New FileStream($"E:\file.{oextension}", FileMode.Create, FileAccess.Write) oMemoryStream.WriteTo(oFileStream) End Using End Using diff --git a/GUIs.ZooFlow/modCurrent.vb b/GUIs.ZooFlow/modCurrent.vb index c9c80bd6..a3df0f48 100644 --- a/GUIs.ZooFlow/modCurrent.vb +++ b/GUIs.ZooFlow/modCurrent.vb @@ -11,4 +11,5 @@ Module modCurrent Public Property NI_MESSAGE As String = "" Public Property NI_TYPE As String = "INFO" Public Property clsDataASorDB As ClassDataASorDB + Public Property GLOBIX_JUMP_DOCTYPE_ID As Integer End Module diff --git a/Modules.EDMIAPI/Client.vb b/Modules.EDMIAPI/Client.vb index 89f29b85..6ce65386 100644 --- a/Modules.EDMIAPI/Client.vb +++ b/Modules.EDMIAPI/Client.vb @@ -281,9 +281,12 @@ Public Class Client Throw ex End Try End Function - Public Function NewFileStoreObject(IDB_OBJ_ID As Long, Optional pStoreType As String = "", Optional pDate As String = "") As String + Public Function NewFileStoreObject(IDB_OBJ_ID As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As String) As String Try - Dim oResponse = _channel.New_FileStore_Object(IDB_OBJ_ID, pStoreType, pDate) + If pExtension.StartsWith(".") Then + pExtension = pExtension.Replace(".", "") + End If + Dim oResponse = _channel.New_FileStore_Object(IDB_OBJ_ID, pStoreType, pDate, pExtension, pKeepExtension) Return oResponse Catch ex As Exception _logger.Error(ex) diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd index 1f5add91..1400b999 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd @@ -232,6 +232,8 @@ + + diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb index 251d8f4a..4ae88d8b 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb @@ -449,11 +449,11 @@ Namespace EDMIServiceReference System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectUnexpect"& _ "edErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ "ns")> _ - Function New_FileStore_Object(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String) As String + Function New_FileStore_Object(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As String _ - Function New_FileStore_ObjectAsync(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String) As System.Threading.Tasks.Task(Of String) + Function New_FileStore_ObjectAsync(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As System.Threading.Tasks.Task(Of String) - - + + diff --git a/Service.EDMIService/EDMIService.vb b/Service.EDMIService/EDMIService.vb index 1ffd4ade..016c98bb 100644 --- a/Service.EDMIService/EDMIService.vb +++ b/Service.EDMIService/EDMIService.vb @@ -519,7 +519,7 @@ Public Class EDMIService Return AccessRight.VIEW_ONLY End Try End Function - Public Function New_FileStore_Object(IDB_OBJ_ID As Long, pStoreType As String, pDate As String) As String Implements IEDMIService.New_FileStore_Object + Public Function New_FileStore_Object(IDB_OBJ_ID As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As Boolean) As String Implements IEDMIService.New_FileStore_Object Try Dim oRelpath As String If pStoreType = String.Empty Then @@ -542,7 +542,7 @@ Public Class EDMIService Else _Logger.Debug($"oRelpath is [{oRelpath}]") - oIDB_FileObject = Path.Combine(oRelpath, GetDigitalDataFileObject(IDB_OBJ_ID)) + oIDB_FileObject = Path.Combine(oRelpath, GetDigitalDataFileObject(IDB_OBJ_ID, pExtension, pKeepExtension)) End If Return oIDB_FileObject @@ -570,7 +570,7 @@ Public Class EDMIService Try _Logger.Info("ImportFile: Saving file to path [{0}]", Data.pIDBFilePath) - Using oStream = New FileStream(Data.pIDBFilePath, FileMode.CreateNew) + Using oStream = New FileStream(Data.pIDBFilePath, FileMode.Create, FileAccess.Write) oStream.Write(Data.Contents, 0, Data.Contents.Length) oStream.Flush(True) oStream.Close() @@ -594,8 +594,13 @@ Public Class EDMIService End Try End Function - Private Function GetDigitalDataFileObject(IDB_OBJ_ID As Long) As String - Return $"{IDB_OBJ_ID}.ddfo" + Private Function GetDigitalDataFileObject(IDB_OBJ_ID As Long, pExtension As String, pKeepExtension As Boolean) As String + If pKeepExtension Then + Return $"{IDB_OBJ_ID}.{pExtension}" + Else + Return $"{IDB_OBJ_ID}.ddfo" + End If + End Function Private Function GetFileStorePraefix(pStoreType As String) As String Dim oObjectStore diff --git a/Service.EDMIService/IEDMIService.vb b/Service.EDMIService/IEDMIService.vb index 6367bcca..12f9a26f 100644 --- a/Service.EDMIService/IEDMIService.vb +++ b/Service.EDMIService/IEDMIService.vb @@ -81,7 +81,7 @@ Interface IEDMIService - Function New_FileStore_Object(IDB_OBJ_ID As Long, pStoreType As String, pDate As String) As String + Function New_FileStore_Object(IDB_OBJ_ID As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As Boolean) As String Function New_IDB_OBJECT(KindType As String, pWho As String, pBusinessEntity As String) As String diff --git a/Service.EDMIService/My Project/AssemblyInfo.vb b/Service.EDMIService/My Project/AssemblyInfo.vb index 83ec6135..14804c26 100644 --- a/Service.EDMIService/My Project/AssemblyInfo.vb +++ b/Service.EDMIService/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +