Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/RecordOrganizer

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
 

app/DD-Record-Organiser/frmConstructor_Main.Designer.vb

@@ -124,6 +124,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()
@@ -764,7 +765,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"
         '
@@ -868,6 +869,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")
@@ -1238,4 +1245,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

app/DD-Record-Organiser/frmConstructor_Main.resx

@@ -1447,6 +1447,18 @@
   <data name="tsButtonShowWorkflowTasks.Text" xml:space="preserve">
     <value>Taskmanagement</value>
   </data>
+  <data name="tsButtonCancel.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="tsButtonCancel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>85, 22</value>
+  </data>
+  <data name="tsButtonCancel.Text" xml:space="preserve">
+    <value>Abbrechen</value>
+  </data>
+  <data name="tsButtonCancel.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="tslblLocked.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9pt</value>
   </data>
@@ -2621,6 +2633,12 @@
   <data name="&gt;&gt;tsButtonShowWorkflowTasks.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;tsButtonCancel.Name" xml:space="preserve">
+    <value>tsButtonCancel</value>
+  </data>
+  <data name="&gt;&gt;tsButtonCancel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;tslblLocked.Name" xml:space="preserve">
     <value>tslblLocked</value>
   </data>

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
@@ -5057,4 +5060,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