MS-Changes
This commit is contained in:
@@ -471,7 +471,7 @@ Public Class ClassDOC_SEARCH
|
|||||||
Return False
|
Return False
|
||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
MsgBox("Could no initialize right-module - Check the log!", MsgBoxStyle.Exclamation)
|
MsgBox("Could not initialize right-module - Check the log!", MsgBoxStyle.Exclamation)
|
||||||
Return False
|
Return False
|
||||||
End If
|
End If
|
||||||
'DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", USER_USERNAME)
|
'DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", USER_USERNAME)
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ Public Class ClassRecordCommands
|
|||||||
|
|
||||||
Public Shared Function CreateRecord(EntityID)
|
Public Shared Function CreateRecord(EntityID)
|
||||||
Dim SQL = "INSERT INTO TBPMO_RECORD(ADDED_WHO, FORM_ID,RECORD_ENTITY_ID) VALUES ('" & USER_USERNAME & "', " & EntityID & ",4711)"
|
Dim SQL = "INSERT INTO TBPMO_RECORD(ADDED_WHO, FORM_ID,RECORD_ENTITY_ID) VALUES ('" & USER_USERNAME & "', " & EntityID & ",4711)"
|
||||||
Return ClassDatabase.Execute_non_Query(SQL) = True
|
Return ClassDatabase.Execute_non_Query(SQL)
|
||||||
End Function
|
End Function
|
||||||
Public Shared Function GetLastRecord()
|
Public Shared Function GetLastRecord()
|
||||||
Dim SQL = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = {0} AND UPPER(ADDED_WHO) = UPPER('{1}') AND DELETED = 0", CURRENT_ENTITY_ID, USER_USERNAME)
|
Dim SQL = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = {0} AND UPPER(ADDED_WHO) = UPPER('{1}') AND DELETED = 0", CURRENT_ENTITY_ID, USER_USERNAME)
|
||||||
@@ -49,4 +49,9 @@ Public Class ClassRecordCommands
|
|||||||
If LogErrorsOnly = False Then ClassLogger.Add(" >> ConnectRecord SQL: " & SQL, False)
|
If LogErrorsOnly = False Then ClassLogger.Add(" >> ConnectRecord SQL: " & SQL, False)
|
||||||
Return ClassDatabase.Execute_non_Query(SQL)
|
Return ClassDatabase.Execute_non_Query(SQL)
|
||||||
End Function
|
End Function
|
||||||
|
Public Shared Function CHECK_RECORD_FINAL(RecordId As Integer, IsInsert As Boolean)
|
||||||
|
Dim SQL = String.Format("EXEC PRPMO_RECORD_CHECK_INTEGRITY {0},{1},{2}", RecordId, Environment.UserName, IsInsert)
|
||||||
|
Return ClassDatabase.Execute_non_Query(SQL)
|
||||||
|
End Function
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -2454,7 +2454,7 @@
|
|||||||
<value>Ansicht zurücksetzen</value>
|
<value>Ansicht zurücksetzen</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>252, 370</value>
|
<value>252, 392</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>ContextMenuStripResultFiles.Name" xml:space="preserve">
|
<data name=">>ContextMenuStripResultFiles.Name" xml:space="preserve">
|
||||||
<value>ContextMenuStripResultFiles</value>
|
<value>ContextMenuStripResultFiles</value>
|
||||||
|
|||||||
@@ -2123,6 +2123,13 @@ Public Class frmConstructor_Main
|
|||||||
Sub DisableEditMode()
|
Sub DisableEditMode()
|
||||||
Dim REC = RECORD_ID
|
Dim REC = RECORD_ID
|
||||||
ClassRecordState.UnlockRecord(SELECTED_RECORD_ID)
|
ClassRecordState.UnlockRecord(SELECTED_RECORD_ID)
|
||||||
|
Dim isinsert As Boolean
|
||||||
|
If IsNothing(CtrlCommandUI) Then
|
||||||
|
isinsert = 0
|
||||||
|
Else
|
||||||
|
isinsert = CtrlCommandUI.IsInsert
|
||||||
|
End If
|
||||||
|
ClassRecordCommands.CHECK_RECORD_FINAL(SELECTED_RECORD_ID, isinsert)
|
||||||
tsbtnRedo.Visible = False
|
tsbtnRedo.Visible = False
|
||||||
Lock_RecordControls(True)
|
Lock_RecordControls(True)
|
||||||
RECORD_ENABLED = False
|
RECORD_ENABLED = False
|
||||||
@@ -5347,7 +5354,7 @@ Public Class frmConstructor_Main
|
|||||||
Else ' Änderungen sollen nicht gespeichert werden
|
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, "TrySave - UserdecidedNotToSave")
|
ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "TrySave - UserdecidedNotToSave - ENTITY-ID: " & CURRENT_ENTITY_ID)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
' Änderungen sollen nicht gespeichert werden
|
' Änderungen sollen nicht gespeichert werden
|
||||||
|
|||||||
@@ -89,11 +89,11 @@ Public Class frmWD_IndexFile
|
|||||||
Dim indexierung_erfolgreich As Boolean = True
|
Dim indexierung_erfolgreich As Boolean = True
|
||||||
'Erst die Objekttyp-Indices indexieren
|
'Erst die Objekttyp-Indices indexieren
|
||||||
'den Entity-Key auslesen
|
'den Entity-Key auslesen
|
||||||
Dim DT As DataTable
|
Dim DTTBPMO_WD_OBJECTTYPE As DataTable
|
||||||
sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & clsWindream.MY_WDOBJECTTYPE & "')"
|
sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & clsWindream.MY_WDOBJECTTYPE & "')"
|
||||||
DT = ClassDatabase.Return_Datatable(sql, True)
|
DTTBPMO_WD_OBJECTTYPE = ClassDatabase.Return_Datatable(sql, True)
|
||||||
If Not DT Is Nothing Then
|
If Not DTTBPMO_WD_OBJECTTYPE Is Nothing Then
|
||||||
If DT.Rows.Count = 1 Then
|
If DTTBPMO_WD_OBJECTTYPE.Rows.Count = 1 Then
|
||||||
Dim indexname
|
Dim indexname
|
||||||
''den Record_Key auslesen
|
''den Record_Key auslesen
|
||||||
'Dim indexname = DT.Rows(0).Item("IDXNAME_RECORDID").ToString
|
'Dim indexname = DT.Rows(0).Item("IDXNAME_RECORDID").ToString
|
||||||
@@ -119,7 +119,7 @@ Public Class frmWD_IndexFile
|
|||||||
' indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_REDUNDANT_FORM_ID, clsWindream.MY_WDOBJECTTYPE)
|
' indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_REDUNDANT_FORM_ID, clsWindream.MY_WDOBJECTTYPE)
|
||||||
'End If
|
'End If
|
||||||
'den Doctype auslesen
|
'den Doctype auslesen
|
||||||
indexname = DT.Rows(0).Item("IDXNAME_DOCTYPE").ToString
|
indexname = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_DOCTYPE").ToString
|
||||||
If LogErrorsOnly = False Then ClassLogger.Add(" >> Doctype: " & vDokart.ToString, False)
|
If LogErrorsOnly = False Then ClassLogger.Add(" >> Doctype: " & vDokart.ToString, False)
|
||||||
indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, vDokart, clsWindream.MY_WDOBJECTTYPE)
|
indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, vDokart, clsWindream.MY_WDOBJECTTYPE)
|
||||||
If indexierung_erfolgreich = False Then
|
If indexierung_erfolgreich = False Then
|
||||||
@@ -129,7 +129,7 @@ Public Class frmWD_IndexFile
|
|||||||
Return False
|
Return False
|
||||||
End If
|
End If
|
||||||
|
|
||||||
indexname = DT.Rows(0).Item("IDXNAME_RELATION").ToString
|
indexname = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_RELATION").ToString
|
||||||
indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, "ADDI-RELATION", clsWindream.MY_WDOBJECTTYPE)
|
indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, "ADDI-RELATION", clsWindream.MY_WDOBJECTTYPE)
|
||||||
If indexierung_erfolgreich = False Then
|
If indexierung_erfolgreich = False Then
|
||||||
err = True
|
err = True
|
||||||
@@ -224,7 +224,6 @@ Public Class frmWD_IndexFile
|
|||||||
End If
|
End If
|
||||||
'Nun alles aufrüumen und die neue DocID holen
|
'Nun alles aufrüumen und die neue DocID holen
|
||||||
|
|
||||||
|
|
||||||
If indexierung_erfolgreich = True Then
|
If indexierung_erfolgreich = True Then
|
||||||
ClassLogger.Add(">> File was correctly imported and indexed: " & CURRENT_FILEIN_WD, False)
|
ClassLogger.Add(">> File was correctly imported and indexed: " & CURRENT_FILEIN_WD, False)
|
||||||
Dim stg As String = "Datei erfolgreich nach windream übertragen"
|
Dim stg As String = "Datei erfolgreich nach windream übertragen"
|
||||||
@@ -249,6 +248,7 @@ Public Class frmWD_IndexFile
|
|||||||
sw.Done()
|
sw.Done()
|
||||||
|
|
||||||
If Not IsNothing(CURRENT_DOC_ID) Then
|
If Not IsNothing(CURRENT_DOC_ID) Then
|
||||||
|
ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC_ID", "File was imported and indexed!")
|
||||||
ClassLogger.Add(String.Format(">> File-Import was finished - DocID: {0} ", CURRENT_DOC_ID), False)
|
ClassLogger.Add(String.Format(">> File-Import was finished - DocID: {0} ", CURRENT_DOC_ID), False)
|
||||||
Dim delete = False
|
Dim delete = False
|
||||||
'Die Originaldatei löschen
|
'Die Originaldatei löschen
|
||||||
|
|||||||
Reference in New Issue
Block a user