This commit is contained in:
SchreiberM
2017-02-07 13:46:55 +01:00
parent e772d0cd57
commit acc6e2ebb3
9 changed files with 122 additions and 66 deletions

View File

@@ -20,7 +20,7 @@
Return False
End If
Catch ex As Exception
ClassLogger.Add("Unexpected Error in Set_InWork: " & ex.Message, True)
ClassLogger.Add("Unexpected Error in Set_InWork: " & ex.Message)
Return False
End Try
End Function
@@ -37,7 +37,7 @@
Return False
End If
Catch ex As Exception
ClassLogger.Add("Unexpected Error in Set_Displayname: " & ex.Message, True)
ClassLogger.Add("Unexpected Error in Set_Displayname: " & ex.Message)
Return False
End Try
End Function
@@ -49,7 +49,7 @@
CURRENT_TBPMO_INDEX_MAN = DT
Return True
Catch ex As Exception
ClassLogger.Add("Unexpected Error in GET_DATATABLE_INDICES_PMO: " & ex.Message, True)
ClassLogger.Add("Unexpected Error in GET_DATATABLE_INDICES_PMO: " & ex.Message)
Return False
End Try
End Function
@@ -68,7 +68,7 @@
End If
Return True
Catch ex As Exception
ClassLogger.Add("Unexpected Error in SET_DOCID_INDICES: " & ex.Message, True)
ClassLogger.Add("Unexpected Error in SET_DOCID_INDICES: " & ex.Message)
Return False
End Try
End Function
@@ -77,7 +77,7 @@
Dim delete As String = String.Format("DELETE FROM TBPMO_DOC_INDICES WHERE DocID = {0}", DocID)
Return ClassDatabase.Execute_non_Query(delete)
Catch ex As Exception
ClassLogger.Add("Unexpected Error in Update_Doc_Indices: " & ex.Message, True)
ClassLogger.Add("Unexpected Error in Update_Doc_Indices: " & ex.Message)
Return False
End Try
End Function
@@ -94,7 +94,7 @@
Return False
End If
Catch ex As Exception
ClassLogger.Add("Unexpected Error in Delete ResultFile: " & ex.Message, True)
ClassLogger.Add(String.Format("Unexpected Error in Delete_ResultFile: ({0},{1},{2})", RESULT_DOC_ID, RECORD_ID, DELETE_FILE) & ex.Message)
MsgBox("Unexpected Error in Delete ResultFile:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
Return False
End Try

View File

@@ -217,9 +217,9 @@ Public Class ClassHelper
Public Shared Function InsertEssential_Log(REFERENCE_KEY As Integer, REFERENCE_STRING As String, COMMENT As String)
Try
Dim insert = String.Format("INSERT INTO TBPMO_LOG_ESSENTIALS (REFERENCE_KEY,REFERENCE_STRING,COMMENT,ADDED_WHO) VALUES ({0},'{1}','{2}','{3}')", REFERENCE_KEY, REFERENCE_STRING, COMMENT, USER_USERNAME)
Return ClassDatabase.Execute_non_Query(insert, False)
Return clsDatabase.Execute_non_Query(insert, False)
Catch ex As Exception
ClassLogger.Add("Unexpected Error in InsertEssential_Log: " & ex.Message, True)
ClassLogger.Add("Unexpected Error in InsertEssential_Log: " & ex.Message, True, False)
Return False
End Try
End Function

View File

@@ -195,8 +195,13 @@ Public Class ClassInit
If ClassDatabase.Execute_non_Query(sql) = True Then
End If
sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME) VALUES ({0},{1},'Record-Organizer','{2}','{3}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString, Environment.MachineName)
Dim ConStringMain As String
If clsDatabase.DB_PROXY_INITIALIZED = True Then
ConStringMain = "PROXY: " & ClassProxy.MyPROXYConnectionString & " # MAIN: " & MyConnectionString
Else
ConStringMain = "Main: " & MyConnectionString
End If
sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,CONNECTION_STRING) VALUES ({0},{1},'Record-Organizer','{2}','{3}','{4}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString, Environment.MachineName, ConStringMain)
ClassDatabase.Execute_non_Query(sql)
USER_IS_ADMIN = USER_DT.Rows(0).Item("RECORD_ADMIN")
@@ -211,11 +216,16 @@ Public Class ClassInit
Else
End If
If clsWindream.Create_Session = False Then
ClassLogger.Add("Could not create the login for windream!")
ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", "Could not create a windream-session for user!")
ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "ADDI will start anyway but be aware that searching and importing won't be possible!")
End If
Try
If clsWindream.Create_Session = False Then
ClassLogger.Add("Could not create the login for windream - No session created!")
ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "ADDI will start anyway but be aware that searching and importing won't be possible!")
End If
Catch ex As Exception
ClassLogger.Add("Unexpected Error in clswindream.Init: " & ex.Message)
MsgBox("Unexpected Error in Creating windream-Session: " & ex.Message & vbNewLine & "Please inform Your sysadmin!", MsgBoxStyle.Critical)
End Try
sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED)
Dim anzahl = ClassDatabase.Execute_Scalar(sql, False)
USERS_LOGGED_IN = CInt(anzahl)

