AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS19052016_1

Browse Source
This commit is contained in:
SchreiberM 2016-05-19 11:38:40 +02:00
parent 186e674950
commit 2e5e1310fa
11 changed files with 142 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/DD-Record-Organiser/ClassControlBuilder.vb
View File

@ -241,10 +241,6 @@ Public Class ClassControlBuilder
Exit Sub
End If
'If CURRENT_RECORD_ID = 0 Then
' Exit Sub
'End If
If IsNothing(value) Then 'Kein Value also abhängige Controls auf "Leer" setzen
For Each row As DataRow In TableResult.Rows
@ -256,7 +252,7 @@ Public Class ClassControlBuilder
Return DirectCast(c.Tag, ClassControlMetadata).Id = dependingControlId
End Function).SingleOrDefault()
Dim type = dependingControl.GetType().Name
Select Case Type
Select Case type
Case "CustomComboBox"
DirectCast(dependingControl, CustomComboBox).DataSource = Nothing
Case "CheckedListBoxControl"
@ -284,12 +280,22 @@ Public Class ClassControlBuilder
If match.Success Then
Dim sqlguid = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", CONTROL_ID, CURRENT_RECORD_ID)
Dim ctrlvalID = ClassDatabase.Execute_Scalar(sqlguid)
Select Case row.Item("FORMAT_TYPE")
Case "Currency"
value = Decimal.Parse(value, Globalization.NumberStyles.Currency).ToString
Case "Decimal"
value = Decimal.Parse(value, Globalization.NumberStyles.Integer)
End Select
Select Case row.Item("CONTROL_TYPE_ID")
Case 4 'DatePicker
value = CDate(value)
End Select
' Diese Abfrage verhindert, dass Werte, die aus z.B. CheckedListBoxen kommen,
' nicht überschrieben werden. Diese Werte werden bereits mit UpdateMultipleValues gespeichert
If (Not value.Contains(";")) Then
If Not IsNothing(ctrlvalID) Then
Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", value.ToString, CONTROL_ID, CURRENT_RECORD_ID)
Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGE_STEP = {1},CHANGED_WHO = '{2}' WHERE CONTROL_ID = {3} AND RECORD_ID = {4}", _
value.ToString, CURRENT_CHANGE_STEP, Environment.UserName, CONTROL_ID, CURRENT_RECORD_ID)
ClassDatabase.Execute_non_Query(upd1)
Else
If CURRENT_RECORD_ID <> 0 Then
@ -321,8 +327,9 @@ Public Class ClassControlBuilder
Case "DateEdit"
If dt.Rows.Count = 1 Then
Try
Dim dateValue As String = dt.Rows(0).Item(0)
If dateValue = "1900-01-01" Then
Dim val = dt.Rows(0).Item(0)
Dim dateValue As String = CDate(dt.Rows(0).Item(0))
If val = "1900-01-01" Then
Continue For
End If
ControlLoader.DateTimePicker.LoadValue(dependingControl, dateValue)
@ -421,10 +428,10 @@ Public Class ClassControlBuilder
Dim controlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id
CONTROL_ID = controlId
'SQL für abhängige Auswahllisten
Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1,CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
Dim value
'SQL für enable control
Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2 FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2,CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
value = DirectCast(control, DevExpress.XtraEditors.DateEdit).DateTime
@ -461,10 +468,10 @@ Public Class ClassControlBuilder
Console.WriteLine("Obacht")
End If
'SQL für abhängige Auswahllisten
Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1, CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
Dim value
'SQL für enable control
Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2 FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2, CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
' Diese Befehle führen dazu, dass auch der ValueMember als Wert ausgelesen wird
' Das kann zu unerwarteten Ergebnissen führen, da der Benutzer nur den DisplayMember sieht.

47
app/DD-Record-Organiser/ClassControlCommandsUI.vb
View File

