diff --git a/app/DD-Record-Organizer/ClassControlCommandsUI.vb b/app/DD-Record-Organizer/ClassControlCommandsUI.vb index 3335021..b59aeb0 100644 --- a/app/DD-Record-Organizer/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organizer/ClassControlCommandsUI.vb @@ -715,10 +715,6 @@ Public Class ClassControlCommandsUI End If checked_result_string = String.Join(";", checked_result) Next - - - - End If ' Hier wird ein String zurückgegeben, der als VALUE gespeichert werden soll @@ -858,9 +854,6 @@ Public Class ClassControlCommandsUI Else Return ClassDatabase.Execute_non_Query(upd) End If - - - Catch ex As Exception ClassLogger.Add("Unerwarteter Fehler in UpdateControlValue: " & ex.Message, True) Return False diff --git a/app/DD-Record-Organizer/ClassControlLoader.vb b/app/DD-Record-Organizer/ClassControlLoader.vb index 983eee8..d9292c6 100644 --- a/app/DD-Record-Organizer/ClassControlLoader.vb +++ b/app/DD-Record-Organizer/ClassControlLoader.vb @@ -248,9 +248,14 @@ End If End If Else - control.Text = autoValue + If IsDBNull(autoValue) Then + control.Text = "ATTENTION: result of select was dbnull" + Else + control.Text = autoValue + End If + + End If End If - End If Catch ex As Exception MsgBox("Unexpected Error in LoadValueMain:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) ClassLogger.Add("Unexpected Error in LoadValueMain: " & ex.Message, True) diff --git a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb index 3ff8d40..3e86e10 100644 --- a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb @@ -1,5 +1,5 @@ Imports System.IO - +Imports DD_LIB_Standards Public Class ClassDOC_SEARCH Private Shared DT_RESULTLIST_OPTIONS As DataTable Private Shared DT_RESULTLIST_SEL_VALUES As DataTable @@ -498,4 +498,36 @@ Public Class ClassDOC_SEARCH Return False End Try End Function + ''' + ''' Returns a right-type for file. + ''' + ''' DOC_ID of windream-file + ''' Returns info about filerights + ''' + Public Shared Function Get_File_Rights(DOC_ID As Integer) + Try + Dim sql = String.Format("SELECT dwAccessRight FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwObjectID = {0} and dwUserOrGroupID = {1}", DOC_ID, USERID_FK_INT_ECM) + Dim result = clsDatabase.Execute_Scalar(sql, True) + If IsNothing(result) Or IsDBNull(result) Then + Return Nothing + End If + Select Case result + Case 1 + Return "R" + Case 3 + Return "RW" + Case 7 + Return "RWA" + Case 141 + Return "RWA" + Case Else + Return "R" + End Select + + Catch ex As Exception + clsLogger.Add("Unexpected Error in Get_File_Rights: " & ex.Message, True) + Return Nothing + End Try + End Function + End Class diff --git a/app/DD-Record-Organizer/ClassHelper.vb b/app/DD-Record-Organizer/ClassHelper.vb index 33fcb64..1321d56 100644 --- a/app/DD-Record-Organizer/ClassHelper.vb +++ b/app/DD-Record-Organizer/ClassHelper.vb @@ -4,6 +4,10 @@ Imports DD_LIB_Standards Public Class ClassHelper Public Shared Function Format_Currency(value As String, language As String) Try + If IsNothing(value) Then + Return "" + End If + If language <> "de-DE" Then value = value.Replace(",", ".") End If @@ -198,7 +202,7 @@ Public Class ClassHelper If System.IO.File.Exists(RESULT_DOC_PATH) = True Then Process.Start(RESULT_DOC_PATH) Else - If clsWD_GET.WDFile_exists(RESULT_DOC_PATH, True) = False Then + If clsWD_GET.WDFile_exists(RESULT_DOC_PATH, clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True) = False Then MSGBOX_Handler("ERROR", "", "File '" & RESULT_DOC_PATH & "' not existing!") Else MSGBOX_Handler("ERROR", "", "File '" & RESULT_DOC_PATH & "' is existing but You are not provided with reading rights! Please inform Your admin!") diff --git a/app/DD-Record-Organizer/ClassImport_Windream.vb b/app/DD-Record-Organizer/ClassImport_Windream.vb index a2c6ed7..fbc21b2 100644 --- a/app/DD-Record-Organizer/ClassImport_Windream.vb +++ b/app/DD-Record-Organizer/ClassImport_Windream.vb @@ -55,32 +55,32 @@ Public Class ClassImport_Windream If err = True Then Return False End If - 'den Entity-Key auslesen - sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & clsWindream.MY_WDOBJECTTYPE & "')" - dt = ClassDatabase.Return_Datatable(sql, True) - If Not dt Is Nothing Then - If dt.Rows.Count = 1 Then - Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString - Dim idxvalue = CURRENT_ENTITY_ID - If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & idxvalue.ToString, False) - indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE) - If indexierung_erfolgreich = False Then - err = True - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in indexing Entity-ID '" & indexname & "') - Check logfile!") - Return False - End If - indexname = dt.Rows(0).Item("IDXNAME_PARENTID").ToString - idxvalue = CURRENT_PARENT_ENTITY_ID - If LogErrorsOnly = False Then ClassLogger.Add(" >> Parent-ID: " & idxvalue.ToString, False) - indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE) - If indexierung_erfolgreich = False Then - err = True - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in indexing Parent-ID '" & indexname & "') - Check logfile!") - Return False - End If - - End If - End If + ''den Entity-Key auslesen + 'sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & clsWindream.MY_WDOBJECTTYPE & "')" + 'dt = ClassDatabase.Return_Datatable(sql, True) + 'If Not dt Is Nothing Then + ' If dt.Rows.Count = 1 Then + ' Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString + ' Dim idxvalue = CURRENT_ENTITY_ID + ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & idxvalue.ToString, False) + ' indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE) + ' If indexierung_erfolgreich = False Then + ' err = True + ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in indexing Entity-ID '" & indexname & "') - Check logfile!") + ' Return False + ' End If + ' indexname = dt.Rows(0).Item("IDXNAME_PARENTID").ToString + ' idxvalue = CURRENT_PARENT_ENTITY_ID + ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Parent-ID: " & idxvalue.ToString, False) + ' indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE) + ' If indexierung_erfolgreich = False Then + ' err = True + ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in indexing Parent-ID '" & indexname & "') - Check logfile!") + ' Return False + ' End If + + ' End If + 'End If If indexierung_erfolgreich = True Then Return True Else diff --git a/app/DD-Record-Organizer/ClassLogger.vb b/app/DD-Record-Organizer/ClassLogger.vb index 4407926..a742262 100644 --- a/app/DD-Record-Organizer/ClassLogger.vb +++ b/app/DD-Record-Organizer/ClassLogger.vb @@ -56,14 +56,14 @@ Public Class ClassLogger If ClassLogger.OpenFile Then Try If ACHTUNG Then - ClassLogger.StreamWriter.WriteLine("#ATTENTION# (" & System.DateTime.Now & "): " & information) + ClassLogger.StreamWriter.WriteLine(String.Format("{0}: #ATTENTION# : {1}", Now.ToString, information)) If clsDatabase.DB_DEFAULT_INITIALIZED = True And USER_GUID > 0 And Essential = True Then ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", information) Else ClassLogger.StreamWriter.WriteLine(String.Format("{0},{1},{2}", clsDatabase.DB_DEFAULT_INITIALIZED.ToString, USER_GUID.ToString, Essential.ToString)) End If Else - ClassLogger.StreamWriter.WriteLine(information) + ClassLogger.StreamWriter.WriteLine(String.Format("{0}: {1}", Now.ToString, information)) End If ClassLogger.CloseFile() Catch e As Exception diff --git a/app/DD-Record-Organizer/ClassWDRights.vb b/app/DD-Record-Organizer/ClassWDRights.vb index 0c3f7b7..9355dc8 100644 --- a/app/DD-Record-Organizer/ClassWDRights.vb +++ b/app/DD-Record-Organizer/ClassWDRights.vb @@ -1,4 +1,5 @@ Imports WINDREAMLib +Imports DD_LIB_Standards Public Class ClassWDRights #Region "+++++ Konstanten +++++" Const REL_Document_AccessRight = "AccessRight" @@ -41,7 +42,13 @@ Public Class ClassWDRights AD_DOMAIN = DT_KONFIG.Rows(0).Item("AD_DOMAIN") AD_USER = DT_KONFIG.Rows(0).Item("AD_USER") WD_RIGHT_ADMIN = DT_KONFIG.Rows(0).Item("WD_RIGHT") - AD_SERVER = DT_KONFIG.Rows(0).Item("AD_SERVER") + If clsDatabase.DB_PROXY_INITIALIZED = True And ClassProxy.MyLinkedServer <> String.Empty Then + ClassLogger.Add("User configured a proxy: " & ClassProxy.MyLinkedServer, False) + AD_SERVER = ClassProxy.MyLinkedServer + Else + AD_SERVER = DT_KONFIG.Rows(0).Item("AD_SERVER") + End If + Dim PWplainText As String Dim wrapper As New ClassEncryption("!35452didalog=") ' DecryptData throws if the wrong password is used. diff --git a/app/DD-Record-Organizer/DD_DMSDataSet.xsc b/app/DD-Record-Organizer/DD_DMSDataSet.xsc index 5065a8c..1c039c3 100644 --- a/app/DD-Record-Organizer/DD_DMSDataSet.xsc +++ b/app/DD-Record-Organizer/DD_DMSDataSet.xsc @@ -165,11 +165,6 @@ - - - - - @@ -180,11 +175,6 @@ - - - - - diff --git a/app/DD-Record-Organizer/DD_DMSDataSet.xsd b/app/DD-Record-Organizer/DD_DMSDataSet.xsd index 44afe40..a91ac2f 100644 --- a/app/DD-Record-Organizer/DD_DMSDataSet.xsd +++ b/app/DD-Record-Organizer/DD_DMSDataSet.xsd @@ -1600,23 +1600,20 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBPMO_WD_OBJECTTYPE - (OBJECT_TYPE, IDXNAME_ENTITYID, IDXNAME_PARENTID, ADDED_WHO, IDXNAME_DOCTYPE, IDXNAME_RECORDID, IDXNAME_RELATION) -VALUES (@OBJECT_TYPE,@IDXNAME_ENTITYID,@IDXNAME_PARENTID,@ADDED_WHO,@IDXNAME_DOCTYPE,@IDXNAME_RECORDID,@IDXNAME_RELATION); + (OBJECT_TYPE, ADDED_WHO, IDXNAME_DOCTYPE, IDXNAME_RELATION) +VALUES (@OBJECT_TYPE,@ADDED_WHO,@IDXNAME_DOCTYPE,@IDXNAME_RELATION); SELECT GUID, OBJECT_TYPE, IDXNAME_ENTITYID, IDXNAME_PARENTID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_WD_OBJECTTYPE WHERE (GUID = SCOPE_IDENTITY()) - - - - SELECT GUID, OBJECT_TYPE, IDXNAME_ENTITYID, IDXNAME_PARENTID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, IDXNAME_RECORDID, IDXNAME_DOCTYPE, IDXNAME_RELATION + SELECT GUID, OBJECT_TYPE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, IDXNAME_RELATION, IDXNAME_DOCTYPE FROM TBPMO_WD_OBJECTTYPE @@ -1624,16 +1621,12 @@ FROM TBPMO_WD_OBJECTTYPE UPDATE TBPMO_WD_OBJECTTYPE -SET OBJECT_TYPE = @OBJECT_TYPE, IDXNAME_ENTITYID = @IDXNAME_ENTITYID, IDXNAME_PARENTID = @IDXNAME_PARENTID, CHANGED_WHO = @CHANGED_WHO, - IDXNAME_RECORDID = @IDXNAME_RECORDID, IDXNAME_DOCTYPE = @IDXNAME_DOCTYPE, IDXNAME_RELATION = @IDXNAME_RELATION -WHERE (GUID = @Original_GUID); +SET OBJECT_TYPE = @OBJECT_TYPE, CHANGED_WHO = @CHANGED_WHO, IDXNAME_DOCTYPE = @IDXNAME_DOCTYPE, IDXNAME_RELATION = @IDXNAME_RELATION +WHERE (GUID = @Original_GUID); SELECT GUID, OBJECT_TYPE, IDXNAME_ENTITYID, IDXNAME_PARENTID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_WD_OBJECTTYPE WHERE (GUID = @GUID) - - - @@ -1646,13 +1639,10 @@ SELECT GUID, OBJECT_TYPE, IDXNAME_ENTITYID, IDXNAME_PARENTID, ADDED_WHO, ADDED_W - - - @@ -3603,7 +3593,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3644,7 +3634,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3722,7 +3712,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3817,7 +3807,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3840,7 +3830,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3885,7 +3875,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3923,7 +3913,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3958,7 +3948,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4002,7 +3992,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4023,7 +4013,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4060,7 +4050,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4105,7 +4095,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4172,7 +4162,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4209,7 +4199,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4265,7 +4255,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4304,7 +4294,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4428,7 +4418,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4526,7 +4516,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4556,7 +4546,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4593,7 +4583,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4630,7 +4620,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4662,7 +4652,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4682,7 +4672,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4728,7 +4718,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4739,13 +4729,6 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - - - - - - - @@ -4762,20 +4745,6 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - - - - - - - - - - - - - - @@ -4783,7 +4752,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4793,7 +4762,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4950,7 +4919,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4975,7 +4944,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5010,7 +4979,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5039,7 +5008,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5099,7 +5068,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5172,7 +5141,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5279,7 +5248,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5373,7 +5342,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5412,7 +5381,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5430,7 +5399,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5476,7 +5445,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5490,7 +5459,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5542,7 +5511,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5586,7 +5555,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5618,7 +5587,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5700,7 +5669,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5752,7 +5721,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5843,7 +5812,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5874,7 +5843,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5912,7 +5881,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5954,7 +5923,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5968,7 +5937,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5997,7 +5966,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -6035,7 +6004,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -6053,7 +6022,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -6091,7 +6060,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -6342,27 +6311,27 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/DD-Record-Organizer/DD_DMSDataSet.xss b/app/DD-Record-Organizer/DD_DMSDataSet.xss index b11d7c9..5f94c9f 100644 --- a/app/DD-Record-Organizer/DD_DMSDataSet.xss +++ b/app/DD-Record-Organizer/DD_DMSDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -29,7 +29,7 @@ - + diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 53e7d18..9087383 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -20,7 +20,7 @@ Imports System.Runtime.InteropServices 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird - + ' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: ' @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb b/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb index 03aa372..38cb29b 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb +++ b/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmConfig_Basic Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmConfig_Basic 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic)) Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() diff --git a/app/DD-Record-Organizer/frmConfig_Basic.resx b/app/DD-Record-Organizer/frmConfig_Basic.resx index 44efcf1..2a98646 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.resx +++ b/app/DD-Record-Organizer/frmConfig_Basic.resx @@ -130,13 +130,13 @@ 6, 168 - 125, 13 + 117, 13 52 - Linked DD_ECM Server: + Name/IP Proxy-Server: False @@ -485,7 +485,7 @@ Top, Left, Right - 6, 143 + 9, 143 547, 22 diff --git a/app/DD-Record-Organizer/frmConfig_Basic.vb b/app/DD-Record-Organizer/frmConfig_Basic.vb index b1ccac8..d88194c 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.vb +++ b/app/DD-Record-Organizer/frmConfig_Basic.vb @@ -404,7 +404,7 @@ Public Class frmConfig_Basic End Sub Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click - If email.Send_Log_Mail(" Log-/SupportMail Record-Organizer.

", _ + If email.Send_Log_Mail(" Log-/SupportMail Record-Organizer.

", "Support-Mail Record-Organizer", "support@didalog.de", "mail.triplew.de", "support@didalog.de", "ddemail40", "support@didalog.de") = True Then MsgBox("Log Mail was sent to Digital Data!", MsgBoxStyle.Information, "Success!") End If @@ -427,6 +427,7 @@ Public Class frmConfig_Basic Display_Proxy_String() Me.lblLinkedServer.Visible = True Me.txtLinkedServer.Visible = True + txtLinkedServer.Text = ClassProxy.MyLinkedServer Else Me.lblLinkedServer.Visible = False Me.txtLinkedServer.Visible = False @@ -509,4 +510,8 @@ Public Class frmConfig_Basic End If End If End Sub + + Private Sub btnTest_Anmeldung_Click(sender As Object, e As EventArgs) + + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index c4e2589..1d9ab29 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -132,7 +132,7 @@ 0, 0 - 1222, 56 + 468, 56 194, 22 @@ -543,7 +543,7 @@ 0 - 395, 95 + 969, 56 Segoe UI Semibold, 9pt, style=Bold, Italic @@ -800,7 +800,7 @@ 0 - 539, 95 + 1113, 56 46, 19 @@ -1134,7 +1134,7 @@ 0 - 225, 95 + 799, 56 False @@ -1388,7 +1388,7 @@ 1 - 17, 134 + 706, 95 148, 22 @@ -1992,7 +1992,7 @@ Black - 762, 95 + 17, 95 1140, 17 @@ -2094,7 +2094,7 @@ 0 - 657, 95 + 1231, 56 Segoe UI Semibold, 9pt, style=Bold, Italic @@ -2235,7 +2235,7 @@ 6 - 17, 95 + 591, 56 251, 22 @@ -2600,7 +2600,7 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1313, 95 + 568, 95 172, 22 @@ -2621,16 +2621,16 @@ 17, 56 - 567, 56 + 295, 56 1283, 17 - 1040, 95 + 295, 95 - 174, 134 + 863, 95 True diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 7fccbdf..724a922 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -88,6 +88,7 @@ Public Class frmConstructor_Main Private TreeView_perControl As Boolean = False Dim IsTopFirstRow As Boolean = True + Dim IsFilterMode As Boolean = False Private GRIDRightMouse_Clicked = False Private GRIDdownHitInfo As GridHitInfo @@ -229,7 +230,6 @@ Public Class frmConstructor_Main If DOC_SEARCH_TAB1 = True Then Save_DocGrid_Layout() End If - Save_Splitter_Layout() ClassWindowLocation.SaveFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "CONSTRUCTOR_MAIN") ' Verhindert, das noch geöffnete Records für immer gelockt sind @@ -491,8 +491,13 @@ Public Class frmConstructor_Main If settings.Count = 0 Then settings.Add(New ClassSetting("SplitViewTopSplitterPosition", SplitContainerTop.SplitterPosition)) - settings.Add(New ClassSetting("SplitViewMainSplitterPosition", SplitContainerMain.SplitterPosition)) - settings.Add(New ClassSetting("SplitViewDetailsSplitterPosition", SplitContainerDetails.SplitterPosition)) + If CONSTRUCTOR_DETAIL_ID > 0 Then + settings.Add(New ClassSetting("SplitViewMainSplitterPosition_" & CONSTRUCTOR_DETAIL_ID.ToString, SplitContainerMain.SplitterPosition)) + Else + settings.Add(New ClassSetting("SplitViewMainSplitterPosition_0", SplitContainerMain.SplitterPosition)) + End If + + settings.Add(New ClassSetting("SplitViewDetailsSplitterPosition_" & CONSTRUCTOR_DETAIL_ID.ToString, SplitContainerDetails.SplitterPosition)) layout.Save(settings) End If @@ -500,13 +505,13 @@ Public Class frmConstructor_Main Select Case setting._name Case "SplitViewTopSplitterPosition" SplitContainerTop.SplitterPosition = Integer.Parse(setting._value) - Case "SplitViewMainSplitterPosition" + Case "SplitViewMainSplitterPosition_" & CONSTRUCTOR_DETAIL_ID.ToString If NODE_NAVIGATION = False Then SplitContainerMain.SplitterPosition = Integer.Parse(setting._value) Else SplitContainerFORM.SplitterPosition = Integer.Parse(setting._value) End If - Case "SplitViewDetailsSplitterPosition" + Case "SplitViewDetailsSplitterPosition_" & CONSTRUCTOR_DETAIL_ID.ToString If DOC_SEARCH_TAB1 = True Then SplitContainerDetails.SplitterPosition = Integer.Parse(setting._value) End If @@ -523,15 +528,18 @@ Public Class frmConstructor_Main Dim settings As New System.Collections.Generic.List(Of ClassSetting) If NODE_NAVIGATION = False Then settings.Add(New ClassSetting("SplitViewTopSplitterPosition", SplitContainerTop.SplitterPosition)) - settings.Add(New ClassSetting("SplitViewMainSplitterPosition", SplitContainerMain.SplitterPosition)) - + If CONSTRUCTOR_DETAIL_ID > 0 Then + settings.Add(New ClassSetting("SplitViewMainSplitterPosition_" & CONSTRUCTOR_DETAIL_ID.ToString, SplitContainerMain.SplitterPosition)) + Else + settings.Add(New ClassSetting("SplitViewMainSplitterPosition_0", SplitContainerMain.SplitterPosition)) + End If Else settings.Add(New ClassSetting("SplitViewTopSplitterPosition", SplitContainerTop.SplitterPosition)) - settings.Add(New ClassSetting("SplitViewMainSplitterPosition", SplitContainerFORM.SplitterPosition)) + settings.Add(New ClassSetting("SplitViewMainSplitterPosition_" & CONSTRUCTOR_DETAIL_ID.ToString, SplitContainerFORM.SplitterPosition)) End If If DOC_SEARCH_TAB1 = True Then - settings.Add(New ClassSetting("SplitViewDetailsSplitterPosition", SplitContainerDetails.SplitterPosition)) + settings.Add(New ClassSetting("SplitViewDetailsSplitterPosition_" & CONSTRUCTOR_DETAIL_ID.ToString, SplitContainerDetails.SplitterPosition)) End If layout.Save(settings) Catch ex As Exception @@ -544,7 +552,7 @@ Public Class frmConstructor_Main End Function Private Function Get_Splitter_Layout_Filename() - Dim Filename As String = String.Format("{0}-SplitterLayout.xml", CONSTRUCTORID) + Dim Filename As String = String.Format("{0}-{1}-SplitterLayout.xml", CONSTRUCTORID, CONSTRUCTOR_DETAIL_ID.ToString) Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) End Function @@ -737,7 +745,7 @@ Public Class frmConstructor_Main GridControlMain.MainView = grvwTiles End Sub Public Function Get_Pos_SQL(FormId As Integer) - POS_SQL = "SELECT T.* FROM VWPMO_ENTITY_TABLE" & FormId.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @PARENT_ID" + POS_SQL = "Select T.* FROM VWPMO_ENTITY_TABLE" & FormId.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID And T1.RECORD1_ID = @PARENT_ID" End Function Public Sub Clear_Grid_View() GridControlMain.DataSource = Nothing @@ -782,7 +790,7 @@ Public Class frmConstructor_Main ' End If ' End If ' Catch ex As Exception - ' ClassLogger.Add("Error in Search_RowHandle: " & ex.Message, False) + ' ClassLogger.Add("Error In Search_RowHandle: " & ex.Message, False) ' End Try 'End Function Public Function Get_Grid_Column_Count() As Integer @@ -882,8 +890,9 @@ Public Class frmConstructor_Main 'End If End If - CURRENT_RECORD_ID = RECORD_ID + CURRENT_RECORD_ID = RECID CURRENT_SEARCH_TYPE = "RECORD" + If RECID = RECORD_ID And ENTITY_RECORD_COUNT > 1 And _refresh = False Then Exit Sub End If @@ -923,28 +932,32 @@ Public Class frmConstructor_Main ' muss vor show selected record data kommen, ' sodass die datasource für die angehakten werte existiert (checked list box) CtrlBuilder.WatchRecordChanges = False - ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, RECID, PARENT_RECORDID, CtrlBuilder.AllControls, ENTITY_ID) + + ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, CURRENT_RECORD_ID, PARENT_RECORDID, CtrlBuilder.AllControls, ENTITY_ID) CtrlBuilder.WatchRecordChanges = True - Show_Selected_Record_Data(RECID, False) + If CURRENT_RECORD_ID > 0 Then + Show_Selected_Record_Data(CURRENT_RECORD_ID, False) + End If + Dim sw1 As New Stopwatch - sw1.Start() - ClassRightManagement.Check_Set_Rights(RECORD_ID, ENTITY_ID) + sw1.Start() + ClassRightManagement.Check_Set_Rights(CURRENT_RECORD_ID, ENTITY_ID) CONTROL_HANDLING() - elapsed = sw1.Elapsed.TotalSeconds - sw1.Stop() + elapsed = sw1.Elapsed.TotalSeconds + sw1.Stop() - If LogErrorsOnly = False Then ClassLogger.Add(" >> Check Rights took " & Format(elapsed, "0.000000000") & " seconds", False) - If TCDetails.SelectedTabPage Is Nothing Then - Exit Sub - End If - If TabPos.PageVisible = True And TCDetails.SelectedTabPage.Name = "TabPos" Then - Clear_GridPos_View() - Dim POS_GRID_RECORD = Get_Focused_Row_Cell_Value_pos("Record-ID") - Load_Pos_Data() - Load_POSGrid_Layout() - End If + If LogErrorsOnly = False Then ClassLogger.Add(" >> Check Rights took " & Format(elapsed, "0.000000000") & " seconds", False) + If TCDetails.SelectedTabPage Is Nothing Then + Exit Sub + End If + If TabPos.PageVisible = True And TCDetails.SelectedTabPage.Name = "TabPos" Then + Clear_GridPos_View() + Dim POS_GRID_RECORD = Get_Focused_Row_Cell_Value_pos("Record-ID") + Load_Pos_Data() + Load_POSGrid_Layout() + End If - If RECORD_ID > 0 Then + If CURRENT_RECORD_ID > 0 Then If RIGHT_RECORD_AND_FILE_READ_ONLY = False And CtrlCommandUI.IsInsert = False Then If DT_CONTROLS_ENTITY.Rows.Count = COUNT_RO_CONTROLS Then tsButtonEdit.Enabled = False @@ -963,14 +976,15 @@ Public Class frmConstructor_Main 'Liste der geänderten Control Values leeren CtrlBuilder.ControlsChanged.Clear() - elapsed = sw.Elapsed.TotalSeconds - sw.Stop() - Console.WriteLine("Column_Row_Handler took {0}ms to load", sw.ElapsedMilliseconds) - sw.Reset() - If LogErrorsOnly = False Then ClassLogger.Add(" >>>> Column/Row Change took " & Format(elapsed, "0.000000000") & " seconds", False) - If NODE_NAVIGATION = True And _navload = False Then - SearchNode(TreeViewMain.Nodes, RECORD_ID) - End If + elapsed = sw.Elapsed.TotalSeconds + sw.Stop() + Console.WriteLine("Column_Row_Handler took {0}ms to load", sw.ElapsedMilliseconds) + sw.Reset() + If LogErrorsOnly = False Then ClassLogger.Add(" >>>> Column/Row Change took " & Format(elapsed, "0.000000000") & " seconds", False) + If NODE_NAVIGATION = True And _navload = False Then + SearchNode(TreeViewMain.Nodes, RECORD_ID) + End If + Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error:", ex.Message & vbNewLine & ex.StackTrace) End Try @@ -1148,6 +1162,7 @@ Public Class frmConstructor_Main If DOC_SEARCH_TAB1 = True Then Save_DocGrid_Layout() End If + Else If Not IsNothing(TreeViewMain.SelectedNode) Then TreeViewMain.SelectedNode.NodeFont = New Font(TreeViewMain.Font.FontFamily, TreeViewMain.Font.Size, FontStyle.Regular) @@ -1265,7 +1280,6 @@ Public Class frmConstructor_Main Sub Create_variable_node() End Sub - Sub Load_Datafor_Entity() 'If ClassProxy.IS_PROXY_BUSY = True Then ' MsgBox("Proxy-Server is actually synchronizing! Please wait until synchronisation is finished!" & vbNewLine & "This might take up to 3 minutes!", MsgBoxStyle.Information) @@ -2386,7 +2400,7 @@ Public Class frmConstructor_Main progressLoadEntity.Visible = True labelLoadEntity.Visible = True - Load_Splitter_Layout() + If LOCK_CONTROLS_BG_LOAD = True Then SplitContainerMain.Panel2.Enabled = False End If @@ -2516,7 +2530,7 @@ Public Class frmConstructor_Main End If End If - + Load_Splitter_Layout() sw.Done() If ENTITY_RELOAD_AFT_CONTROL_LOAD = True Then @@ -4714,13 +4728,15 @@ Public Class frmConstructor_Main Private Sub grvwGrid_RowStyle(sender As Object, e As DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs) Handles grvwGrid.RowStyle If e.RowHandle = -1 Then + IsFilterMode = True Exit Sub End If If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then + IsFilterMode = True e.Appearance.BackColor = Color.Orange Else If GRID_TYPE = GridType.Grid Then - + IsFilterMode = False Try Dim rowCellValue = grvwGrid.GetRowCellValue(e.RowHandle, "ROW_COLOR") If rowCellValue <> "" Then @@ -4968,26 +4984,28 @@ Public Class frmConstructor_Main If result = MsgBoxResult.Yes Then Try For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows - Dim DT_INDICES As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '" & row.Item("OBJECTTYPE") & "'", True) - If Not IsNothing(DT_INDICES) Then - If DT_INDICES.Rows.Count = 1 Then - 'Record-Links entfernen - If clsWD_SET.REMOVE_VEKTOR_LINK(row.Item("DOC_PATH"), DT_INDICES.Rows(0).Item("IDXNAME_RECORDID"), RECORD_ID) = True Then - 'ENTITY-Links entfernen - If clsWD_SET.REMOVE_VEKTOR_LINK(row.Item("DOC_PATH"), DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID) = True Then - If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID"), RECORD_ID, 0) = True Then - ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH") - Cursor = Cursors.WaitCursor - RUN_WDSEARCH_GRID() - End If - Else - MsgBox("Could not remove Vektor-Link ENTITY! Check logfile.", MsgBoxStyle.Exclamation) - End If - Else - MsgBox("Could not remove Vektor-Link RECORD! Check logfile.", MsgBoxStyle.Exclamation) - End If - End If + If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID"), RECORD_ID, 0) = True Then + ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH") + Cursor = Cursors.WaitCursor + RUN_WDSEARCH_GRID() End If + + 'Dim DT_INDICES As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '" & row.Item("OBJECTTYPE") & "'", True) + 'If Not IsNothing(DT_INDICES) Then + ' If DT_INDICES.Rows.Count = 1 Then + ' 'Record-Links entfernen + ' If clsWD_SET.REMOVE_VEKTOR_LINK(row.Item("DOC_PATH"), DT_INDICES.Rows(0).Item("IDXNAME_RECORDID"), RECORD_ID) = True Then + ' 'ENTITY-Links entfernen + ' If clsWD_SET.REMOVE_VEKTOR_LINK(row.Item("DOC_PATH"), DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID) = True Then + + ' Else + ' MsgBox("Could not remove Vektor-Link ENTITY! Check logfile.", MsgBoxStyle.Exclamation) + ' End If + ' Else + ' MsgBox("Could not remove Vektor-Link RECORD! Check logfile.", MsgBoxStyle.Exclamation) + ' End If + ' End If + 'End If Next Catch ex As Exception @@ -5423,7 +5441,7 @@ Public Class frmConstructor_Main End If End If File_in_Work() - Dim Result = clsWD_GET.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_PATH, USER_USERNAME) + Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID) If Not IsNothing(Result) Then ROW_READ_ONLY = False Select Case Result.ToString @@ -5482,11 +5500,7 @@ Public Class frmConstructor_Main IW_USER = "" IW_COMMENT = "" End Try - - - Dim displ As String - If CBool(ClassWindreamDocGrid.SELECTED_INWORK) = True Then If IW_USER.ToUpper = USER_USERNAME.ToUpper Or USER_IS_ADMIN Then displ = "Datei wieder freigeben" @@ -5764,10 +5778,10 @@ Public Class frmConstructor_Main ClassHelper.InsertEssential_Log(_RECORD, "RECORD-ID", msg) sql = "SELECT T.* FROM VWPMO_DOC_SEARCH T, TBPMO_DOC_RECORD_LINK T1 WHERE T.DocID = T1.DOC_ID AND T1.RECORD_ID = " & _RECORD 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("FULL_FILENAME"), DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID) - Next + '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("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}) " & "AND LINKED_CTRL_ID IN (SELECT GUID FROM TBPMO_CONTROL where FORM_ID = {1})", ENTITY_ID, node_tag) @@ -5830,7 +5844,7 @@ Public Class frmConstructor_Main End Try End Sub Private Sub DateirechteFürUserToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_GetRights.Click - Dim result = clsWD_GET.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_PATH, USER_USERNAME) + Dim result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID) If Not IsNothing(result) Then Dim msg = "Das aktuelle Recht für Sie (" & USER_USERNAME & ") ist: " If USER_LANGUAGE <> "de-DE" Then @@ -6338,7 +6352,7 @@ Public Class frmConstructor_Main Me.Cursor = Cursors.WaitCursor Dim allow_Open As Boolean = False ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) - Dim Result = clsWD_GET.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_PATH, USER_USERNAME) + Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID) 'clsWD_GET.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_PATH, USER_USERNAME) If Not IsNothing(Result) Then Select Case Result.ToString Case "R" @@ -6359,7 +6373,7 @@ Public Class frmConstructor_Main ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID")) Next Else - If clsWD_GET.WDFile_exists(ClassWindreamDocGrid.SELECTED_DOC_PATH, True) = True Then + If clsWD_GET.WDFile_exists(ClassWindreamDocGrid.SELECTED_DOC_PATH, DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True) = True Then ClassHelper.MSGBOX_Handler("ERROR", "Right-Management", "File is existing, but you do not have the rights to open this file! " & vbNewLine & "Please contact your admin!" & vbNewLine & "DOC-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString) Else ClassHelper.MSGBOX_Handler("ERROR", "", "File does not exist! Please contact your admin!") @@ -6461,7 +6475,7 @@ Public Class frmConstructor_Main e.Cancel = True End If Me.Cursor = Cursors.WaitCursor - Dim Result = clsWD_GET.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_PATH, USER_USERNAME) + Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID) 'clsWD_GET.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_PATH, USER_USERNAME) If Not IsNothing(Result) Then Select Case Result.ToString Case "R" @@ -6553,6 +6567,19 @@ Public Class frmConstructor_Main Save_Record() End If End Sub + Private Sub grvwGrid_LostFocus(sender As Object, e As EventArgs) Handles grvwGrid.LostFocus + Save_Grid_Layout() + End Sub + Private Sub SplitContainerMain_SplitterMoved(sender As Object, e As EventArgs) Handles SplitContainerMain.SplitterMoved + Save_Splitter_Layout() + End Sub + Private Sub SplitContainerTop_SplitterMoved(sender As Object, e As EventArgs) Handles SplitContainerTop.SplitterMoved + Save_Splitter_Layout() + End Sub + + Private Sub SplitContainerDetails_SplitterMoved(sender As Object, e As EventArgs) Handles SplitContainerDetails.SplitterMoved + Save_Splitter_Layout() + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmLicense.vb b/app/DD-Record-Organizer/frmLicense.vb index 63b83c5..f169e2c 100644 --- a/app/DD-Record-Organizer/frmLicense.vb +++ b/app/DD-Record-Organizer/frmLicense.vb @@ -14,7 +14,7 @@ Public Class frmLicense Me.lblPW.Visible = False Me.txtPW.Visible = False Me.btnPW_check.Visible = False - If DT_CLIENT_USER.Rows.Count > 1 Then + If DT_CLIENT_USER.Rows.Count >= 1 Then lblClient.Visible = True cmbClients.Visible = True Try @@ -24,10 +24,13 @@ Public Class frmLicense Catch ex As Exception MsgBox("Unexpected Error in Loading Clients: " & ex.Message, MsgBoxStyle.Critical) End Try - ElseIf DT_CLIENT_USER.Rows.Count = 1 Then + Else lblClient.Visible = False cmbClients.Visible = False - CLIENT_ID = DT_CLIENT_USER.Rows(0).Item("CLIENT_ID") + End If + + If DT_CLIENT_USER.Rows.Count = 1 Then + CLIENT_ID = 0 End If @@ -128,7 +131,12 @@ Public Class frmLicense CLIENT_ID = cmbClients.SelectedValue Refresh_Licence(False) Catch ex As Exception - CLIENT_ID = 99 + If DT_CLIENT_USER.Rows.Count = 1 Then + CLIENT_ID = 0 + Else + CLIENT_ID = 99 + End If + End Try End If diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index e303fa0..a3b3500 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -394,12 +394,8 @@ Public Class frmMain Private Sub ToolbarButtonItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Cursor = Cursors.WaitCursor - If ClassProxy.IS_PROXY_BUSY = False Then - Dim formId As Integer = Integer.Parse(e.Item.Tag) - OpenFormConstructor(formId) - Else - MsgBox("Proxy-Server is actually synchronizing! Please wait until synchronisation is finished!" & vbNewLine & "This might take up to 3 minutes!", MsgBoxStyle.Information) - End If + Dim formId As Integer = Integer.Parse(e.Item.Tag) + OpenFormConstructor(formId) Cursor = Cursors.Default End Sub @@ -652,10 +648,6 @@ Public Class frmMain End Sub Sub Load_ConfigBasic() frmConfig_Basic.ShowDialog() - If LANGUAGE_CHANGED = True Then - MsgBox("Application will restart now!", MsgBoxStyle.Information) - Application.Restart() - End If If CONNECTION_CHANGED = True Then ' Den User neu laden, damit MenuItems korrekt geladen werden können If ClassInit.InitDatabase = True Then diff --git a/app/DD-Record-Organizer/frmMass_Change.vb b/app/DD-Record-Organizer/frmMass_Change.vb index 25db5e1..6cc609c 100644 --- a/app/DD-Record-Organizer/frmMass_Change.vb +++ b/app/DD-Record-Organizer/frmMass_Change.vb @@ -18,6 +18,8 @@ Public Class frmMass_Change cmbColumn.Items.Add(Str) End If Next + txtNewValue.Text = "" + Me.cmbColumn.SelectedIndex = -1 Catch ex As Exception MsgBox("Unexpected Error in load form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -26,10 +28,9 @@ Public Class frmMass_Change Private Sub btncancel_Click(sender As Object, e As EventArgs) Handles btncancel.Click Me.Close() End Sub - Private Sub btnRefresh_Click(sender As Object, e As EventArgs) Handles btnRefresh.Click Try - If txtNewValue.Text <> "" And Me.cmbColumn.SelectedIndex <> -1 And cmbColumn.Text <> "" Then + If txtNewValue.Text <> "" And Me.cmbColumn.SelectedIndex <> -1 Then Dim msg = "Sind Sie sicher, dass Sie diese Massenänderung durchführen wollen?" & vbNewLine & MASS_RECORD_IDs2CHANGE.Count.ToString & " Datensätze werden geändert!" If USER_LANGUAGE <> "de-DE" Then msg = "Are You sure You want to execute this mass change?" & vbNewLine & MASS_RECORD_IDs2CHANGE.Count.ToString & " records will be changed!" @@ -38,6 +39,7 @@ Public Class frmMass_Change Dim result As MsgBoxResult result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then + ClassLogger.Add(String.Format("### Starting MassChange of column '{0}' with value '{1}'....###", cmbColumn.Text, txtNewValue.Text)) Me.Cursor = Cursors.WaitCursor SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL WHERE COL_NAME = '{0}' AND FORM_ID = {1}", cmbColumn.Text, CURRENT_ENTITY_ID) ProgressBar1.Visible = True @@ -48,6 +50,8 @@ Public Class frmMass_Change '.. und starten BackgroundWorker.RunWorkerAsync() End If + Else + MessageBox.Show("Please choose an entry from dropdown and input a new value.") End If Catch ex As Exception @@ -123,7 +127,7 @@ Public Class frmMass_Change i += 1 Next SUCCESSFULL = True - + ClassLogger.Add(String.Format("### MassChange finished successfully! ###")) Catch ex As Exception ClassLogger.Add("Unexpected Error in Getting record to be changed:" & ex.Message) _Error = True @@ -154,6 +158,7 @@ Public Class frmMass_Change msg = "All changes were executed!" End If If _Error = True Then + ClassLogger.Add(String.Format("### MassChange finished - WITH errors!! ###")) If USER_LANGUAGE <> "de-DE" Then msg = msg & vbNewLine & "But errors occured while updating values! Check the log" Else diff --git a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.Designer.vb b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.Designer.vb index 26d0b77..a199828 100644 --- a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.Designer.vb +++ b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.Designer.vb @@ -54,6 +54,7 @@ Partial Class frmRecOrgConfig_Basic Me.txtDomäne = New System.Windows.Forms.TextBox() Me.Label7 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() + Me.Label10 = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.GroupBox3.SuspendLayout() @@ -187,6 +188,7 @@ Partial Class frmRecOrgConfig_Basic ' 'GroupBox5 ' + Me.GroupBox5.Controls.Add(Me.Label10) Me.GroupBox5.Controls.Add(Me.btnTest_Anmeldung) Me.GroupBox5.Controls.Add(Me.txtServername) Me.GroupBox5.Controls.Add(Me.Label5) @@ -255,6 +257,11 @@ Partial Class frmRecOrgConfig_Basic resources.ApplyResources(Me.Label8, "Label8") Me.Label8.Name = "Label8" ' + 'Label10 + ' + resources.ApplyResources(Me.Label10, "Label10") + Me.Label10.Name = "Label10" + ' 'frmRecOrgConfig_Basic ' resources.ApplyResources(Me, "$this") @@ -317,4 +324,5 @@ Partial Class frmRecOrgConfig_Basic Friend WithEvents Label8 As System.Windows.Forms.Label Friend WithEvents txtWiki As System.Windows.Forms.TextBox Friend WithEvents Label9 As System.Windows.Forms.Label + Friend WithEvents Label10 As Label End Class diff --git a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.resx b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.resx index 9902855..50112a9 100644 --- a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.resx +++ b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.resx @@ -126,7 +126,7 @@ 15, 18 - 235, 13 + 233, 13 0 @@ -180,7 +180,7 @@ 15, 59 - 261, 13 + 260, 13 2 @@ -399,66 +399,6 @@ 6 - - btnResetBackground - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox3 - - - 0 - - - btnSelectBackground - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox3 - - - 1 - - - pbBackground - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox3 - - - 2 - - - 564, 12 - - - 368, 315 - - - 81 - - - Anwendungshintergrund - - - GroupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - 211, 274 @@ -531,9 +471,42 @@ 2 + + 564, 12 + + + 368, 315 + + + 81 + + + Anwendungshintergrund + + + GroupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + 17, 17 + + 6, 21 + + + 238, 22 + + + 0 + txtProductName @@ -570,27 +543,6 @@ 3 - - 6, 21 - - - 238, 22 - - - 0 - - - txtProductName - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 0 - False @@ -655,150 +607,40 @@ 5 - - btnTest_Anmeldung + + True - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI, 9pt, style=Italic - + + NoControl + + + 16, 126 + + + 347, 30 + + + 50 + + + Beachten Sie bei Proxyserverkonfiguration, die Konfiguration des +Anmeldeservers in den Grundeinstellungen des Users. + + + Label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBox5 - + 0 - - txtServername - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 1 - - - Label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 2 - - - txtPW - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 3 - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 4 - - - txtUser - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 5 - - - Label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 6 - - - txtDomäne - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 7 - - - Label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 8 - - - Label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox5 - - - 9 - - - 12, 185 - - - 541, 142 - - - 83 - - - Userauthentifizierung windream Rechte: - - - GroupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - MiddleLeft @@ -827,7 +669,7 @@ GroupBox5 - 0 + 1 19, 101 @@ -848,7 +690,7 @@ GroupBox5 - 1 + 2 True @@ -875,7 +717,7 @@ GroupBox5 - 2 + 3 355, 56 @@ -896,7 +738,7 @@ GroupBox5 - 3 + 4 True @@ -923,7 +765,7 @@ GroupBox5 - 4 + 5 187, 56 @@ -944,7 +786,7 @@ GroupBox5 - 5 + 6 True @@ -971,7 +813,7 @@ GroupBox5 - 6 + 7 19, 56 @@ -992,7 +834,7 @@ GroupBox5 - 7 + 8 True @@ -1019,7 +861,7 @@ GroupBox5 - 8 + 9 True @@ -1049,7 +891,31 @@ GroupBox5 - 9 + 10 + + + 12, 185 + + + 541, 170 + + + 83 + + + Userauthentifizierung windream Rechte: + + + GroupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 True diff --git a/app/DD-Record-Organizer/frmRecordView.vb b/app/DD-Record-Organizer/frmRecordView.vb index b977ec4..de18244 100644 --- a/app/DD-Record-Organizer/frmRecordView.vb +++ b/app/DD-Record-Organizer/frmRecordView.vb @@ -758,7 +758,8 @@ Public Class frmRecordView Private Sub ContextMenuStripResultFiles_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStripResultFiles.Opening ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) - Dim Result = clsWD_GET.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_PATH, USER_USERNAME) + Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID) 'clsWD_GET.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_PATH, USER_USERNAME) + If Not IsNothing(Result) Then Select Case Result.ToString diff --git a/app/DD-Record-Organizer/frmWD_IndexFile.vb b/app/DD-Record-Organizer/frmWD_IndexFile.vb index d2d0f4e..b53786e 100644 --- a/app/DD-Record-Organizer/frmWD_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWD_IndexFile.vb @@ -12,6 +12,26 @@ Public Class frmWD_IndexFile Dim formloaded As Boolean = False Dim DTVWPMO_DOKUMENTTYPES As DataTable + Public Class SW + Public label As String + Public stopwatch As Stopwatch + + Public Sub New(label As String) + Me.label = label + stopwatch = New Stopwatch() + stopwatch.Start() + End Sub + + Public Function Done() As Long + stopwatch.Stop() + Dim message = String.Format("{0, 5}ms || {1}", stopwatch.ElapsedMilliseconds, label) + Console.WriteLine(message) + If LogErrorsOnly = False Then ClassLogger.Add(message, False) + Return stopwatch.ElapsedMilliseconds + End Function + + + End Class Function WORK_FILE(ImportFilePath As String, VerzeichnisZiel As String, vDokart_ID As Integer, vDokart As String, multiindex As Boolean) Try CURRENT_DOKARTSTRING = vDokart @@ -19,10 +39,14 @@ Public Class frmWD_IndexFile '################################################################# 'Name und ZielPfad generieren '################################################################# + Dim sw As New SW("GetUse Nameconvention ID: " & DOCTYPE_IDTextBox.Text) If ClassImport_Windream.Name_Generieren(DOCTYPE_IDTextBox.Text) = False Then Return False End If - If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2)) = True Then + sw.Done() + sw = New SW("CheckFileExists") + If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer) = True Then + sw.Done() Dim msg = "Eine Datei mit identischem Namen existiert bereits! Wollen Sie die bestehende Datei ersetzen?" If USER_LANGUAGE <> "de-DE" Then msg = "There is already a file with the same name! Would You like to replace the file?" @@ -36,13 +60,19 @@ Public Class frmWD_IndexFile Else CURRENT_NEWFILENAME = ClassHelper.Versionierung_Datei(CURRENT_NEWFILENAME) End If + Else + sw.Done() End If + '################################################################# 'Stream File to windream '################################################################# + sw = New SW("File Stream") Dim streamresult = clsWD_SET.Stream_File(ImportFilePath, CURRENT_NEWFILENAME, False) + sw.Done() '################################################################# If streamresult = True Then + sw = New SW("File Indexing") CURRENT_FILEIN_WD = CURRENT_NEWFILENAME Dim sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE ACTIVE = 1 AND UPPER(INDEXNAME) NOT LIKE UPPER('%ONLY %') AND SQL_ACTIVE = 0 AND DOCTYPE_ID = " & vDokart_ID Dim DT_AUTO_INDEXE As DataTable = ClassDatabase.Return_Datatable(sql, True) @@ -54,27 +84,30 @@ Public Class frmWD_IndexFile DT = ClassDatabase.Return_Datatable(sql, True) If Not DT Is Nothing Then If DT.Rows.Count = 1 Then - 'den Record_Key auslesen - Dim indexname = DT.Rows(0).Item("IDXNAME_RECORDID").ToString - If LogErrorsOnly = False Then ClassLogger.Add(" >> Record-ID: " & CURRENT_RECORD_ID.ToString, False) - indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_RECORD_ID, clsWindream.MY_WDOBJECTTYPE) - If indexierung_erfolgreich = False Then - err = True - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing RecordID '" & indexname & "') - Check logfile!") - Return False - End If + Dim indexname + ''den Record_Key auslesen + 'Dim indexname = DT.Rows(0).Item("IDXNAME_RECORDID").ToString + 'If LogErrorsOnly = False Then ClassLogger.Add(" >> Record-ID: " & CURRENT_RECORD_ID.ToString, False) + 'indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_RECORD_ID, clsWindream.MY_WDOBJECTTYPE) + 'If indexierung_erfolgreich = False Then + ' err = True + ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing RecordID '" & indexname & "') - Check logfile!") + ' sw.Done() + ' Return False + 'End If 'den Entity-Key auslesen - indexname = DT.Rows(0).Item("IDXNAME_ENTITYID").ToString - If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & CURRENT_ENTITY_ID.ToString, False) - indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_ENTITY_ID, clsWindream.MY_WDOBJECTTYPE) - If indexierung_erfolgreich = False Then - err = True - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing EntityID '" & indexname & "') - Check logfile!") - Return False - End If - If CURRENT_REDUNDANT_FORM_ID <> 0 Then - indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_REDUNDANT_FORM_ID, clsWindream.MY_WDOBJECTTYPE) - End If + 'indexname = DT.Rows(0).Item("IDXNAME_ENTITYID").ToString + 'If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & CURRENT_ENTITY_ID.ToString, False) + 'indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_ENTITY_ID, clsWindream.MY_WDOBJECTTYPE) + 'If indexierung_erfolgreich = False Then + ' err = True + ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing EntityID '" & indexname & "') - Check logfile!") + ' sw.Done() + ' Return False + 'End If + 'If CURRENT_REDUNDANT_FORM_ID <> 0 Then + ' indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_REDUNDANT_FORM_ID, clsWindream.MY_WDOBJECTTYPE) + 'End If 'den Doctype auslesen indexname = DT.Rows(0).Item("IDXNAME_DOCTYPE").ToString If LogErrorsOnly = False Then ClassLogger.Add(" >> Doctype: " & vDokart.ToString, False) @@ -82,6 +115,7 @@ Public Class frmWD_IndexFile If indexierung_erfolgreich = False Then err = True ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing Doctype '" & indexname & "') - Check logfile!") + sw.Done() Return False End If @@ -90,12 +124,13 @@ Public Class frmWD_IndexFile If indexierung_erfolgreich = False Then err = True ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing AddiRelation '" & indexname & "') - Check logfile!") + sw.Done() Return False End If End If End If - + sw.Done() If DT_AUTO_INDEXE Is Nothing = False Then 'CHECK DD If DT_AUTO_INDEXE.Rows.Count > 0 Then Dim Count As Integer = 0 @@ -178,7 +213,7 @@ Public Class frmWD_IndexFile Return False End If 'Nun alles aufrüumen und die neue DocID holen - + If indexierung_erfolgreich = True Then ClassLogger.Add(">> File was correctly imported and indexed: " & CURRENT_FILEIN_WD, False) @@ -198,9 +233,11 @@ Public Class frmWD_IndexFile End If End If Next - + sw = New SW("GettingDocID") sql = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD) CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql) + sw.Done() + If Not IsNothing(CURRENT_DOC_ID) Then ClassLogger.Add(String.Format(">> File-Import was finished - DocID: {0} ", CURRENT_DOC_ID), False) Dim delete = False @@ -242,12 +279,14 @@ Public Class frmWD_IndexFile 'If CURRENT_REDUNDANT_FORM_ID <> 0 Then ' ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD) 'End If + sw = New SW("Setting_Rights") If ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD) = False Then - MsgBox("The rights for the new file could not be created! Please check the logfile!" & vbNewLine & _ + MsgBox("The rights for the new file could not be created! Please check the logfile!" & vbNewLine & "ADDI will try to give You at least reading rights!", MsgBoxStyle.Exclamation) DD_Rights.ClassRights.SetRightExplicit(CURRENT_DOC_ID, CURRENT_FILEIN_WD, USER_USERNAME, 1) ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "NEW FILE INDEXING - RIGHTS COULD NOT BE SET!!") End If + sw.Done() End If End If diff --git a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.Designer.vb b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.Designer.vb index 5ab9bf1..d132946 100644 --- a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.Designer.vb +++ b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.Designer.vb @@ -26,15 +26,12 @@ Partial Class frmWD_ObjecttypeConfig Dim GUIDLabel As System.Windows.Forms.Label Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWD_ObjecttypeConfig)) Dim OBJECT_TYPELabel As System.Windows.Forms.Label - Dim IDXNAME_ENTITYIDLabel As System.Windows.Forms.Label Dim ADDED_WHOLabel As System.Windows.Forms.Label Dim ADDED_WHENLabel As System.Windows.Forms.Label Dim CHANGED_WHOLabel As System.Windows.Forms.Label Dim CHANGED_WHENLabel As System.Windows.Forms.Label - Dim IDXNAME_PARENTIDLabel As System.Windows.Forms.Label - Dim Label2 As System.Windows.Forms.Label - Dim Label3 As System.Windows.Forms.Label Dim Label4 As System.Windows.Forms.Label + Dim Label2 As System.Windows.Forms.Label Me.Label1 = New System.Windows.Forms.Label() Me.DD_DMSDataSet = New DD_Record_Organizer.DD_DMSDataSet() Me.TBPMO_WD_OBJECTTYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -59,24 +56,18 @@ Partial Class frmWD_ObjecttypeConfig Me.ADDED_WHENTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() - Me.IDXNAME_ENTITYIDComboBox = New System.Windows.Forms.ComboBox() Me.lblSaveDokart = New System.Windows.Forms.Label() - Me.IDXNAME_PARENTIDComboBox = New System.Windows.Forms.ComboBox() Me.ListBox1 = New System.Windows.Forms.ListBox() - Me.cmbDokartIndex = New System.Windows.Forms.ComboBox() - Me.cmbRecordIndex = New System.Windows.Forms.ComboBox() Me.cmbADDIRelIdx = New System.Windows.Forms.ComboBox() + Me.cmbDoctype = New System.Windows.Forms.ComboBox() GUIDLabel = New System.Windows.Forms.Label() OBJECT_TYPELabel = New System.Windows.Forms.Label() - IDXNAME_ENTITYIDLabel = New System.Windows.Forms.Label() ADDED_WHOLabel = New System.Windows.Forms.Label() ADDED_WHENLabel = New System.Windows.Forms.Label() CHANGED_WHOLabel = New System.Windows.Forms.Label() CHANGED_WHENLabel = New System.Windows.Forms.Label() - IDXNAME_PARENTIDLabel = New System.Windows.Forms.Label() - Label2 = New System.Windows.Forms.Label() - Label3 = New System.Windows.Forms.Label() Label4 = New System.Windows.Forms.Label() + Label2 = New System.Windows.Forms.Label() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_WD_OBJECTTYPEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_WD_OBJECTTYPEBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() @@ -93,11 +84,6 @@ Partial Class frmWD_ObjecttypeConfig resources.ApplyResources(OBJECT_TYPELabel, "OBJECT_TYPELabel") OBJECT_TYPELabel.Name = "OBJECT_TYPELabel" ' - 'IDXNAME_ENTITYIDLabel - ' - resources.ApplyResources(IDXNAME_ENTITYIDLabel, "IDXNAME_ENTITYIDLabel") - IDXNAME_ENTITYIDLabel.Name = "IDXNAME_ENTITYIDLabel" - ' 'ADDED_WHOLabel ' resources.ApplyResources(ADDED_WHOLabel, "ADDED_WHOLabel") @@ -118,21 +104,6 @@ Partial Class frmWD_ObjecttypeConfig resources.ApplyResources(CHANGED_WHENLabel, "CHANGED_WHENLabel") CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" ' - 'IDXNAME_PARENTIDLabel - ' - resources.ApplyResources(IDXNAME_PARENTIDLabel, "IDXNAME_PARENTIDLabel") - IDXNAME_PARENTIDLabel.Name = "IDXNAME_PARENTIDLabel" - ' - 'Label2 - ' - resources.ApplyResources(Label2, "Label2") - Label2.Name = "Label2" - ' - 'Label3 - ' - resources.ApplyResources(Label3, "Label3") - Label3.Name = "Label3" - ' 'Label4 ' resources.ApplyResources(Label4, "Label4") @@ -319,26 +290,12 @@ Partial Class frmWD_ObjecttypeConfig resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox") Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" ' - 'IDXNAME_ENTITYIDComboBox - ' - Me.IDXNAME_ENTITYIDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_WD_OBJECTTYPEBindingSource, "IDXNAME_ENTITYID", True)) - Me.IDXNAME_ENTITYIDComboBox.FormattingEnabled = True - resources.ApplyResources(Me.IDXNAME_ENTITYIDComboBox, "IDXNAME_ENTITYIDComboBox") - Me.IDXNAME_ENTITYIDComboBox.Name = "IDXNAME_ENTITYIDComboBox" - ' 'lblSaveDokart ' resources.ApplyResources(Me.lblSaveDokart, "lblSaveDokart") Me.lblSaveDokart.BackColor = System.Drawing.Color.Yellow Me.lblSaveDokart.Name = "lblSaveDokart" ' - 'IDXNAME_PARENTIDComboBox - ' - Me.IDXNAME_PARENTIDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_WD_OBJECTTYPEBindingSource, "IDXNAME_PARENTID", True)) - Me.IDXNAME_PARENTIDComboBox.FormattingEnabled = True - resources.ApplyResources(Me.IDXNAME_PARENTIDComboBox, "IDXNAME_PARENTIDComboBox") - Me.IDXNAME_PARENTIDComboBox.Name = "IDXNAME_PARENTIDComboBox" - ' 'ListBox1 ' Me.ListBox1.DataSource = Me.TBPMO_WD_OBJECTTYPEBindingSource @@ -348,46 +305,37 @@ Partial Class frmWD_ObjecttypeConfig Me.ListBox1.Name = "ListBox1" Me.ListBox1.ValueMember = "GUID" ' - 'cmbDokartIndex - ' - Me.cmbDokartIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_WD_OBJECTTYPEBindingSource, "IDXNAME_DOCTYPE", True)) - Me.cmbDokartIndex.FormattingEnabled = True - resources.ApplyResources(Me.cmbDokartIndex, "cmbDokartIndex") - Me.cmbDokartIndex.Name = "cmbDokartIndex" - ' - 'cmbRecordIndex - ' - Me.cmbRecordIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_WD_OBJECTTYPEBindingSource, "IDXNAME_RECORDID", True)) - Me.cmbRecordIndex.FormattingEnabled = True - resources.ApplyResources(Me.cmbRecordIndex, "cmbRecordIndex") - Me.cmbRecordIndex.Name = "cmbRecordIndex" - ' 'cmbADDIRelIdx ' Me.cmbADDIRelIdx.FormattingEnabled = True resources.ApplyResources(Me.cmbADDIRelIdx, "cmbADDIRelIdx") Me.cmbADDIRelIdx.Name = "cmbADDIRelIdx" ' + 'cmbDoctype + ' + Me.cmbDoctype.FormattingEnabled = True + resources.ApplyResources(Me.cmbDoctype, "cmbDoctype") + Me.cmbDoctype.Name = "cmbDoctype" + ' + 'Label2 + ' + resources.ApplyResources(Label2, "Label2") + Label2.Name = "Label2" + ' 'frmWD_ObjecttypeConfig ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.cmbDoctype) + Me.Controls.Add(Label2) Me.Controls.Add(Me.cmbADDIRelIdx) Me.Controls.Add(Label4) - Me.Controls.Add(Label2) - Me.Controls.Add(Me.cmbDokartIndex) - Me.Controls.Add(Me.cmbRecordIndex) - Me.Controls.Add(Label3) Me.Controls.Add(Me.ListBox1) - Me.Controls.Add(IDXNAME_PARENTIDLabel) - Me.Controls.Add(Me.IDXNAME_PARENTIDComboBox) Me.Controls.Add(Me.lblSaveDokart) - Me.Controls.Add(Me.IDXNAME_ENTITYIDComboBox) Me.Controls.Add(GUIDLabel) Me.Controls.Add(Me.GUIDTextBox) Me.Controls.Add(OBJECT_TYPELabel) Me.Controls.Add(Me.OBJECT_TYPEComboBox) - Me.Controls.Add(IDXNAME_ENTITYIDLabel) Me.Controls.Add(ADDED_WHOLabel) Me.Controls.Add(Me.ADDED_WHOTextBox) Me.Controls.Add(ADDED_WHENLabel) @@ -432,11 +380,8 @@ Partial Class frmWD_ObjecttypeConfig Friend WithEvents ADDED_WHENTextBox As System.Windows.Forms.TextBox Friend WithEvents CHANGED_WHOTextBox As System.Windows.Forms.TextBox Friend WithEvents CHANGED_WHENTextBox As System.Windows.Forms.TextBox - Friend WithEvents IDXNAME_ENTITYIDComboBox As System.Windows.Forms.ComboBox Friend WithEvents lblSaveDokart As System.Windows.Forms.Label - Friend WithEvents IDXNAME_PARENTIDComboBox As System.Windows.Forms.ComboBox Friend WithEvents ListBox1 As System.Windows.Forms.ListBox - Friend WithEvents cmbDokartIndex As System.Windows.Forms.ComboBox - Friend WithEvents cmbRecordIndex As System.Windows.Forms.ComboBox Friend WithEvents cmbADDIRelIdx As System.Windows.Forms.ComboBox + Friend WithEvents cmbDoctype As ComboBox End Class diff --git a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.resx b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.resx index 609cc9f..e745eeb 100644 --- a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.resx +++ b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.resx @@ -150,7 +150,7 @@ $this - 11 + 6 False @@ -180,37 +180,7 @@ $this - 13 - - - False - - - True - - - 62, 102 - - - 157, 17 - - - 6 - - - Indexname für Entitäts-ID: - - - IDXNAME_ENTITYIDLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 15 + 8 False @@ -222,7 +192,7 @@ Segoe UI, 9.75pt, style=Italic - 62, 271 + 62, 150 71, 17 @@ -243,7 +213,7 @@ $this - 16 + 10 False @@ -255,7 +225,7 @@ Segoe UI, 9.75pt, style=Italic - 232, 271 + 232, 150 81, 17 @@ -276,7 +246,7 @@ $this - 18 + 12 False @@ -288,7 +258,7 @@ Segoe UI, 9.75pt, style=Italic - 413, 269 + 63, 203 86, 17 @@ -309,7 +279,7 @@ $this - 20 + 14 False @@ -321,7 +291,7 @@ Segoe UI, 9.75pt, style=Italic - 582, 269 + 232, 203 96, 17 @@ -342,104 +312,7 @@ $this - 22 - - - False - - - True - - - 283, 102 - - - 152, 17 - - - 78 - - - Indexname für Parent-ID: - - - IDXNAME_PARENTIDLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 7 - - - False - - - True - - - - NoControl - - - 283, 158 - - - 173, 17 - - - 83 - - - Indexname für Dokumentart: - - - Label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - False - - - True - - - NoControl - - - 62, 158 - - - 157, 17 - - - 81 - - - Indexname für Record-ID: - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 + 16 False @@ -447,11 +320,12 @@ True + NoControl - 62, 206 + 62, 102 179, 17 @@ -472,7 +346,7 @@ $this - 1 + 3 True @@ -502,7 +376,7 @@ $this - 25 + 19 17, 17 @@ -705,7 +579,7 @@ $this - 24 + 18 False @@ -732,7 +606,7 @@ $this - 12 + 7 65, 74 @@ -753,7 +627,7 @@ $this - 14 + 9 False @@ -762,7 +636,7 @@ Segoe UI, 9.75pt, style=Italic - 65, 289 + 65, 168 154, 25 @@ -780,7 +654,7 @@ $this - 17 + 11 False @@ -789,7 +663,7 @@ Segoe UI, 9.75pt, style=Italic - 235, 289 + 235, 168 169, 25 @@ -807,7 +681,7 @@ $this - 19 + 13 False @@ -816,7 +690,7 @@ Segoe UI, 9.75pt, style=Italic - 415, 289 + 65, 223 154, 25 @@ -834,7 +708,7 @@ $this - 21 + 15 False @@ -843,7 +717,7 @@ Segoe UI, 9.75pt, style=Italic - 585, 289 + 235, 223 169, 25 @@ -861,28 +735,7 @@ $this - 23 - - - 65, 122 - - - 206, 25 - - - 16 - - - IDXNAME_ENTITYIDComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 10 + 17 True @@ -891,7 +744,7 @@ Segoe UI, 9.75pt, style=Bold - 62, 317 + 62, 251 261, 17 @@ -915,28 +768,7 @@ $this - 9 - - - 286, 122 - - - 205, 25 - - - 79 - - - IDXNAME_PARENTIDComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 8 + 5 Segoe UI, 9.75pt, style=Italic @@ -963,52 +795,10 @@ $this - 6 - - - 286, 178 - - - 205, 25 - - - 84 - - - cmbDokartIndex - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - 65, 178 - - - 206, 25 - - - 82 - - - cmbRecordIndex - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - 4 - 65, 226 + 65, 122 206, 25 @@ -1026,8 +816,62 @@ $this + 2 + + + 277, 122 + + + 206, 25 + + + 88 + + + cmbDoctype + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 + + False + + + True + + + NoControl + + + 274, 102 + + + 173, 17 + + + 87 + + + Indexname für Dokumentart: + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + True @@ -1035,7 +879,7 @@ 7, 17 - 781, 404 + 781, 273 Segoe UI, 9.75pt @@ -1050,7 +894,7 @@ DD_DMSDataSet - DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPMO_WD_OBJECTTYPEBindingSource @@ -1062,13 +906,13 @@ TBPMO_WD_OBJECTTYPETableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_WD_OBJECTTYPETableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_WD_OBJECTTYPETableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null BindingNavigatorAddNewItem diff --git a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.vb b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.vb index b33d05b..e69e931 100644 --- a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.vb +++ b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.vb @@ -59,22 +59,24 @@ Public Class frmWD_ObjecttypeConfig Sub load_Indices() Try If Me.OBJECT_TYPEComboBox.SelectedIndex <> -1 Then - Me.IDXNAME_ENTITYIDComboBox.Items.Clear() - Me.IDXNAME_PARENTIDComboBox.Items.Clear() - Me.cmbDokartIndex.Items.Clear() - Me.cmbRecordIndex.Items.Clear() + 'Me.IDXNAME_ENTITYIDComboBox.Items.Clear() + 'Me.IDXNAME_PARENTIDComboBox.Items.Clear() + Me.cmbDoctype.Items.Clear() + 'Me.cmbRecordIndex.Items.Clear() + Me.cmbADDIRelIdx.Items.Clear() Dim indexe = clsWD_GET.GetIndicesByObjecttype(OBJECT_TYPEComboBox.Text) If indexe IsNot Nothing Then For Each index As String In indexe - Me.IDXNAME_ENTITYIDComboBox.Items.Add(index) - Me.IDXNAME_PARENTIDComboBox.Items.Add(index) - Me.cmbDokartIndex.Items.Add(index) - Me.cmbRecordIndex.Items.Add(index) + 'Me.IDXNAME_ENTITYIDComboBox.Items.Add(index) + 'Me.IDXNAME_PARENTIDComboBox.Items.Add(index) + Me.cmbDoctype.Items.Add(index) + 'Me.cmbRecordIndex.Items.Add(index) + Me.cmbADDIRelIdx.Items.Add(index) Next End If End If Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Fehler bei OBJECT_TYPEComboBox.SelectedIndexChanged: ") + MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in OBJECT_TYPEComboBox.SelectedIndexChanged: ") End Try End Sub diff --git a/app/VERSION_CHECKER/ClassLogger.vb b/app/VERSION_CHECKER/ClassLogger.vb index 6b8c83a..b85193f 100644 --- a/app/VERSION_CHECKER/ClassLogger.vb +++ b/app/VERSION_CHECKER/ClassLogger.vb @@ -61,7 +61,7 @@ Public Class ClassLogger If ClassLogger.OpenFile Then Try If ACHTUNG Then - ClassLogger.StreamWriter.WriteLine("#ERROR# (" & System.DateTime.Now & "): " & information) + ClassLogger.StreamWriter.WriteLine(Now.ToString & " #ERROR# : " & information) If (information.Contains("Der Zugriff auf den Pfad")) Then Else @@ -70,7 +70,7 @@ Public Class ClassLogger Else - ClassLogger.StreamWriter.WriteLine(information) + ClassLogger.StreamWriter.WriteLine(Now.ToString & " " & information) End If ClassLogger.CloseFile() Catch e As Exception diff --git a/app/VERSION_CHECKER/frmVersionCheck.vb b/app/VERSION_CHECKER/frmVersionCheck.vb index 4e2bdd4..b0a67cf 100644 --- a/app/VERSION_CHECKER/frmVersionCheck.vb +++ b/app/VERSION_CHECKER/frmVersionCheck.vb @@ -8,6 +8,7 @@ Public Class frmVersionCheck Private mainForm As Form Private UPDATE_NECESSARY As Boolean = False Private UPDATE_CANCELLED As Boolean = False + Private Shared myRow As String Private Sub InitProgram() bw.WorkerReportsProgress = True AddHandler bw.DoWork, AddressOf bw_DoWork @@ -29,40 +30,51 @@ Public Class frmVersionCheck Dim Init = New ClassInit() bw.ReportProgress(CalcProgress(1), "Initializing Logger") Init.InitLogger() + myRow = 33 System.Threading.Thread.Sleep(200) bw.ReportProgress(CalcProgress(3), "Initializing MySettings") MySettings_Load() + myRow = 37 System.Threading.Thread.Sleep(200) bw.ReportProgress(CalcProgress(2), "Initializing Database") If Init.InitDatabase() = True Then + myRow = 41 System.Threading.Thread.Sleep(200) bw.ReportProgress(CalcProgress(3), "Initializing Basic-Configuration") Init.InitBasics() + myRow = 45 System.Threading.Thread.Sleep(200) bw.ReportProgress(CalcProgress(4), "Initializing User-Configuration") If ClassInit.InitUser = False Then Exit Sub Else + myRow = 51 VERSION_USER = CInt(VERSION_USER.ToString.Replace(".", "")) VERSION_SERVER = CInt(VERSION_SERVER.ToString.Replace(".", "")) + myRow = 54 If (VERSION_USER = VERSION_SERVER) Or VERSION_SERVER = 1000 Or VERSION_USER = 1000 Then Exit Sub End If UPDATE_NECESSARY = True If FORCE_UPDATE = False Then + myRow = 60 If VERSIONS_FOR_FORCE_UPDATE.Contains(VERSION_USER) Then + myRow = 62 ClassInit.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("VersionChecker: ForceUpdate for User as Version '{0}' is used!", VERSION_USER)) FORCE_UPDATE = True End If End If If FORCE_UPDATE = False Then + myRow = 68 If ALL_USERS = False Then Dim sql = String.Format("SELECT COUNT(GUID) FROM TBDD_VERSION_USER_UPDATE WHERE USER_ID = {0} AND UPDATE_ID = {1}", USER_GUID, UPDATE_ID) If clsDatabase.Execute_Scalar(sql) = 0 Then + myRow = 73 ClassInit.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("VersionChecker: User is not part of update-group - UPDATE-ID: {0}", UPDATE_ID)) Exit Sub End If End If + myRow = 77 Dim msg = "Auf dem Server liegt ein Update für ADDI bereit!" & vbNewLine & "Wollen Sie das Update nun durchführen? Die Dauer ist abhängig von Ihrer Netzwerkverbindung!" If USER_LANGUAGE <> "de-DE" Then msg = "There is a new release available for ADDI!" & vbNewLine & "Would You like to install the update now? This might take some minutes!" @@ -74,11 +86,12 @@ Public Class frmVersionCheck Exit Sub End If End If - + myRow = 89 If MyServer_UpdatePath <> String.Empty Then If Directory.Exists(MyServer_UpdatePath) Then GetTempFolderGuid() If FOLDER_TEMP <> String.Empty Then + myRow = 94 bw.ReportProgress(CalcProgress(5), "Copying files to tempfolder") ' Make a reference to a directory. Dim di As New DirectoryInfo(MyServer_UpdatePath) @@ -104,9 +117,10 @@ Public Class frmVersionCheck ClassLogger.Add(String.Format("UpdateFile {0} is not existing or accessible", updatefile2copy)) End If Next - + myRow = "120 - Copying finished" If error_while_copying = False Then Replace_Files() + End If Try @@ -131,7 +145,7 @@ Public Class frmVersionCheck End If Catch ex As Exception ClassLogger.Add(String.Format(">> Unexpected Error in bwDoWork: " & ex.Message)) - ClassLogger.Add(ex.StackTrace) + ClassLogger.Add("myRow: " & myRow, False) End Try End Sub Sub Replace_Files() @@ -178,6 +192,7 @@ Public Class frmVersionCheck ClassLogger.Add(String.Format("Error while copying file {0} to {1}: " & ex.Message, sourcefile, targetfile)) error_while_replacing = True End Try + myRow = "195 - Moving/Replacing finished" Next 'For Each fri In fiArr ' If error_while_replacing = True Then @@ -220,17 +235,22 @@ Public Class frmVersionCheck ClassLogger.Add(String.Format("Unexpected Error in Replace_Files: {0}", ex.Message)) End Try End Sub - Private Shared Function File_Rename(targetfile As String, BackUpOfFileToReplace As String) + Private Shared Function File_Rename(targetfile As String, Renamefilestring As String) Try - If File.Exists(BackUpOfFileToReplace) Then - If File_Delete(BackUpOfFileToReplace) = False Then + myRow = "240" + Renamefilestring = Renamefilestring.Replace("\\", "\") + If File.Exists(Renamefilestring) Then + myRow = "242" + If File_Delete(Renamefilestring) = False Then Return False End If End If - Rename(targetfile, BackUpOfFileToReplace) + myRow = "248" + Rename(targetfile, Renamefilestring) Return True Catch ex As Exception - ClassLogger.Add(String.Format("Unexpected Error in File_Rename: " & vbNewLine & "targetfile '{0}'" & vbNewLine & "BackUpOfFileToReplace '{1}'" & vbNewLine & "ERROR: {2}", targetfile, BackUpOfFileToReplace, ex.Message)) + ClassLogger.Add(String.Format("Unexpected Error in File_Rename: " & "targetfile '{0}'" & "Renamefilestring '{1}'" & "ERROR: {2}", targetfile, Renamefilestring, ex.Message)) + ClassLogger.Add("myRow: " & myRow.ToString, False) Return False End Try End Function @@ -256,12 +276,15 @@ Public Class frmVersionCheck Dim filename = "" Try Dim PMO_PATH = System.IO.Path.Combine(MY_INSTALL_PATH, "DD-Record-Organizer.exe") + myRow = "274" Dim startInfo As New ProcessStartInfo() startInfo.Arguments = """" & MyConnectionString & """" filename = startInfo.FileName If System.IO.File.Exists(PMO_PATH) Then + myRow = "280" startInfo.FileName = PMO_PATH + myRow = "282 - " & PMO_PATH Process.Start(startInfo) Else MsgBox("Can not find ADDI-Executable in regular path! Please inform your systemadmin.", MsgBoxStyle.Critical) @@ -271,6 +294,7 @@ Public Class frmVersionCheck Catch ex As Exception ClassLogger.Add("Could not find RecordOrganizer: " & filename & " - " & ex.Message) + ClassLogger.Add("myRow: " & myRow.ToString, False) End Try End Sub @@ -288,32 +312,38 @@ Public Class frmVersionCheck End Function Private Sub frmVersionCheck_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - If ERROR_WHILE_UPDATING = True Then - Dim msg = String.Format("Während des Updatevorgangs für Version '{0}' haben sich unerwartet Fehler ereignet!" & vbNewLine & "Wollen Sie die Logdatei anzeigen?", VERSION_SERVER) - If USER_LANGUAGE <> "de-DE" Then - msg = String.Format("During update of version '{0}' unexpected errors occured!" & vbNewLine & "Would You like to show the logfile?", VERSION_SERVER) - End If - ClassInit.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("Unexpected errors occured during client-update update of version {0}!", VERSION_SERVER)) - Dim result As MsgBoxResult - result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - If result = MsgBoxResult.Yes Then - Process.Start(ClassLogger.DateiSpeicherort) - End If - Else - If UPDATE_NECESSARY = True Then - If UPDATE_CANCELLED = True Then - If clsDatabase.DB_DEFAULT_INITIALIZED = True Then - ClassInit.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("The ClientUpdate {0} is necessary but user cancelled update-process!", VERSION_SERVER)) - End If - Else - If clsDatabase.DB_DEFAULT_INITIALIZED = True Then - ClassInit.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("The ClientUpdate {0} was completed without errors!", VERSION_SERVER)) - End If + Try + If ERROR_WHILE_UPDATING = True Then + myRow = "308 - ERROR_WHILE_UPDATING" + Dim msg = String.Format("Während des Updatevorgangs für Version '{0}' haben sich unerwartet Fehler ereignet!" & vbNewLine & "Wollen Sie die Logdatei anzeigen?", VERSION_SERVER) + If USER_LANGUAGE <> "de-DE" Then + msg = String.Format("During update of version '{0}' unexpected errors occured!" & vbNewLine & "Would You like to show the logfile?", VERSION_SERVER) + End If + ClassInit.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("Unexpected errors occured during client-update update of version {0}!", VERSION_SERVER)) + Dim result As MsgBoxResult + result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + Process.Start(ClassLogger.DateiSpeicherort) + End If + Else + If UPDATE_NECESSARY = True Then + If UPDATE_CANCELLED = True Then + If clsDatabase.DB_DEFAULT_INITIALIZED = True Then + ClassInit.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("The ClientUpdate {0} is necessary but user cancelled update-process!", VERSION_SERVER)) + End If + Else + If clsDatabase.DB_DEFAULT_INITIALIZED = True Then + ClassInit.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("The ClientUpdate {0} was completed without errors!", VERSION_SERVER)) + End If + End If + End If - End If - End If - + Catch ex As Exception + ClassLogger.Add("Unexpected Error in FormClosing" & ex.Message) + End Try + + Start_RO() End Sub Private Sub frmVersionCheck_Load(sender As Object, e As EventArgs) Handles Me.Load