From c3c7ff5b38e38e588b5d383cf84f373781186762 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 21 Sep 2021 15:17:34 +0200 Subject: [PATCH] MS ExportFiles SelectedPath and PRPM_GETFILENAME_EXPORT --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- app/DD_PM_WINDREAM/clsPatterns.vb | 5 +++- app/DD_PM_WINDREAM/frmMain.vb | 12 ++++----- app/DD_PM_WINDREAM/frmValidator.vb | 27 +++++++++++++++---- 4 files changed, 33 insertions(+), 13 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 810615c..b62dfbb 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/clsPatterns.vb b/app/DD_PM_WINDREAM/clsPatterns.vb index 99e1fc6..2b91309 100644 --- a/app/DD_PM_WINDREAM/clsPatterns.vb +++ b/app/DD_PM_WINDREAM/clsPatterns.vb @@ -136,11 +136,14 @@ Public Class clsPatterns End While While ContainsPatternAndValue(result, PATTERN_USER, VALUE_PROFILE_ID) + If IsNothing(CURRENT_CLICKED_PROFILE_ID) Then + CURRENT_CLICKED_PROFILE_ID = 0 + End If result = ReplacePattern(result, PATTERN_USER, CURRENT_CLICKED_PROFILE_ID) End While While ContainsPatternAndValue(result, PATTERN_USER, VALUE_PROFILE_TITLE) If CURRENT_CLICKED_PROFILE_TITLE Is Nothing Then - CURRENT_CLICKED_PROFILE_TITLE = "EXCEPTIONTitleNothing" + CURRENT_CLICKED_PROFILE_TITLE = "NONE_TITLE" End If result = ReplacePattern(result, PATTERN_USER, CURRENT_CLICKED_PROFILE_TITLE) End While diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 1603a63..903af5d 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -719,7 +719,9 @@ Public Class frmMain Await Load_single_Profile(True) GridView_Docs.HideLoadingPanel() TimerRefresh.Start() - + Else + CURRENT_CLICKED_PROFILE_TITLE = Nothing + CURRENT_CLICKED_PROFILE_ID = Nothing End If End If ElseIf _tag = "OVERVIEW" Then @@ -1463,20 +1465,18 @@ Public Class frmMain If oHitProfilID > 0 Then CURRENT_CLICKED_PROFILE_ID = oHitProfilID End If - End If If Not IsNothing(CURRENT_CLICKED_PROFILE_ID) And IsNumeric(CURRENT_CLICKED_PROFILE_ID) Then LOGGER.Debug($"Item_Scope: Not IsNothing(PROFIL_ID) And IsNumeric(PROFIL_ID)") - Dim expression As String - expression = "PROFILE_ID = " & CURRENT_CLICKED_PROFILE_ID + Dim oExpression As String + oExpression = "PROFILE_ID = " & CURRENT_CLICKED_PROFILE_ID If hitInfo.InGroupRow Or (startedFrom = "CMGROUP" And hitInfo.InDataRow) Then CURRENT_JUMP_DOC_GUID = 0 CURRENT_DOC_GUID = 0 CURRENT_ProfilGUID = CURRENT_CLICKED_PROFILE_ID LOGGER.Debug($"Item_Scope: hitInfo.InGroupRow...oHitProfilID [{CURRENT_CLICKED_PROFILE_ID}]") Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID) - ElseIf hitInfo.InDataRow Then LOGGER.Debug($"Item_Scope: hitInfo.InDataRow...") Dim oFocusedDocGUID @@ -1515,7 +1515,7 @@ Public Class frmMain DOC_PATH = DOC_PATH.Replace("W:\", "\\windream\objects\") DOC_PATH = DOC_PATH.Replace("K:\", "\\windream\objects\") 'Checking if table really contains one record with profile-id and docid - expression = expression & " AND DocID = " & oFocusedDocID + oExpression = oExpression & " AND DocID = " & oFocusedDocID 'Dim TEMP_TABLE = CURR_DT_OVERVIEW 'Dim foundRows() As DataRow 'foundRows = TEMP_TABLE.Select(expression) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 18b415f..f9a3d7c 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -3684,7 +3684,7 @@ Public Class frmValidator Try If ButtonExport2Folder_RootFolder <> "" Then If Directory.Exists(ButtonExport2Folder_RootFolder) Then - FolderBrowserDialog1.RootFolder = ButtonExport2Folder_RootFolder + FolderBrowserDialog1.SelectedPath = ButtonExport2Folder_RootFolder Else LOGGER.Warn($"### Dis/Enabale Export2Path - RootFolder {ButtonExport2Folder_RootFolder} not existing or accessible!###") End If @@ -5644,21 +5644,38 @@ Public Class frmValidator Private Sub barbtnitmExport_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles barbtnitmExport.ItemClick If File.Exists(WMDocPathWindows) Then Try + d Dim oFilenameOnly As String + Dim oExtension As String Dim oTargetPath As String If FolderBrowserDialog1.ShowDialog = DialogResult.OK Then Dim oCount As Integer = 0 oFilenameOnly = Path.GetFileName(WMDocPathWindows) - oTargetPath = FolderBrowserDialog1.SelectedPath & "\" & oFilenameOnly + oExtension = Path.GetExtension(WMDocPathWindows) + Dim oSQLGetFilename As String + oSQLGetFilename = $"DECLARE @Filename Varchar(512) " & vbNewLine & + $"EXEC dbo.PRPM_GETFILENAME_EXPORT {CURRENT_DOC_ID}, 1, @Outputfilename = @Filename OUTPUT;" & vbNewLine & + "SELECT Filename" + Dim oExportFilename = Database_ECM.GetScalarValue(oSQLGetFilename) + + oTargetPath = FolderBrowserDialog1.SelectedPath & "\" & oExportFilename & oExtension File.Copy(WMDocPathWindows, oTargetPath) oCount += 1 - + Dim oFileCount As Integer = 1 If Not IsNothing(DT_AdditionalSearches_Resultset_Docs) Then For Each oFileRecord As DataRow In DT_AdditionalSearches_Resultset_Docs.Rows Dim oFromFilename = oFileRecord.Item("FULL_FILENAME") + Dim oDocID = oFileRecord.Item("DocID") If File.Exists(oFromFilename) Then - oFilenameOnly = Path.GetFileName(oFromFilename) - oTargetPath = FolderBrowserDialog1.SelectedPath & "\" & oFilenameOnly + oFileCount += 1 + oSQLGetFilename = $"DECLARE @Filename Varchar(512) " & vbNewLine & + $"EXEC dbo.PRPM_GETFILENAME_EXPORT {oDocID}, {oFileCount}, @Outputfilename = @Filename OUTPUT;" & vbNewLine & + "SELECT Filename" + oExportFilename = Database_ECM.GetScalarValue(oSQLGetFilename) + oExtension = Path.GetExtension(oFromFilename) + + 'oFilenameOnly = Path.GetFileName(oFromFilename) + oTargetPath = FolderBrowserDialog1.SelectedPath & "\" & oExportFilename & oExtension File.Copy(oFromFilename, oTargetPath) oCount += 1 End If