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

jj 24.10

Browse Source
This commit is contained in:
Jonathan Jenne 2017-10-24 12:31:59 +02:00
parent 3d1f9a2bb5
commit 96a9487130
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/DD-Record-Organizer/ClassControlBuilder.vb
View File

@ -373,13 +373,15 @@ Public Class ClassControlBuilder
If ClassControlCommandsUI.UpdateControlValue(CONTROL_ID, CURRENT_RECORD_ID, value.ToString, CURRENT_ENTITY_ID) = False Then
ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.UpdateControlValue (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value), False)
Else
' & upd & "'")
ControlsChanged.Remove(CONTROL_ID)
End If
Else
If LogErrorsOnly = False Then ClassLogger.Add(" >> ctrlvalID is Nothing - Attention.....", False, False)
If CURRENT_RECORD_ID <> 0 Then
If ClassControlCommandsUI.InsertControlValue(CONTROL_ID, CURRENT_RECORD_ID, value, CURRENT_ENTITY_ID) = False Then
ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.InsertControlValue (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value), False)
Else
ControlsChanged.Remove(CONTROL_ID)
End If
End If
End If
@ -429,6 +431,7 @@ Public Class ClassControlBuilder
If Not IsNothing(id) Then
'Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", dateValue, USER_USERNAME, id)
If ClassControlCommandsUI.UpdateControlValue(dependingControlId, CURRENT_RECORD_ID, dateValue, CURRENT_ENTITY_ID) = True Then
ControlsChanged.Remove(dependingControlId)
If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue'", False) '" & upd)
Else
ClassLogger.Add(" >> Check Update depending control (DateEdit) value as it was nothing and Update was not successful - Update-Command '", False) ' & upd & "'")
@ -436,6 +439,7 @@ Public Class ClassControlBuilder
Else
If ClassControlCommandsUI.InsertControlValue(dependingControlId, CURRENT_RECORD_ID, dateValue, CURRENT_ENTITY_ID) = True Then
ControlsChanged.Remove(dependingControlId)
If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue (DateEdit)!", False)
Else
ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.InsertControlValue (DateEdit) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, dateValue), False)
@ -495,6 +499,7 @@ Public Class ClassControlBuilder
If Not IsNothing(id) Then
If ClassControlCommandsUI.UpdateControlValue(dependingControlId, CURRENT_RECORD_ID, value1, CURRENT_ENTITY_ID) = True Then
If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue'", False) '" & upd)
ControlsChanged.Remove(dependingControlId)
Else
ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.UpdateControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1), False)
End If
@ -507,6 +512,7 @@ Public Class ClassControlBuilder
Else
If ClassControlCommandsUI.InsertControlValue(dependingControlId, CURRENT_RECORD_ID, value1, CURRENT_ENTITY_ID) = True Then
ControlsChanged.Remove(dependingControlId)
If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue (TextBox)!", False)
Else
ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.InsertControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1), False)
@ -740,7 +746,7 @@ Public Class ClassControlBuilder
' CtrlCommandUI.SaveRecord(0, CURRENT_ENTITY_ID, CURRENT_PARENT_ID)
'End If
Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control)
Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control)
If CURRENT_RECORD_ID = 0 Then
Exit Sub

8
app/DD-Record-Organizer/ClassControlCommandsUI.vb
View File

@ -580,8 +580,8 @@ Public Class ClassControlCommandsUI
End If
'Dim values As New List(Of String)(value.Split(";"))
Dim AddValues = values.Except(oldValues)
Dim RemoveValues = oldValues.Except(values)
Dim AddValues = values.Except(oldValues).ToList()
Dim RemoveValues = oldValues.Except(values).ToList()
For Each _addValue As String In AddValues
If Not _addValue = "" Then
Dim converted_value = Check_and_Format_Value(ControlId, RecordId, _addValue)
@ -596,9 +596,9 @@ Public Class ClassControlCommandsUI
Next
For Each v As String In RemoveValues
ClassDatabase.Execute_non_Query(String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1} AND VALUE = '{2}'", ControlId, RecordId, v))
ClassProxy.PRPROXY_CONTROL_DEL(RecordId, CURRENT_ENTITY_ID, ControlId)
' ClassProxy.PRPROXY_CONTROL_DEL(RecordId, CURRENT_ENTITY_ID, ControlId)
Next
ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, ControlId, RecordId, "")
Catch ex As Exception
MsgBox("Error in UpdateMultipleValues:" & vbNewLine & ex.Message)
End Try

8
app/DD-Record-Organizer/frmConstructor_Main.vb
View File

@ -1796,6 +1796,7 @@ Public Class frmConstructor_Main
Private Sub tsButtonSave_Click(sender As Object, e As EventArgs) Handles tsButtonSave.Click
Save_Record()
End Sub
Sub Focus_Control(name As String)
@ -1851,7 +1852,6 @@ Public Class frmConstructor_Main
End If
If CtrlCommandUI.IsInsert Then
ActivateAllTabs()
DisableEditMode()
End If
ClassProxy.PRPROXY_RECORD_UPD_INS(CURRENT_ENTITY_ID, CURRENT_RECORD_ID)
@ -1964,10 +1964,10 @@ Public Class frmConstructor_Main
If CtrlCommandUI.IsInsert Then
tsButtonSave.Enabled = False
tsButtonCancel.Visible = False
Else
' DisableEditMode()
End If
DisableEditMode()
CtrlCommandUI.IsInsert = False
EDIT_STATE = EditState.None
RECORD_CHANGED = False
@ -5298,6 +5298,8 @@ Public Class frmConstructor_Main
Customer_Run_Procedures()
' RECORD_CHANGED zurücksetzen
RECORD_CHANGED = False
'Liste der geänderten Control Values leeren
CtrlBuilder.ControlsChanged.Clear()
End Sub
''' <summary>