diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 0650375..9ff774a 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -24,10 +24,6 @@ Partial Class frmMain Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) - Me.ListViewProfile = New System.Windows.Forms.ListView() - Me.ProfilJob = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.DocumentNumber = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.Profilname = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.ImageListProfile = New System.Windows.Forms.ImageList(Me.components) Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -49,6 +45,8 @@ Partial Class frmMain Me.tslblUserLoggedin = New System.Windows.Forms.ToolStripStatusLabel() Me.tslblVersion = New System.Windows.Forms.ToolStripStatusLabel() Me.Panel1 = New System.Windows.Forms.Panel() + Me.GridControlProfile = New DevExpress.XtraGrid.GridControl() + Me.GridViewProfile = New DevExpress.XtraGrid.Views.Grid.GridView() Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) Me.Timer = New System.Windows.Forms.Timer(Me.components) Me.VWPM_PROFILE_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -60,50 +58,19 @@ Partial Class frmMain Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TimerReminder = New System.Windows.Forms.Timer(Me.components) - Me.GridControlProfile = New DevExpress.XtraGrid.GridControl() - Me.GridViewProfile = New DevExpress.XtraGrid.Views.Grid.GridView() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.ToolStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout() Me.Panel1.SuspendLayout() + CType(Me.GridControlProfile, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewProfile, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPM_PROFILE_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridControlProfile, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridViewProfile, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'ListViewProfile - ' - Me.ListViewProfile.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ProfilJob, Me.DocumentNumber, Me.Profilname}) - Me.ListViewProfile.Font = New System.Drawing.Font("Verdana", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ListViewProfile.FullRowSelect = True - Me.ListViewProfile.Location = New System.Drawing.Point(714, 37) - Me.ListViewProfile.Name = "ListViewProfile" - Me.ListViewProfile.ShowItemToolTips = True - Me.ListViewProfile.Size = New System.Drawing.Size(163, 101) - Me.ListViewProfile.SmallImageList = Me.ImageListProfile - Me.ListViewProfile.TabIndex = 1 - Me.ListViewProfile.UseCompatibleStateImageBehavior = False - Me.ListViewProfile.View = System.Windows.Forms.View.Details - ' - 'ProfilJob - ' - Me.ProfilJob.Text = "title" - Me.ProfilJob.Width = 500 - ' - 'DocumentNumber - ' - Me.DocumentNumber.Text = "# documents" - Me.DocumentNumber.Width = 150 - ' - 'Profilname - ' - Me.Profilname.Text = "Profilname" - Me.Profilname.Width = 2 - ' 'ImageListProfile ' Me.ImageListProfile.ImageStream = CType(resources.GetObject("ImageListProfile.ImageStream"), System.Windows.Forms.ImageListStreamer) @@ -272,7 +239,6 @@ Partial Class frmMain 'Panel1 ' Me.Panel1.Controls.Add(Me.GridControlProfile) - Me.Panel1.Controls.Add(Me.ListViewProfile) Me.Panel1.Controls.Add(Me.ToolStrip1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel1.Location = New System.Drawing.Point(0, 0) @@ -280,6 +246,44 @@ Partial Class frmMain Me.Panel1.Size = New System.Drawing.Size(889, 351) Me.Panel1.TabIndex = 4 ' + 'GridControlProfile + ' + Me.GridControlProfile.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GridControlProfile.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GridControlProfile.Location = New System.Drawing.Point(12, 28) + Me.GridControlProfile.MainView = Me.GridViewProfile + Me.GridControlProfile.Name = "GridControlProfile" + Me.GridControlProfile.Size = New System.Drawing.Size(865, 311) + Me.GridControlProfile.TabIndex = 3 + Me.GridControlProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfile}) + ' + 'GridViewProfile + ' + Me.GridViewProfile.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan + Me.GridViewProfile.Appearance.EvenRow.Options.UseBackColor = True + Me.GridViewProfile.Appearance.Row.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GridViewProfile.Appearance.Row.Options.UseFont = True + Me.GridViewProfile.GridControl = Me.GridControlProfile + Me.GridViewProfile.GroupPanelText = "Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu la" & + "ssen" + Me.GridViewProfile.Name = "GridViewProfile" + Me.GridViewProfile.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewProfile.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewProfile.OptionsBehavior.Editable = False + Me.GridViewProfile.OptionsBehavior.ReadOnly = True + Me.GridViewProfile.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewProfile.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridViewProfile.OptionsSelection.EnableAppearanceFocusedRow = False + Me.GridViewProfile.OptionsSelection.EnableAppearanceHideSelection = False + Me.GridViewProfile.OptionsSelection.MultiSelect = True + Me.GridViewProfile.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect + Me.GridViewProfile.OptionsView.ColumnAutoWidth = False + Me.GridViewProfile.OptionsView.EnableAppearanceEvenRow = True + Me.GridViewProfile.OptionsView.ShowAutoFilterRow = True + Me.GridViewProfile.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True] + ' 'NotifyIcon1 ' Me.NotifyIcon1.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info @@ -330,43 +334,6 @@ Partial Class frmMain 'TimerReminder ' ' - 'GridControlProfile - ' - Me.GridControlProfile.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GridControlProfile.Location = New System.Drawing.Point(12, 37) - Me.GridControlProfile.MainView = Me.GridViewProfile - Me.GridControlProfile.Name = "GridControlProfile" - Me.GridControlProfile.Size = New System.Drawing.Size(682, 311) - Me.GridControlProfile.TabIndex = 3 - Me.GridControlProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfile}) - ' - 'GridViewProfile - ' - Me.GridViewProfile.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan - Me.GridViewProfile.Appearance.EvenRow.Options.UseBackColor = True - Me.GridViewProfile.Appearance.Row.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GridViewProfile.Appearance.Row.Options.UseFont = True - Me.GridViewProfile.GridControl = Me.GridControlProfile - Me.GridViewProfile.GroupPanelText = "Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu la" & - "ssen" - Me.GridViewProfile.Name = "GridViewProfile" - Me.GridViewProfile.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridViewProfile.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridViewProfile.OptionsBehavior.Editable = False - Me.GridViewProfile.OptionsBehavior.ReadOnly = True - Me.GridViewProfile.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] - Me.GridViewProfile.OptionsCustomization.AllowGroup = False - Me.GridViewProfile.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridViewProfile.OptionsSelection.EnableAppearanceFocusedRow = False - Me.GridViewProfile.OptionsSelection.EnableAppearanceHideSelection = False - Me.GridViewProfile.OptionsSelection.MultiSelect = True - Me.GridViewProfile.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect - Me.GridViewProfile.OptionsView.ColumnAutoWidth = False - Me.GridViewProfile.OptionsView.EnableAppearanceEvenRow = True - Me.GridViewProfile.OptionsView.ShowAutoFilterRow = True - Me.GridViewProfile.OptionsView.ShowGroupPanel = False - Me.GridViewProfile.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True] - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 21.0!) @@ -388,12 +355,12 @@ Partial Class frmMain Me.StatusStrip1.PerformLayout() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() + CType(Me.GridControlProfile, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewProfile, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWPM_PROFILE_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControlProfile, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridViewProfile, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -402,9 +369,6 @@ Partial Class frmMain Friend WithEvents TBPM_PROFILEBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_PROFILETableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager - Friend WithEvents ListViewProfile As System.Windows.Forms.ListView - Friend WithEvents ProfilJob As System.Windows.Forms.ColumnHeader - Friend WithEvents DocumentNumber As System.Windows.Forms.ColumnHeader Friend WithEvents ImageListProfile As System.Windows.Forms.ImageList Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip Friend WithEvents ToolStripLabel1 As System.Windows.Forms.ToolStripLabel @@ -431,7 +395,6 @@ Partial Class frmMain Friend WithEvents tsbtnrefresh As System.Windows.Forms.ToolStripButton Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton - Friend WithEvents Profilname As System.Windows.Forms.ColumnHeader Friend WithEvents tslblVersion As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents TimerReminder As System.Windows.Forms.Timer Friend WithEvents GridControlProfile As DevExpress.XtraGrid.GridControl diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index ef6c892..9328cd4 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAdABAQHQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAdgBAQHYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 0be296f..3a2cb4c 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -2,6 +2,7 @@ Imports DLLLicenseManager Imports DevExpress.LookAndFeel Imports System.Globalization +Imports DevExpress.Utils Public Class frmMain Private _windreamPM As ClassPMWindream @@ -25,6 +26,16 @@ Public Class frmMain Catch ex As Exception ClassLogger.Add("Error in Save FormLayout: " & ex.Message) End Try + Try + Try + Dim XMLPath = GetXML_LayoutName() + GridViewProfile.SaveLayoutToXml(XMLPath) + Catch ex As Exception + + End Try + Catch ex As Exception + + End Try End Sub Private Sub frmProfiles_KeyUp(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles Me.KeyUp @@ -139,18 +150,25 @@ Public Class frmMain Return False End Try End Function + Private Function GetXML_LayoutName() + Dim Filename As String = String.Format("GridViewProfiles_UserLayout.xml") + Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) + End Function Sub LoadProfile_PM() Try If Me.Visible = True And frmProfileDesigner.Visible = False Then DTPROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID) PROFILE_COUNT = 0 - Dim sql = String.Format("Select T.PROFIL_ID, T.TITLE as 'Profil/Schritt', NO_OF_DOCUMENTS AS 'Anzahl Dateien',ISNULL([dbo].[FNPM_LASTWORKUSER_PROFIL] ( T.PROFIL_ID),'') as 'Letzter Bearbeiter' from VWPM_PROFILE_USER T" & - " Where(ACTIVE = 1) And (UPPER(USERNAME) = UPPER('{0}')) Order By PRIORITY", Environment.UserName) + Dim sql = String.Format("SELECT T.PROFIL_ID,T1.TITLE, T.DOC_ID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DOC_ID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DOC_ID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & + "WHERE T.PROFIL_ID = T1.PROFIL_ID " & + "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", Environment.UserName) Dim DTGRID As DataTable = ClassDatabase.Return_Datatable(sql, True) If Not IsNothing(DTGRID) Then GridControlProfile.DataSource = DTGRID Try GridViewProfile.Columns.Item("PROFIL_ID").Visible = False + GridViewProfile.Columns("Last edited").DisplayFormat.FormatType = FormatType.DateTime + GridViewProfile.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" Catch ex As Exception End Try @@ -165,6 +183,12 @@ Public Class frmMain Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(SQL_DETAILS, True) End If + Try + Dim XMLPath = GetXML_LayoutName() + GridViewProfile.RestoreLayoutFromXml(XMLPath) + Catch ex As Exception + + End Try Else @@ -181,9 +205,9 @@ Public Class frmMain Me.VWPM_PROFILE_USERTableAdapter.FillByActive(Me.DD_DMSLiteDataSet.VWPM_PROFILE_USER, Environment.UserName) Dim DT As DataTable = DD_DMSLiteDataSet.Tables("VWPM_PROFILE_USER") If LogErrorsOnly = False Then ClassLogger.Add("", False) - ListViewProfile.Items.Clear() + If DT.Rows.Count > 0 Then - ListViewProfile.Visible = True + For Each row As DataRow In DT.Rows ' If LogErrorsOnly = False Then ClassLogger.Add("## Profil zugeordnet: " & row.Item("PROFIL_NAME"), False) Dim anz As Integer = TBPM_PROFILE_FILESTableAdapter.cmdGet_Anzahl(row.Item("PROFIL_ID")) @@ -194,10 +218,7 @@ Public Class frmMain Else img = 1 End If - ListViewProfile.Items.Add(row.Item("TITLE").ToString, img) - 'ListViewProfile.Items(Count).SubItems.Add(row.Item("TITLE").ToString) - ListViewProfile.Items(PROFILE_COUNT).SubItems.Add(anz) - ListViewProfile.Items(PROFILE_COUNT).SubItems.Add(row.Item("PROFIL_ID").ToString) + PROFILE_COUNT += 1 Else ClassLogger.Add(">> Keine Dateien für Profil '" & row.Item("TITLE").ToString & "' vorhanden!!", False) @@ -206,7 +227,7 @@ Public Class frmMain Else ClassLogger.Add(" >> KEINE PROFILE FÜR USER: '" & Environment.UserName & "' hinterlegt?!", False) MsgBox("KEINE PROFILE FÜR USER: '" & Environment.UserName & "' hinterlegt", MsgBoxStyle.Exclamation, "Achtung:") - ListViewProfile.Visible = False + End If End If Catch ex As Exception @@ -226,32 +247,19 @@ Public Class frmMain Return False End Try End Function - Private Sub ListViewProfile_DoubleClick(sender As System.Object, e As System.EventArgs) Handles ListViewProfile.DoubleClick - Load_Profil() - End Sub - Sub Load_Profil() - Me.Visible = False - Dim I As Integer - For I = 0 To ListViewProfile.SelectedItems.Count - 1 - CURRENT_ProfilGUID = ListViewProfile.SelectedItems(I).SubItems(2).Text - CURRENT_ProfilName = ClassDatabase.Execute_Scalar("SELECT NAME FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID, MyConnectionString) - My.Settings.Save() - 'frmValidation.ShowDialog() - frmValidator.ShowDialog() - Next - Me.Visible = True - LoadProfile_PM() + Private Sub ListViewProfile_DoubleClick(sender As System.Object, e As System.EventArgs) + End Sub Private Sub tsbtnStartValidation_Click(sender As System.Object, e As System.EventArgs) Handles tsbtnStartValidation.Click - Load_Profil() + End Sub Private Sub ToolStripButton1_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton1.Click Try frmKonfig.ShowDialog() Refresh_ConnectionString() - Load_Profil() + ' Load_Profil() Check_Timer_Notification() Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden Grundeinstellungen:") @@ -311,4 +319,29 @@ Public Class frmMain Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown End Sub + + Private Sub GridViewProfile_DoubleClick(sender As Object, e As EventArgs) Handles GridViewProfile.DoubleClick + Try + Dim PROFIL_ID = GridViewProfile.GetFocusedRowCellValue(GridViewProfile.Columns("PROFIL_ID")) + If IsNumeric(PROFIL_ID) Then + Load_Profil_from_Grid(PROFIL_ID) + End If + Catch ex As Exception + + End Try + End Sub + Sub Load_Profil_from_Grid(ID As Integer) + Try + Me.Visible = False + CURRENT_ProfilGUID = ID + CURRENT_ProfilName = ClassDatabase.Execute_Scalar("SELECT NAME FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID, MyConnectionString) + My.Settings.Save() + frmValidator.ShowDialog() + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical) + End Try + + Me.Visible = True + LoadProfile_PM() + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 7449a96..78af5b7 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -2045,9 +2045,10 @@ Public Class frmValidator WORK_HISTORY_ENTRY = "" End If End If - sql = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY) VALUES ({0},{1},{'2'})", CURRENT_ProfilGUID, CURRENT_DOC_ID, Environment.UserName) - ClassDatabase.Execute_non_Query(sql) - Close_document_viewer() + Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, Environment.UserName, Environment.MachineName, WORK_HISTORY_ENTRY) + ClassDatabase.Execute_non_Query(ins) + + Close_document_viewer() 'wenn Move2Folder aktiviert wurde