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

jj 23.08 fix tabs and buttons :D

Browse Source
This commit is contained in:
JenneJ
2016-08-23 15:01:15 +02:00
parent 05b5fffc29
commit b6370ca3bd
2 changed files with 78 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/DD-Record-Organiser/ClassHelper.vb
View File

@@ -245,7 +245,17 @@ Public Class ClassHelper
Public Shared Function DeleteRecord(ByVal SELECTED_RECORD_ID) Public Shared Function DeleteRecord(ByVal SELECTED_RECORD_ID)
Try Try
Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}, '{1}'", SELECTED_RECORD_ID, Environment.UserName) Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}, '{1}'", SELECTED_RECORD_ID, Environment.UserName)
Return ClassDatabase.Execute_non_Query_withConn(DeleteRecordSQL, 1) Dim result As Boolean = ClassDatabase.Execute_non_Query_withConn(DeleteRecordSQL, 1)
If result = False Then
Dim msg = "Der Datensatz '" & SELECTED_RECORD_ID & "' konnte nicht gelöscht werden. Überprüfen Sie das log"
If USER_LANGUAGE <> "de-DE" Then
msg = "The record '" & SELECTED_RECORD_ID & "' could not be deleted. Check the log"
End If
MsgBox(msg, MsgBoxStyle.Exclamation)
End If
Return result
Catch ex As Exception Catch ex As Exception
ClassLogger.Add("Unexpected Error in DeleteRecord: " & ex.Message, True) ClassLogger.Add("Unexpected Error in DeleteRecord: " & ex.Message, True)
Return False Return False

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

