3.4.4.0
This commit is contained in:
parent
07a4c00b01
commit
5c0120cca8
@ -171,6 +171,9 @@ Public Class ClassDocGrid
|
||||
For Each row In gridView.GetSelectedRows
|
||||
Dim newRow As DataRow = DT_RESULTFILES.NewRow()
|
||||
Dim oDocID = gridView.GetRowCellValue(row, "DocID")
|
||||
If IsNothing(oDocID) Then
|
||||
Exit Sub
|
||||
End If
|
||||
Dim CHeckDT As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_DT_TBPMO_DOC_RECORD_LINK, "DOC_ID = " + oDocID.ToString, "")
|
||||
Try
|
||||
newRow("INWORK") = False
|
||||
@ -602,8 +605,6 @@ Public Class ClassDocGrid
|
||||
Public Shared Sub GVDoc_Values_FocusedRowChanged(sender As GridView, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs)
|
||||
Try
|
||||
ClassDocGrid.GetDocItems(sender)
|
||||
|
||||
|
||||
Catch ex As Exception
|
||||
LOGGER.Warn("Unexpected error in GVDoc_Values_FocusedRowChanged: " & ex.Message)
|
||||
MsgBox("Unexpected error in GVDoc_Values_FocusedRowChanged: " & ex.Message, MsgBoxStyle.Critical)
|
||||
|
||||
@ -232,22 +232,6 @@ Public Class ClassHelper
|
||||
LOGGER.Warn("Error in Open_Folder: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID)
|
||||
End Try
|
||||
End Sub
|
||||
Public Shared Sub OPEN_DOCVIEW(Doc_Path As String, DocID As Integer)
|
||||
Try
|
||||
Dim DocView
|
||||
DocView = Nothing
|
||||
DocView = CreateObject("WMPViewXNG.Viewer")
|
||||
' open the viewer
|
||||
Dim viewer_string = Doc_Path.Substring(2)
|
||||
DocView.ViewFile(viewer_string)
|
||||
CURRENT_DOCVIEW_PATH = viewer_string
|
||||
CURRENT_DOCVIEW = DocView
|
||||
Catch ex As Exception
|
||||
MsgBox("Unexpected Error in DocView Open:" & vbNewLine & ex.Message & vbNewLine & Doc_Path & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
|
||||
LOGGER.Warn("Error in DocView Open: " & ex.Message & vbNewLine & " - Path: " & Doc_Path & " - DocID: " & DocID)
|
||||
File_SYSOPEN(Doc_Path, DocID, 0)
|
||||
End Try
|
||||
End Sub
|
||||
Private Shared Sub File_SYSOPEN(RESULT_DOC_PATH As Object, DocID As String, pParentID As Integer)
|
||||
Try
|
||||
If RESULT_DOC_PATH <> Nothing Then
|
||||
@ -270,51 +254,155 @@ Public Class ClassHelper
|
||||
End Sub
|
||||
Private Shared Sub BWFileHandler_DoWork()
|
||||
Try
|
||||
Dim oOverrideRunPath As String = ""
|
||||
Dim oExtension As String = Path.GetExtension(BW_DocPath).ToLower()
|
||||
|
||||
' Prüfen, ob eine spezielle Anwendung für die Dateierweiterung definiert ist
|
||||
For Each oROW As DataRow In CURRENT_TBFILE_EXTENSION_OVERRIDE.Rows
|
||||
If oExtension.Replace(".", "") = oROW.Item("FILE_EXTENSION").ToString().ToLower() Then
|
||||
LOGGER.Debug($"Specific file extension override for [{oExtension}] found.")
|
||||
oOverrideRunPath = oROW.Item("PROCESS").ToString()
|
||||
Exit For
|
||||
End If
|
||||
Next
|
||||
|
||||
Dim oMyProcess As Process = Nothing
|
||||
Dim oSql As String = ""
|
||||
|
||||
Dim oMyProcess = New Process()
|
||||
Dim oExtension
|
||||
Dim oSql
|
||||
Try
|
||||
'Dim oPSI As New ProcessStartInfo(BW_DocPath)
|
||||
oMyProcess.StartInfo.FileName = BW_DocPath
|
||||
oMyProcess.StartInfo.UseShellExecute = True
|
||||
oMyProcess.StartInfo.RedirectStandardOutput = False
|
||||
oMyProcess.Start()
|
||||
Dim ProcID = oMyProcess.GetCurrentProcess.Id
|
||||
' ###### Startinfo vorbereiten ######
|
||||
Dim startInfo As New ProcessStartInfo()
|
||||
|
||||
If oOverrideRunPath <> "" Then
|
||||
startInfo.FileName = oOverrideRunPath
|
||||
startInfo.Arguments = $"""{BW_DocPath}"""
|
||||
LOGGER.Debug($"Opening document [{BW_DocPath}] using override application [{oOverrideRunPath}].")
|
||||
Else
|
||||
startInfo.FileName = BW_DocPath
|
||||
LOGGER.Debug($"Opening document [{BW_DocPath}] with system default application.")
|
||||
End If
|
||||
|
||||
startInfo.UseShellExecute = True
|
||||
startInfo.RedirectStandardOutput = False
|
||||
If oOverrideRunPath <> "" Then
|
||||
oMyProcess = Process.Start(startInfo)
|
||||
Else
|
||||
oMyProcess = Process.Start(BW_DocPath)
|
||||
End If
|
||||
' ###### Prozess starten ######
|
||||
|
||||
|
||||
' ID des gestarteten Prozesses holen (nicht den eigenen!)
|
||||
Dim ProcID As Integer = oMyProcess.Id
|
||||
LOGGER.Debug($"Started process ID {ProcID} for document [{BW_DocPath}].")
|
||||
|
||||
' Warten, bis der Benutzer das Dokument geschlossen hat
|
||||
oMyProcess.WaitForExit()
|
||||
oExtension = Path.GetExtension(BW_DocPath).ToLower
|
||||
LOGGER.Debug($"Checking oExtension [{oExtension}]...")
|
||||
|
||||
' Nachbearbeitung, wenn Format bearbeitbar ist
|
||||
oExtension = Path.GetExtension(BW_DocPath).ToLower()
|
||||
LOGGER.Debug($"Checking if file extension [{oExtension}] may change during edit...")
|
||||
|
||||
If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then
|
||||
oSql = $"SELECT * FROM VWOF_DOCID_HANDLE WHERE dwParentID = {BW_ParentID} and [Filename] = '{BW_Filename}'"
|
||||
oSql = $"SELECT * FROM VWOF_DOCID_HANDLE WHERE dwParentID = {BW_ParentID} AND [Filename] = '{BW_Filename}'"
|
||||
Dim oDTNEWDoc As DataTable = MYDB_ECM.GetDatatable(oSql)
|
||||
|
||||
If Not IsNothing(oDTNEWDoc) Then
|
||||
If oDTNEWDoc.Rows.Count = 1 Then
|
||||
|
||||
Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,NEW_DOC_ID, DOC_PATH) VALUES (
|
||||
{USER_GUID},'{ProcID.ToString}',{oDTNEWDoc.Rows(0).Item("dwVersionID")},{BW_DocID},{oDTNEWDoc.Rows(0).Item("NewDocID")}, '{BW_DocPath}')"
|
||||
MYDB_ECM.ExecuteNonQuery(oInsert)
|
||||
End If
|
||||
If oDTNEWDoc IsNot Nothing AndAlso oDTNEWDoc.Rows.Count = 1 Then
|
||||
Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,NEW_DOC_ID,DOC_PATH) VALUES (" &
|
||||
$"{USER_GUID},'{ProcID}',{oDTNEWDoc.Rows(0).Item("dwVersionID")},{BW_DocID},{oDTNEWDoc.Rows(0).Item("NewDocID")},'{BW_DocPath}')"
|
||||
|
||||
|
||||
End If
|
||||
MYDB_ECM.ExecuteNonQuery(oInsert)
|
||||
LOGGER.Debug("Document change recorded in TBPMO_DOC_ID_CHANGED.")
|
||||
Else
|
||||
LOGGER.Debug("No matching document change detected.")
|
||||
End If
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
LOGGER.Warn("Error in Process1.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
|
||||
MsgBox("Error in OpenFile: " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID, MsgBoxStyle.Exclamation)
|
||||
Exit Sub
|
||||
' Fehler im Prozessstart oder während des Wartens
|
||||
LOGGER.Warn("Error in Process.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
|
||||
MsgBox("Error in OpenFile: " & ex.Message & vbNewLine &
|
||||
"Path: " & BW_DocPath & vbNewLine & "DocID: " & BW_DocID,
|
||||
MsgBoxStyle.Exclamation, "Open File Error")
|
||||
End Try
|
||||
|
||||
Catch ex As Exception
|
||||
LOGGER.Warn("Error in Process.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
|
||||
' Fehler im gesamten Worker (z. B. Path nicht vorhanden)
|
||||
LOGGER.Warn("General error in BWFileHandler_DoWork: " & ex.Message & vbNewLine &
|
||||
" - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
|
||||
|
||||
' Letzter Versuch: Öffne mit Standardprogramm
|
||||
Try
|
||||
Process.Start(BW_DocPath)
|
||||
LOGGER.Debug("Fallback: Document opened with default application.")
|
||||
Catch ex1 As Exception
|
||||
LOGGER.Warn("Error in Process.Start(1): " & ex1.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
|
||||
LOGGER.Warn("Fallback error in Process.Start(): " & ex1.Message & vbNewLine &
|
||||
" - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
|
||||
End Try
|
||||
End Try
|
||||
End Sub
|
||||
'Private Shared Sub BWFileHandler_DoWork()
|
||||
' Try
|
||||
' Dim oOverrideRunPath As String = ""
|
||||
' Dim oExtension = Path.GetExtension(BW_DocPath).ToLower
|
||||
' For Each oROW As DataRow In CURRENT_TBFILE_EXTENSION_OVERRIDE.Rows
|
||||
' If oExtension.Replace(".", "") = oROW.Item("FILE_EXTENSION") Then
|
||||
' LOGGER.Debug($"Specific fileextension override for extension [{oExtension}] found! ")
|
||||
' oOverrideRunPath = oROW.Item("PROCESS")
|
||||
' End If
|
||||
' Next
|
||||
' Dim oMyProcess = New Process()
|
||||
' Dim oSql
|
||||
' Try
|
||||
' '######
|
||||
' Dim startInfo As New ProcessStartInfo()
|
||||
' If oOverrideRunPath <> "" Then
|
||||
' startInfo.FileName = oOverrideRunPath
|
||||
' startInfo.Arguments = """" & BW_DocPath & """"
|
||||
' startInfo.UseShellExecute = True
|
||||
' startInfo.RedirectStandardOutput = False
|
||||
' Else
|
||||
' startInfo.FileName = BW_DocPath
|
||||
' startInfo.UseShellExecute = True
|
||||
' startInfo.RedirectStandardOutput = False
|
||||
' End If
|
||||
' '#####
|
||||
' oMyProcess.Start(startInfo)
|
||||
' Dim myViewerProcessID = oMyProcess.Id
|
||||
' oMyProcess.WaitForExit()
|
||||
' oExtension = Path.GetExtension(BW_DocPath).ToLower
|
||||
' LOGGER.Debug($"Checking oExtension [{oExtension}]...")
|
||||
' If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then
|
||||
' oSql = $"SELECT * FROM VWOF_DOCID_HANDLE WHERE dwParentID = {BW_ParentID} and [Filename] = '{BW_Filename}'"
|
||||
' Dim oDTNEWDoc As DataTable = MYDB_ECM.GetDatatable(oSql)
|
||||
|
||||
' If Not IsNothing(oDTNEWDoc) Then
|
||||
' If oDTNEWDoc.Rows.Count = 1 Then
|
||||
|
||||
' Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,NEW_DOC_ID, DOC_PATH) VALUES (
|
||||
' {USER_GUID},'{myViewerProcessID.ToString}',{oDTNEWDoc.Rows(0).Item("dwVersionID")},{BW_DocID},{oDTNEWDoc.Rows(0).Item("NewDocID")}, '{BW_DocPath}')"
|
||||
' MYDB_ECM.ExecuteNonQuery(oInsert)
|
||||
' End If
|
||||
|
||||
|
||||
' End If
|
||||
' End If
|
||||
|
||||
' Catch ex As Exception
|
||||
' LOGGER.Warn("Error in Process1.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
|
||||
' MsgBox("Error in OpenFile: " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID, MsgBoxStyle.Exclamation)
|
||||
' Exit Sub
|
||||
' End Try
|
||||
|
||||
' Catch ex As Exception
|
||||
' LOGGER.Warn("Error in Process.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
|
||||
' Try
|
||||
' Process.Start(BW_DocPath)
|
||||
' Catch ex1 As Exception
|
||||
' LOGGER.Warn("Error in Process.Start(1): " & ex1.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
|
||||
' End Try
|
||||
' End Try
|
||||
'End Sub
|
||||
Private Shared Sub FOLDER_OPEN(PATH As Object, DocID As String)
|
||||
Try
|
||||
If PATH <> Nothing Then
|
||||
|
||||
@ -237,8 +237,8 @@ Public Class ClassInit
|
||||
CURRENT_TBPMO_FORM_VIEW = MYDB_ECM.GetDatatable(oSql)
|
||||
oSql = "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
|
||||
|
||||
oSql = "SELECT * FROM TBFILE_EXTENSION_OVERRIDE"
|
||||
CURRENT_TBFILE_EXTENSION_OVERRIDE = MYDB_ECM.GetDatatable(oSql)
|
||||
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
|
||||
@ -483,7 +483,7 @@ Public Class ClassInit
|
||||
|
||||
Dim anzahl = MYDB_ECM.GetScalarValue(oFNSQL)
|
||||
LICENSES_USED = CInt(anzahl)
|
||||
LOGGER.Info("NamedUser in TimeSpan#: " & anzahl.ToString)
|
||||
LOGGER.Info("NamedUser via SQL_LIC_NAMED_USER in TimeSpan: " & anzahl.ToString)
|
||||
LOGGER.Info("LICENSE_COUNT: " & LICENSE_COUNT.ToString)
|
||||
'####
|
||||
|
||||
|
||||
@ -13,18 +13,22 @@ Public Class ClassLicence
|
||||
|
||||
Dim lic As String = MYDB_ECM.GetScalarValue(sql)
|
||||
If lic = "" Then
|
||||
LOGGER.Info($"Achtung es gibt keine Lizenz- Prüfe SQL [{sql}]")
|
||||
LICENSE_COUNT = 0
|
||||
LICENSE_DATE = "1900-01-01"
|
||||
LICENSE_DOSSIER_COUNT = 0
|
||||
Exit Sub
|
||||
End If
|
||||
Dim licString = _lizenzManager.DecodeLicenseKey(lic)
|
||||
LOGGER.Info("lic-String is: " & licString)
|
||||
Dim split() = licString.ToString.Split("#")
|
||||
|
||||
If lic <> "" Then
|
||||
LICENSE_COUNT = split(0)
|
||||
Else
|
||||
|
||||
LICENSE_COUNT = 0
|
||||
LOGGER.Info($"Achtung LICENSE_COUNT wird 0 - licString: [{licString}]")
|
||||
End If
|
||||
Dim LicDATEsplit() = split(1).ToString.Split("-")
|
||||
Dim LICENSE_FILE_DATE As Date
|
||||
|
||||
@ -117,6 +117,8 @@ Module ModuleRuntimeVariables
|
||||
Public CURRENT_VARIABLE_CONTROLS As DataTable
|
||||
Public CURRENT_TBPMO_FORM_VIEW As DataTable
|
||||
Public CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS As DataTable
|
||||
Public CURRENT_TBFILE_EXTENSION_OVERRIDE As DataTable
|
||||
|
||||
Public CURRENT_TBPMO_RIGHT_USER As DataTable
|
||||
|
||||
Public CURRENT_RECORD_ENABLED As Boolean = False
|
||||
|
||||
@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.4.3.0")>
|
||||
<Assembly: AssemblyVersion("3.4.4.0")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
|
||||
<Assembly: NeutralResourcesLanguageAttribute("")>
|
||||
@ -1006,6 +1006,7 @@
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmGlobalSearch.resx">
|
||||
<DependentUpon>frmGlobalSearch.vb</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmStaticListEditor.en-US.resx">
|
||||
<DependentUpon>frmStaticListEditor.vb</DependentUpon>
|
||||
|
||||
@ -3790,9 +3790,9 @@ Public Class frmConstructor_Main
|
||||
Dim oSQL = $"SELECT ENTITY_DOC_SEARCH FROM TBPMO_FORM WHERE GUID = {ENTITY_ID}"
|
||||
CURRENT_DOCSEARCH_SQL = MYDB_ECM.ExecuteNonQuery(oSQL)
|
||||
If CURRENT_DOCSEARCH_SQL <> String.Empty Then
|
||||
Dim oText = $"Die Entität-weite Suche wird im Hintergrund ausgeführt und angezeigt sobald sie fertig ist."
|
||||
Dim oText = $"Die Sicht-weite Suche wird im Hintergrund ausgeführt und angezeigt sobald sie fertig ist."
|
||||
If USER_LANGUAGE <> "de-De" Then
|
||||
oText = $"The entity-wide search will be started in background. The result will be displayed when ready."
|
||||
oText = $"The view-wide search will be started in background. The result will be displayed when ready."
|
||||
End If
|
||||
MsgBox(oText, vbOKOnly, "Information")
|
||||
|
||||
@ -3804,9 +3804,9 @@ Public Class frmConstructor_Main
|
||||
|
||||
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
CURRENT_DOCSEARCH_CAPTION = "Entity-wide search"
|
||||
CURRENT_DOCSEARCH_CAPTION = "view-wide search"
|
||||
Else
|
||||
CURRENT_DOCSEARCH_CAPTION = "Entitätssuche"
|
||||
CURRENT_DOCSEARCH_CAPTION = "Sicht-Suche"
|
||||
End If
|
||||
Dim myformThread = New Thread(Sub()
|
||||
Using frm As New frmDocSearchResult
|
||||
@ -3886,9 +3886,9 @@ Public Class frmConstructor_Main
|
||||
Else
|
||||
Entitystring = selnode.Text
|
||||
End If
|
||||
msg = "Dateien für Entität: " & Entitystring
|
||||
msg = "Dateien für Sicht: " & Entitystring
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
msg = "files for entity: " & Entitystring
|
||||
msg = "files for view: " & Entitystring
|
||||
End If
|
||||
msg &= " (" & DT_RESULT.Rows.Count.ToString & ")"
|
||||
ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then
|
||||
@ -3963,9 +3963,9 @@ Public Class frmConstructor_Main
|
||||
Else
|
||||
Entitystring = selnode.Text
|
||||
End If
|
||||
msg = "Keine Dateien für Entität: " & Entitystring & " gefunden"
|
||||
msg = "Keine Dateien für Sicht: " & Entitystring & " gefunden"
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
msg = "No files found for entity: " & Entitystring
|
||||
msg = "No files found for View: " & Entitystring
|
||||
End If
|
||||
ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then
|
||||
If NODE_NAVIGATION Then
|
||||
@ -7245,7 +7245,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
|
||||
|
||||
Private Sub bbtniclearCache_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniclearCache.ItemClick
|
||||
Dim result As MsgBoxResult
|
||||
Dim msg = "Möchten Sie den Anwendungscache wirklich leeren?" & vbNewLine & "Die Entität wird dann automatisch neugeladen!"
|
||||
Dim msg = "Möchten Sie den Anwendungscache wirklich leeren?" & vbNewLine & "Die Sicht wird dann automatisch neugeladen!"
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
msg = "Would You like to clear the applications-cache?" & vbNewLine & "All data will be loaded new!"
|
||||
End If
|
||||
|
||||
29
app/DD-Record-Organizer/frmDocRecordLink.Designer.vb
generated
29
app/DD-Record-Organizer/frmDocRecordLink.Designer.vb
generated
@ -35,14 +35,14 @@ Partial Class frmDocRecordLink
|
||||
Me.bbtnitmLinkRecords = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.bbtnitmsaveLayout = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.bbtnitmresetlayout = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.bsitmSource = New DevExpress.XtraBars.BarStaticItem()
|
||||
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
|
||||
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||
Me.Label2 = New System.Windows.Forms.Label()
|
||||
Me.txtcurrSichtData = New System.Windows.Forms.TextBox()
|
||||
Me.bsitmSource = New DevExpress.XtraBars.BarStaticItem()
|
||||
CType(Me.dgEntityRecords, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@ -156,25 +156,31 @@ Partial Class frmDocRecordLink
|
||||
Me.bbtnitmresetlayout.ItemAppearance.Normal.Options.UseFont = True
|
||||
Me.bbtnitmresetlayout.Name = "bbtnitmresetlayout"
|
||||
'
|
||||
'bsitmSource
|
||||
'
|
||||
Me.bsitmSource.Id = 5
|
||||
Me.bsitmSource.Name = "bsitmSource"
|
||||
'
|
||||
'RibbonPage1
|
||||
'
|
||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup1})
|
||||
Me.RibbonPage1.Name = "RibbonPage1"
|
||||
resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
|
||||
'
|
||||
'RibbonPageGroup1
|
||||
'
|
||||
Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmsaveLayout)
|
||||
Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmresetlayout)
|
||||
Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
|
||||
resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
|
||||
'
|
||||
'RibbonPageGroup3
|
||||
'
|
||||
Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtnitmLinkRecords)
|
||||
Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
|
||||
resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
|
||||
'
|
||||
'RibbonPageGroup1
|
||||
'
|
||||
Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
|
||||
Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmsaveLayout)
|
||||
Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmresetlayout)
|
||||
Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
|
||||
resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
|
||||
'
|
||||
'RibbonStatusBar1
|
||||
'
|
||||
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo)
|
||||
@ -199,11 +205,6 @@ Partial Class frmDocRecordLink
|
||||
Me.txtcurrSichtData.Name = "txtcurrSichtData"
|
||||
Me.txtcurrSichtData.ReadOnly = True
|
||||
'
|
||||
'bsitmSource
|
||||
'
|
||||
Me.bsitmSource.Id = 5
|
||||
Me.bsitmSource.Name = "bsitmSource"
|
||||
'
|
||||
'frmDocRecordLink
|
||||
'
|
||||
resources.ApplyResources(Me, "$this")
|
||||
|
||||
@ -374,23 +374,17 @@
|
||||
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup3.Text" xml:space="preserve">
|
||||
<value>Funktionen</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup1.Text" xml:space="preserve">
|
||||
<value>Layout</value>
|
||||
</data>
|
||||
<data name="RibbonPage1.Text" xml:space="preserve">
|
||||
<value>Start</value>
|
||||
</data>
|
||||
<data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1155, 158</value>
|
||||
<value>1155, 147</value>
|
||||
</data>
|
||||
<data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 639</value>
|
||||
<value>0, 638</value>
|
||||
</data>
|
||||
<data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1155, 22</value>
|
||||
<value>1155, 23</value>
|
||||
</data>
|
||||
<data name=">>RibbonStatusBar1.Name" xml:space="preserve">
|
||||
<value>RibbonStatusBar1</value>
|
||||
@ -416,6 +410,12 @@
|
||||
<data name=">>RibbonControl1.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup3.Text" xml:space="preserve">
|
||||
<value>Funktionen</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup1.Text" xml:space="preserve">
|
||||
<value>Layout</value>
|
||||
</data>
|
||||
<data name="RibbonPage2.Text" xml:space="preserve">
|
||||
<value>RibbonPage2</value>
|
||||
</data>
|
||||
@ -1717,7 +1717,7 @@
|
||||
</value>
|
||||
</data>
|
||||
<data name="$this.Text" xml:space="preserve">
|
||||
<value>Datei mit Datensatz aus Entität verknüpfen</value>
|
||||
<value>Datei mit Datensatz aus Sicht verknüpfen</value>
|
||||
</data>
|
||||
<data name=">>grvwGrid.Name" xml:space="preserve">
|
||||
<value>grvwGrid</value>
|
||||
@ -1749,36 +1749,36 @@
|
||||
<data name=">>bbtnitmresetlayout.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>bsitmSource.Name" xml:space="preserve">
|
||||
<value>bsitmSource</value>
|
||||
</data>
|
||||
<data name=">>bsitmSource.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>RibbonPage1.Name" xml:space="preserve">
|
||||
<value>RibbonPage1</value>
|
||||
</data>
|
||||
<data name=">>RibbonPage1.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>RibbonPageGroup1.Name" xml:space="preserve">
|
||||
<value>RibbonPageGroup1</value>
|
||||
</data>
|
||||
<data name=">>RibbonPageGroup1.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>RibbonPageGroup3.Name" xml:space="preserve">
|
||||
<value>RibbonPageGroup3</value>
|
||||
</data>
|
||||
<data name=">>RibbonPageGroup3.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>RibbonPageGroup1.Name" xml:space="preserve">
|
||||
<value>RibbonPageGroup1</value>
|
||||
</data>
|
||||
<data name=">>RibbonPageGroup1.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>RibbonPage2.Name" xml:space="preserve">
|
||||
<value>RibbonPage2</value>
|
||||
</data>
|
||||
<data name=">>RibbonPage2.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>bsitmSource.Name" xml:space="preserve">
|
||||
<value>bsitmSource</value>
|
||||
</data>
|
||||
<data name=">>bsitmSource.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>frmDocRecordLink</value>
|
||||
</data>
|
||||
|
||||
@ -23,6 +23,7 @@ Public Class frmDocRecordLink
|
||||
Dim DT_RECORDS As DataTable
|
||||
If current = True Then
|
||||
DT_RECORDS = GET_CURRENT_ENTITY_DATA()
|
||||
|
||||
Else
|
||||
DT_RECORDS = ENTITY_DATATABLE
|
||||
End If
|
||||
@ -59,11 +60,11 @@ Public Class frmDocRecordLink
|
||||
grvwGrid.Columns.Clear()
|
||||
dgEntityRecords.DataSource = DT_RECORDS
|
||||
' grvwGrid.Columns.Item("already linked").Fixed = True
|
||||
grvwGrid.PopulateColumns()
|
||||
dgEntityRecords.RefreshDataSource()
|
||||
grvwGrid.OptionsView.ColumnAutoWidth = False
|
||||
grvwGrid.Columns(0).Fixed = FixedStyle.Left
|
||||
grvwGrid.BestFitColumns()
|
||||
'grvwGrid.PopulateColumns()
|
||||
'dgEntityRecords.RefreshDataSource()
|
||||
'grvwGrid.OptionsView.ColumnAutoWidth = False
|
||||
'grvwGrid.Columns(0).Fixed = FixedStyle.Left
|
||||
'grvwGrid.BestFitColumns()
|
||||
|
||||
Catch ex As Exception
|
||||
ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in format grid", ex.Message, ex.StackTrace)
|
||||
@ -80,9 +81,6 @@ Public Class frmDocRecordLink
|
||||
txtFileInfo.Text = String.Format("{0} files selected for linking to record", ClassDocGrid.DT_RESULTFILES.Rows.Count)
|
||||
End If
|
||||
Try
|
||||
If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then
|
||||
Me.Close()
|
||||
End If
|
||||
If CURRENT_LINK_ENTITY_ID = 0 Then
|
||||
Refresh_Grid_Data(True, Nothing)
|
||||
CURRENT_LINK_ENTITY_ID = CURRENT_ENTITY_ID
|
||||
@ -257,9 +255,9 @@ Public Class frmDocRecordLink
|
||||
End Sub
|
||||
|
||||
Private Sub btnloadData2Entity_Click(sender As Object, e As EventArgs) Handles btnloadData2Entity.Click
|
||||
Dim entity As ClassEntity = DirectCast(cmbConstructorForms.SelectedItem, ClassEntity)
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
If cmbConstructorForms.SelectedIndex <> -1 Then
|
||||
Dim entity As ClassEntity = DirectCast(cmbConstructorForms.SelectedItem, ClassEntity)
|
||||
ENTITY_LOAD_ACTIVE = True
|
||||
dgEntityRecords.DataSource = Nothing
|
||||
grvwGrid.Columns.Clear()
|
||||
|
||||
@ -121,12 +121,6 @@
|
||||
<value>241, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="OrdnerÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>149, 22</value>
|
||||
</data>
|
||||
<data name="OrdnerÖffnenToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Ordner öffnen</value>
|
||||
</data>
|
||||
<data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>150, 26</value>
|
||||
</data>
|
||||
@ -141,10 +135,10 @@
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="GridControlRecords.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 158</value>
|
||||
<value>0, 147</value>
|
||||
</data>
|
||||
<data name="GridControlRecords.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>908, 324</value>
|
||||
<value>908, 334</value>
|
||||
</data>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="GridControlRecords.TabIndex" type="System.Int32, mscorlib">
|
||||
@ -162,8 +156,14 @@
|
||||
<data name=">>GridControlRecords.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="OrdnerÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>149, 22</value>
|
||||
</data>
|
||||
<data name="OrdnerÖffnenToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Ordner öffnen</value>
|
||||
</data>
|
||||
<data name="bbtnitmdeletelink.Caption" xml:space="preserve">
|
||||
<value>Ausgewählte Links löschen</value>
|
||||
<value>Ausgewählte Verknüpfungen löschen</value>
|
||||
</data>
|
||||
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<data name="bbtnitmdeletelink.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
@ -320,16 +320,16 @@
|
||||
<value>Layout</value>
|
||||
</data>
|
||||
<data name="RibbonPage1.Text" xml:space="preserve">
|
||||
<value>Doc-Links</value>
|
||||
<value>Verknüpfungen</value>
|
||||
</data>
|
||||
<data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>908, 158</value>
|
||||
<value>908, 147</value>
|
||||
</data>
|
||||
<data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 482</value>
|
||||
<value>0, 481</value>
|
||||
</data>
|
||||
<data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>908, 22</value>
|
||||
<value>908, 23</value>
|
||||
</data>
|
||||
<data name=">>RibbonStatusBar1.Name" xml:space="preserve">
|
||||
<value>RibbonStatusBar1</value>
|
||||
@ -544,7 +544,7 @@
|
||||
<value>CenterScreen</value>
|
||||
</data>
|
||||
<data name="$this.Text" xml:space="preserve">
|
||||
<value>Doc-Links</value>
|
||||
<value>Verknüpfungen</value>
|
||||
</data>
|
||||
<data name=">>OrdnerÖffnenToolStripMenuItem.Name" xml:space="preserve">
|
||||
<value>OrdnerÖffnenToolStripMenuItem</value>
|
||||
|
||||
@ -8,6 +8,7 @@ Imports Microsoft.Office.Interop.Outlook
|
||||
Public Class frmDoc_Links
|
||||
|
||||
Private ENTITY_ID As Integer = 0
|
||||
Private form_shown As Boolean = False
|
||||
Public Property Documents As New List(Of ClassDocGrid.clsWMDoc)
|
||||
|
||||
Private Sub frmDoc_DocLinks_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
@ -23,7 +24,7 @@ Public Class frmDoc_Links
|
||||
|
||||
' TODO: this does not work for the old form
|
||||
If Documents.Count = 0 Then
|
||||
Text = $"Document-Links for: NODOC-ID"
|
||||
Text = $"Document-Link for: NODOC-ID"
|
||||
ElseIf Documents.Count = 1 Then
|
||||
Text = $"Document-Links for: {Documents.First.DocPath}"
|
||||
Else
|
||||
@ -47,6 +48,7 @@ Public Class frmDoc_Links
|
||||
Catch ex As System.Exception
|
||||
ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in frmDoc_DocLinks_Load", ex.Message, ex.StackTrace)
|
||||
End Try
|
||||
form_shown = True
|
||||
End Sub
|
||||
|
||||
Private Function Get_Grid_Data(pDocuments As List(Of ClassDocGrid.clsWMDoc)) As DataTable
|
||||
@ -155,6 +157,9 @@ Public Class frmDoc_Links
|
||||
|
||||
End Sub
|
||||
Sub Save_DocGrid_Layout()
|
||||
If form_shown = False Then
|
||||
Exit Sub
|
||||
End If
|
||||
Try
|
||||
Dim XMLPath = Get_DocGrid_Layout_Filename()
|
||||
grvwGrid.SaveLayoutToXml(XMLPath)
|
||||
|
||||
@ -314,7 +314,7 @@ Public Class frmEntities
|
||||
Dim anz_ent = MYDB_ECM.GetScalarValue("SELECT Count(GUID) FROM TBPMO_FORM where PARENT_ID = 0 and FORM_TYPE_ID = 1")
|
||||
anz_ent += 1
|
||||
If anz_ent > LICENSE_DOSSIER_COUNT Then
|
||||
Dim msg = String.Format("Die Anzahl an lizensierten Sichten/Akten {0} ist erreicht! Bitte kontaktieren Sie Digital Data!", LICENSE_DOSSIER_COUNT.ToString)
|
||||
Dim msg = String.Format("Die Anzahl an lizensierten Sichten {0} ist erreicht! Bitte kontaktieren Sie Digital Data!", LICENSE_DOSSIER_COUNT.ToString)
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
msg = String.Format("The number of licensed views {0} was reached! Please contact Digital Data", LICENSE_DOSSIER_COUNT.ToString)
|
||||
End If
|
||||
|
||||
19
app/DD-Record-Organizer/frmGlobalSearch.Designer.vb
generated
19
app/DD-Record-Organizer/frmGlobalSearch.Designer.vb
generated
@ -56,7 +56,7 @@ Partial Class frmGlobalSearch
|
||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroupRecords = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroupFiles = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroupExcel = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
|
||||
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||
@ -307,7 +307,7 @@ Partial Class frmGlobalSearch
|
||||
'
|
||||
'RibbonPage1
|
||||
'
|
||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupRecords, Me.RibbonPageGroupFiles, Me.RibbonPageGroup2, Me.RibbonPageGroup3})
|
||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupRecords, Me.RibbonPageGroupFiles, Me.RibbonPageGroupExcel, Me.RibbonPageGroup3})
|
||||
Me.RibbonPage1.Name = "RibbonPage1"
|
||||
resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
|
||||
'
|
||||
@ -321,6 +321,7 @@ Partial Class frmGlobalSearch
|
||||
'RibbonPageGroupRecords
|
||||
'
|
||||
Me.RibbonPageGroupRecords.AllowTextClipping = False
|
||||
Me.RibbonPageGroupRecords.Enabled = False
|
||||
Me.RibbonPageGroupRecords.ItemLinks.Add(Me.BarButtonItem9)
|
||||
Me.RibbonPageGroupRecords.Name = "RibbonPageGroupRecords"
|
||||
resources.ApplyResources(Me.RibbonPageGroupRecords, "RibbonPageGroupRecords")
|
||||
@ -328,6 +329,7 @@ Partial Class frmGlobalSearch
|
||||
'RibbonPageGroupFiles
|
||||
'
|
||||
Me.RibbonPageGroupFiles.AllowTextClipping = False
|
||||
Me.RibbonPageGroupFiles.Enabled = False
|
||||
Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem6)
|
||||
Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem7)
|
||||
Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem8)
|
||||
@ -335,12 +337,13 @@ Partial Class frmGlobalSearch
|
||||
Me.RibbonPageGroupFiles.Name = "RibbonPageGroupFiles"
|
||||
resources.ApplyResources(Me.RibbonPageGroupFiles, "RibbonPageGroupFiles")
|
||||
'
|
||||
'RibbonPageGroup2
|
||||
'RibbonPageGroupExcel
|
||||
'
|
||||
Me.RibbonPageGroup2.AllowTextClipping = False
|
||||
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem4)
|
||||
Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
|
||||
resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
|
||||
Me.RibbonPageGroupExcel.AllowTextClipping = False
|
||||
Me.RibbonPageGroupExcel.Enabled = False
|
||||
Me.RibbonPageGroupExcel.ItemLinks.Add(Me.BarButtonItem4)
|
||||
Me.RibbonPageGroupExcel.Name = "RibbonPageGroupExcel"
|
||||
resources.ApplyResources(Me.RibbonPageGroupExcel, "RibbonPageGroupExcel")
|
||||
'
|
||||
'RibbonPageGroup3
|
||||
'
|
||||
@ -441,7 +444,7 @@ Partial Class frmGlobalSearch
|
||||
Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents BarButtonItem10 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
||||
Friend WithEvents RibbonPageGroupExcel As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
||||
Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog
|
||||
Friend WithEvents BarToggleSearchCombined As DevExpress.XtraBars.BarToggleSwitchItem
|
||||
Friend WithEvents BarToggleSearchRecord As DevExpress.XtraBars.BarToggleSwitchItem
|
||||
|
||||
@ -123,7 +123,7 @@
|
||||
</data>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="SplitContainerMain.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 248</value>
|
||||
<value>0, 237</value>
|
||||
</data>
|
||||
<data name="GridControlRecords.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
@ -135,7 +135,7 @@
|
||||
<value>orgFLOW-Datensätze</value>
|
||||
</data>
|
||||
<data name="GridControlRecords.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>616, 402</value>
|
||||
<value>616, 412</value>
|
||||
</data>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="GridControlRecords.TabIndex" type="System.Int32, mscorlib">
|
||||
@ -156,6 +156,12 @@
|
||||
<metadata name="ToolStripRecords.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<data name="tslblRecordsResult.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>0, 22</value>
|
||||
</data>
|
||||
<data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>6, 25</value>
|
||||
</data>
|
||||
<data name="ToolStripRecords.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
@ -202,10 +208,10 @@
|
||||
<value>0, 25</value>
|
||||
</data>
|
||||
<data name="GridViewFiles.ViewCaption" xml:space="preserve">
|
||||
<value>windream-Dateien und Werte</value>
|
||||
<value>Dateien</value>
|
||||
</data>
|
||||
<data name="GridControlFiles.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>841, 402</value>
|
||||
<value>839, 412</value>
|
||||
</data>
|
||||
<data name="GridControlFiles.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
@ -228,11 +234,17 @@
|
||||
<data name="ToolStripDokumente.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Tahoma, 9pt</value>
|
||||
</data>
|
||||
<data name="tslblDocView.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Segoe UI, 8.25pt, style=Bold, Italic</value>
|
||||
</data>
|
||||
<data name="tslblDocView.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>0, 22</value>
|
||||
</data>
|
||||
<data name="ToolStripDokumente.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="ToolStripDokumente.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>841, 25</value>
|
||||
<value>839, 25</value>
|
||||
</data>
|
||||
<data name="ToolStripDokumente.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
@ -268,7 +280,7 @@
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="SplitContainerMain.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1467, 427</value>
|
||||
<value>1467, 437</value>
|
||||
</data>
|
||||
<data name="SplitContainerMain.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>8</value>
|
||||
@ -288,18 +300,6 @@
|
||||
<data name=">>SplitContainerMain.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tslblRecordsResult.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>0, 22</value>
|
||||
</data>
|
||||
<data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>6, 25</value>
|
||||
</data>
|
||||
<data name="tslblDocView.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Segoe UI, 8.25pt, style=Bold, Italic</value>
|
||||
</data>
|
||||
<data name="tslblDocView.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>0, 22</value>
|
||||
</data>
|
||||
<data name="Label1.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
@ -367,13 +367,13 @@
|
||||
<value>15, 74</value>
|
||||
</data>
|
||||
<data name="lblFT_Irregular.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>171, 13</value>
|
||||
<value>194, 13</value>
|
||||
</data>
|
||||
<data name="lblFT_Irregular.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="lblFT_Irregular.Text" xml:space="preserve">
|
||||
<value>Volltext enthält ungültige Zeichen.</value>
|
||||
<value>Volltext enthält ungültige Zeichen. (".")</value>
|
||||
</data>
|
||||
<data name="lblFT_Irregular.Visible" type="System.Boolean, mscorlib">
|
||||
<value>False</value>
|
||||
@ -442,7 +442,7 @@
|
||||
<value>Top</value>
|
||||
</data>
|
||||
<data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 158</value>
|
||||
<value>0, 147</value>
|
||||
</data>
|
||||
<data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1467, 90</value>
|
||||
@ -695,17 +695,32 @@
|
||||
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup1.Text" xml:space="preserve">
|
||||
<value>Aktionen</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroupRecords.Text" xml:space="preserve">
|
||||
<value>Datensatz</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroupFiles.Text" xml:space="preserve">
|
||||
<value>Dateien</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroupExcel.Text" xml:space="preserve">
|
||||
<value>Funktionen Tabelle</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup3.Text" xml:space="preserve">
|
||||
<value>Suchvariante</value>
|
||||
</data>
|
||||
<data name="RibbonPage1.Text" xml:space="preserve">
|
||||
<value>Global Search</value>
|
||||
<value>Globale Suche</value>
|
||||
</data>
|
||||
<data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1467, 158</value>
|
||||
<value>1467, 147</value>
|
||||
</data>
|
||||
<data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 675</value>
|
||||
<value>0, 674</value>
|
||||
</data>
|
||||
<data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>1467, 22</value>
|
||||
<value>1467, 23</value>
|
||||
</data>
|
||||
<data name=">>RibbonStatusBar1.Name" xml:space="preserve">
|
||||
<value>RibbonStatusBar1</value>
|
||||
@ -731,21 +746,6 @@
|
||||
<data name=">>RibbonControl1.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup1.Text" xml:space="preserve">
|
||||
<value>Aktionen</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroupRecords.Text" xml:space="preserve">
|
||||
<value>Datensatz</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroupFiles.Text" xml:space="preserve">
|
||||
<value>Dateien</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup2.Text" xml:space="preserve">
|
||||
<value>Funktionen Tabelle</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup3.Text" xml:space="preserve">
|
||||
<value>Suchvariante</value>
|
||||
</data>
|
||||
<data name="RibbonPage2.Text" xml:space="preserve">
|
||||
<value>RibbonPage2</value>
|
||||
</data>
|
||||
@ -942,10 +942,10 @@
|
||||
<data name=">>RibbonPageGroupFiles.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>RibbonPageGroup2.Name" xml:space="preserve">
|
||||
<value>RibbonPageGroup2</value>
|
||||
<data name=">>RibbonPageGroupExcel.Name" xml:space="preserve">
|
||||
<value>RibbonPageGroupExcel</value>
|
||||
</data>
|
||||
<data name=">>RibbonPageGroup2.Type" xml:space="preserve">
|
||||
<data name=">>RibbonPageGroupExcel.Type" xml:space="preserve">
|
||||
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name=">>RibbonPageGroup3.Name" xml:space="preserve">
|
||||
|
||||
@ -301,6 +301,7 @@ Public Class frmGlobalSearch
|
||||
End Function
|
||||
|
||||
Private Sub frmSearchAllOVer_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
|
||||
_Helper = New ClassHelper
|
||||
Load_DocGrid_Layout()
|
||||
Load_RecordGrid_Layout()
|
||||
@ -373,6 +374,8 @@ Public Class frmGlobalSearch
|
||||
Dim oTerm As String = txtSearch.Text
|
||||
If txtSearch.Text.Contains(".") Then
|
||||
lblFT_Irregular.Visible = True
|
||||
Else
|
||||
lblFT_Irregular.Visible = False
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
@ -58,6 +58,8 @@ Public Class frmLicense
|
||||
Dim sql As String = String.Format("UPDATE TBDD_CLIENT SET LICENSE_PMO = '" & result & "' WHERE GUID = {0}", CLIENT_ID)
|
||||
If MYDB_ECM.ExecuteNonQuery(Sql) = True Then
|
||||
Refresh_Licence(True)
|
||||
Else
|
||||
MsgBox("Fehler bei Update der License. Überprüfe das Log!", MsgBoxStyle.Exclamation)
|
||||
End If
|
||||
|
||||
'MsgBox("Die Lizenzen wurden erfolgreich aktualisiert!", MsgBoxStyle.Exclamation, "Erfolgsmeldung:")
|
||||
|
||||
@ -130,10 +130,13 @@
|
||||
</data>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="OK_Button.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 3</value>
|
||||
<value>4, 4</value>
|
||||
</data>
|
||||
<data name="OK_Button.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>4, 4, 4, 4</value>
|
||||
</data>
|
||||
<data name="OK_Button.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>67, 23</value>
|
||||
<value>89, 28</value>
|
||||
</data>
|
||||
<data name="OK_Button.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -157,10 +160,13 @@
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="Cancel_Button.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>76, 3</value>
|
||||
<value>101, 4</value>
|
||||
</data>
|
||||
<data name="Cancel_Button.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>4, 4, 4, 4</value>
|
||||
</data>
|
||||
<data name="Cancel_Button.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>67, 23</value>
|
||||
<value>89, 28</value>
|
||||
</data>
|
||||
<data name="Cancel_Button.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
@ -181,13 +187,16 @@
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="TableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>277, 274</value>
|
||||
<value>369, 337</value>
|
||||
</data>
|
||||
<data name="TableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>4, 4, 4, 4</value>
|
||||
</data>
|
||||
<data name="TableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="TableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>146, 29</value>
|
||||
<value>195, 36</value>
|
||||
</data>
|
||||
<data name="TableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
@ -211,10 +220,13 @@
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
|
||||
<value>6, 13</value>
|
||||
<value>8, 16</value>
|
||||
</data>
|
||||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>435, 315</value>
|
||||
<value>580, 388</value>
|
||||
</data>
|
||||
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>4, 4, 4, 4</value>
|
||||
</data>
|
||||
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
|
||||
<value>CenterParent</value>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -7,6 +7,7 @@ Imports DevExpress.XtraBars
|
||||
Imports DevExpress.XtraBars.Ribbon
|
||||
Imports DevExpress.XtraBars.Ribbon.ViewInfo
|
||||
Imports DevExpress.XtraNavBar
|
||||
Imports Microsoft.Office.Core
|
||||
|
||||
Public Class frmMain
|
||||
Dim strIPAddress As String
|
||||
@ -225,7 +226,7 @@ Public Class frmMain
|
||||
End Try
|
||||
Dim msg = "Anzahl verbrauchte Lizenzen: " & LICENSES_USED.ToString()
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
msg = "#User logged in: " & LICENSES_USED.ToString()
|
||||
msg = "#Used licenses: " & LICENSES_USED.ToString()
|
||||
End If
|
||||
LabelLoggedIn.Caption = msg
|
||||
LOGGER.Debug(msg)
|
||||
@ -581,7 +582,8 @@ Public Class frmMain
|
||||
End If
|
||||
|
||||
'Lizenz abgellaufen, überprüfen ob User Admin ist
|
||||
If LICENSE_COUNT <= (LICENSES_USED + 1) Then
|
||||
If LICENSE_COUNT <= (LICENSES_USED) Then
|
||||
LOGGER.Info($"{LICENSE_COUNT} <= {LICENSES_USED}")
|
||||
If USER_IS_ADMIN = True Then
|
||||
LOGGER.Info("User is Admin - Timer will be started")
|
||||
'If USER_LANGUAGE = "de-DE" Then
|
||||
@ -928,6 +930,7 @@ Public Class frmMain
|
||||
Private Sub frmMain_MdiChildActivate(sender As Object, e As EventArgs) Handles Me.MdiChildActivate
|
||||
Dim mainForm As Form = sender
|
||||
Dim constructorFound = False
|
||||
Dim child As Form = Me.ActiveMdiChild
|
||||
|
||||
For Each childForm As Form In mainForm.MdiChildren
|
||||
If (childForm.Name = "frmConstructor_Main") Then
|
||||
@ -948,6 +951,7 @@ Public Class frmMain
|
||||
Else
|
||||
ribbonMain.Minimized = False
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub ribbonMain_MouseMove(sender As Object, e As MouseEventArgs) Handles ribbonMain.MouseMove
|
||||
|
||||
@ -173,7 +173,7 @@ Partial Class frmNodeNavigation
|
||||
Me.ribbonNodeNavigation.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[True]
|
||||
Me.ribbonNodeNavigation.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False]
|
||||
Me.ribbonNodeNavigation.ShowToolbarCustomizeItem = False
|
||||
Me.ribbonNodeNavigation.Size = New System.Drawing.Size(2215, 158)
|
||||
Me.ribbonNodeNavigation.Size = New System.Drawing.Size(1151, 147)
|
||||
Me.ribbonNodeNavigation.StatusBar = Me.RibbonStatusBar1
|
||||
Me.ribbonNodeNavigation.Toolbar.ShowCustomizeItem = False
|
||||
'
|
||||
@ -350,6 +350,7 @@ Partial Class frmNodeNavigation
|
||||
'
|
||||
'RibbonPageGroupDocResult
|
||||
'
|
||||
Me.RibbonPageGroupDocResult.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
|
||||
Me.RibbonPageGroupDocResult.ItemLinks.Add(Me.checkShowPreview)
|
||||
Me.RibbonPageGroupDocResult.ItemLinks.Add(Me.bbtnitmDocResultRefresh)
|
||||
Me.RibbonPageGroupDocResult.ItemLinks.Add(Me.bbtnitmDocResultExport)
|
||||
@ -368,10 +369,10 @@ Partial Class frmNodeNavigation
|
||||
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, 1305)
|
||||
Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 566)
|
||||
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
|
||||
Me.RibbonStatusBar1.Ribbon = Me.ribbonNodeNavigation
|
||||
Me.RibbonStatusBar1.Size = New System.Drawing.Size(2215, 22)
|
||||
Me.RibbonStatusBar1.Size = New System.Drawing.Size(1151, 23)
|
||||
'
|
||||
'RibbonPage2
|
||||
'
|
||||
@ -393,7 +394,7 @@ Partial Class frmNodeNavigation
|
||||
'
|
||||
Me.SplitContainerTreeList.Panel2.Controls.Add(Me.SplitContainerDocumentSearch)
|
||||
Me.SplitContainerTreeList.Panel2.Text = "Panel2"
|
||||
Me.SplitContainerTreeList.Size = New System.Drawing.Size(799, 1147)
|
||||
Me.SplitContainerTreeList.Size = New System.Drawing.Size(776, 419)
|
||||
Me.SplitContainerTreeList.SplitterPosition = 229
|
||||
Me.SplitContainerTreeList.TabIndex = 2
|
||||
'
|
||||
@ -435,7 +436,7 @@ Partial Class frmNodeNavigation
|
||||
Me.TreeListDevexpress.OptionsView.ShowVertLines = False
|
||||
Me.TreeListDevexpress.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Dark
|
||||
Me.TreeListDevexpress.ParentFieldName = "PARENT_GUID"
|
||||
Me.TreeListDevexpress.Size = New System.Drawing.Size(229, 1147)
|
||||
Me.TreeListDevexpress.Size = New System.Drawing.Size(229, 419)
|
||||
Me.TreeListDevexpress.StateImageList = Me.ImageCollection1
|
||||
Me.TreeListDevexpress.TabIndex = 1
|
||||
'
|
||||
@ -459,8 +460,8 @@ Partial Class frmNodeNavigation
|
||||
'
|
||||
Me.SplitContainerDocumentSearch.Panel2.Controls.Add(Me.GridControlDocSearch)
|
||||
Me.SplitContainerDocumentSearch.Panel2.Text = "Panel2"
|
||||
Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(560, 1147)
|
||||
Me.SplitContainerDocumentSearch.SplitterPosition = 246
|
||||
Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(535, 419)
|
||||
Me.SplitContainerDocumentSearch.SplitterPosition = 133
|
||||
Me.SplitContainerDocumentSearch.TabIndex = 1
|
||||
'
|
||||
'pnlControls
|
||||
@ -470,7 +471,7 @@ Partial Class frmNodeNavigation
|
||||
Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.pnlControls.Location = New System.Drawing.Point(0, 0)
|
||||
Me.pnlControls.Name = "pnlControls"
|
||||
Me.pnlControls.Size = New System.Drawing.Size(560, 246)
|
||||
Me.pnlControls.Size = New System.Drawing.Size(535, 133)
|
||||
Me.pnlControls.TabIndex = 0
|
||||
'
|
||||
'GridControlDocSearch
|
||||
@ -484,7 +485,7 @@ Partial Class frmNodeNavigation
|
||||
Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0)
|
||||
Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
|
||||
Me.GridControlDocSearch.Name = "GridControlDocSearch"
|
||||
Me.GridControlDocSearch.Size = New System.Drawing.Size(560, 891)
|
||||
Me.GridControlDocSearch.Size = New System.Drawing.Size(535, 274)
|
||||
Me.GridControlDocSearch.TabIndex = 8
|
||||
Me.GridControlDocSearch.TabStop = False
|
||||
Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
|
||||
@ -702,7 +703,7 @@ Partial Class frmNodeNavigation
|
||||
'
|
||||
Me.SplitContainerDocView.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
|
||||
Me.SplitContainerDocView.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 158)
|
||||
Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 147)
|
||||
Me.SplitContainerDocView.Name = "SplitContainerDocView"
|
||||
'
|
||||
'SplitContainerDocView.Panel1
|
||||
@ -714,8 +715,8 @@ Partial Class frmNodeNavigation
|
||||
'
|
||||
Me.SplitContainerDocView.Panel2.Controls.Add(Me.DocumentViewer)
|
||||
Me.SplitContainerDocView.Panel2.Text = "Panel2"
|
||||
Me.SplitContainerDocView.Size = New System.Drawing.Size(2215, 1147)
|
||||
Me.SplitContainerDocView.SplitterPosition = 799
|
||||
Me.SplitContainerDocView.Size = New System.Drawing.Size(1151, 419)
|
||||
Me.SplitContainerDocView.SplitterPosition = 776
|
||||
Me.SplitContainerDocView.TabIndex = 0
|
||||
'
|
||||
'DocumentViewer
|
||||
@ -725,7 +726,7 @@ Partial Class frmNodeNavigation
|
||||
Me.DocumentViewer.FileLoaded = False
|
||||
Me.DocumentViewer.Location = New System.Drawing.Point(0, 0)
|
||||
Me.DocumentViewer.Name = "DocumentViewer"
|
||||
Me.DocumentViewer.Size = New System.Drawing.Size(1406, 1147)
|
||||
Me.DocumentViewer.Size = New System.Drawing.Size(363, 419)
|
||||
Me.DocumentViewer.TabIndex = 0
|
||||
Me.DocumentViewer.Viewer_ForceTemporaryMode = False
|
||||
'
|
||||
@ -780,15 +781,15 @@ Partial Class frmNodeNavigation
|
||||
Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top
|
||||
Me.barDockControlTop.Location = New System.Drawing.Point(0, 0)
|
||||
Me.barDockControlTop.Manager = Me.BarManager1
|
||||
Me.barDockControlTop.Size = New System.Drawing.Size(2215, 0)
|
||||
Me.barDockControlTop.Size = New System.Drawing.Size(1151, 0)
|
||||
'
|
||||
'barDockControlBottom
|
||||
'
|
||||
Me.barDockControlBottom.CausesValidation = False
|
||||
Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
|
||||
Me.barDockControlBottom.Location = New System.Drawing.Point(0, 1327)
|
||||
Me.barDockControlBottom.Location = New System.Drawing.Point(0, 589)
|
||||
Me.barDockControlBottom.Manager = Me.BarManager1
|
||||
Me.barDockControlBottom.Size = New System.Drawing.Size(2215, 0)
|
||||
Me.barDockControlBottom.Size = New System.Drawing.Size(1151, 0)
|
||||
'
|
||||
'barDockControlLeft
|
||||
'
|
||||
@ -796,15 +797,15 @@ Partial Class frmNodeNavigation
|
||||
Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left
|
||||
Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0)
|
||||
Me.barDockControlLeft.Manager = Me.BarManager1
|
||||
Me.barDockControlLeft.Size = New System.Drawing.Size(0, 1327)
|
||||
Me.barDockControlLeft.Size = New System.Drawing.Size(0, 589)
|
||||
'
|
||||
'barDockControlRight
|
||||
'
|
||||
Me.barDockControlRight.CausesValidation = False
|
||||
Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right
|
||||
Me.barDockControlRight.Location = New System.Drawing.Point(2215, 0)
|
||||
Me.barDockControlRight.Location = New System.Drawing.Point(1151, 0)
|
||||
Me.barDockControlRight.Manager = Me.BarManager1
|
||||
Me.barDockControlRight.Size = New System.Drawing.Size(0, 1327)
|
||||
Me.barDockControlRight.Size = New System.Drawing.Size(0, 589)
|
||||
'
|
||||
'BarButtonItem2
|
||||
'
|
||||
@ -1037,7 +1038,7 @@ Partial Class frmNodeNavigation
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.ClientSize = New System.Drawing.Size(2215, 1327)
|
||||
Me.ClientSize = New System.Drawing.Size(1151, 589)
|
||||
Me.Controls.Add(Me.SplitContainerDocView)
|
||||
Me.Controls.Add(Me.RibbonStatusBar1)
|
||||
Me.Controls.Add(Me.ribbonNodeNavigation)
|
||||
|
||||
@ -777,7 +777,7 @@
|
||||
<value>606, 54</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>130</value>
|
||||
<value>84</value>
|
||||
</metadata>
|
||||
<data name="frmNodeNavigation.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
|
||||
@ -5,6 +5,7 @@ Imports DD_Record_Organizer.ClassDocGrid
|
||||
Imports DevExpress.Data
|
||||
Imports DevExpress.Data.Filtering
|
||||
Imports DevExpress.Utils
|
||||
Imports DevExpress.XtraBars.Ribbon
|
||||
Imports DevExpress.XtraEditors
|
||||
Imports DevExpress.XtraGrid
|
||||
Imports DevExpress.XtraGrid.Views.Grid
|
||||
@ -93,9 +94,7 @@ Public Class frmNodeNavigation
|
||||
Update
|
||||
Delete
|
||||
End Enum
|
||||
|
||||
#End Region
|
||||
|
||||
Public Sub New(pEntityID As Int16, pConstructID As Int16, pNodeKeyID As Integer)
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
@ -409,7 +408,7 @@ Public Class frmNodeNavigation
|
||||
' END NEW NODE
|
||||
CURRENT_NODEID = oGuid
|
||||
If oHasRecordId Then
|
||||
Update_Status_Label(True, $"NodeGUID {oGuid} - RecordID {CURRENT_RECORD_ID}", EditState.None)
|
||||
Update_Status_Label(True, $"NodeID {oGuid} - RecordID {CURRENT_RECORD_ID}", EditState.None)
|
||||
|
||||
Node_AfterSelect = True
|
||||
|
||||
@ -467,7 +466,7 @@ Public Class frmNodeNavigation
|
||||
Node_AfterSelect = False
|
||||
|
||||
Else
|
||||
Update_Status_Label(True, $"NodeGUID {oGuid}", EditState.None)
|
||||
Update_Status_Label(True, $"NodeID {oGuid}", EditState.None)
|
||||
|
||||
ClassControlValues.ClearControlValues(pnlControls.Controls)
|
||||
|
||||
@ -509,9 +508,9 @@ Public Class frmNodeNavigation
|
||||
oMessage = "Keine Dateien für '"
|
||||
|
||||
If CURRENT_SEARCH_TYPE = "ENTITY" Then
|
||||
oMessage &= " Entität gefunden"
|
||||
oMessage &= " Sicht gefunden"
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
oMessage = "No files found for entity: "
|
||||
oMessage = "No files found for view: "
|
||||
End If
|
||||
|
||||
ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then
|
||||
@ -543,9 +542,9 @@ Public Class frmNodeNavigation
|
||||
|
||||
If CURRENT_SEARCH_TYPE = "ENTITY" Then
|
||||
|
||||
oMessage = "Dateien für Entität: "
|
||||
oMessage = "Dateien für Sicht: "
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
oMessage = "files for entity: "
|
||||
oMessage = "files for view: "
|
||||
End If
|
||||
oMessage &= " (" & pDocumentCount.ToString & ")"
|
||||
|
||||
@ -1795,9 +1794,9 @@ Public Class frmNodeNavigation
|
||||
Dim oSQL = $"SELECT ENTITY_DOC_SEARCH FROM TBPMO_FORM WHERE GUID = {_EntityId}"
|
||||
CURRENT_DOCSEARCH_SQL = MYDB_ECM.GetScalarValue(oSQL)
|
||||
If CURRENT_DOCSEARCH_SQL <> String.Empty Then
|
||||
Dim oText = $"Die Entität-weite Suche wird im Hintergrund ausgeführt und in einem separaten Fenster angezeigt sobald sie fertig ist."
|
||||
If USER_LANGUAGE <> "de-De" Then
|
||||
oText = $"The entity-wide search will be started in background. The result will be displayed when ready."
|
||||
Dim oText = $"Die sichtweite Suche wird im Hintergrund ausgeführt und in einem separaten Fenster angezeigt sobald sie fertig ist."
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
oText = $"The view-wide search will be started in background. The result will be displayed when ready."
|
||||
End If
|
||||
Update_Notification_Label(True, oText, "Yellow")
|
||||
|
||||
@ -1808,9 +1807,9 @@ Public Class frmNodeNavigation
|
||||
|
||||
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
CURRENT_DOCSEARCH_CAPTION = "Entity-wide search"
|
||||
CURRENT_DOCSEARCH_CAPTION = "view-wide search"
|
||||
Else
|
||||
CURRENT_DOCSEARCH_CAPTION = "Entitätssuche"
|
||||
CURRENT_DOCSEARCH_CAPTION = "Sichtweite Suche"
|
||||
End If
|
||||
Dim myformThread = New Thread(Sub()
|
||||
Using frm As New frmDocSearchResult
|
||||
@ -2025,9 +2024,14 @@ Public Class frmNodeNavigation
|
||||
Update_DocID_Label(True, omsg, EditState.Update)
|
||||
If SELECTED_DOC_ID <> oDocID Then
|
||||
SELECTED_DOC_ID = oDocID
|
||||
If SplitContainerDocView.Collapsed Then
|
||||
SplitContainerDocView.Collapsed = False
|
||||
If checkShowPreview.Checked = False Then
|
||||
SplitContainerDocView.Collapsed = True
|
||||
Else
|
||||
If SplitContainerDocView.Collapsed Then
|
||||
SplitContainerDocView.Collapsed = False
|
||||
End If
|
||||
End If
|
||||
|
||||
DocView_DisplaySelectedDoc(False)
|
||||
End If
|
||||
Update_DocID_Label(True, omsg, EditState.Update)
|
||||
@ -3272,15 +3276,126 @@ Public Class frmNodeNavigation
|
||||
Else
|
||||
NNLogger.Debug("Show_SelectedDoc - oSelectedDocs is nothing")
|
||||
End If
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
' If AfterNodeChange Then Exit Sub
|
||||
|
||||
'Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
|
||||
|
||||
'Try
|
||||
' Dim oSelectedDoc = ClassDocGrid.GetSingleSelectedDocument(GridViewDoc_Search)
|
||||
|
||||
' If oSelectedDoc Is Nothing OrElse oSelectedDoc.Count <> 1 Then
|
||||
' NNLogger.Debug("Kein oder mehrere Dokumente ausgewählt.")
|
||||
' Close_Document_Viewer()
|
||||
' Return
|
||||
' End If
|
||||
|
||||
' If Not checkShowPreview.Checked OrElse Not DocViewInitialized Then
|
||||
' NNLogger.Info("Vorschau deaktiviert oder Viewer nicht initialisiert.")
|
||||
' Return
|
||||
' End If
|
||||
|
||||
' Close_Document_Viewer()
|
||||
' Await Task.Delay(400)
|
||||
|
||||
' Dim oDocument As ClassDocGrid.clsWMDoc = oSelectedDoc.First()
|
||||
' Dim oPath = ClassHelper.FORMAT_WM_PATH(oDocument.DocPath)
|
||||
' NNLogger.Debug("Starte DocumentViewer.LoadFile...")
|
||||
|
||||
' ' Flag für Erfolg
|
||||
' Dim fileLoadedSuccessfully As Boolean = False
|
||||
|
||||
' ' Starte Timeout-Überwachung
|
||||
' Dim timeoutTask = Task.Delay(TimeSpan.FromSeconds(20))
|
||||
|
||||
' ' Starte Laden im UI-Thread
|
||||
' Dim loadTask = Task.Run(Sub()
|
||||
' Try
|
||||
' ' Direkt im UI-Thread ausführen
|
||||
' Me.Invoke(Sub()
|
||||
' DocumentViewer.LoadFile(oPath)
|
||||
' fileLoadedSuccessfully = True
|
||||
' End Sub)
|
||||
' Catch ex As Exception
|
||||
' NNLogger.Error("Fehler beim Laden des Dokuments: " & ex.Message)
|
||||
' End Try
|
||||
' End Sub)
|
||||
|
||||
' ' Warte auf Timeout oder Ladeende
|
||||
' Await Task.WhenAny(loadTask, timeoutTask)
|
||||
|
||||
' If Not fileLoadedSuccessfully Then
|
||||
' NNLogger.Warn("Ladevorgang hat Timeout überschritten oder ist fehlgeschlagen.")
|
||||
' ' Optional: Viewer zurücksetzen oder Meldung anzeigen
|
||||
' Else
|
||||
' NNLogger.Info("Dokument erfolgreich geladen.")
|
||||
' End If
|
||||
|
||||
Catch ex As Exception
|
||||
NNLogger.Error(ex)
|
||||
Finally
|
||||
SplashScreenManager.CloseOverlayForm(oHandle)
|
||||
End Try
|
||||
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
'Private Async Sub DocView_DisplaySelectedDoc(AfterNodeChange As Boolean)
|
||||
' If AfterNodeChange Then
|
||||
' Exit Sub
|
||||
' End If
|
||||
' Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
|
||||
' Try
|
||||
' Dim oSelectedDoc = ClassDocGrid.GetSingleSelectedDocument(GridViewDoc_Search)
|
||||
' If Not IsNothing(oSelectedDoc) Then
|
||||
' If checkShowPreview.Checked Then
|
||||
' If DocViewInitialized Then
|
||||
' If oSelectedDoc.Count = 1 Then
|
||||
' Close_Document_Viewer()
|
||||
' Await Task.Delay(400)
|
||||
' Dim oDocument As ClassDocGrid.clsWMDoc = oSelectedDoc.First()
|
||||
' Dim oPath = ClassHelper.FORMAT_WM_PATH(oDocument.DocPath)
|
||||
' NNLogger.Debug("Now DocumentViewer.LoadFile...")
|
||||
' Dim loadTask = Task.Run(Sub()
|
||||
' DocumentViewer.LoadFile(oPath)
|
||||
' End Sub)
|
||||
|
||||
' Dim timeoutTask = Task.Delay(TimeSpan.FromSeconds(20))
|
||||
|
||||
' Dim completedTask = Await Task.WhenAny(loadTask, timeoutTask)
|
||||
|
||||
' If completedTask Is timeoutTask Then
|
||||
' NNLogger.Warn("Document loading timed out.")
|
||||
' ' Optional: Cancel or reset viewer
|
||||
' Else
|
||||
' NNLogger.Info("Document loaded successfully.")
|
||||
' End If
|
||||
' Else
|
||||
' NNLogger.Debug("Show_SelectedDoc - oSelectedDocs.Count not = 1 ")
|
||||
' Close_Document_Viewer()
|
||||
' End If
|
||||
' Else
|
||||
' NNLogger.Info("DocumentViewer not inited. No Show_SelectedDoc")
|
||||
' End If
|
||||
' End If
|
||||
|
||||
' Else
|
||||
' NNLogger.Debug("Show_SelectedDoc - oSelectedDocs is nothing")
|
||||
' End If
|
||||
' Catch ex As Exception
|
||||
' NNLogger.Error(ex)
|
||||
' Finally
|
||||
' SplashScreenManager.CloseOverlayForm(oHandle)
|
||||
' End Try
|
||||
|
||||
|
||||
|
||||
'End Sub
|
||||
Private Sub Close_Document_Viewer()
|
||||
Try
|
||||
DocumentViewer.CloseDocument()
|
||||
|
||||
@ -16,8 +16,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_USER_G
|
||||
Dim newUserRow As DD_ECMAdmin.TBAD_UsersRow
|
||||
newUserRow = DD_ECMAdmin.TBAD_Users.NewTBAD_UsersRow
|
||||
newUserRow.Username = row.Item("USERNAME")
|
||||
newUserRow.Surname = row.Item("NAME")
|
||||
newUserRow.Prename = row.Item("PRENAME")
|
||||
newUserRow.Surname = If(IsDBNull(row("NAME")), "", row("NAME").ToString())
|
||||
newUserRow.Prename = If(IsDBNull(row("PRENAME")), "", row("PRENAME").ToString())
|
||||
Try
|
||||
newUserRow.Email = row.Item("EMAIL")
|
||||
Catch ex As Exception
|
||||
@ -35,8 +35,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_USER_G
|
||||
For Each row As DataRow In DT_USERS_CONFIGURED.Rows
|
||||
Dim newUserRow As DD_ECMAdmin.TBWH_Users1Row
|
||||
newUserRow = DD_ECMAdmin.TBWH_Users1.NewTBWH_Users1Row
|
||||
newUserRow.Surname = row.Item("NAME")
|
||||
newUserRow.Prename = row.Item("PRENAME")
|
||||
newUserRow.Surname = If(IsDBNull(row("NAME")), "", row("NAME").ToString())
|
||||
newUserRow.Prename = If(IsDBNull(row("PRENAME")), "", row("PRENAME").ToString())
|
||||
newUserRow.Username = row.Item("USERNAME")
|
||||
Try
|
||||
newUserRow.Email = row.Item("EMAIL")
|
||||
|
||||
@ -194,8 +194,6 @@
|
||||
<File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.dll" />
|
||||
<File Id="GdPicture.NET.14.Imaging.ML.64" Name="GdPicture.NET.14.Imaging.ML.64.dll" />
|
||||
<File Id="GdPicture.NET.14.Imaging.ML" Name="GdPicture.NET.14.Imaging.ML.dll" />
|
||||
|
||||
<File Id="GdPicture.NET.14.Imaging.Formats.Conversion" Name="GdPicture.NET.14.Imaging.Formats.Conversion.dll" />
|
||||
<File Id="GdPicture.NET.14.Imaging.Formats.Conversion" Name="GdPicture.NET.14.Imaging.Formats.Conversion.dll" />
|
||||
<File Id="GdPicture.NET.14.Common" Name="GdPicture.NET.14.Common.dll" />
|
||||
<File Id="GdPicture.NET.14.Imaging.Rendering" Name="GdPicture.NET.14.Imaging.Rendering.dll" />
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user