View File

@@ -1,4 +1,5 @@
Imports System.IO
Imports DD_LIB_Standards
Public Class ClassLogger
Public Shared DateiSpeicherort As String = Nothing
Public Shared DateiPrefix As String = ""
@@ -51,11 +52,16 @@ Public Class ClassLogger
ClassLogger.DateiPrefix = prefix
End Sub
Public Shared Sub Add(ByVal information As String, Optional ByVal ACHTUNG As Boolean = True)
Public Shared Sub Add(ByVal information As String, Optional ByVal ACHTUNG As Boolean = True, Optional ByVal Essential As Boolean = True)
If ClassLogger.OpenFile Then
Try
If ACHTUNG Then
ClassLogger.StreamWriter.WriteLine("#ATTENTION# (" & System.DateTime.Now & "): " & 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)
End If

View File

@@ -1,8 +1,9 @@
Public Class ClassProxy
Imports DD_LIB_Standards
Public Class ClassProxy
Public Shared MyPROXYConnectionString As String = ""
Public Shared MyLinkedServer As String
Public Shared Function Refresh_Object_Data()
If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then
If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
Return False
End If
Dim sel = "DECLARE @return_value int" & vbNewLine & _
@@ -20,7 +21,7 @@
End If
End Function
Public Shared Function PRPROXY_SYNC_DOC_OBJECTS()
If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then
If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
Return False
End If
Dim sel = "DECLARE @return_value int" & vbNewLine & _
@@ -38,7 +39,7 @@
End If
End Function
Public Shared Function PRPROXY_RECORD_DEL(RECID As Integer, ENTITY_ID As Integer)
If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then
If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
Return False
End If
Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _
@@ -56,7 +57,7 @@
End If
End Function
Public Shared Function PRPROXY_RECORD_UPD_INS(ENT_ID As Integer, RECID As Integer)
If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then
If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
Return False
End If
Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _
@@ -74,7 +75,7 @@
End If
End Function
Public Shared Function PRPROXY_RECORD_CONNECT(PARENT_RECID As Integer, RECID As Integer)
If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then
If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
Return False
End If
Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _
@@ -92,7 +93,7 @@
End If
End Function
Public Shared Function PRPROXY_CONTROL_DEL(REC_ID As Integer, ENT_ID As Integer, CONTROL_ID As Integer)
If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then
If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
Return False
End If
Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _
@@ -110,7 +111,7 @@
End If
End Function
Public Shared Function Refresh_Workflow_Data()
If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then
If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
Return False
End If
Dim sel = "DECLARE @return_value int" & vbNewLine & _
@@ -128,7 +129,7 @@
End If
End Function
Public Shared Function PRPROXY_SYNC_DETAIL_OBJECT(Objectname As String)
If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then
If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
Return False
End If
Dim sel = "DECLARE @return_value int" & vbNewLine & _
@@ -146,7 +147,7 @@
End If
End Function
Public Shared Function PRPROXY_CONTROL_VALUE_UPD_INS(EntityID As Integer, ControlID As Integer, RecordID As Integer, Value As String)
If LICENSE_SITE_PROXY = False Or ClassProxy.MyPROXYConnectionString = String.Empty Then
If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
Return False
End If
Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _
@@ -163,6 +164,18 @@
Return False
End If
End Function
Public Shared Function IS_PROXY_BUSY()
If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
Return False
End If
Dim sql = "SELECT SYNC_RUNNING FROM TBPROXY_CONFIG WHERE GUID = 1"
Dim BUSY
BUSY = clsDatabase.Execute_Scalar(sql, True)
If IsNothing(BUSY) Then
Return True
Else
Return BUSY
End If
End Function
End Class