@@ -206,6 +206,7 @@ Public Class frmConstructor_Main
' End Try ' End Try
'End If 'End If
If TrySave_Automatic() = False Then If TrySave_Automatic() = False Then
e.Cancel = True e.Cancel = True
End If End If
@@ -573,6 +574,10 @@ Public Class frmConstructor_Main
SELECTED_RECORD_ID = 0 SELECTED_RECORD_ID = 0
RECORD_ID = 0 RECORD_ID = 0
CURRENT_RECORD_ID = 0 CURRENT_RECORD_ID = 0
If CtrlCommandUI.IsInsert Then
ActivateAllTabs()
End If
Load_Datafor_Entity() Load_Datafor_Entity()
End If End If
End If End If
@@ -817,6 +822,10 @@ Public Class frmConstructor_Main
'End If 'End If
If TrySave_Automatic() = False Then If TrySave_Automatic() = False Then
e.Allow = False e.Allow = False
Else
If CtrlCommandUI.IsInsert Then
ActivateAllTabs()
End If
End If End If
End Sub End Sub
@@ -938,7 +947,7 @@ Public Class frmConstructor_Main
End If End If
If RECORD_ID > 0 Then If RECORD_ID > 0 Then
If RIGHT_ONLY_READ = False Then If RIGHT_ONLY_READ = False And CtrlCommandUI.IsInsert = False Then
tsButtonEdit.Enabled = True tsButtonEdit.Enabled = True
End If End If
If NODE_NAVIGATION = False Then If NODE_NAVIGATION = False Then
@@ -1902,6 +1911,14 @@ Public Class frmConstructor_Main
Private Sub tsButtonAdd_Click(sender As Object, e As EventArgs) Handles tsButtonAdd.Click Private Sub tsButtonAdd_Click(sender As Object, e As EventArgs) Handles tsButtonAdd.Click
' Vor dem Hinzufügen muss der EditMode auf jeden Fall ausgeschaltet werden!! ' Vor dem Hinzufügen muss der EditMode auf jeden Fall ausgeschaltet werden!!
DisableEditMode() DisableEditMode()
tsButtonEdit.Enabled = False
' IsInsert muss true sein, damit wir wissen ob wir bei
' Abbruch den Record Wieder löschen können
CtrlCommandUI.IsInsert = True
' Alle Tabs außer Detailansicht deaktivierne
DeactivateTabs()
'Wenn es eine Parent_ID gibt aber kein PArent_Datensatz ausgewählt wurde muss dies nachgeholt werden 'Wenn es eine Parent_ID gibt aber kein PArent_Datensatz ausgewählt wurde muss dies nachgeholt werden
If PARENT_ENTITYID > 0 Then If PARENT_ENTITYID > 0 Then
@@ -1978,9 +1995,6 @@ Public Class frmConstructor_Main
MsgBox("Unexpected Error in Insert: " & ex.Message) MsgBox("Unexpected Error in Insert: " & ex.Message)
Finally Finally
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
' IsInsert muss true sein, damit wir wissen ob wir bei
' Abbruch den Record Wieder löschen können
CtrlCommandUI.IsInsert = True
End Try End Try
End Sub End Sub
@@ -2026,6 +2040,10 @@ Public Class frmConstructor_Main
' Cursor zurücksetzen ' Cursor zurücksetzen
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
Return False Return False
Else
If CtrlCommandUI.IsInsert Then
ActivateAllTabs()
End If
End If End If
Dim recid As Integer Dim recid As Integer
@@ -2182,12 +2200,6 @@ Public Class frmConstructor_Main
DisableEditMode() DisableEditMode()
Load_Entity_Data(ACT_EBENE) Load_Entity_Data(ACT_EBENE)
RECORD_CHANGED = False RECORD_CHANGED = False
Else
msg = "Der Datensatz '" & SELECTED_RECORD_ID & "' konnte nicht gelöscht werden. Überprüfen Sie das log"
If USER_LANGUAGE <> "de-DE" Then
msg = "The record '" & SELECTED_RECORD_ID & "' could not be deleted. Check the log"
End If
MsgBox(msg, MsgBoxStyle.Exclamation)
End If End If
End If End If
End Sub End Sub
@@ -2215,6 +2227,7 @@ Public Class frmConstructor_Main
'End If 'End If
If TrySave_Automatic() = True Then If TrySave_Automatic() = True Then
DisableEditMode() DisableEditMode()
End If End If
End If End If
End Sub End Sub
@@ -2241,6 +2254,10 @@ Public Class frmConstructor_Main
'Wenn Record bearbeitet werden kann, IN_WORK auf 1 setzen, um Bearbeitung durch andere zu verhindern! 'Wenn Record bearbeitet werden kann, IN_WORK auf 1 setzen, um Bearbeitung durch andere zu verhindern!
ClassRecordState.LockRecord(SELECTED_RECORD_ID) ClassRecordState.LockRecord(SELECTED_RECORD_ID)
End If End If
' Alle Tabs außer Detailsicht deaktivieren
DeactivateTabs()
CURRENT_CHANGE_STEP += 1 CURRENT_CHANGE_STEP += 1
Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", Environment.UserName.ToUpper) Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", Environment.UserName.ToUpper)
ClassDatabase.Execute_non_Query(del) ClassDatabase.Execute_non_Query(del)
@@ -2295,7 +2312,11 @@ Public Class frmConstructor_Main
End If End If
Me.tsButtonEdit.Text = stg Me.tsButtonEdit.Text = stg
Me.tsButtonEdit.Text = stg Me.tsButtonEdit.Text = stg
'Funktion nur zum load der Inhalte
If Not IsNothing(CtrlCommandUI) Then
ActivateAllTabs()
End If
If RECORD_ENABLED = True Then If RECORD_ENABLED = True Then
ClassControlValues.UnloadControlValuesList(SELECTED_RECORD_ID, RECORD_ID, CtrlBuilder.AllControls) ClassControlValues.UnloadControlValuesList(SELECTED_RECORD_ID, RECORD_ID, CtrlBuilder.AllControls)
@@ -4563,15 +4584,15 @@ Public Class frmConstructor_Main
Private Sub TCDetails_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles TCDetails.SelectedPageChanged Private Sub TCDetails_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles TCDetails.SelectedPageChanged
Update_Status_Label(False, "") Update_Status_Label(False, "")
tsButtonEdit.Enabled = True 'tsButtonEdit.Enabled = True
If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("pos") Then If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("pos") Then
tsButtonEdit.Enabled = False 'tsButtonEdit.Enabled = False
Load_Pos_Data() Load_Pos_Data()
Load_POSGrid_Layout() Load_POSGrid_Layout()
End If End If
If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("windr") Then If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("windr") Then
If RIGHT_WINDREAM_FORBIDDEN = False Then If RIGHT_WINDREAM_FORBIDDEN = False Then
tsButtonEdit.Enabled = False 'tsButtonEdit.Enabled = False
If RECORD_ID = 0 Then If RECORD_ID = 0 Then
Dim result As MsgBoxResult Dim result As MsgBoxResult
Dim msg = String.Format("Wollen Sie eine Entitätsweite Suche ausführen?") Dim msg = String.Format("Wollen Sie eine Entitätsweite Suche ausführen?")
@@ -4592,7 +4613,7 @@ Public Class frmConstructor_Main
End If End If
End If End If
If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("wieder") Or TCDetails.SelectedTabPage.Text.ToLower.StartsWith("follo") Then If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("wieder") Or TCDetails.SelectedTabPage.Text.ToLower.StartsWith("follo") Then
tsButtonEdit.Enabled = False 'tsButtonEdit.Enabled = False
Refresh_FollowUps() Refresh_FollowUps()
dtpFollowUp.Enabled = False dtpFollowUp.Enabled = False
lblWiedervorlage_Control.Text = "<< Waiting for Selection:" lblWiedervorlage_Control.Text = "<< Waiting for Selection:"
@@ -5723,7 +5744,13 @@ Public Class frmConstructor_Main
Private Sub tsButtonCancel_Click(sender As Object, e As EventArgs) Handles tsButtonCancel.Click Private Sub tsButtonCancel_Click(sender As Object, e As EventArgs) Handles tsButtonCancel.Click
If CtrlCommandUI.IsInsert = True Then If CtrlCommandUI.IsInsert = True Then
ClassHelper.DeleteRecord(SELECTED_RECORD_ID) If ClassHelper.DeleteRecord(SELECTED_RECORD_ID) = False Then
Dim msg = "Der Datensatz '" & SELECTED_RECORD_ID & "' konnte nicht gelöscht werden. Überprüfen Sie das log"
If USER_LANGUAGE <> "de-DE" Then
msg = "The record '" & SELECTED_RECORD_ID & "' could not be deleted. Check the log"
End If
MsgBox(msg, MsgBoxStyle.Exclamation)
End If
End If End If
tsButtonCancel.Visible = False tsButtonCancel.Visible = False
tsButtonAdd.Enabled = True tsButtonAdd.Enabled = True
@@ -5831,10 +5858,11 @@ Public Class frmConstructor_Main
ShouldSave = MessageBox.Show("There are unsaved changes. Would You like to save?", "Unsaved changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question) ShouldSave = MessageBox.Show("There are unsaved changes. Would You like to save?", "Unsaved changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
End If End If
' Änderungen sollen gespeichert werden
If ShouldSave = DialogResult.Yes Then If ShouldSave = DialogResult.Yes Then
If CtrlCommandUI.IsInsert Then If CtrlCommandUI.IsInsert Then
EDIT_STATE = EditState.None EDIT_STATE = EditState.None
'
End If End If
Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled() Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled()
@@ -5854,7 +5882,7 @@ Public Class frmConstructor_Main
' aber Muss-Felder sind noch nicht ausgefüllt worden ' aber Muss-Felder sind noch nicht ausgefüllt worden
Return False Return False
End If End If
Else Else ' Änderungen sollen nicht gespeichert werden
' Angelegten Record löschen ' Angelegten Record löschen
If CtrlCommandUI.IsInsert Then If CtrlCommandUI.IsInsert Then
ClassHelper.DeleteRecord(SELECTED_RECORD_ID) ClassHelper.DeleteRecord(SELECTED_RECORD_ID)
@@ -6192,4 +6220,25 @@ Public Class frmConstructor_Main
MsgBox(msg, MsgBoxStyle.Exclamation) MsgBox(msg, MsgBoxStyle.Exclamation)
End If End If
End Sub End Sub
Public Sub ActivateAllTabs()
' Alle Tabs aktivieren
For Each tab As DevExpress.XtraTab.XtraTabPage In TCDetails.TabPages
If (tab.Name <> "TabDetails") Then
tab.PageEnabled = True
End If
Next
End Sub
Public Sub DeactivateTabs()
' Alle Tab Pages außer Detailansicht deaktivieren
' Zur Detailansicht springen
For Each tab As DevExpress.XtraTab.XtraTabPage In TCDetails.TabPages
If (tab.Name <> "TabDetails") Then
tab.PageEnabled = False
Else
TCDetails.SelectedTabPage = tab
End If
Next
End Sub
End Class End Class