This commit is contained in:
Digital Data - Marlon Schreiber
2017-12-13 10:28:24 +01:00
parent 290871b3dc
commit 673895755d
23 changed files with 744 additions and 1380 deletions

View File

@@ -1080,7 +1080,7 @@ Public Class frmConstructor_Main
tslblLocked.Visible = False
tslblFileslocked.Visible = False
TabFollowUp.PageEnabled = True
TabPos.PageEnabled = True
'pnlPositions.Enabled = True
TabWindream.PageEnabled = True
tsbtnDoc_Refresh.Enabled = True
tsmientitySearch.Enabled = True
@@ -1092,7 +1092,7 @@ Public Class frmConstructor_Main
tsButtonEdit.Enabled = False
tslblLocked.Visible = True
TabFollowUp.PageEnabled = False
TabPos.PageEnabled = False
'pnlPositions.Enabled = False
' tsButtonShowTaskOverview.Enabled = False
End If
If RIGHT_READ_ONLY_DOC = True Then
@@ -1703,7 +1703,7 @@ Public Class frmConstructor_Main
' IsInsert muss true sein, damit wir wissen ob wir bei
' Abbruch den Record Wieder löschen können
CtrlCommandUI.IsInsert = True
INSERT_IN_ACTION = True
' Alle Tabs außer Detailansicht deaktivierne
' DeactivateTabs()
@@ -1933,6 +1933,7 @@ Public Class frmConstructor_Main
End If
CtrlCommandUI.IsInsert = False
CtrlCommandUI.IsEdit = False
INSERT_IN_ACTION = False
'Jetzt den Record nochmal laden
' Show_Selected_Record_Data(SELECTED_RECORD_ID)
Update_Status_Label(True, "Record saved - " & Now, EditState.Update)
@@ -1978,6 +1979,7 @@ Public Class frmConstructor_Main
DisableEditMode()
CtrlCommandUI.IsInsert = False
INSERT_IN_ACTION = False
EDIT_STATE = EditState.None
RECORD_CHANGED = False
SAVE_ROUTINE_ACTIVE = False
@@ -2884,6 +2886,7 @@ Public Class frmConstructor_Main
End If
CtrlCommandUI.IsEdit = False
CtrlCommandUI.IsInsert = False
INSERT_IN_ACTION = False
RECORD_CHANGED = False
End If
End Sub
@@ -4114,6 +4117,7 @@ Public Class frmConstructor_Main
tslblPoslocked.Visible = False
BindingNavigatorAddNewItem.Enabled = True
BindingNavigatorDeleteItem.Enabled = True
tsbtnWork.Enabled = True
grvwGridPos.OptionsBehavior.ReadOnly = False
If USER_LANGUAGE = "de-DE" Then
stg = "Bearbeiten beenden"
@@ -4130,6 +4134,7 @@ Public Class frmConstructor_Main
tslblPoslocked.Visible = True
BindingNavigatorAddNewItem.Enabled = False
BindingNavigatorDeleteItem.Enabled = False
tsbtnWork.Enabled = False
grvwGridPos.OptionsBehavior.ReadOnly = True
End If
Me.tsbtnWork.Text = stg
@@ -5247,6 +5252,7 @@ Public Class frmConstructor_Main
tsButtonAdd.Enabled = True
End If
CtrlCommandUI.IsInsert = False
INSERT_IN_ACTION = False
RECORD_CHANGED = False
' Den derzeitigen Record Neuladen
@@ -5390,7 +5396,10 @@ Public Class frmConstructor_Main
Else ' Änderungen sollen nicht gespeichert werden
' Angelegten Record löschen
If CtrlCommandUI.IsInsert Then
ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "TrySave - UserdecidedNotToSave - ENTITY-ID: " & CURRENT_ENTITY_ID)
If ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "TrySave - UserdecidedNotToSave - ENTITY-ID: " & CURRENT_ENTITY_ID) = True Then
CtrlCommandUI.IsInsert = False
INSERT_IN_ACTION = False
End If
End If
' Änderungen sollen nicht gespeichert werden
@@ -5909,6 +5918,7 @@ Public Class frmConstructor_Main
Private Sub TreeViewMain_DragDrop(sender As Object, e As DragEventArgs) Handles TreeViewMain.DragDrop
Try
If Not IsNothing(e.Data) Then
Me.Cursor = Cursors.WaitCursor
Dim pt As Point
@@ -5948,6 +5958,22 @@ Public Class frmConstructor_Main
Save_Grid_Layout()
For Each _RECORD As String In e.Data.GetData(GetType(String()))
'hh
ClassRightManagement.Check_Set_Rights(_RECORD, ENTITY_ID)
If RIGHT_EDIT_R = False Then
msg = String.Format("USER {0} WANTED TO CHANGE ENTITY OF RECORD {1} to {2} but was rejected due to rights", USER_USERNAME, _RECORD, ENTITY_STRING)
ClassHelper.InsertEssential_Log(_RECORD, "RECORD-ID", msg)
Continue For
End If
Dim sql1 = String.Format("SELECT [dbo].[FNPMO_CUST_ALLOW_ENTITY_RELINK] ({0},{1})", _RECORD, USER_GUID)
If ClassDatabase.Execute_Scalar(sql1, True) = 0 Then
msg = String.Format("Verschieben von Datensatz {0} nicht möglich. Kriterien nicht erfüllt!", _RECORD.ToString)
If USER_LANGUAGE <> "de-DE" Then
msg = String.Format("Changing of entity-link for record {0}not possible - Criteria is invalid!", _RECORD.ToString)
End If
MsgBox(msg, MsgBoxStyle.Information)
Continue For
End If
ClassLogger.Add(String.Format("Relinking entity of record '{0}' to entity '{1}'?", _RECORD, ENTITY_STRING.ToString), False)
Dim upd = String.Format("UPDATE TBPMO_RECORD SET FORM_ID = {0} where GUID = {1}", node_tag, _RECORD)
@@ -5977,15 +6003,26 @@ Public Class frmConstructor_Main
ClassDatabase.Execute_non_Query(upd, True)
End If
Next
Dim execsql = String.Format("EXEC PRPMO_DELETE_RECORD_PMO_TABLE {0},{1}", ENTITY_ID, _RECORD)
If ClassDatabase.Execute_non_Query(execsql) = True Then
If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then
ClassDatabase.Execute_non_Query(execsql, True)
End If
End If
execsql = String.Format("EXEC PRPMO_ENTITY_TABLE_RENEW_RECORD {0},{1}", node_tag, _RECORD)
If ClassDatabase.Execute_non_Query(execsql) = True Then
ClassDatabase.Execute_non_Query(execsql, True)
End If
End If
Next
msg = String.Format("Der Datensatz wurde erfolgreich auf die Entität {0} verlinked!", ENTITY_STRING.ToString)
msg = String.Format("Datensatz/-sätze erfolgreich auf die Entität {0} verlinked (wenn Kriterien erfüllt)!", ENTITY_STRING.ToString)
If USER_LANGUAGE <> "de-DE" Then
msg = String.Format("The record was successfully relinked with entity {0}", ENTITY_STRING.ToString)
msg = String.Format("The record/s was/were successfully relinked with entity {0} (if criteria matched)", ENTITY_STRING.ToString)
End If
MsgBox(msg, MsgBoxStyle.Information)
If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then
msg = "Sie benutzen einen Proxyserver. Die Daten des neu verlinkten Datensatzes werden Sie erst nach vollständiger Proxysynchronisation einsehen können!"
msg = "Sie benutzen einen Proxyserver. Die Daten des neu verlinkten Datensatzes werden Sie evtl. erst nach vollständiger Proxysynchronisation einsehen können!"
If USER_LANGUAGE <> "de-DE" Then
msg = String.Format("You are using a proxy-Server. The new linked record in entity '{0}' will only be displayed after a full synchronisation!", ENTITY_STRING)
End If
@@ -6796,5 +6833,13 @@ Public Class frmConstructor_Main
End Sub
Private Sub tslblPoslocked_VisibleChanged(sender As Object, e As EventArgs) Handles tslblPoslocked.VisibleChanged
If tslblPoslocked.Visible = True Then
Dim msg = "Nur lesenden Zugriff"
If USER_LANGUAGE <> "de-DE" Then
msg = "Positions are read only"
End If
tslblPoslocked.Text = msg
End If
End Sub
End Class