Neue Datei hinzugefügt und Logging verbessert
In der Datei Product.wxs wurde die Datei DLLLicenseManager.dll zum Installationspaket hinzugefügt. In frmInvDashboard.Designer.vb wurde der Adapter VWPM_CHART_TOP5TableAdapter entfernt und durch das neue Element CreateChartOtherRibbonPage1 ersetzt. In frmValidator.vb wurden mehrere Verbesserungen vorgenommen: - Debug- und Info-Logs für Exportprozesse hinzugefügt. - SQL-Befehl für Export-Dateinamen angepasst. - Verbesserte Fehlerbehandlung und Logging bei fehlenden oder ungültigen Export-Dateinamen. - Warn-Log für nicht gefundene Dateien ergänzt. - Info-Log für leere Dokumentenlisten hinzugefügt.
This commit is contained in:
@@ -126,6 +126,7 @@
|
|||||||
<File Id="DDPatterns" Name="DigitalData.Modules.Patterns.dll" Source="DigitalData.Modules.Patterns.dll"/>
|
<File Id="DDPatterns" Name="DigitalData.Modules.Patterns.dll" Source="DigitalData.Modules.Patterns.dll"/>
|
||||||
<File Id="DDEDMIAPI" Name="DigitalData.Modules.EDMI.API.dll" Source="DigitalData.Modules.EDMI.API.dll"/>
|
<File Id="DDEDMIAPI" Name="DigitalData.Modules.EDMI.API.dll" Source="DigitalData.Modules.EDMI.API.dll"/>
|
||||||
<File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll"/>
|
<File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll"/>
|
||||||
|
<File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="M:\Bibliotheken\Digital Data\DD_Modules\DLLLicenseManager.dll"/>
|
||||||
<File Id="Messaging" Name="DigitalData.Modules.Messaging.dll" Source="DigitalData.Modules.Messaging.dll" KeyPath="no" />
|
<File Id="Messaging" Name="DigitalData.Modules.Messaging.dll" Source="DigitalData.Modules.Messaging.dll" KeyPath="no" />
|
||||||
<File Id="Messaging.License" Name="MailLicense.xml" Source="MailLicense.xml" KeyPath="no" />
|
<File Id="Messaging.License" Name="MailLicense.xml" Source="MailLicense.xml" KeyPath="no" />
|
||||||
<File Id="Limilabs.Mail" Name="Mail.dll" Source="Mail.dll" KeyPath="no" />
|
<File Id="Limilabs.Mail" Name="Mail.dll" Source="Mail.dll" KeyPath="no" />
|
||||||
|
|||||||
5
app/TaskFlow/frmInvDashboard.Designer.vb
generated
5
app/TaskFlow/frmInvDashboard.Designer.vb
generated
@@ -1384,10 +1384,7 @@ Partial Class frmInvDashboard
|
|||||||
Me.ChartBottomRight.Size = New System.Drawing.Size(808, 130)
|
Me.ChartBottomRight.Size = New System.Drawing.Size(808, 130)
|
||||||
Me.ChartBottomRight.TabIndex = 1
|
Me.ChartBottomRight.TabIndex = 1
|
||||||
'
|
'
|
||||||
'VWPM_CHART_TOP5TableAdapter
|
|
||||||
'
|
|
||||||
Me.VWPM_CHART_TOP5TableAdapter.ClearBeforeFill = True
|
|
||||||
'
|
|
||||||
'CreateChartOtherRibbonPage1
|
'CreateChartOtherRibbonPage1
|
||||||
'
|
'
|
||||||
Me.CreateChartOtherRibbonPage1.Name = "CreateChartOtherRibbonPage1"
|
Me.CreateChartOtherRibbonPage1.Name = "CreateChartOtherRibbonPage1"
|
||||||
|
|||||||
@@ -8627,14 +8627,14 @@ Public Class frmValidator
|
|||||||
|
|
||||||
Dim oFileCount As Integer = 1
|
Dim oFileCount As Integer = 1
|
||||||
If Not IsNothing(DT_AdditionalSearches_Resultset_Docs) Then
|
If Not IsNothing(DT_AdditionalSearches_Resultset_Docs) Then
|
||||||
|
|
||||||
For Each oFileRecord As DataRow In DT_AdditionalSearches_Resultset_Docs.Rows
|
For Each oFileRecord As DataRow In DT_AdditionalSearches_Resultset_Docs.Rows
|
||||||
Dim oFromFilename = oFileRecord.Item("FULL_FILENAME")
|
Dim oFromFilename = oFileRecord.Item("FULL_FILENAME")
|
||||||
Dim oDocID = oFileRecord.Item("DocID")
|
Dim oDocID = oFileRecord.Item("DocID")
|
||||||
If File.Exists(oFromFilename) Then
|
If File.Exists(oFromFilename) Then
|
||||||
|
MyValidationLogger.Debug($"Found additional document for export: [{oFromFilename}] with DocID [{oDocID}]")
|
||||||
oFileCount += 1
|
oFileCount += 1
|
||||||
oSQLGetFilename = $"DECLARE @Filename Varchar(512) " & vbcrlf &
|
oSQLGetFilename = $"DECLARE @Filename Varchar(512) " & vbCrLf &
|
||||||
$"EXEC dbo.PRPM_GETFILENAME_EXPORT {oDocID}, {oFileCount}, @Outputfilename = @Filename OUTPUT;" & vbcrlf &
|
$"EXEC dbo.PRPM_GETFILENAME_EXPORT {oDocID}, {oFileCount}, @Outputfilename = @Filename OUTPUT;" & vbCrLf &
|
||||||
"SELECT @Filename"
|
"SELECT @Filename"
|
||||||
oExportFilename = DatabaseFallback.GetScalarValueECM(oSQLGetFilename)
|
oExportFilename = DatabaseFallback.GetScalarValueECM(oSQLGetFilename)
|
||||||
oExtension = Path.GetExtension(oFromFilename)
|
oExtension = Path.GetExtension(oFromFilename)
|
||||||
@@ -8646,17 +8646,25 @@ Public Class frmValidator
|
|||||||
If oExportFilename <> String.Empty Then
|
If oExportFilename <> String.Empty Then
|
||||||
oTargetPath = FolderBrowserDialog1.SelectedPath & "\" & oExportFilename & oExtension
|
oTargetPath = FolderBrowserDialog1.SelectedPath & "\" & oExportFilename & oExtension
|
||||||
File.Copy(oFromFilename, oTargetPath)
|
File.Copy(oFromFilename, oTargetPath)
|
||||||
|
LOGGER.Info($"Additional file [{oFromFilename}] exported successfully to [{oTargetPath}]")
|
||||||
oCount += 1
|
oCount += 1
|
||||||
Else
|
Else
|
||||||
Dim omsg = $"Error encountered while extracting ATTACHMENT-Export-Filename DocID [{oDocID}]!"
|
Dim omsg = $"Error encountered while extracting ATTACHMENT-Export-Filename DocID [{oDocID}]!"
|
||||||
MyValidationLogger.Info($"#### ATTENTION: {omsg} SQL: {oSQLGetFilename}")
|
MyValidationLogger.Info($"#### ATTENTION: {omsg} SQL: {oSQLGetFilename}")
|
||||||
MsgBox(omsg & vbcrlf & "Please inform Admin-Team!", MsgBoxStyle.Critical, ADDITIONAL_TITLE)
|
MsgBox(omsg & vbCrLf & "Please inform Admin-Team!", MsgBoxStyle.Critical, ADDITIONAL_TITLE)
|
||||||
End If
|
End If
|
||||||
|
Else
|
||||||
|
Dim omsg = $"Error encountered while extracting ATTACHMENT-Export-Filename DocID [{oDocID}] - Result is Nothing!"
|
||||||
|
MyValidationLogger.Info($"#### ATTENTION: {omsg} SQL: {oSQLGetFilename}")
|
||||||
|
MsgBox(omsg & vbCrLf & "Please inform Admin-Team!", MsgBoxStyle.Critical, ADDITIONAL_TITLE)
|
||||||
End If
|
End If
|
||||||
'oFilenameOnly = Path.GetFileName(oFromFilename)
|
'oFilenameOnly = Path.GetFileName(oFromFilename)
|
||||||
|
Else
|
||||||
|
MyValidationLogger.Warn($"⚠️ Additional file for export not found: [{oFromFilename}] with DocID [{oDocID}]")
|
||||||
End If
|
End If
|
||||||
Next
|
Next
|
||||||
|
Else
|
||||||
|
MyValidationLogger.Info("No additional documents to export (DT_AdditionalSearches_Resultset_Docs is Nothing)")
|
||||||
End If
|
End If
|
||||||
|
|
||||||
CONFIG.Config.LastExportPath = FolderBrowserDialog1.SelectedPath
|
CONFIG.Config.LastExportPath = FolderBrowserDialog1.SelectedPath
|
||||||
|
|||||||
Reference in New Issue
Block a user