@ -494,7 +494,9 @@ Public Class ClassControlCommandsUI
Private Sub UpdateAllControls(FormID As Integer, RecordID As Integer, controls As Control.ControlCollection)
Try
Dim sw As New SW("UpdateAllControls")
Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", Environment.UserName.ToUpper)
ClassDatabase.Execute_non_Query(del)
CURRENT_CHANGE_STEP += 1
Dim VALUE_EXISTS_DT As DataTable = ClassDatabase.Return_Datatable(String.Format("SELECT RECORD_ID, CONTROL_ID FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordID))
For Each ctrl As Control In controls
@ -581,8 +583,17 @@ Public Class ClassControlCommandsUI
Dim AddValues = values.Except(oldValues)
Dim RemoveValues = oldValues.Except(values)
Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlId)
For Each v As String In AddValues
If Not v = String.Empty Then
Select Case FORMAT_TYPE
Case "Currency"
v = Decimal.Parse(v, Globalization.NumberStyles.Currency).ToString
Case "Decimal"
v = Decimal.Parse(v, Globalization.NumberStyles.Integer)
End Select
End If
ClassDatabase.Execute_non_Query(String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE) VALUES({0}, {1}, '{2}')", ControlId, RecordId, v))
Next
@ -795,28 +806,36 @@ Public Class ClassControlCommandsUI
Public Shared Function UpdateControlValue(ControlID As Integer, RecordID As Integer, Value As String)
Try
Dim CHANGED_WHO = Environment.UserName
Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
Dim DT_FORMAT_TYPE As DataTable = ClassDatabase.Return_Datatable("SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
If Not Value = String.Empty Then
Select Case FORMAT_TYPE
Select Case DT_FORMAT_TYPE.Rows(0).Item(0).ToString ' FORMAT_TYPE
Case "Currency"
Value = Decimal.Parse(Value, Globalization.NumberStyles.Currency).ToString
Case "Decimal"
Value = Decimal.Parse(Value, Globalization.NumberStyles.Integer)
End Select
Select Case DT_FORMAT_TYPE.Rows(0).Item(1)
Case 4 'DateEdit
Value = CDate(Value)
End Select
End If
Using conn As New SqlClient.SqlConnection(MyConnectionString)
Dim cmd As New SqlClient.SqlCommand("UPDATE TBPMO_CONTROL_VALUE SET VALUE = @VALUE, CHANGED_WHO = @CHANGED_WHO WHERE CONTROL_ID = @CONTROL_ID AND RECORD_ID = @RECORD_ID", conn)
cmd.Parameters.Add("@VALUE", SqlDbType.NVarChar).Value = Value
cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.VarChar).Value = CHANGED_WHO
cmd.Parameters.Add("@CONTROL_ID", SqlDbType.Int).Value = ControlID
cmd.Parameters.Add("@RECORD_ID", SqlDbType.Int).Value = RecordID
conn.Open()
cmd.ExecuteNonQuery()
Return True
End Using
Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}', CHANGE_STEP = {2} WHERE CONTROL_ID = {3} AND RECORD_ID = {4}", _
Value, CHANGED_WHO, CURRENT_CHANGE_STEP, ControlID, RecordID)
Return ClassDatabase.Execute_non_Query(upd)
'Using conn As New SqlClient.SqlConnection(MyConnectionString)
' Dim cmd As New SqlClient.SqlCommand("UPDATE TBPMO_CONTROL_VALUE SET VALUE = @VALUE, CHANGED_WHO = @CHANGED_WHO, CHANGE_STEP = @CHANGE_STEP WHERE CONTROL_ID = @CONTROL_ID AND RECORD_ID = @RECORD_ID", conn)
' cmd.Parameters.Add("@VALUE", SqlDbType.NVarChar).Value = Value
' cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.VarChar).Value = CHANGED_WHO
' cmd.Parameters.Add("@CONTROL_ID", SqlDbType.Int).Value = ControlID
' cmd.Parameters.Add("@RECORD_ID", SqlDbType.Int).Value = RecordID
' cmd.Parameters.Add("CHANGE_STEP", SqlDbType.Int).Value = CURRENT_CHANGE_STEP
' conn.Open()
' cmd.ExecuteNonQuery()
' Return True
'End Using
Catch ex As Exception
ClassLogger.Add("Unerwarteter Fehler in UpdateControlValue: " & ex.Message, True)

