From 028183d9b74984266f239b2f9f9c117d1c9cd17f Mon Sep 17 00:00:00 2001 From: JenneJ Date: Wed, 11 May 2016 16:49:11 +0200 Subject: [PATCH] jj 11.05.16 --- .../ClassControlValueCache.vb | 6 ++++++ .../frmConstructor_Main.Designer.vb | 10 +++++++++- .../frmConstructor_Main.resx | 18 ++++++++++++++++++ app/DD-Record-Organiser/frmConstructor_Main.vb | 13 +++++++++++++ 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/app/DD-Record-Organiser/ClassControlValueCache.vb b/app/DD-Record-Organiser/ClassControlValueCache.vb index dc82335..15eb529 100644 --- a/app/DD-Record-Organiser/ClassControlValueCache.vb +++ b/app/DD-Record-Organiser/ClassControlValueCache.vb @@ -21,6 +21,12 @@ Public Shared Sub SaveToCache(sqlCommand As String, dt As DataTable) Dim UpperCaseCommand = sqlCommand.ToUpper() + + ' Dynamische Queries dürfen nicht gecached werden + If (UpperCaseCommand.Contains("@")) Then + Exit Sub + End If + Cache.Item(UpperCaseCommand) = dt End Sub diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index 1824153..be2482f 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -123,6 +123,7 @@ Partial Class frmConstructor_Main Me.AnwendungscacheFreigebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.tsButtonShowTaskOverview = New System.Windows.Forms.ToolStripButton() Me.tsButtonShowWorkflowTasks = New System.Windows.Forms.ToolStripButton() + Me.tsButtonCancel = New System.Windows.Forms.ToolStripButton() Me.tslblLocked = New System.Windows.Forms.ToolStripLabel() Me.tslblFileslocked = New System.Windows.Forms.ToolStripLabel() Me.Panel2 = New System.Windows.Forms.Panel() @@ -763,7 +764,7 @@ Partial Class frmConstructor_Main 'ToolStripEdit ' Me.ToolStripEdit.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEdit, Me.ToolStripDropDownButton1, Me.tsButtonShowTaskOverview, Me.tsButtonShowWorkflowTasks, Me.tslblLocked, Me.tslblFileslocked}) + Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEdit, Me.ToolStripDropDownButton1, Me.tsButtonShowTaskOverview, Me.tsButtonShowWorkflowTasks, Me.tsButtonCancel, Me.tslblLocked, Me.tslblFileslocked}) resources.ApplyResources(Me.ToolStripEdit, "ToolStripEdit") Me.ToolStripEdit.Name = "ToolStripEdit" ' @@ -867,6 +868,12 @@ Partial Class frmConstructor_Main Me.tsButtonShowWorkflowTasks.Image = Global.DD_Record_Organiser.My.Resources.Resources.bricks Me.tsButtonShowWorkflowTasks.Name = "tsButtonShowWorkflowTasks" ' + 'tsButtonCancel + ' + Me.tsButtonCancel.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel + resources.ApplyResources(Me.tsButtonCancel, "tsButtonCancel") + Me.tsButtonCancel.Name = "tsButtonCancel" + ' 'tslblLocked ' resources.ApplyResources(Me.tslblLocked, "tslblLocked") @@ -1237,4 +1244,5 @@ Partial Class frmConstructor_Main Friend WithEvents ToolStripSeparator9 As System.Windows.Forms.ToolStripSeparator Friend WithEvents PropertiesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents tslblFileslocked As System.Windows.Forms.ToolStripLabel + Friend WithEvents tsButtonCancel As System.Windows.Forms.ToolStripButton End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 5b2585d..2fd849b 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -1447,6 +1447,18 @@ Taskmanagement + + Magenta + + + 85, 22 + + + Abbrechen + + + False + Segoe UI, 9pt @@ -2621,6 +2633,12 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsButtonCancel + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tslblLocked diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index ef4e455..dff251e 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -1320,6 +1320,8 @@ Public Class frmConstructor_Main RECORD_ID = 0 Lock_RecordControls(False) tsButtonShowWorkflowTasks.Enabled = True + tsButtonCancel.Visible = True + CURRENT_PARENT_ID = PARENT_ID ClassControlValues.LoadDefaultValues(ENTITY_ID, SELECTED_RECORD_ID, pnlDetails.Controls, CURRENT_PARENT_ID, ENTITY_ID) ' Den Record anlegen, damit wir eine RECORD_ID bekommen @@ -1504,6 +1506,7 @@ Public Class frmConstructor_Main If CtrlCommandUI.IsInsert Then tsButtonSave.Enabled = False + tsButtonCancel.Visible = False Else ' DisableEditMode() End If @@ -5051,4 +5054,14 @@ Public Class frmConstructor_Main tslblFileslocked.Text = msg End If End Sub + + Private Sub tsButtonCancel_Click(sender As Object, e As EventArgs) Handles tsButtonCancel.Click + If CtrlCommandUI.IsInsert = True Then + Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID + ClassDatabase.Execute_non_Query(del, True) + End If + tsButtonCancel.Visible = False + CtrlCommandUI.IsInsert = False + RECORD_CHANGED = False + End Sub End Class \ No newline at end of file