From 4660e8ee9a906d1b2f6c6b09b6b3784ea4e4d054 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Thu, 4 Jul 2024 15:42:54 +0200 Subject: [PATCH] MS Buttons Validator, Fomat Currency --- app/TaskFlow/ClassInit.vb | 2 +- .../My Project/Application.Designer.vb | 2 +- app/TaskFlow/My Project/Application.myapp | 2 +- app/TaskFlow/My Project/licenses.licx | 17 +- app/TaskFlow/TaskFlow.vbproj | 9 + .../frmAdmin_notResponsibleConfig.Designer.vb | 4 + .../frmAdmin_notResponsibleConfig.resx | 72 ++++++++ app/TaskFlow/frmAdmin_notResponsibleConfig.vb | 11 +- .../frmAdmin_rejectionConfig.Designer.vb | 2 +- app/TaskFlow/frmAdmin_rejectionConfig.resx | 158 +++++++----------- app/TaskFlow/frmAdmin_rejectionConfig.vb | 30 +++- app/TaskFlow/frmAdministration.Designer.vb | 23 +-- app/TaskFlow/frmAdministration.resx | 86 +++++++--- app/TaskFlow/frmAdministration.vb | 69 ++++---- app/TaskFlow/frmMain.Designer.vb | 2 + app/TaskFlow/frmMain.resx | 14 +- app/TaskFlow/frmMain.vb | 2 + app/TaskFlow/frmValidator.Designer.vb | 66 ++++---- app/TaskFlow/frmValidator.resx | 100 +++++------ app/TaskFlow/frmValidator.vb | 91 +++++++--- app/TaskFlow/frmYesNo.Designer.vb | 128 ++++++++++++++ app/TaskFlow/frmYesNo.resx | 146 ++++++++++++++++ app/TaskFlow/frmYesNo.vb | 26 +++ 23 files changed, 753 insertions(+), 309 deletions(-) create mode 100644 app/TaskFlow/frmYesNo.Designer.vb create mode 100644 app/TaskFlow/frmYesNo.resx create mode 100644 app/TaskFlow/frmYesNo.vb diff --git a/app/TaskFlow/ClassInit.vb b/app/TaskFlow/ClassInit.vb index 2b09d5c..b9ef61c 100644 --- a/app/TaskFlow/ClassInit.vb +++ b/app/TaskFlow/ClassInit.vb @@ -271,7 +271,7 @@ Public Class ClassInit Dim oSQL As String Try If pUSRNAME <> String.Empty Then - LOGGER.Info($"InitUserLogin with GhostUSer [{pUSRNAME}]") + LOGGER.Info($"InitUserLogin with GhostUser [{pUSRNAME}]") USER_USERNAME = pUSRNAME Else USER_USERNAME = Environment.UserName diff --git a/app/TaskFlow/My Project/Application.Designer.vb b/app/TaskFlow/My Project/Application.Designer.vb index 8d31ac0..44583d7 100644 --- a/app/TaskFlow/My Project/Application.Designer.vb +++ b/app/TaskFlow/My Project/Application.Designer.vb @@ -24,7 +24,7 @@ Namespace My _ Public Sub New() MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = false + Me.IsSingleInstance = true Me.EnableVisualStyles = true Me.SaveMySettingsOnExit = true Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses diff --git a/app/TaskFlow/My Project/Application.myapp b/app/TaskFlow/My Project/Application.myapp index 1eb0a95..74f2fe3 100644 --- a/app/TaskFlow/My Project/Application.myapp +++ b/app/TaskFlow/My Project/Application.myapp @@ -2,7 +2,7 @@ true frmMain - false + true 0 true 0 diff --git a/app/TaskFlow/My Project/licenses.licx b/app/TaskFlow/My Project/licenses.licx index 16e9985..d5a41d3 100644 --- a/app/TaskFlow/My Project/licenses.licx +++ b/app/TaskFlow/My Project/licenses.licx @@ -1,13 +1,14 @@ DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index d0ed3f6..3b7f7f1 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -523,6 +523,12 @@ Form + + frmYesNo.vb + + + Form + @@ -728,6 +734,9 @@ frmWorkflow.vb + + frmYesNo.vb + VbMyResourcesResXFileCodeGenerator diff --git a/app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb b/app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb index 2263e22..1fd97ca 100644 --- a/app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb +++ b/app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb @@ -86,6 +86,7 @@ Partial Class frmAdmin_notResponsibleConfig ' 'RibbonPageGroup2 ' + Me.RibbonPageGroup2.AllowTextClipping = False Me.RibbonPageGroup2.ItemLinks.Add(Me.btnNotResponsibleSQL) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "SQL Design" @@ -122,6 +123,8 @@ Partial Class frmAdmin_notResponsibleConfig Me.SimpleButton1.Appearance.Options.UseBackColor = True Me.SimpleButton1.Appearance.Options.UseBorderColor = True Me.SimpleButton1.Appearance.Options.UseFont = True + Me.SimpleButton1.Enabled = False + Me.SimpleButton1.ImageOptions.Image = CType(resources.GetObject("SimpleButton1.ImageOptions.Image"), System.Drawing.Image) Me.SimpleButton1.Location = New System.Drawing.Point(17, 255) Me.SimpleButton1.Name = "SimpleButton1" Me.SimpleButton1.Size = New System.Drawing.Size(197, 42) @@ -181,6 +184,7 @@ Partial Class frmAdmin_notResponsibleConfig Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmAdmin_notResponsibleConfig.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Name = "frmAdmin_notResponsibleConfig" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 diff --git a/app/TaskFlow/frmAdmin_notResponsibleConfig.resx b/app/TaskFlow/frmAdmin_notResponsibleConfig.resx index 82f1d4e..0eace64 100644 --- a/app/TaskFlow/frmAdmin_notResponsibleConfig.resx +++ b/app/TaskFlow/frmAdmin_notResponsibleConfig.resx @@ -159,6 +159,78 @@ ZD0iTTI5LDIzbC04LDhsLTQtNGw4LThMMjksMjN6IE0zMCwyMmwxLjctMS43YzAuNC0wLjQsMC40LTEs MC0xLjNMMjksMTYuM2MtMC40LTAuNC0xLTAuNC0xLjMsMEwyNiwxOEwzMCwyMnogICAgTTE2LDI4djRo NEwxNiwyOHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABV0RVh0VGl0 + bGUATmV4dDtBcnJvdztEb3duKXvBAwAACnFJREFUWEeVVgdUlUcWHnfTdlNxk3WTmD0REXDFBoIUYekP + sGIBUaOoFHvDREMRERQQEOmIYDdqYqICFoogKErUJJIISi8qqKEpSs9+uXceDzWb3T0753xn5p+5937f + vVPeE/7JViJgr7UIPGAjgg/bitAjtiLsS4WI+FohIk8qRFSqQsSk24m403Yi/py9oDbgvyHmjI3YmW4l + Ik9ZivBvLETIV+Zi21EzseWwqfDfbyJ8U0zE57uMxGfxhmRObVOypbj3dK+of7pPNLTvF/c7Dkg86DhI + OCQedh5iMxXBHwh/JLxEePk34DkGr7PdgHtPD4q7Tw+IO0/2i9q2faLm8R5R/ShFVLbuFuvjx5MJNd/d + FmS0Rwqob1eKaJAiDvKyiliSBh+20I1KtdkSl2FbkJBl+31itqI3KUfRG59h/UPcOevLO05YBPnvMRlH + tq+wPUEKudNGAh7vE9UqAS3JYn2cAS1R800yJ4XJ4u6TFKoECWmnahCoqTJ+OeSIuVNUunXZnlxHnC/x + ws374ShrjMaDjsMSZY0xNBeGrOK1SD4/FRGnzMsCDhjPJd9XCVJIbR95VWuyqGhJEl6xfQK8E81EXVsi + idhFIpJIxG6elllvjDUcGnbcovBgnjN+qg9FfftuVD7ajpImfxQ3+eDGw3X44eFa/NToTfBFeUso7jzZ + jSKy3X9hFrYeM7nq5q+jTbG4IrIalS27REVzolgXq0+f1DYmmNDexNEexZOQBJ5i8pe8k4xttn9l0Zx7 + 61PUtEWh6OeNuHZ/Ba4/YKyU+O4hj5fj2oNl+LZhKa7UL8Hlex643rAO5a07kXXTC1uPTmheFTHWgWJy + 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 + +oEotzUUCQAAAABJRU5ErkJggg== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAQDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9CgkuWWVsbG93e2ZpbGw6I0ZG + QjExNTt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMjQsMjQu + OFYyOEg0VjRoMjB2Ny4ybDItMlYzYzAtMC41LTAuNS0xLTEtMUgzQzIuNSwyLDIsMi41LDIsM3YyNmMw + LDAuNSwwLjUsMSwxLDFoMjJjMC41LDAsMS0wLjUsMS0xdi02LjIgIEwyNCwyNC44eiIgY2xhc3M9IkJs + YWNrIiAvPg0KICA8cGF0aCBkPSJNMjksMTdsLTgsOGwtNC00bDgtOEwyOSwxN3ogTTMwLDE2bDEuNy0x + LjdjMC40LTAuNCwwLjQtMSwwLTEuM0wyOSwxMC4zYy0wLjQtMC40LTEtMC40LTEuMywwTDI2LDEyTDMw + LDE2eiAgIE0xNiwyMnY0aDRMMTYsMjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3ZnPgs= \ No newline at end of file diff --git a/app/TaskFlow/frmAdmin_notResponsibleConfig.vb b/app/TaskFlow/frmAdmin_notResponsibleConfig.vb index 62790f2..728d9d2 100644 --- a/app/TaskFlow/frmAdmin_notResponsibleConfig.vb +++ b/app/TaskFlow/frmAdmin_notResponsibleConfig.vb @@ -1,4 +1,5 @@ Imports DigitalData.GUIs.Common +Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback Public Class frmAdmin_notResponsibleConfig Dim oProfilID As Integer = 0 @@ -26,6 +27,8 @@ Public Class frmAdmin_notResponsibleConfig If DatabaseECM.ExecuteNonQuery(oUpd) Then oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_REJECTION_CAPT{oProfilID}','{USER_LANGUAGE}','PROFILE_REJECTION_CAPT','{txtCaption_NotResponsible.Text}','','{USER_USERNAME}','{oProfilID}',0" bstitmInfo.Caption = "Data saved successfully - " + Now.ToString + + End If Else bstitmInfo.Caption = "Attention: Error storing data - Check Your log" @@ -36,11 +39,10 @@ Public Class frmAdmin_notResponsibleConfig Try Dim oSQL = $"SELECT NOT_RESP_SQL FROM TBPM_PROFILE WHERE GUID = {oProfilID}" Dim oDT = DatabaseECM.GetDatatable(oSQL) - oCaption = oDT.Rows(0).Item(0) oNotResponsible_SQL = oDT.Rows(0).Item(0) For Each oRow As DataRow In CURRENT_DT_PROFILE_LANGUAGE.Rows - If oRow.Item("TITLE") = $"PROFILE_NOT_RESPONSIBLE_CAPT{oProfilID}" Then + If oRow.Item("TITLE") = $"PROFILE_NOT_RESPONSIBLE_CAPT{oProfilID}" And oRow.Item("LANGUAGE") = USER_LANGUAGE Then oCaption = oRow.Item("STRING1") ElseIf oRow.Item("TITLE") = $"PROFILE_NOT_RESPONSIBLE_QUEST{oProfilID}" And oRow.Item("LANGUAGE") = USER_LANGUAGE Then oQuestion = oRow.Item("STRING1") @@ -87,4 +89,9 @@ Public Class frmAdmin_notResponsibleConfig MsgBox("Error in Saving Profile SQL: " & vbNewLine & vbNewLine & ex.Message) End Try End Sub + + Private Sub frmAdmin_notResponsibleConfig_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + Dim oSQL = $"select * from TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE = 'PM' AND TITLE LIKE 'PROFILE_%'" + CURRENT_DT_PROFILE_LANGUAGE = DatabaseECM.GetDatatable(oSQL) + End Sub End Class \ No newline at end of file diff --git a/app/TaskFlow/frmAdmin_rejectionConfig.Designer.vb b/app/TaskFlow/frmAdmin_rejectionConfig.Designer.vb index 5b6d936..52b68e4 100644 --- a/app/TaskFlow/frmAdmin_rejectionConfig.Designer.vb +++ b/app/TaskFlow/frmAdmin_rejectionConfig.Designer.vb @@ -228,7 +228,7 @@ Partial Class frmAdmin_rejectionConfig Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.Font = New System.Drawing.Font("Tahoma", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.IconOptions.LargeImage = CType(resources.GetObject("frmAdmin_rejectionConfig.IconOptions.LargeImage"), System.Drawing.Image) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmAdmin_rejectionConfig.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/app/TaskFlow/frmAdmin_rejectionConfig.resx b/app/TaskFlow/frmAdmin_rejectionConfig.resx index acd26db..19a25c0 100644 --- a/app/TaskFlow/frmAdmin_rejectionConfig.resx +++ b/app/TaskFlow/frmAdmin_rejectionConfig.resx @@ -188,110 +188,66 @@ - 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 - X9ttAMYAAAAASUVORK5CYII= + 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 - X9ttAMYAAAAASUVORK5CYII= + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAQDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9CgkuWWVsbG93e2ZpbGw6I0ZG + QjExNTt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMjQsMjQu + OFYyOEg0VjRoMjB2Ny4ybDItMlYzYzAtMC41LTAuNS0xLTEtMUgzQzIuNSwyLDIsMi41LDIsM3YyNmMw + LDAuNSwwLjUsMSwxLDFoMjJjMC41LDAsMS0wLjUsMS0xdi02LjIgIEwyNCwyNC44eiIgY2xhc3M9IkJs + YWNrIiAvPg0KICA8cGF0aCBkPSJNMjksMTdsLTgsOGwtNC00bDgtOEwyOSwxN3ogTTMwLDE2bDEuNy0x + LjdjMC40LTAuNCwwLjQtMSwwLTEuM0wyOSwxMC4zYy0wLjQtMC40LTEtMC40LTEuMywwTDI2LDEyTDMw + LDE2eiAgIE0xNiwyMnY0aDRMMTYsMjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3ZnPgs= \ No newline at end of file diff --git a/app/TaskFlow/frmAdmin_rejectionConfig.vb b/app/TaskFlow/frmAdmin_rejectionConfig.vb index ed84675..425fc41 100644 --- a/app/TaskFlow/frmAdmin_rejectionConfig.vb +++ b/app/TaskFlow/frmAdmin_rejectionConfig.vb @@ -1,4 +1,5 @@ -Imports DevExpress.XtraEditors +Imports System.ComponentModel +Imports DevExpress.XtraEditors Imports DigitalData.GUIs.Common Public Class frmAdmin_rejectionConfig @@ -67,9 +68,9 @@ Public Class frmAdmin_rejectionConfig Try CURRENT_ProfilGUID = oProfilID CURRENT_DESIGN_TYPE = "SQL_REJ_REASONS" - Dim oldSQL = oRej_SQL_REASONS + Dim oldSQL = oRej_SQL_Reasons Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { - .SQLCommand = oRej_SQL_REASONS, + .SQLCommand = oRej_SQL_Reasons, .SQLConnection = 1, .PlaceholdersManualPrefix = "CTRL", .PlaceholdersManualTitle = "Controls", @@ -84,7 +85,7 @@ Public Class frmAdmin_rejectionConfig If oResult = DialogResult.Yes Then Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', REJECT_SQL_REASONS = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}" If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then - oRej_SQL_REASONS = oForm.SQLCommand + oRej_SQL_Reasons = oForm.SQLCommand bstitmInfo.Caption = $"SQL Reasons saved - {Now.ToLongTimeString}" CHANGES_FORM_DESIGN = True End If @@ -123,11 +124,17 @@ Public Class frmAdmin_rejectionConfig End If Else For Each oRow As DataRow In IDBData.DTVWIDB_BE_ATTRIBUTE.Rows + Dim oOk As Boolean = False Select Case CInt(oRow.Item("TYP_ID")) Case 1 - Me.cmbAttrRejReas.Items.Add(oRow.Item("ATTR_TITLE")) - Me.cmbAttrRejComment.Items.Add(oRow.Item("ATTR_TITLE")) + oOk = True + Case 8 + oOk = True End Select + If oOk Then + Me.cmbAttrRejReas.Items.Add(oRow.Item("ATTR_TITLE")) + Me.cmbAttrRejComment.Items.Add(oRow.Item("ATTR_TITLE")) + End If Next End If @@ -136,12 +143,12 @@ Public Class frmAdmin_rejectionConfig Dim oSQL = $"SELECT SQL_BTN_REJECT,BTN_REJECT_CAPTION,REJECT_SQL_REASONS,REJECT_ACTIONS_ATTRIBUTE,REJECT_COMMENT_ATTRIBUTE FROM TBPM_PROFILE WHERE GUID = {oProfilID}" Dim oDT = DatabaseECM.GetDatatable(oSQL) oCaption = oDT.Rows(0).Item(1) - oRej_SQL_REASONS = oDT.Rows(0).Item(0) - oRej_SQL_REASONS = oDT.Rows(0).Item(2) + oRej_SQL_Reasons = oDT.Rows(0).Item(0) + oRej_SQL_Reasons = oDT.Rows(0).Item(2) oRej_Act_Attr = oDT.Rows(0).Item(3) oRej_Comment_Attr = oDT.Rows(0).Item(4) For Each oRow As DataRow In CURRENT_DT_PROFILE_LANGUAGE.Rows - If oRow.Item("TITLE") = $"BTN_REJECTION_CAPT{oProfilID}" Then + If oRow.Item("TITLE") = $"BTN_REJECTION_CAPT{oProfilID}" And oRow.Item("LANGUAGE") = USER_LANGUAGE Then oCaption = oRow.Item("STRING1") End If Next @@ -182,4 +189,9 @@ Public Class frmAdmin_rejectionConfig Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click End Sub + + Private Sub frmAdmin_rejectionConfig_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing + Dim oSQL = $"select * from TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE = 'PM' AND TITLE LIKE 'PROFILE_%'" + CURRENT_DT_PROFILE_LANGUAGE = DatabaseECM.GetDatatable(oSQL) + End Sub End Class \ No newline at end of file diff --git a/app/TaskFlow/frmAdministration.Designer.vb b/app/TaskFlow/frmAdministration.Designer.vb index abe43be..5e495b5 100644 --- a/app/TaskFlow/frmAdministration.Designer.vb +++ b/app/TaskFlow/frmAdministration.Designer.vb @@ -120,7 +120,7 @@ Partial Class frmAdministration Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() Me.BarToggleSwitchItemEdit = New DevExpress.XtraBars.BarToggleSwitchItem() Me.bbtnitmReject = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.bbtnitmNotResponsible = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupProfile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -755,7 +755,7 @@ Partial Class frmAdministration 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemRefreshProfileData, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarToggleSwitchItemEdit, Me.bbtnitmReject, Me.BarButtonItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemRefreshProfileData, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarToggleSwitchItemEdit, Me.bbtnitmReject, Me.bbtnitmNotResponsible}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 32 Me.RibbonControl1.Name = "RibbonControl1" @@ -991,16 +991,17 @@ Partial Class frmAdministration ' resources.ApplyResources(Me.bbtnitmReject, "bbtnitmReject") Me.bbtnitmReject.Id = 30 - Me.bbtnitmReject.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmReject.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitmReject.ImageOptions.Image = CType(resources.GetObject("bbtnitmReject.ImageOptions.Image"), System.Drawing.Image) + Me.bbtnitmReject.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitmReject.ImageOptions.LargeImage"), System.Drawing.Image) Me.bbtnitmReject.Name = "bbtnitmReject" ' - 'BarButtonItem1 + 'bbtnitmNotResponsible ' - resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") - Me.BarButtonItem1.Id = 31 - Me.BarButtonItem1.ImageOptions.Image = CType(resources.GetObject("BarButtonItem1.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem1.Name = "BarButtonItem1" + resources.ApplyResources(Me.bbtnitmNotResponsible, "bbtnitmNotResponsible") + Me.bbtnitmNotResponsible.Id = 31 + Me.bbtnitmNotResponsible.ImageOptions.Image = CType(resources.GetObject("BarButtonItem1.ImageOptions.Image"), System.Drawing.Image) + Me.bbtnitmNotResponsible.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image) + Me.bbtnitmNotResponsible.Name = "bbtnitmNotResponsible" ' 'RibbonPage1 ' @@ -1027,7 +1028,7 @@ Partial Class frmAdministration Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem21) Me.RibbonPageGroupProfile.ItemLinks.Add(Me.bbtnItemFinishSQL) Me.RibbonPageGroupProfile.ItemLinks.Add(Me.bbtnitmReject) - Me.RibbonPageGroupProfile.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroupProfile.ItemLinks.Add(Me.bbtnitmNotResponsible) Me.RibbonPageGroupProfile.MergeOrder = 1 Me.RibbonPageGroupProfile.Name = "RibbonPageGroupProfile" resources.ApplyResources(Me.RibbonPageGroupProfile, "RibbonPageGroupProfile") @@ -2311,5 +2312,5 @@ Partial Class frmAdministration Friend WithEvents Label15 As Label Friend WithEvents TYPEComboBox As ComboBox Friend WithEvents bbtnitmReject As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents bbtnitmNotResponsible As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/TaskFlow/frmAdministration.resx b/app/TaskFlow/frmAdministration.resx index 45bd953..2f7e56a 100644 --- a/app/TaskFlow/frmAdministration.resx +++ b/app/TaskFlow/frmAdministration.resx @@ -1658,26 +1658,72 @@ Ablehnen konfigurieren - + - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAM4CAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - UmVke2ZpbGw6I0QxMUMxQzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuR3JlZW57ZmlsbDojMDM5 - QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IlN0b3AiPg0KICAgIDxwYXRoIGQ9Ik0yNyw2Yy0xLjEsMC0y - LDAuOS0yLDJ2NmgtMVY0YzAtMS4xLTAuOS0yLTItMnMtMiwwLjktMiwydjEwaC0xVjJjMC0xLjEtMC45 - LTItMi0ycy0yLDAuOS0yLDJ2MTJoLTFWNCAgIGMwLTEuMS0wLjktMi0yLTJzLTIsMC45LTIsMnYxMHY0 - djAuNGwtNC45LTMuMWMtMC44LTAuNS0xLjgtMC40LTIuNSwwLjNjLTAuOCwwLjgtMC44LDIuMSwwLDIu - OWw5LjMsOS41YzEuMiwxLjMsMywyLjEsNC45LDIuMUgyMyAgIGMzLjMsMCw2LTIuNyw2LTZ2LTR2LTZW - OEMyOSw2LjksMjguMSw2LDI3LDZ6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAddEVYdFRpdGxlAENsb3NlO0V4aXQ7QmFycztSaWJib247RgO56AAAAwpJREFUOE+Nk2lIVFEY + hqdMcytR0yDa3NNMs9RJ0zLX1BiLUvGHJUYQCeqPxCVtXAIzqdwhBiQxKTGJIEfNUbKoGJ3EJU1H0zKX + dOZq2jgj9ePtfNehf0EXHnjvOed7znfvuVcwc7tIwK7NDAPGlv/AUA+t38QQGHwuFL/6eqsAX4qIfEwV + iTcoZBTcxCRPHibzGeI8fBbnYjQ3p5vVklBgSBPaD+0bKPTwuU1PK7S9hBRaeQvPaE4WWK0RCYyUN7Kh + 7WnB0uNKDGanQ2LvgY7zF/h7QhYbC4mdBwYy08A9KgdXX4aPGddJYEyCrSOZGVh795wtSEVdRDxkUgWe + XM1B6xkR2kQxfJa19KIuPB79GSlQ191Df2o6CUxIYNx/LQWa7mZI9rphUjkL1ZIWyikOjakFPKMsz6s1 + mBibhWSPG1S1pZBfvkICUxKYvD5zlrVawVqNQ0/JfWi0v6Fe0WHsK4exLxwWf+iwuvaLn5OxR5vOSkZ7 + SCQJzEhgKguNwvf7WfiWmYSO6Gi8LynHwrIOC6yT78sMToe3xWV4GRmJqbQEKBNC8MI/mATmJDCTBoZh + tigVExdPo/W4H9rFd1jLWsyp1zCr0jC0aMsrgdRPiLELQfh0LhDPjgaQYBsJzJ/7BmE65wpafbzQnJ6P + oXEVZhY14FZ14FbWMb2gwYByEU/TxJB6eWA40geN7kISbCfBtiZPP761BnsXqOfVmFGtYWl1HQPlVTwb + kp9QzanRYOeCgWBP1DsfJYEFCbY3uPpgPFkERUwoOhOTsM5x6CsphSzgGDoYlGmsM/ES5BGB6PN3Re2+ + QySwJIHFQzsvfIoLwXC0EL3RJ9HkcgBdAb4YiTmBYVEguvx9+DF52HH0n/KE4ogDHuxyJYEVL5DsPoih + KLaT0BmDwYfZiwrGx3BfKISOUHg7YijUGyOiALazG+Se+yF334tqG6e/ArO7tk5vanY6o8bWBdW2zqiy + IZw2sHZEpZUjKngcUGHpgHJGsYXdW1bLHyP9lvRBkM1az45/YKOHMjtCgcEfpxkalin7Ah0AAAAASUVO + RK5CYII= + + + + + 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 + AABJRU5ErkJggg== - + Nicht zuständig konfigurieren @@ -5402,10 +5448,10 @@ Top Kreditoren: DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem1 + + bbtnitmNotResponsible - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/TaskFlow/frmAdministration.vb b/app/TaskFlow/frmAdministration.vb index f1f1fb6..7530140 100644 --- a/app/TaskFlow/frmAdministration.vb +++ b/app/TaskFlow/frmAdministration.vb @@ -59,7 +59,11 @@ Public Class frmAdministration dragDropManager.AddGridView(viewAssignedGroups) tabctrl_Profilkonfig.SelectedIndex = 0 - + If IDB_ACTIVE Then + bbtnitmNotResponsible.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + Else + bbtnitmNotResponsible.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End If Catch ex As Exception _Logger.Error(ex) MsgBox("Error in loading BasicValues: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Unexpected error:") @@ -1497,35 +1501,40 @@ Public Class frmAdministration EditMode_Profile("") End Sub Sub EditMode_Profile(pMode As String) - If BarButtonItem26.Tag = "Lock" Then - Me.TBPM_PROFILEBindingSource.EndEdit() - If DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges Is Nothing = False Or UNSAVED_CHANGES_FI Then - UNSAVED_CHANGES_PROFILE = True - CHECK_QUESTION_CHANGES() + Try + If BarButtonItem26.Tag = "Lock" Then + Me.TBPM_PROFILEBindingSource.EndEdit() + If DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges Is Nothing = False Or UNSAVED_CHANGES_FI Then + UNSAVED_CHANGES_PROFILE = True + CHECK_QUESTION_CHANGES() + End If + With BarButtonItem26 + .Tag = "Unlock" + .ImageOptions.SvgImage = My.Resources.Security_Lock + .ItemAppearance.Normal.BackColor = Nothing + End With + + 'GridControlNavigation.Enabled = True + ' RibbonPageGroupProfile.Enabled = False + 'pnlEdit.Enabled = False End If - With BarButtonItem26 - .Tag = "Unlock" - .ImageOptions.SvgImage = My.Resources.Security_Lock - .ItemAppearance.Normal.BackColor = Nothing - End With - - 'GridControlNavigation.Enabled = True - ' RibbonPageGroupProfile.Enabled = False - 'pnlEdit.Enabled = False - End If - If pMode = "Unlock" Or BarButtonItem26.Tag = "Unlock" Then - Dim ocolor As New Color - ocolor = Color.FromArgb(0, 192, 0) - With BarButtonItem26 - .Tag = "Lock" - .ImageOptions.SvgImage = My.Resources.Security_Unlock - .ItemAppearance.Normal.BackColor = ocolor - End With - - ' GridControlNavigation.Enabled = False - ' RibbonPageGroupProfile.Enabled = True - ' pnlEdit.Enabled = True - End If + If pMode = "Unlock" Or BarButtonItem26.Tag = "Unlock" Then + Dim ocolor As New Color + ocolor = Color.FromArgb(0, 192, 0) + With BarButtonItem26 + .Tag = "Lock" + .ImageOptions.SvgImage = My.Resources.Security_Unlock + .ItemAppearance.Normal.BackColor = ocolor + End With + + ' GridControlNavigation.Enabled = False + ' RibbonPageGroupProfile.Enabled = True + ' pnlEdit.Enabled = True + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical) + End Try + End Sub Private Sub GridViewProfile_BeforeLeaveRow(sender As Object, e As RowAllowEventArgs) Handles GridViewProfile.BeforeLeaveRow @@ -1573,7 +1582,7 @@ Public Class frmAdministration ofrm.ShowDialog() End Sub - Private Sub BarButtonItem1_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Private Sub BarButtonItem1_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmNotResponsible.ItemClick Dim ofrm As New frmAdmin_notResponsibleConfig(PROFILGUIDTextBox.Text) ofrm.ShowDialog() End Sub diff --git a/app/TaskFlow/frmMain.Designer.vb b/app/TaskFlow/frmMain.Designer.vb index 8c90ea8..181a75b 100644 --- a/app/TaskFlow/frmMain.Designer.vb +++ b/app/TaskFlow/frmMain.Designer.vb @@ -930,6 +930,7 @@ Partial Class frmMain ' 'PopupErinnerungInaktivierenToolStripMenuItem ' + Me.PopupErinnerungInaktivierenToolStripMenuItem.Image = Global.DD_ProcessManager.My.Resources.Resources.user_red Me.PopupErinnerungInaktivierenToolStripMenuItem.Name = "PopupErinnerungInaktivierenToolStripMenuItem" resources.ApplyResources(Me.PopupErinnerungInaktivierenToolStripMenuItem, "PopupErinnerungInaktivierenToolStripMenuItem") ' @@ -940,6 +941,7 @@ Partial Class frmMain ' 'AnzeigenToolStripMenuItem ' + Me.AnzeigenToolStripMenuItem.Image = Global.DD_ProcessManager.My.Resources.Resources.Files_7954 Me.AnzeigenToolStripMenuItem.Name = "AnzeigenToolStripMenuItem" resources.ApplyResources(Me.AnzeigenToolStripMenuItem, "AnzeigenToolStripMenuItem") ' diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index e8a2642..9f33497 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAZABCgGQAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAZgBCgGYAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1900,28 +1900,28 @@ 250, 56 - 282, 22 + 290, 30 Popup Erinnerung deaktivieren - 279, 6 + 287, 6 - 282, 22 + 290, 30 In den Vordergrund - 282, 22 + 290, 30 Out of Range - Fenster wiederherstellen - 283, 76 + 291, 122 ContextMenuNotifyIcon @@ -2010,7 +2010,7 @@ - Process Manager + taskFLOW True diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index 24fb370..50b8458 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -2770,6 +2770,8 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ Private Async Sub BarButtonItem2_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemGhostMode.ItemClick USER_GHOST_MODE_ACTIVE = False USER_GHOST_MODE_USRNAME = String.Empty + USER_ID = 0 + USER_USERNAME = "FORNER_GHOSTUSER" BarButtonItemGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Never _Init.InitUserLogin() GetBaseData("InactivateGM") diff --git a/app/TaskFlow/frmValidator.Designer.vb b/app/TaskFlow/frmValidator.Designer.vb index c9b0261..e3c8650 100644 --- a/app/TaskFlow/frmValidator.Designer.vb +++ b/app/TaskFlow/frmValidator.Designer.vb @@ -33,6 +33,9 @@ Partial Class frmValidator Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() Me.PanelValidatorControlBorder = New DevExpress.XtraEditors.PanelControl() Me.PanelValidatorControl = New DevExpress.XtraEditors.XtraScrollableControl() + Me.DESCRIPTIONLabel = New DevExpress.XtraEditors.LabelControl() + Me.TITLELabel1 = New DevExpress.XtraEditors.LabelControl() + Me.DocumentViewerValidator = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() @@ -63,9 +66,6 @@ Partial Class frmValidator Me.PdfSetFitWidthZoomModeCheckItem2 = New DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem() Me.PdfSetFitVisibleZoomModeCheckItem2 = New DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.DESCRIPTIONLabel = New DevExpress.XtraEditors.LabelControl() - Me.TITLELabel1 = New DevExpress.XtraEditors.LabelControl() - Me.DocumentViewerValidator = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.BarAndDockingController2 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.BarAndDockingController1 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.PdfBarController1 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) @@ -157,7 +157,7 @@ Partial Class frmValidator ' Me.SplitContainerButtons.Panel2.Controls.Add(Me.btnSave) resources.ApplyResources(Me.SplitContainerButtons.Panel2, "SplitContainerButtons.Panel2") - Me.SplitContainerButtons.SplitterPosition = 314 + Me.SplitContainerButtons.SplitterPosition = 391 ' 'SplitContainerReject_NotResp ' @@ -172,15 +172,13 @@ Partial Class frmValidator 'SplitContainerReject_NotResp.Panel2 ' Me.SplitContainerReject_NotResp.Panel2.Controls.Add(Me.btnNotResponsible) - Me.SplitContainerReject_NotResp.SplitterPosition = 166 + Me.SplitContainerReject_NotResp.SplitterPosition = 197 ' 'btnReject ' Me.btnReject.Appearance.BackColor = System.Drawing.Color.Red - Me.btnReject.Appearance.BorderColor = System.Drawing.Color.Red Me.btnReject.Appearance.Font = CType(resources.GetObject("btnReject.Appearance.Font"), System.Drawing.Font) Me.btnReject.Appearance.Options.UseBackColor = True - Me.btnReject.Appearance.Options.UseBorderColor = True Me.btnReject.Appearance.Options.UseFont = True Me.btnReject.Appearance.Options.UseTextOptions = True Me.btnReject.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap @@ -192,14 +190,12 @@ Partial Class frmValidator 'btnNotResponsible ' Me.btnNotResponsible.Appearance.BackColor = System.Drawing.Color.Yellow - Me.btnNotResponsible.Appearance.BorderColor = System.Drawing.Color.Yellow Me.btnNotResponsible.Appearance.Font = CType(resources.GetObject("btnNotResponsible.Appearance.Font"), System.Drawing.Font) Me.btnNotResponsible.Appearance.Options.UseBackColor = True - Me.btnNotResponsible.Appearance.Options.UseBorderColor = True Me.btnNotResponsible.Appearance.Options.UseFont = True resources.ApplyResources(Me.btnNotResponsible, "btnNotResponsible") Me.btnNotResponsible.ImageOptions.Image = CType(resources.GetObject("btnNotResponsible.ImageOptions.Image"), System.Drawing.Image) - Me.btnNotResponsible.ImageOptions.Location = DevExpress.XtraEditors.ImageLocation.MiddleRight + Me.btnNotResponsible.ImageOptions.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft Me.btnNotResponsible.Name = "btnNotResponsible" ' 'btnSave @@ -255,6 +251,31 @@ Partial Class frmValidator resources.ApplyResources(Me.PanelValidatorControl, "PanelValidatorControl") Me.PanelValidatorControl.Name = "PanelValidatorControl" ' + 'DESCRIPTIONLabel + ' + resources.ApplyResources(Me.DESCRIPTIONLabel, "DESCRIPTIONLabel") + Me.DESCRIPTIONLabel.Appearance.Font = CType(resources.GetObject("DESCRIPTIONLabel.Appearance.Font"), System.Drawing.Font) + Me.DESCRIPTIONLabel.Appearance.Options.UseFont = True + Me.DESCRIPTIONLabel.Appearance.Options.UseTextOptions = True + Me.DESCRIPTIONLabel.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Top + Me.DESCRIPTIONLabel.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap + Me.DESCRIPTIONLabel.Name = "DESCRIPTIONLabel" + ' + 'TITLELabel1 + ' + resources.ApplyResources(Me.TITLELabel1, "TITLELabel1") + Me.TITLELabel1.Appearance.Font = CType(resources.GetObject("TITLELabel1.Appearance.Font"), System.Drawing.Font) + Me.TITLELabel1.Appearance.Options.UseFont = True + Me.TITLELabel1.Appearance.Options.UseTextOptions = True + Me.TITLELabel1.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap + Me.TITLELabel1.Name = "TITLELabel1" + ' + 'DocumentViewerValidator + ' + resources.ApplyResources(Me.DocumentViewerValidator, "DocumentViewerValidator") + Me.DocumentViewerValidator.FileLoaded = False + Me.DocumentViewerValidator.Name = "DocumentViewerValidator" + ' 'BarManager1 ' Me.BarManager1.Controller = Me.BarAndDockingController3 @@ -468,31 +489,6 @@ Partial Class frmValidator Me.BarButtonItem1.Id = 0 Me.BarButtonItem1.Name = "BarButtonItem1" ' - 'DESCRIPTIONLabel - ' - resources.ApplyResources(Me.DESCRIPTIONLabel, "DESCRIPTIONLabel") - Me.DESCRIPTIONLabel.Appearance.Font = CType(resources.GetObject("DESCRIPTIONLabel.Appearance.Font"), System.Drawing.Font) - Me.DESCRIPTIONLabel.Appearance.Options.UseFont = True - Me.DESCRIPTIONLabel.Appearance.Options.UseTextOptions = True - Me.DESCRIPTIONLabel.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Top - Me.DESCRIPTIONLabel.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap - Me.DESCRIPTIONLabel.Name = "DESCRIPTIONLabel" - ' - 'TITLELabel1 - ' - resources.ApplyResources(Me.TITLELabel1, "TITLELabel1") - Me.TITLELabel1.Appearance.Font = CType(resources.GetObject("TITLELabel1.Appearance.Font"), System.Drawing.Font) - Me.TITLELabel1.Appearance.Options.UseFont = True - Me.TITLELabel1.Appearance.Options.UseTextOptions = True - Me.TITLELabel1.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - Me.TITLELabel1.Name = "TITLELabel1" - ' - 'DocumentViewerValidator - ' - resources.ApplyResources(Me.DocumentViewerValidator, "DocumentViewerValidator") - Me.DocumentViewerValidator.FileLoaded = False - Me.DocumentViewerValidator.Name = "DocumentViewerValidator" - ' 'BarAndDockingController2 ' Me.BarAndDockingController2.PropertiesBar.AllowLinkLighting = False diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index 78200d1..d3908ce 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -135,70 +135,60 @@ 0, 0 - Segoe UI, 9.75pt, style=Bold + Segoe UI, 9.75pt Fill - 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 - X9ttAMYAAAAASUVORK5CYII= + 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 0, 0 - 166, 55 + 197, 55 @@ -292,7 +282,7 @@ 0, 0 - 138, 55 + 184, 55 0 @@ -325,7 +315,7 @@ 1 - 314, 55 + 391, 55 46 @@ -418,7 +408,7 @@ 0, 0 - 344, 55 + 267, 55 2 diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index e889b07..326dfd5 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -347,42 +347,56 @@ Public Class frmValidator If oProfileRejectionText = String.Empty Then oProfileRejectionText = PROF_BTN_RE_CAPT End If - If (oProfileRejectionText = String.Empty And oProfileNotResponsibleText = String.Empty) Or + + + + If IDB_ACTIVE Then + Logger.Debug($"oProfileRejectionText: " + oProfileRejectionText) + Logger.Debug($"oProfile_REJECT_SQL_REASONS: " + oProfile_REJECT_SQL_REASONS) + Logger.Debug($"oProfileNotResponsibleText: " + oProfileNotResponsibleText) + Logger.Debug($"oProfile_NOT_RESP_SQL: " + oProfile_NOT_RESP_SQL) + Logger.Debug($"oProfileRejectionText: " + oProfileRejectionText) + If (oProfileRejectionText = String.Empty And oProfileNotResponsibleText = String.Empty) Or (oProfileRejectionText <> String.Empty And oProfile_REJECT_SQL_REASONS = String.Empty) Or (oProfileNotResponsibleText <> String.Empty And oProfile_NOT_RESP_SQL = String.Empty) Then - SplitContainerReject_NotResp.Visible = False - SplitContainerButtons.CollapsePanel = SplitCollapsePanel.None - SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Panel2 - Else - SplitContainerButtons.CollapsePanel = SplitCollapsePanel.Panel1 - SplitContainerReject_NotResp.Visible = True - If oProfileRejectionText <> String.Empty And oProfileNotResponsibleText <> String.Empty Then - SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.None - SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Both - btnReject.Text = oProfileRejectionText - btnNotResponsible.Text = oProfileNotResponsibleText + Logger.Debug($"Keine Ablehnung und Nicht zuständig Funktion konfiguriert") + SplitContainerReject_NotResp.Visible = False + SplitContainerButtons.CollapsePanel = SplitCollapsePanel.None + SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Panel2 Else - If oProfileNotResponsibleText <> String.Empty Then - SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.Panel1 - SplitContainerReject_NotResp.PanelVisibility = SplitPanelVisibility.Panel2 - btnReject.Visible = False - SplitContainerReject_NotResp.Collapsed = True + SplitContainerButtons.CollapsePanel = SplitCollapsePanel.Panel1 + SplitContainerReject_NotResp.Visible = True + If oProfileRejectionText <> String.Empty And oProfileNotResponsibleText <> String.Empty Then + Logger.Debug($"Nicht zuständig und Ablehnungs-Buttons werden eingeblendet!") + SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.None + SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Both + btnReject.Text = oProfileRejectionText btnNotResponsible.Text = oProfileNotResponsibleText Else - SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.Panel2 - SplitContainerReject_NotResp.PanelVisibility = SplitPanelVisibility.Panel1 - SplitContainerReject_NotResp.Collapsed = True - btnNotResponsible.Visible = False - btnReject.Text = oProfileRejectionText + If oProfileNotResponsibleText <> String.Empty Then + Logger.Debug($"Nicht zuständig Button wird eingeblendet!") + SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.Panel1 + SplitContainerReject_NotResp.PanelVisibility = SplitPanelVisibility.Panel2 + btnReject.Visible = False + SplitContainerReject_NotResp.Collapsed = True + btnNotResponsible.Text = oProfileNotResponsibleText + Else + SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.Panel2 + SplitContainerReject_NotResp.PanelVisibility = SplitPanelVisibility.Panel1 + SplitContainerReject_NotResp.Collapsed = True + btnNotResponsible.Visible = False + btnReject.Text = oProfileRejectionText + End If End If - End If + End If End If + bbtniNext.Visibility = BarItemVisibility.Always If CURRENT_JUMP_DOC_GUID <> 0 Then bbtniNext.Visibility = BarItemVisibility.Never @@ -2590,7 +2604,24 @@ Public Class frmValidator Try Dim oCurrency = GetVariableValuefromSource(PROFIL_CURRENCY_ATTRIBUTE, 1, False) If Not IsNothing(oCurrency) Then + + Dim oValueType = oCurrency.GetType.ToString + If IsDBNull(oCurrency) Then + oCurrency = "EUR" + Else + Try + oCurrency = oCurrency.ToString + Catch ex As Exception + Logger.Warn($"Unexpected error in Converting oCurreny to string: " & ex.Message) + oCurrency = "EUR" + End Try + End If If oCurrency <> String.Empty Then + If oCurrency.ToString.Length = 2 Then + oCurrency = "EUR" + Logger.Debug("oCurrency = 48 - Stting to EUR") + End If + Logger.Debug($"oCurrency = {oCurrency}") For Each oControl As Control In PanelValidatorControl.Controls Try Dim oMeta = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata) @@ -2635,7 +2666,12 @@ Public Class frmValidator Logger.Error(ex) End Try Next + Else + Logger.Warn($"oCurrency is String.empty! ") End If + Else + Logger.Warn($"oCurrency is Nothing! ") + End If Catch ex As Exception Logger.Warn($"Unexpected error in display format Currency: " & ex.Message) @@ -4324,7 +4360,7 @@ Public Class frmValidator OverrideAll = False End If If oErrorOcurred = True Then - MsgBox("Unhandled error occured ... please check your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) + MsgBox("Unhandled error occured in Finish Workflow-Step...Please check your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) _ItemWorked = False Else Logger.Debug("Validation of document ended successfully!") @@ -5948,9 +5984,10 @@ Public Class frmValidator Private Sub btnNotResponsible_Click(sender As Object, e As EventArgs) Handles btnNotResponsible.Click oProfile_NOT_RESP_SQL = clsPatterns.ReplaceAllValues(oProfile_NOT_RESP_SQL, PanelValidatorControl, True) - Dim result As MsgBoxResult - result = MessageBox.Show(oProfileNotResponsibleQuestion, ADDITIONAL_TITLE, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) - If result = MsgBoxResult.Yes Then + Dim frmDialog As New frmYesNo(oProfileNotResponsibleQuestion) + frmDialog.ShowDialog() + ' result = MessageBox.Show(oProfileNotResponsibleQuestion, ADDITIONAL_TITLE, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) + If frmDialog.DialogResult = DialogResult.OK Then OverrideAll = True Override_SQLCommand = oProfile_NOT_RESP_SQL Override = True diff --git a/app/TaskFlow/frmYesNo.Designer.vb b/app/TaskFlow/frmYesNo.Designer.vb new file mode 100644 index 0000000..cd32e85 --- /dev/null +++ b/app/TaskFlow/frmYesNo.Designer.vb @@ -0,0 +1,128 @@ + _ +Partial Class frmYesNo + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmYesNo)) + Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() + Me.OK_Button = New System.Windows.Forms.Button() + Me.Cancel_Button = New System.Windows.Forms.Button() + Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() + Me.txtQuestion = New System.Windows.Forms.TextBox() + Me.TableLayoutPanel1.SuspendLayout() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'TableLayoutPanel1 + ' + Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TableLayoutPanel1.ColumnCount = 2 + Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0) + Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0) + Me.TableLayoutPanel1.Location = New System.Drawing.Point(193, 100) + Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(4) + Me.TableLayoutPanel1.Name = "TableLayoutPanel1" + Me.TableLayoutPanel1.RowCount = 1 + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.Size = New System.Drawing.Size(209, 48) + Me.TableLayoutPanel1.TabIndex = 0 + ' + 'OK_Button + ' + Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None + Me.OK_Button.Location = New System.Drawing.Point(9, 7) + Me.OK_Button.Margin = New System.Windows.Forms.Padding(4) + Me.OK_Button.Name = "OK_Button" + Me.OK_Button.Size = New System.Drawing.Size(86, 34) + Me.OK_Button.TabIndex = 0 + Me.OK_Button.Text = "OK" + ' + 'Cancel_Button + ' + Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None + Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.Cancel_Button.Location = New System.Drawing.Point(113, 7) + Me.Cancel_Button.Margin = New System.Windows.Forms.Padding(4) + Me.Cancel_Button.Name = "Cancel_Button" + Me.Cancel_Button.Size = New System.Drawing.Size(86, 34) + Me.Cancel_Button.TabIndex = 1 + Me.Cancel_Button.Text = "Abbrechen" + ' + 'PictureEdit1 + ' + Me.PictureEdit1.EditValue = CType(resources.GetObject("PictureEdit1.EditValue"), Object) + Me.PictureEdit1.Location = New System.Drawing.Point(12, 29) + Me.PictureEdit1.Name = "PictureEdit1" + Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.SystemColors.Control + Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True + Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder + Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] + Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom + Me.PictureEdit1.Size = New System.Drawing.Size(45, 38) + Me.PictureEdit1.TabIndex = 2 + ' + 'txtQuestion + ' + Me.txtQuestion.BackColor = System.Drawing.SystemColors.Control + Me.txtQuestion.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtQuestion.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtQuestion.Location = New System.Drawing.Point(63, 29) + Me.txtQuestion.Multiline = True + Me.txtQuestion.Name = "txtQuestion" + Me.txtQuestion.ReadOnly = True + Me.txtQuestion.Size = New System.Drawing.Size(336, 40) + Me.txtQuestion.TabIndex = 3 + Me.txtQuestion.Text = "Beispieltext mit Ansicht zum Umbruch, weil Text auch länger sein kann" + ' + 'frmYesNo + ' + Me.AcceptButton = Me.OK_Button + Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.CancelButton = Me.Cancel_Button + Me.ClientSize = New System.Drawing.Size(403, 149) + Me.Controls.Add(Me.txtQuestion) + Me.Controls.Add(Me.PictureEdit1) + Me.Controls.Add(Me.TableLayoutPanel1) + Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.Margin = New System.Windows.Forms.Padding(4) + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "frmYesNo" + Me.ShowInTaskbar = False + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Text = "Bestätigung/Confirmation" + Me.TableLayoutPanel1.ResumeLayout(False) + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel + Friend WithEvents OK_Button As System.Windows.Forms.Button + Friend WithEvents Cancel_Button As System.Windows.Forms.Button + Friend WithEvents PictureEdit1 As DevExpress.XtraEditors.PictureEdit + Friend WithEvents txtQuestion As TextBox +End Class diff --git a/app/TaskFlow/frmYesNo.resx b/app/TaskFlow/frmYesNo.resx new file mode 100644 index 0000000..fe89061 --- /dev/null +++ b/app/TaskFlow/frmYesNo.resx @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABkEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBdHRlbnRpb24iPg0K + ICAgIDxwYXRoIGQ9Ik0xNS4xLDIuNUwyLjEsMjYuNUMxLjgsMjcuMiwyLjMsMjgsMy4xLDI4aDI1Ljlj + MC44LDAsMS4zLTAuOCwwLjktMS41TDE2LjksMi41ICAgQzE2LjUsMS44LDE1LjUsMS44LDE1LjEsMi41 + eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMjBjMS4xLDAsMiwwLjksMiwycy0w + LjksMi0yLDJzLTItMC45LTItMlMxNC45LDIwLDE2LDIweiBNMTQsMTBoNHY4aC00VjEweiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + \ No newline at end of file diff --git a/app/TaskFlow/frmYesNo.vb b/app/TaskFlow/frmYesNo.vb new file mode 100644 index 0000000..f739f1d --- /dev/null +++ b/app/TaskFlow/frmYesNo.vb @@ -0,0 +1,26 @@ +Imports System.Windows.Forms + +Public Class frmYesNo + Dim oQuestion As String + Public Sub New(pQuestion As String) + MyBase.New() + oQuestion = pQuestion + + InitializeComponent() + ' Add any initialization after the InitializeComponent() call. + + End Sub + Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click + Me.DialogResult = System.Windows.Forms.DialogResult.OK + Me.Close() + End Sub + + Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click + Me.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.Close() + End Sub + + Private Sub frmYesNo_Load(sender As Object, e As EventArgs) Handles Me.Load + txtQuestion.Text = oQuestion + End Sub +End Class