This commit is contained in:
SchreiberM
2017-02-17 14:38:36 +01:00
parent a7ab84cc3f
commit 4fbf33d5ab
6 changed files with 216 additions and 145 deletions

View File

@@ -1705,12 +1705,16 @@ Public Class frmConstructor_Main
Me.Cursor = Cursors.WaitCursor
SAVE_ROUTINE_ACTIVE = True
Save_Grid_Layout()
Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled()
If RequiredControlsFilled = False Then
Return False
End If
If CtrlCommandUI.IsInsert Then
EDIT_STATE = EditState.Insert
Else
EDIT_STATE = EditState.Update
NEW_RECORD_ID = 0
If Not RECORD_CHANGED Then
If RECORD_CHANGED = False Then
Update_Status_Label(True, "NO CHANGES in Record.")
ActivateAllTabs()
DisableEditMode()
@@ -5171,14 +5175,17 @@ Public Class frmConstructor_Main
Try
'EDIT_STATE = EditState.None
'Update_Status_Label(False)
Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled()
If RECORD_CHANGED = False Then
If RECORD_CHANGED = False And RequiredControlsFilled = True Then
' Datensatz wurde nicht verändert
Return True
Else
If RequiredControlsFilled = False Then
Return False
End If
End If
Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled()
If RequiredControlsFilled = True Then
TrySave_DoSave()
@@ -5809,7 +5816,7 @@ Public Class frmConstructor_Main
Dim DT_DOCS As DataTable = ClassDatabase.Return_Datatable(sql, True)
For Each doc As DataRow In DT_DOCS.Rows
Dim DT_INDICES As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '" & doc.Item("OBJECTTYPE") & "'", True)
clsWD_SET.REMOVE_VEKTOR_LINK(doc.Item("DOC_PATH"), DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID)
clsWD_SET.REMOVE_VEKTOR_LINK(doc.Item("FULL_FILENAME"), DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID)
Next
sql = String.Format("select ORIGIN_CTRL_ID,LINKED_CTRL_ID from TBPMO_CONTROL_ENTITY_LINK where ORIGIN_CTRL_ID in (SELECT GUID FROM TBPMO_CONTROL where FORM_ID = {0}) " & _
@@ -6188,10 +6195,12 @@ Public Class frmConstructor_Main
' Rename file.
My.Computer.FileSystem.RenameFile(OldName, NewName)
Cursor = Cursors.WaitCursor
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}", _
OnlyFilename, NewName, USER_USERNAME, ClassWindreamDocGrid.SELECTED_DOC_ID)
ClassDatabase.Execute_non_Query(upd, True)
Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}", _
OnlyFilename, NewName, USER_USERNAME, ClassWindreamDocGrid.SELECTED_DOC_ID)
If DD_LIB_Standards.clsDatabase.Execute_non_Query(upd) Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
ClassDatabase.Execute_non_Query(upd, True)
End If
End If
Cursor = Cursors.Default
RUN_WDSEARCH_GRID()
@@ -6576,4 +6585,13 @@ Public Class frmConstructor_Main
Private Sub tsbtnPos_Refresh_Click(sender As Object, e As EventArgs) Handles tsbtnPos_Refresh.Click
Load_Pos_Data()
End Sub
Private Sub frmConstructor_Main_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp
If e.KeyCode = Keys.Tab Then
If pnlDetails.Focused Then
End If
End If
End Sub
End Class