2
app/DD-Record-Organiser/DD-Record-Organiser.vbproj
View File

@ -1276,6 +1276,8 @@
<None Include="Resources\calendar_32x32.png" />
<None Include="Resources\csv.png" />
<None Include="Resources\Connection_Manager.png" />
<None Include="Resources\Arrow_RedoRetry_16xMD.png" />
<None Include="Resources\Arrow_RedoRetry_16xLG.png" />
<Content Include="Resources\cube.ico" />
<Content Include="Resources\138_PushPin_32x42_72.png" />
<None Include="Resources\PropertyGridEditorPart_6041.png" />

2
app/DD-Record-Organiser/ModuleRuntimeVariables.vb
View File

@ -16,6 +16,8 @@
Public CURRENT_CONTROL_ID As Integer
Public CURRENT_RECORD_ID As Integer
Public CURRENT_CHANGE_STEP As Integer = 0
Public CURRENT_TASK_ID As Integer
Public CURRENT_DOKARTID As Integer

20
app/DD-Record-Organiser/My Project/Resources.Designer.vb generated
View File

@ -290,6 +290,26 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Arrow_RedoRetry_16xLG() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("Arrow_RedoRetry_16xLG", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Arrow_RedoRetry_16xMD() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("Arrow_RedoRetry_16xMD", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

28
app/DD-Record-Organiser/My Project/Resources.resx
View File

@ -169,8 +169,8 @@
<data name="Men3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Men3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="database_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\database_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Arrow_RedoRetry_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Arrow_RedoRetry_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -274,6 +274,9 @@
<data name="brick_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\brick_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DateOrTimePicker_675" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="calendar_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\calendar_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -346,6 +349,9 @@
<data name="shield_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shield_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TableView_nameonly_263" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\TableView_nameonly_263.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Men1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Men1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -382,8 +388,8 @@
<data name="Label_684" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Label_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DateOrTimePicker_675" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="benutzer3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bug_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bug_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -469,9 +475,6 @@
<data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="benutzer3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_Open_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder_Open_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -541,8 +544,8 @@
<data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="page_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\page_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="database_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\database_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="doc_excel_csv" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -577,6 +580,9 @@
<data name="NetworkPipes_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\NetworkPipes_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="page_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\page_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Checkbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Checkbox.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -634,7 +640,7 @@
<data name="action_Cancel_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TableView_nameonly_263" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\TableView_nameonly_263.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Arrow_RedoRetry_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Arrow_RedoRetry_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
app/DD-Record-Organiser/Resources/Arrow_RedoRetry_16xLG.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 416 B

BIN
app/DD-Record-Organiser/Resources/Arrow_RedoRetry_16xMD.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 400 B

10
app/DD-Record-Organiser/frmConstructor_Main.Designer.vb generated
View File

@ -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.tsbtnRedo = 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()
@ -765,7 +766,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.tsButtonCancel, 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.tsbtnRedo, Me.tsButtonCancel, Me.tslblLocked, Me.tslblFileslocked})
resources.ApplyResources(Me.ToolStripEdit, "ToolStripEdit")
Me.ToolStripEdit.Name = "ToolStripEdit"
'
@ -869,6 +870,12 @@ Partial Class frmConstructor_Main
Me.tsButtonShowWorkflowTasks.Image = Global.DD_Record_Organiser.My.Resources.Resources.bricks
Me.tsButtonShowWorkflowTasks.Name = "tsButtonShowWorkflowTasks"
'
'tsbtnRedo
'
Me.tsbtnRedo.Image = Global.DD_Record_Organiser.My.Resources.Resources.Arrow_RedoRetry_16xLG
resources.ApplyResources(Me.tsbtnRedo, "tsbtnRedo")
Me.tsbtnRedo.Name = "tsbtnRedo"
'
'tsButtonCancel
'
Me.tsButtonCancel.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel
@ -1246,4 +1253,5 @@ Partial Class frmConstructor_Main
Friend WithEvents PropertiesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents tslblFileslocked As System.Windows.Forms.ToolStripLabel
Friend WithEvents tsButtonCancel As System.Windows.Forms.ToolStripButton
Friend WithEvents tsbtnRedo As System.Windows.Forms.ToolStripButton
End Class