View File

@@ -652,6 +652,10 @@ Public Class frmConstructor_Main
End If
End Sub
Sub Refresh_Entity_Data()
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)
Exit Sub
End If
If TrySave_Automatic() = True Then
' Setzt die RECORD_ID auf Null
' damit beim Refresh keine alten Werte
@@ -1261,6 +1265,10 @@ Public Class frmConstructor_Main
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)
Exit Sub
End If
Try
If NODE_NAVIGATION = True Then
If NODE_NAVIGATION_LOADED = True Then
@@ -1575,6 +1583,10 @@ Public Class frmConstructor_Main
ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using ADDi in personified mode! Adding records is not allowed!")
Exit Sub
End If
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)
Exit Sub
End If
' Vor dem Hinzufügen muss der EditMode auf jeden Fall ausgeschaltet werden!!
DisableEditMode()
tsButtonEdit.Enabled = False
@@ -1848,6 +1860,10 @@ Public Class frmConstructor_Main
ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using ADDI in personified mode! Deleting records is not allowed!")
Exit Sub
End If
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)
Exit Sub
End If
Dim msg As String
If RIGHT_RECORD_AND_FILE_READ_ONLY = False Then
msg = "Sind Sie sicher, dass Sie diesen Record/Datensatz '" & SELECTED_RECORD_ID.ToString & "' löschen wollen?"
@@ -3355,11 +3371,6 @@ Public Class frmConstructor_Main
Exit Sub
Else
TabWindream.PageVisible = True
'If IsDBNull(DTWD.Rows(0).Item(0)) Then
' windream_Docshow = False
' DocSearchRefresh.Visible = False
' Exit Function
'End If
tsbtnDoc_Refresh.Enabled = True
tsmiFilesearch.Enabled = True
windream_Docshow = True
@@ -3367,10 +3378,14 @@ Public Class frmConstructor_Main
Dim sw As New Stopwatch
sw.Start()
Dim elapsed As Double
If clsWindream.Create_Session = True Then
windream_inited = True
End If
Try
If clsWindream.Create_Session = True Then
windream_inited = True
End If
Catch ex As Exception
windream_inited = False
End Try
elapsed = sw.Elapsed.TotalSeconds
sw.Stop()
sw.Reset()
@@ -3418,22 +3433,20 @@ Public Class frmConstructor_Main
msg = "This file is also linked to other records! Only the link for this Record will be deleted!"
End If
MsgBox(msg, MsgBoxStyle.Information)
If ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 0) = False Then
ClassHelper.InsertEssential_Log(DOC_ID, "DOC-ID", "FILE LINK DELETED BY USER")
ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 0)
Else
If ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 1) = False Then
msg = String.Format("Die Datei {0} konnte nicht gelöscht werden! Prüfen Sie die logfile!", path)
If USER_LANGUAGE <> "de-DE" Then
msg = String.Format("The file {0} could not be deleted! Check the logfile!", path)
End If
MsgBox(msg, MsgBoxStyle.Critical, "Attention:")
Else
If ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 1) = False Then
msg = String.Format("Die Datei {0} konnte nicht gelöscht werden! Prüfen Sie die logfile!", path)
If USER_LANGUAGE <> "de-DE" Then
msg = String.Format("The file {0} could not be deleted! Check the logfile!", path)
End If
MsgBox(msg, MsgBoxStyle.Critical, "Attention:")
Else
If clsWD_SET.Delete_WDFile(path) Then
ClassHelper.InsertEssential_Log(DOC_ID, "DOC-ID", "FILE DELETED BY USER")
End If
If clsWD_SET.Delete_WDFile(path) Then
ClassHelper.InsertEssential_Log(DOC_ID, "DOC-ID", "FILE DELETED BY USER")
End If
End If
End If
End If
Next
@@ -4040,9 +4053,10 @@ Public Class frmConstructor_Main
End If
End Sub
Sub Drag_Drop(e As DragEventArgs)
If ClassDragDrop.Drop_File(e) = False Then
Exit Sub
End If
Try
If ClassDragDrop.Drop_File(e) = False Then
Exit Sub
End If
If USER_PERSONIFIED_TEST = True Then
ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using ADDi in personified mode! Adding files is not allowed!")
Exit Sub
@@ -4134,7 +4148,12 @@ Public Class frmConstructor_Main
ClassLogger.Add(">> RIGHT_WD_FORBIDDEN is set! No DragDrop allowed", False)
End If
End If
End If
Catch ex As Exception
ClassLogger.Add("Unexpected Error in Drag_Drop: " & ex.Message)
Finally
End Try
End Sub
Private DROPPED_CHECKED As Boolean = False
Sub Check_Dropped_Files()
@@ -5500,6 +5519,7 @@ Public Class frmConstructor_Main
Catch ex As Exception
ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Opening DocContextMenu: ", ex.Message)
e.Cancel = True
Finally
Me.Cursor = Cursors.Default
End Try
@@ -6490,6 +6510,7 @@ Public Class frmConstructor_Main
'cmDoc1FileProperties.Enabled = True
End If
Catch ex As Exception
e.Cancel = True
Finally
Me.Cursor = Cursors.Default
End Try

