From 4a93b2e6fe9611919acbf84e01aea612b590ac1f Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Fri, 5 Jul 2024 13:21:25 +0200 Subject: [PATCH] =?UTF-8?q?MS=20Version=202.4.9.0=20Buttons,=20Nicht=20zus?= =?UTF-8?q?t=C3=A4ndig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/TaskFlow/ClassControlCreator.vb | 7 +- app/TaskFlow/ClassInit.vb | 6 +- app/TaskFlow/My Project/AssemblyInfo.vb | 2 +- app/TaskFlow/TaskFlow.vbproj | 6 + .../Translations/frmValidator_Strings.en.resx | 3 + .../Translations/frmValidator_Strings.fr.resx | 3 + .../frmAdmin_notResponsibleConfig.Designer.vb | 26 + app/TaskFlow/frmAdmin_notResponsibleConfig.vb | 51 +- app/TaskFlow/frmRejectionCommit.Designer.vb | 12 +- app/TaskFlow/frmRejectionCommit.resx | 444 +++++++++--------- app/TaskFlow/frmValidator.vb | 49 +- app/TaskFlow/frmYesNo.Designer.vb | 62 +-- app/TaskFlow/frmYesNo.en.resx | 156 ++++++ app/TaskFlow/frmYesNo.fr.resx | 159 +++++++ app/TaskFlow/frmYesNo.resx | 231 +++++++++ app/TaskFlow/frmYesNo.vb | 25 +- 16 files changed, 965 insertions(+), 277 deletions(-) create mode 100644 app/TaskFlow/frmYesNo.en.resx create mode 100644 app/TaskFlow/frmYesNo.fr.resx diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index fb796f4..31764f6 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -79,6 +79,7 @@ Public Class ClassControlCreator Private Class ControlDBProps Public Guid As Integer Public Name As String + Public Attribute As String Public Location As Point Public [Font] As Font Public [Color] As Color @@ -88,6 +89,7 @@ Public Class ClassControlCreator Public Class ControlMetadata Public Guid As Integer Public Name As String + Public Attribute As String Public [ReadOnly] As Boolean = False Public BackColor As Color = Color.White End Class @@ -106,7 +108,8 @@ Public Class ClassControlCreator Dim family As FontFamily = New FontFamily(familyString) Dim oGuid As Integer = row.Item("GUID") - Dim oName As String = row.Item("NAME") + Dim oName As String = NotNull(row.Item("NAME"), "") + Dim oAttribute As String = NotNull(row.Item("INDEX_NAME"), "") Dim oLocation As New Point(x, y) Dim oFont As New Font(family, size, style, GraphicsUnit.Point) Dim oColor As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR)) @@ -115,6 +118,7 @@ Public Class ClassControlCreator Return New ControlDBProps() With { .Guid = oGuid, .Name = oName, + .Attribute = oAttribute, .Location = oLocation, .Font = oFont, .Color = oColor, @@ -128,6 +132,7 @@ Public Class ClassControlCreator ctrl.Tag = New ControlMetadata() With { .Guid = props.Guid, + .Attribute = props.Attribute, .ReadOnly = props.ReadOnly, .Name = props.Name } diff --git a/app/TaskFlow/ClassInit.vb b/app/TaskFlow/ClassInit.vb index b9ef61c..0fb3cb7 100644 --- a/app/TaskFlow/ClassInit.vb +++ b/app/TaskFlow/ClassInit.vb @@ -16,12 +16,12 @@ Public Class ClassInit Dim oLocalUserAppDataPath As String = Application.LocalUserAppDataPath LOGCONFIG = New LogConfig(LogConfig.PathType.CustomPath, oLocalUserAppDataPath & "\Log", - Nothing, + My.Settings.UserConfig_Prefix, My.Application.Info.CompanyName, My.Application.Info.ProductName) - LOGGER = LOGCONFIG.GetLogger("ProcessManager") + LOGGER = LOGCONFIG.GetLogger("taskFLOW") - LOGGER.Info("## ProcessManager started - {0}", Now) + LOGGER.Info("## taskFLOW started - {0}", Now) Try Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log") diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index 2bc4a5d..c063872 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 3b7f7f1..65727c4 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -734,6 +734,12 @@ frmWorkflow.vb + + frmYesNo.vb + + + frmYesNo.vb + frmYesNo.vb diff --git a/app/TaskFlow/Translations/frmValidator_Strings.en.resx b/app/TaskFlow/Translations/frmValidator_Strings.en.resx index 09991f6..1ce6076 100644 --- a/app/TaskFlow/Translations/frmValidator_Strings.en.resx +++ b/app/TaskFlow/Translations/frmValidator_Strings.en.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Confirmation + Please validate red marked fields! diff --git a/app/TaskFlow/Translations/frmValidator_Strings.fr.resx b/app/TaskFlow/Translations/frmValidator_Strings.fr.resx index 8785d2b..5ccd9a7 100644 --- a/app/TaskFlow/Translations/frmValidator_Strings.fr.resx +++ b/app/TaskFlow/Translations/frmValidator_Strings.fr.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Confirmation + Veuillez valider les champs marqués en rouge! diff --git a/app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb b/app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb index 1fd97ca..1e72aa9 100644 --- a/app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb +++ b/app/TaskFlow/frmAdmin_notResponsibleConfig.Designer.vb @@ -38,6 +38,8 @@ Partial Class frmAdmin_notResponsibleConfig Me.Label1 = New System.Windows.Forms.Label() Me.txtPROFILE_NOT_RESPONSIBLE_QUEST = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.cmbAttrComment = New System.Windows.Forms.ComboBox() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -171,11 +173,33 @@ Partial Class frmAdmin_notResponsibleConfig Me.Label2.TabIndex = 102 Me.Label2.Text = "Sicherheitsfrage" ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label9.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label9.Location = New System.Drawing.Point(230, 233) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(119, 16) + Me.Label9.TabIndex = 107 + Me.Label9.Text = "Attribut Kommentar" + ' + 'cmbAttrComment + ' + Me.cmbAttrComment.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbAttrComment.FormattingEnabled = True + Me.cmbAttrComment.Location = New System.Drawing.Point(234, 255) + Me.cmbAttrComment.Name = "cmbAttrComment" + Me.cmbAttrComment.Size = New System.Drawing.Size(295, 24) + Me.cmbAttrComment.TabIndex = 106 + ' 'frmAdmin_notResponsibleConfig ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(778, 340) + Me.Controls.Add(Me.Label9) + Me.Controls.Add(Me.cmbAttrComment) Me.Controls.Add(Me.txtPROFILE_NOT_RESPONSIBLE_QUEST) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label3) @@ -210,4 +234,6 @@ Partial Class frmAdmin_notResponsibleConfig Friend WithEvents bstitmInfo As DevExpress.XtraBars.BarStaticItem Friend WithEvents txtPROFILE_NOT_RESPONSIBLE_QUEST As TextBox Friend WithEvents Label2 As Label + Friend WithEvents Label9 As Label + Friend WithEvents cmbAttrComment As ComboBox End Class diff --git a/app/TaskFlow/frmAdmin_notResponsibleConfig.vb b/app/TaskFlow/frmAdmin_notResponsibleConfig.vb index 728d9d2..90fe59e 100644 --- a/app/TaskFlow/frmAdmin_notResponsibleConfig.vb +++ b/app/TaskFlow/frmAdmin_notResponsibleConfig.vb @@ -21,7 +21,7 @@ Public Class frmAdmin_notResponsibleConfig End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - Dim oUpd = $"UPDATE TBPM_PROFILE SET NOT_RESP_SQL = '{oNotResponsible_SQL.Replace("'", "''")}', CHANGED_WHO = '{User.UserName}' WHERE GUID = {oProfilID}" + Dim oUpd = $"UPDATE TBPM_PROFILE SET NOT_RESP_SQL = '{oNotResponsible_SQL.Replace("'", "''")}',NOT_RESP_COMMENT_ATTRIBUTE = '{cmbAttrComment.Text}', CHANGED_WHO = '{User.UserName}' WHERE GUID = {oProfilID}" If DatabaseECM.ExecuteNonQuery(oUpd) = True Then oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_NOT_RESPONSIBLE_QUEST{oProfilID}','{USER_LANGUAGE}','PROFILE_NOT_RESPONSIBLE_QUEST','{txtPROFILE_NOT_RESPONSIBLE_QUEST.Text}','','{USER_USERNAME}','{oProfilID}',0" If DatabaseECM.ExecuteNonQuery(oUpd) Then @@ -37,9 +37,13 @@ Public Class frmAdmin_notResponsibleConfig Private Sub frmAdmin_notResponsibleConfig_Load(sender As Object, e As EventArgs) Handles Me.Load Try - Dim oSQL = $"SELECT NOT_RESP_SQL FROM TBPM_PROFILE WHERE GUID = {oProfilID}" + Dim oNR_Act_Attr As String + Dim oSQL = $"SELECT NOT_RESP_SQL, NOT_RESP_COMMENT_ATTRIBUTE FROM TBPM_PROFILE WHERE GUID = {oProfilID}" Dim oDT = DatabaseECM.GetDatatable(oSQL) - oNotResponsible_SQL = oDT.Rows(0).Item(0) + oNotResponsible_SQL = oDT.Rows(0).Item("NOT_RESP_SQL") + oNR_Act_Attr = oDT.Rows(0).Item("NOT_RESP_COMMENT_ATTRIBUTE") + LOGGER.Debug($"oNR_Act_Attr: {oNR_Act_Attr}") + For Each oRow As DataRow In CURRENT_DT_PROFILE_LANGUAGE.Rows If oRow.Item("TITLE") = $"PROFILE_NOT_RESPONSIBLE_CAPT{oProfilID}" And oRow.Item("LANGUAGE") = USER_LANGUAGE Then @@ -49,6 +53,47 @@ Public Class frmAdmin_notResponsibleConfig End If Next + + If IDB_ACTIVE = False Then + If MyIndicies IsNot Nothing Then + Dim i As Integer = 0 + For Each index As String In MyIndicies + Dim _vektorString = False + Dim oIndexType = WINDREAM.GetTypeOfIndex(index) + i += 1 + MyIndicies_Types.Add(oIndexType) + Select Case oIndexType + Case 4097 + _vektorString = True + Case 36865 + _vektorString = True + Case Else + _vektorString = False + End Select + If _vektorString = False Then + Me.cmbAttrComment.Items.Add(index) + End If + + Next + 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 + oOk = True + End Select + If oOk Then + Me.cmbAttrComment.Items.Add(oRow.Item("ATTR_TITLE")) + End If + Next + End If + If oNR_Act_Attr <> "" Then + cmbAttrComment.SelectedIndex = cmbAttrComment.FindStringExact(oNR_Act_Attr) + Else + cmbAttrComment.SelectedIndex = -1 + End If + txtPROFILE_NOT_RESPONSIBLE_QUEST.Text = oQuestion txtCaption_NotResponsible.Text = oCaption Catch ex As Exception diff --git a/app/TaskFlow/frmRejectionCommit.Designer.vb b/app/TaskFlow/frmRejectionCommit.Designer.vb index 08de462..e3d93c4 100644 --- a/app/TaskFlow/frmRejectionCommit.Designer.vb +++ b/app/TaskFlow/frmRejectionCommit.Designer.vb @@ -35,16 +35,16 @@ Partial Class frmRejectionCommit ' 'lblMsg1 ' - resources.ApplyResources(Me.lblMsg1, "lblMsg1") Me.lblMsg1.Appearance.Font = CType(resources.GetObject("lblMsg1.Appearance.Font"), System.Drawing.Font) Me.lblMsg1.Appearance.Options.UseFont = True + resources.ApplyResources(Me.lblMsg1, "lblMsg1") Me.lblMsg1.Name = "lblMsg1" ' 'lblMsg2 ' - resources.ApplyResources(Me.lblMsg2, "lblMsg2") Me.lblMsg2.Appearance.Font = CType(resources.GetObject("lblMsg2.Appearance.Font"), System.Drawing.Font) Me.lblMsg2.Appearance.Options.UseFont = True + resources.ApplyResources(Me.lblMsg2, "lblMsg2") Me.lblMsg2.Name = "lblMsg2" ' 'btnRejection @@ -69,22 +69,22 @@ Partial Class frmRejectionCommit ' 'lblReasons ' - resources.ApplyResources(Me.lblReasons, "lblReasons") Me.lblReasons.Appearance.Font = CType(resources.GetObject("lblReasons.Appearance.Font"), System.Drawing.Font) Me.lblReasons.Appearance.Options.UseFont = True + resources.ApplyResources(Me.lblReasons, "lblReasons") Me.lblReasons.Name = "lblReasons" ' 'cmbReason ' - resources.ApplyResources(Me.cmbReason, "cmbReason") Me.cmbReason.FormattingEnabled = True + resources.ApplyResources(Me.cmbReason, "cmbReason") Me.cmbReason.Name = "cmbReason" ' 'LabelControl2 ' - resources.ApplyResources(Me.LabelControl2, "LabelControl2") Me.LabelControl2.Appearance.Font = CType(resources.GetObject("LabelControl2.Appearance.Font"), System.Drawing.Font) Me.LabelControl2.Appearance.Options.UseFont = True + resources.ApplyResources(Me.LabelControl2, "LabelControl2") Me.LabelControl2.Name = "LabelControl2" ' 'txtComment @@ -94,8 +94,8 @@ Partial Class frmRejectionCommit ' 'frmRejectionCommit ' - resources.ApplyResources(Me, "$this") Me.Appearance.Options.UseFont = True + resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.txtComment) Me.Controls.Add(Me.LabelControl2) diff --git a/app/TaskFlow/frmRejectionCommit.resx b/app/TaskFlow/frmRejectionCommit.resx index c7a3b0c..b332a76 100644 --- a/app/TaskFlow/frmRejectionCommit.resx +++ b/app/TaskFlow/frmRejectionCommit.resx @@ -117,242 +117,68 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Bottom, Left - - - lblReasons - - - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Tahoma, 9.75pt - - - 4, 4, 4, 4 - - - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Tahoma, 12pt - - 316, 158 + + 12, 12 - - 12, 74 + + 287, 19 - - True - - - Tahoma, 9.75pt - - - 316, 24 - - - DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 2 - - - CenterScreen - - - SimpleButton1 - - - 12, 145 - - - 7 + + 0 [GLP] Sie wollen diesen Beleg ablehnen? - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 4 - - - 8 - - - 6 - - - lblMsg2 - - - $this - - - 1 - - - 12, 12 - - - Tahoma, 9.75pt - - - 344, 37 - - - Begründung: + + lblMsg1 DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - cmbReason - - - btnRejection - - - 12, 123 + + $this 7 - - So far none from GUI_LANGUAGE_PHRASE - - - 3 + + Tahoma, 12pt - - 362, 318 + + 12, 37 - - $this + + 513, 19 - - SimpleButton1 + + 1 - - 5 + + [GLP] Wenn ja, dann geben Sie bitte einen Grund für die Ablehnung ein! - - Tahoma, 9.75pt + + lblMsg2 DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Abbruch - - - 12, 96 - - - LabelControl2 - - - Tahoma, 12pt, style=Bold - - - $this - - - Grund auswählen: - - - Tahoma, 9.75pt - - - 616, 367 - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPoBAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJIZWFkZXJBbmRGb290ZXIiIHN0eWxlPSJlbmFibGUtYmFja2dy - b3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDoj - RDExQzFDO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDRINUM0LjUsNCw0LDQuNSw0LDV2MjJjMCww - LjUsMC41LDEsMSwxaDIyYzAuNSwwLDEtMC41LDEtMVY1QzI4LDQuNSwyNy41LDQsMjcsNHogTTIyLDIw - bC0yLDJsLTQtNGwtNCw0ICBsLTItMmw0LTRsLTQtNGwyLTJsNCw0bDQtNGwyLDJsLTQsNEwyMiwyMHoi - IGNsYXNzPSJSZWQiIC8+DQo8L3N2Zz4L - - - - 2 - - + $this - - 7, 16 - - - 1 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAM4CAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - UmVke2ZpbGw6I0QxMUMxQzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuR3JlZW57ZmlsbDojMDM5 - QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IlN0b3AiPg0KICAgIDxwYXRoIGQ9Ik0yNyw2Yy0xLjEsMC0y - LDAuOS0yLDJ2NmgtMVY0YzAtMS4xLTAuOS0yLTItMnMtMiwwLjktMiwydjEwaC0xVjJjMC0xLjEtMC45 - LTItMi0ycy0yLDAuOS0yLDJ2MTJoLTFWNCAgIGMwLTEuMS0wLjktMi0yLTJzLTIsMC45LTIsMnYxMHY0 - djAuNGwtNC45LTMuMWMtMC44LTAuNS0xLjgtMC40LTIuNSwwLjNjLTAuOCwwLjgtMC44LDIuMSwwLDIu - OWw5LjMsOS41YzEuMiwxLjMsMywyLjEsNC45LDIuMUgyMyAgIGMzLjMsMCw2LTIuNyw2LTZ2LTR2LTZW - OEMyOSw2LjksMjguMSw2LDI3LDZ6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - 0 + + 6 + Bottom, Left - - 5 - - - 242, 37 - - - 12, 37 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - frmRejectionCommit - - - lblMsg1 - - - Tahoma, 12pt, style=Bold - - - 333, 19 + + Tahoma, 9.75pt @@ -408,46 +234,220 @@ X9ttAMYAAAAASUVORK5CYII= - + + 12, 318 + + + 344, 37 + + + 2 + + + SimpleButton1 + + + btnRejection + + + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 5 + + + Bottom, Left + + + Tahoma, 9.75pt + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPoBAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJIZWFkZXJBbmRGb290ZXIiIHN0eWxlPSJlbmFibGUtYmFja2dy + b3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDoj + RDExQzFDO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDRINUM0LjUsNCw0LDQuNSw0LDV2MjJjMCww + LjUsMC41LDEsMSwxaDIyYzAuNSwwLDEtMC41LDEtMVY1QzI4LDQuNSwyNy41LDQsMjcsNHogTTIyLDIw + bC0yLDJsLTQtNGwtNCw0ICBsLTItMmw0LTRsLTQtNGwyLTJsNCw0bDQtNGwyLDJsLTQsNEwyMiwyMHoi + IGNsYXNzPSJSZWQiIC8+DQo8L3N2Zz4L + + + + 362, 318 + + + 242, 37 + + 3 - - 0 + + Abbruch - - 12, 318 + + SimpleButton1 + + + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this 4 - - $this + + Tahoma, 9.75pt + + + 12, 74 104, 16 - - [GLP] Wenn ja, dann geben Sie bitte einen Grund für die Ablehnung ein! - - - 586, 19 + + 4 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Grund auswählen: - - txtComment + + lblReasons - + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + $this + + + 3 + + + 12, 96 + + + 586, 24 + + + 5 + + + cmbReason + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Tahoma, 9.75pt + + + 12, 123 + 73, 16 - + + 7 + + + Begründung: + + + LabelControl2 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 1 + + + 12, 145 + + + True + + + 586, 158 + + + 8 + + + txtComment + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this + + 0 + True + + 7, 16 + + + 616, 367 + + + Tahoma, 9.75pt + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAM4CAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + UmVke2ZpbGw6I0QxMUMxQzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuR3JlZW57ZmlsbDojMDM5 + QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IlN0b3AiPg0KICAgIDxwYXRoIGQ9Ik0yNyw2Yy0xLjEsMC0y + LDAuOS0yLDJ2NmgtMVY0YzAtMS4xLTAuOS0yLTItMnMtMiwwLjktMiwydjEwaC0xVjJjMC0xLjEtMC45 + LTItMi0ycy0yLDAuOS0yLDJ2MTJoLTFWNCAgIGMwLTEuMS0wLjktMi0yLTJzLTIsMC45LTIsMnYxMHY0 + djAuNGwtNC45LTMuMWMtMC44LTAuNS0xLjgtMC40LTIuNSwwLjNjLTAuOCwwLjgtMC44LDIuMSwwLDIu + OWw5LjMsOS41YzEuMiwxLjMsMywyLjEsNC45LDIuMUgyMyAgIGMzLjMsMCw2LTIuNyw2LTZ2LTR2LTZW + OEMyOSw2LjksMjguMSw2LDI3LDZ6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + 4, 4, 4, 4 + + + CenterScreen + + + So far none from GUI_LANGUAGE_PHRASE + + + frmRejectionCommit + + + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 326dfd5..c4d3277 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -61,6 +61,7 @@ Public Class frmValidator Private Property PROFIL_CURRENCY_ATTRIBUTE Private Property PROFIL_REJECT_ACTIONS_ATTRIBUTE As String = "" Private Property PROFIL_REJECT_COMMENT_ATTRIBUTE As String = "" + Private Property PROFIL_NOT_RESP_COMMENT_ATTR As String = "" Private Property oErrMsgMissingInput Private Const PMDelimiter As String = "~" @@ -272,6 +273,7 @@ Public Class frmValidator PROFIL_REJECT_ACTIONS_ATTRIBUTE = oProfileRow.Item("REJECT_ACTIONS_ATTRIBUTE") PROFIL_REJECT_COMMENT_ATTRIBUTE = oProfileRow.Item("REJECT_COMMENT_ATTRIBUTE") + PROFIL_NOT_RESP_COMMENT_ATTR = oProfileRow.Item("NOT_RESP_COMMENT_ATTRIBUTE") PROFIL_LOGINDEX = oProfileRow.Item("LOG_INDEX") CURRENT_PROFILE_LOG_INDEX = PROFIL_LOGINDEX @@ -5983,11 +5985,56 @@ Public Class frmValidator End Sub Private Sub btnNotResponsible_Click(sender As Object, e As EventArgs) Handles btnNotResponsible.Click + Dim oCommentSoFar As String = "" + For Each oControl As Control In PanelValidatorControl.Controls + If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Attribute = PROFIL_NOT_RESP_COMMENT_ATTR Then + Dim oName = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Name + Logger.Debug($"Got the control for the NR Attribute :{oName}..Gettin the value...") + If oControl.GetType() = GetType(DevExpress.XtraEditors.TextEdit) Or oControl.GetType() = GetType(MemoEdit) Then + Try + oCommentSoFar = DirectCast(oControl, DevExpress.XtraEditors.TextEdit).EditValue + Exit For + Catch ex As Exception + Logger.Warn($"Unexpected error in Checking EditValue: {ex.Message}") + End Try + End If + End If + Next + + oProfile_NOT_RESP_SQL = clsPatterns.ReplaceAllValues(oProfile_NOT_RESP_SQL, PanelValidatorControl, True) - Dim frmDialog As New frmYesNo(oProfileNotResponsibleQuestion) + Dim oCaption As String = "Bestätigung - " + If USER_LANGUAGE <> "de-DE" Then + oCaption = "Confirmation - " + End If + Dim frmDialog As New frmYesNo(oProfileNotResponsibleQuestion, oCaption + oProfileNotResponsibleText, oCommentSoFar) frmDialog.ShowDialog() ' result = MessageBox.Show(oProfileNotResponsibleQuestion, ADDITIONAL_TITLE, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) If frmDialog.DialogResult = DialogResult.OK Then + + 'For Each oControl As Control In PanelValidatorControl.Controls + ' If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Attribute = PROFIL_NOT_RESP_COMMENT_ATTR Then + ' Dim oName = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Name + ' Logger.Debug($"Got the control for the NR Attribute :{oName}..Gettin the value...") + ' If oControl.GetType() = GetType(DevExpress.XtraEditors.TextEdit) Or oControl.GetType() = GetType(MemoEdit) Then + ' Try + ' DirectCast(oControl, DevExpress.XtraEditors.TextEdit).EditValue = frmDialog.oComment + ' Exit For + ' Catch ex As Exception + ' Logger.Warn($"Unexpected error in Setting EditValue NotResponsible: {ex.Message}") + ' End Try + ' End If + ' End If + 'Next + + + If IDB_ACTIVE = False Then + Indexiere_File(CURRENT_WMFILE, PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment) + Else + Dim oREsult = IDBData.SetVariableValue(PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment) + + End If + OverrideAll = True Override_SQLCommand = oProfile_NOT_RESP_SQL Override = True diff --git a/app/TaskFlow/frmYesNo.Designer.vb b/app/TaskFlow/frmYesNo.Designer.vb index cd32e85..d296a3f 100644 --- a/app/TaskFlow/frmYesNo.Designer.vb +++ b/app/TaskFlow/frmYesNo.Designer.vb @@ -28,92 +28,76 @@ Partial Class frmYesNo Me.Cancel_Button = New System.Windows.Forms.Button() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() Me.txtQuestion = New System.Windows.Forms.TextBox() + Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() + Me.txtReason = 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!)) + resources.ApplyResources(Me.TableLayoutPanel1, "TableLayoutPanel1") 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) + resources.ApplyResources(Me.OK_Button, "OK_Button") 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 + resources.ApplyResources(Me.Cancel_Button, "Cancel_Button") 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) + resources.ApplyResources(Me.PictureEdit1, "PictureEdit1") 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 + resources.ApplyResources(Me.txtQuestion, "txtQuestion") 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" + ' + 'LabelControl1 + ' + Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font) + Me.LabelControl1.Appearance.Options.UseFont = True + resources.ApplyResources(Me.LabelControl1, "LabelControl1") + Me.LabelControl1.Name = "LabelControl1" + ' + 'txtReason + ' + resources.ApplyResources(Me.txtReason, "txtReason") + Me.txtReason.Name = "txtReason" ' 'frmYesNo ' Me.AcceptButton = Me.OK_Button - Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) + resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(403, 149) + Me.Controls.Add(Me.txtReason) + Me.Controls.Add(Me.LabelControl1) 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) @@ -125,4 +109,6 @@ Partial Class frmYesNo Friend WithEvents Cancel_Button As System.Windows.Forms.Button Friend WithEvents PictureEdit1 As DevExpress.XtraEditors.PictureEdit Friend WithEvents txtQuestion As TextBox + Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl + Friend WithEvents txtReason As TextBox End Class diff --git a/app/TaskFlow/frmYesNo.en.resx b/app/TaskFlow/frmYesNo.en.resx new file mode 100644 index 0000000..11eac96 --- /dev/null +++ b/app/TaskFlow/frmYesNo.en.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Confirm + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABkEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBdHRlbnRpb24iPg0K + ICAgIDxwYXRoIGQ9Ik0xNS4xLDIuNUwyLjEsMjYuNUMxLjgsMjcuMiwyLjMsMjgsMy4xLDI4aDI1Ljlj + MC44LDAsMS4zLTAuOCwwLjktMS41TDE2LjksMi41ICAgQzE2LjUsMS44LDE1LjUsMS44LDE1LjEsMi41 + eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMjBjMS4xLDAsMiwwLjksMiwycy0w + LjksMi0yLDJzLTItMC45LTItMlMxNC45LDIwLDE2LDIweiBNMTQsMTBoNHY4aC00VjEweiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + 40, 13 + + + Reason: + + \ No newline at end of file diff --git a/app/TaskFlow/frmYesNo.fr.resx b/app/TaskFlow/frmYesNo.fr.resx new file mode 100644 index 0000000..2b88a84 --- /dev/null +++ b/app/TaskFlow/frmYesNo.fr.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Confirmer + + + Annuler + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABkEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBdHRlbnRpb24iPg0K + ICAgIDxwYXRoIGQ9Ik0xNS4xLDIuNUwyLjEsMjYuNUMxLjgsMjcuMiwyLjMsMjgsMy4xLDI4aDI1Ljlj + MC44LDAsMS4zLTAuOCwwLjktMS41TDE2LjksMi41ICAgQzE2LjUsMS44LDE1LjUsMS44LDE1LjEsMi41 + eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMjBjMS4xLDAsMiwwLjksMiwycy0w + LjksMi0yLDJzLTItMC45LTItMlMxNC45LDIwLDE2LDIweiBNMTQsMTBoNHY4aC00VjEweiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + 61, 13 + + + Justification: + + \ No newline at end of file diff --git a/app/TaskFlow/frmYesNo.resx b/app/TaskFlow/frmYesNo.resx index fe89061..a1adfbc 100644 --- a/app/TaskFlow/frmYesNo.resx +++ b/app/TaskFlow/frmYesNo.resx @@ -117,6 +117,105 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bottom, Right + + + + 2 + + + None + + + + 9, 7 + + + 4, 4, 4, 4 + + + 86, 34 + + + 0 + + + OK + + + OK_Button + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TableLayoutPanel1 + + + 0 + + + None + + + 113, 7 + + + 4, 4, 4, 4 + + + 86, 34 + + + 1 + + + Abbrechen + + + Cancel_Button + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TableLayoutPanel1 + + + 1 + + + 242, 277 + + + 4, 4, 4, 4 + + + 1 + + + 209, 48 + + + 0 + + + TableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="OK_Button" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="Cancel_Button" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50" /></TableLayoutSettings> + @@ -143,4 +242,136 @@ IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + 12, 29 + + + 45, 38 + + + 2 + + + PictureEdit1 + + + DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 3 + + + Tahoma, 9.75pt + + + 63, 29 + + + True + + + 378, 68 + + + 3 + + + Beispieltext mit Ansicht zum Umbruch, weil Text auch länger sein kann + + + txtQuestion + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Tahoma, 9.75pt + + + 12, 103 + + + 73, 16 + + + 4 + + + Begründung: + + + LabelControl1 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 1 + + + Top, Bottom, Left, Right + + + 12, 125 + + + True + + + 428, 139 + + + 5 + + + txtReason + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 7, 16 + + + 452, 326 + + + Tahoma, 9.75pt + + + 4, 4, 4, 4 + + + CenterParent + + + Bestätigung/Confirmation + + + frmYesNo + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/app/TaskFlow/frmYesNo.vb b/app/TaskFlow/frmYesNo.vb index f739f1d..01aa811 100644 --- a/app/TaskFlow/frmYesNo.vb +++ b/app/TaskFlow/frmYesNo.vb @@ -2,16 +2,35 @@ Public Class frmYesNo Dim oQuestion As String - Public Sub New(pQuestion As String) + Dim oCaption As String + Public oComment As String + Public Sub New(pQuestion As String, pCaption As String, pCommentSoFar As String) MyBase.New() oQuestion = pQuestion - + oCaption = pCaption + oComment = pCommentSoFar 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 + If txtReason.Text = String.Empty Then + Dim oStop As String + If USER_LANGUAGE = "de-DE" Then + oStop = "Bitte eine Begründung eingeben!" + ElseIf USER_LANGUAGE = "es-ES" Then + oStop = "Introduzca un motivo!" + ElseIf USER_LANGUAGE = "en-US" Then + oStop = "Please enter a reason!" + ElseIf USER_LANGUAGE = "fr-FR" Then + oStop = "Veuillez saisir une justification!" + End If + MsgBox(oStop, MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) + Exit Sub + End If + oComment = txtReason.Text Me.DialogResult = System.Windows.Forms.DialogResult.OK + Me.Close() End Sub @@ -22,5 +41,7 @@ Public Class frmYesNo Private Sub frmYesNo_Load(sender As Object, e As EventArgs) Handles Me.Load txtQuestion.Text = oQuestion + txtReason.Text = oComment + Me.Text = oCaption End Sub End Class