20
app/DD-Record-Organiser/frmConstructor_Main.resx
View File

@ -1447,6 +1447,18 @@
<data name="tsButtonShowWorkflowTasks.Text" xml:space="preserve">
<value>Taskmanagement</value>
</data>
<data name="tsbtnRedo.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbtnRedo.Size" type="System.Drawing.Size, System.Drawing">
<value>159, 22</value>
</data>
<data name="tsbtnRedo.Text" xml:space="preserve">
<value>Rückgängig Änderungen</value>
</data>
<data name="tsbtnRedo.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="tsButtonCancel.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
@ -1472,7 +1484,7 @@
<value>False</value>
</data>
<data name="tslblFileslocked.Size" type="System.Drawing.Size, System.Drawing">
<value>110, 22</value>
<value>110, 16</value>
</data>
<data name="tslblFileslocked.Text" xml:space="preserve">
<value>Kein Dateizugriff</value>
@ -2633,6 +2645,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;tsbtnRedo.Name" xml:space="preserve">
<value>tsbtnRedo</value>
</data>
<data name="&gt;&gt;tsbtnRedo.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>

25
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@ -157,7 +157,7 @@ Public Class frmConstructor_Main
End Sub
Private Sub frmForm_Constructor_Main_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
If RECORD_CHANGED Then
If RECORD_CHANGED = True Then
Dim ResultMessage As String
Try
ResultMessage = Update_Record_OnChange()
@ -694,7 +694,7 @@ Public Class frmConstructor_Main
End Function
Private Sub grvwGrid_BeforeLeaveRow(sender As Object, e As RowAllowEventArgs) Handles grvwGrid.BeforeLeaveRow
If RECORD_CHANGED Then
If RECORD_CHANGED = True Then
Dim ResultMessage As String
Try
ResultMessage = Update_Record_OnChange()
@ -1404,6 +1404,7 @@ Public Class frmConstructor_Main
Me.Cursor = Cursors.Default
Return True
End If
End If
'Update aller Control-Werte
Dim ResultMessage
@ -1586,7 +1587,7 @@ Public Class frmConstructor_Main
If RECORD_ENABLED = False Then
EnableEditMode()
Else
If RECORD_CHANGED Then
If RECORD_CHANGED = True Then
Dim ResultMessage As String
Try
ResultMessage = Update_Record_OnChange()
@ -1623,11 +1624,14 @@ Public Class frmConstructor_Main
'Wenn Record bearbeitet werden kann, IN_WORK auf 1 setzen, um Bearbeitung durch andere zu verhindern!
ClassRecordState.LockRecord(SELECTED_RECORD_ID)
End If
CURRENT_CHANGE_STEP += 1
Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", Environment.UserName.ToUpper)
ClassDatabase.Execute_non_Query(del)
Lock_RecordControls(False)
tsmi_RecordDelete.Enabled = True
Me.tsButtonAdd.Enabled = True
Me.tsButtonSave.Enabled = True
tsbtnRedo.Visible = True
Dim stg As String
If USER_LANGUAGE = "de-DE" Then
stg = "Bearbeiten beenden"
@ -1657,7 +1661,7 @@ Public Class frmConstructor_Main
Sub DisableEditMode()
ClassRecordState.UnlockRecord(SELECTED_RECORD_ID)
tsbtnRedo.Visible = False
Lock_RecordControls(True)
RECORD_ENABLED = False
CURRENT_RECORD_ENABLED = False
@ -5107,4 +5111,15 @@ Public Class frmConstructor_Main
Console.WriteLine("Focus panel")
End If
End Sub
Private Sub tsbtnRedo_Click(sender As Object, e As EventArgs) Handles tsbtnRedo.Click
Me.Cursor = Cursors.WaitCursor
Dim proc = String.Format("EXEC PRPMO_REDO_RECORD_CHANGES {0}", RECORD_ID)
If ClassDatabase.Execute_non_Query(proc) = True Then
RECORD_ID = 0
Column_Row_Handler()
Me.Cursor = Cursors.Default
End If
End Sub
End Class