View File

@@ -8,6 +8,7 @@ Imports System.Threading
Imports System.Globalization
Imports System.Net
Imports System.Net.Sockets
Imports DD_LIB_Standards
Public Class frmMain
@@ -128,9 +129,10 @@ Public Class frmMain
End If
End Sub
Sub Proxy_Server_Controls()
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> "" Then
If LICENSE_SITE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then
itemRefreshProxy.Visibility = BarItemVisibility.Always
LabelProxyServer.Visibility = BarItemVisibility.Always
ClassLogger.Add(">> PROXY-SERVER is being used", False)
Else
itemRefreshProxy.Visibility = BarItemVisibility.Never
LabelProxyServer.Visibility = BarItemVisibility.Never
@@ -366,7 +368,6 @@ Public Class frmMain
End If
Dim sql = "SELECT COUNT(GUID) FROM TBPMO_USER_GLOBAL_SEARCH WHERE USER_ID = " & USER_GUID
Dim Count = ClassDatabase.Execute_Scalar(sql)
If Count = 0 Then
@@ -383,10 +384,13 @@ Public Class frmMain
End Sub
Private Sub ToolbarButtonItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
Dim formId As Integer = Integer.Parse(e.Item.Tag)
Cursor = Cursors.WaitCursor
OpenFormConstructor(formId)
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
Cursor = Cursors.Default
End Sub
@@ -618,6 +622,8 @@ Public Class frmMain
End Sub
Private Sub itemRefreshProxy_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemRefreshProxy.ItemClick
Me.Cursor = Cursors.WaitCursor
Dim upd = "UPDATE TBPROXY_CONFIG SET SYNC_RUNNING = 1 WHERE GUID = 1"
clsDatabase.Execute_non_Query(upd, True)
If ClassProxy.Refresh_Object_Data() = True Then
If ClassProxy.PRPROXY_SYNC_DOC_OBJECTS() = True Then
Dim msg = "Die Proxydaten wurden erfolgreich synchronisiert!"
@@ -631,6 +637,8 @@ Public Class frmMain
Else
MessageBox.Show("Error while refreshing proxy-data (objects)!", "", MessageBoxButtons.OK, MessageBoxIcon.Error)
End If
upd = "UPDATE TBPROXY_CONFIG SET SYNC_RUNNING = 0, LAST_SYNC = GETDATE() WHERE GUID = 1"
clsDatabase.Execute_non_Query(upd, True)
Me.Cursor = Cursors.Default
End Sub
Sub Load_ConfigBasic()

View File

@@ -45,7 +45,7 @@ Public Class frmWD_IndexFile
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)
Dim indexierung_erfolgreich As Boolean = False
Dim indexierung_erfolgreich As Boolean = True
'Erst die Objekttyp-Indices indexieren
'den Entity-Key auslesen
Dim DT As DataTable
@@ -201,6 +201,7 @@ Public Class frmWD_IndexFile
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)
If Not IsNothing(CURRENT_DOC_ID) Then
ClassLogger.Add(String.Format(">> File-Import was finished - DocID: {0} ", CURRENT_DOC_ID), False)
Dim delete = False
'Die Originaldatei löschen
If droptype = "dragdrop file" And indexierung_erfolgreich = True Then
@@ -222,7 +223,6 @@ Public Class frmWD_IndexFile
End If
Next
End If
If clsWindream.Create_Session() = False Then
MsgBox("Could not create a windream-session!", MsgBoxStyle.Critical)
@@ -245,7 +245,6 @@ Public Class frmWD_IndexFile
stg = "Unerwarteter Fehler: Der Record-Link konnte nicht erzeugt werden! Überprüfen Sie das Log."
If USER_LANGUAGE <> "de-DE" Then
stg = "Unexpected Error: Could not create the recordlink! Please check the log."
End If
MsgBox(stg, MsgBoxStyle.Critical, stg1)
End If
@@ -393,14 +392,14 @@ Public Class frmWD_IndexFile
If cmbDokumentart.SelectedIndex <> -1 Then
My.Settings.WD_INDEXDOKART_SAVE = cmbDokumentart.Text
My.Settings.Save()
Indexing_File(cmbDokumentart.SelectedValue)
Handle_File(cmbDokumentart.SelectedValue)
End If
Catch ex As Exception
MsgBox("Unexpected Error in Prepare indexing: " & ex.Message, MsgBoxStyle.Critical)
End Try
End Sub
Sub Indexing_File(doctype_id As Integer)
Sub Handle_File(doctype_id As Integer)
Try
Me.Cursor = Cursors.WaitCursor
SaveMySettingsValue("WD_IndexDeleteDocs", WD_IndexDeleteDocs, "ConfigMain")

View File

@@ -33,7 +33,7 @@ Public Class ClassInit
Try
Dim UPDATE_ID As Integer
InitInstallPath()
Dim sql = String.Format("SELECT * FROM TBDD_MODULES WHERE UPPER(NAME) = ('Record-Organizer')")
Dim sql = String.Format("SELECT * FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')")
Dim KONFIG_DT As DataTable = clsDatabase.Return_Datatable(sql, False)
If KONFIG_DT.Rows.Count = 1 Then
MyServer_UpdatePath = KONFIG_DT.Rows(0).Item("VERSION_UPATE_PATH")
@@ -79,6 +79,8 @@ Public Class ClassInit
If USER_UPDATE_PATH <> String.Empty Then
MyServer_UpdatePath = USER_UPDATE_PATH
End If
Else
MyServer_UpdatePath = String.Empty
End If
sql = String.Format("SELECT CASE VERSION_CLIENT WHEN '' THEN '1.0.0.0' ELSE VERSION_CLIENT END AS VERSION_CLIENT FROM VWDD_LOGIN_USER_HISTORY WHERE GUID = (select MAX(GUID) from VWDD_LOGIN_USER_HISTORY where USER_ID = {0} AND VERSION_CLIENT <> '' AND UPPER(MACHINE_NAME) = UPPER('{1}') AND UPPER(MODULE) = UPPER('{2}'))", USER_GUID, Environment.MachineName, "Record-Organizer")
VERSION_USER = clsDatabase.Execute_Scalar(sql)
@@ -88,10 +90,7 @@ Public Class ClassInit
If IsNothing(VERSION_USER) Then
VERSION_USER = "1.0.0.0"
End If
End If
Return True
End If
Catch ex As Exception