AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://JenneJ@172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
JenneJ 2017-01-25 10:29:42 +01:00
commit 9d485d82f0
12 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD-Record-Organiser/ClassDOC_SEARCH.vb
View File

@ -430,7 +430,7 @@ Public Class ClassDOC_SEARCH
Try
Dim execute = String.Format("EXEC [dbo].[PRPMO_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME)
If ClassDatabase.Execute_non_Query(execute) = True Then
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
execute = String.Format("EXEC [dbo].[PRPROXY_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME)
ClassDatabase.Execute_non_Query(execute, True)
End If

6
app/DD-Record-Organiser/ClassDatabase.vb
View File

@ -60,7 +60,7 @@ Public Class ClassDatabase
Dim SQLconnect As New SqlClient.SqlConnection
Dim SQLcommand As SqlClient.SqlCommand
If USE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If USE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
SQLconnect.ConnectionString = ClassProxy.MyPROXYConnectionString
Else
SQLconnect.ConnectionString = connectionString
@ -193,7 +193,7 @@ Public Class ClassDatabase
Dim SQLconnect As New SqlClient.SqlConnection
Dim SQLcommand As SqlClient.SqlCommand
If USE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If USE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
SQLconnect.ConnectionString = ClassProxy.MyPROXYConnectionString
Else
SQLconnect.ConnectionString = connectionString
@ -292,7 +292,7 @@ Public Class ClassDatabase
Dim SQLconnect As New SqlClient.SqlConnection
Dim SQLcommand As SqlClient.SqlCommand
If USE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If USE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
SQLconnect.ConnectionString = ClassProxy.MyPROXYConnectionString
Else
SQLconnect.ConnectionString = connectionString

6
app/DD-Record-Organiser/ClassFileResult.vb
View File

@ -11,7 +11,7 @@
upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET IN_WORK = {0}, IN_WORK_USER = '{1}', IN_WORK_COMMENT = '{2}' WHERE DocID = {3}", state, USER_USERNAME, comment, DocID)
End If
If ClassDatabase.Execute_non_Query(upd) = True Then
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
ClassDatabase.Execute_non_Query(upd, True)
End If
InWork = True
@ -29,7 +29,7 @@
Dim upd As String
upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET DISPLAY_NAME = '{0}' WHERE DocID = {1}", Displayname, DocID)
If ClassDatabase.Execute_non_Query(upd) = True Then
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
ClassDatabase.Execute_non_Query(upd, True)
End If
Return True
@ -85,7 +85,7 @@
Try
Dim proc = String.Format("EXEC PRPMO_DELETE_RESULTFILE {0},{1},{2}", RESULT_DOC_ID, RECORD_ID, DELETE_FILE)
If ClassDatabase.Execute_non_Query(proc) = True Then
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", RESULT_DOC_ID)
ClassDatabase.Execute_non_Query(proc, True)
End If

11
app/DD-Record-Organiser/ClassInit.vb
View File

@ -21,10 +21,15 @@ Public Class ClassInit
End If
clsDatabase.GUI = True
If MyConnectionString <> String.Empty Then
dbResult = clsDatabase.Init(MyConnectionString, ClassProxy.MyPROXYConnectionString)
dbResult = clsDatabase.Init(MyConnectionString)
Else
frmConfig_Basic.ShowDialog()
dbResult = clsDatabase.Init(MyConnectionString, ClassProxy.MyPROXYConnectionString)
dbResult = clsDatabase.Init(MyConnectionString)
End If
If ClassProxy.MyPROXYConnectionString <> String.Empty Then
If clsDatabase.Init(ClassProxy.MyPROXYConnectionString, True) = False Then
ClassHelper.MSGBOX_Handler("ERROR", "", "Error while Initializing proxyserver - Check logfile")
End If
End If
ClassDatabase.Init()
If dbResult = False Then
@ -234,7 +239,7 @@ Public Class ClassInit
End Try
End If
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then
SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""')"
End If
Return True

4
app/DD-Record-Organiser/ClassRecordState.vb
View File

@ -7,7 +7,7 @@
End If
Dim Username As String = USER_USERNAME
Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 1, IN_WORK_WHO = '{0}' WHERE GUID = {1}", Username, RecordId)
If ClassProxy.MyPROXYConnectionString <> String.Empty Then
If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
ClassDatabase.Execute_non_Query(SQL, True)
End If
ClassDatabase.Execute_non_Query(SQL)
@ -26,7 +26,7 @@
Exit Sub
End If
Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 0, IN_WORK_WHO = NULL WHERE GUID = {0}", RecordId)
If ClassProxy.MyPROXYConnectionString <> String.Empty Then
If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
ClassDatabase.Execute_non_Query(SQL, True)
End If
ClassDatabase.Execute_non_Query(SQL)

2
app/DD-Record-Organiser/frmConfig_Basic.vb
View File

@ -456,7 +456,7 @@ Public Class frmConfig_Basic
End If
End Sub
Sub Refresh_Proxy()
If ClassProxy.MyPROXYConnectionString <> String.Empty Then
If clsDatabase.DB_PROXY_INITIALIZED Then
Dim csb As New SqlClient.SqlConnectionStringBuilder
csb.ConnectionString = ClassProxy.MyPROXYConnectionString

20
app/DD-Record-Organiser/frmConstructor_Main.resx
View File

@ -525,7 +525,7 @@
<value>0, 25</value>
</data>
<data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
<value>1067, 212</value>
<value>1074, 212</value>
</data>
<data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -665,7 +665,7 @@
<value>0, 0</value>
</data>
<data name="ToolStripRecords.Size" type="System.Drawing.Size, System.Drawing">
<value>1067, 25</value>
<value>1074, 25</value>
</data>
<data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -749,7 +749,7 @@
<value>0, 0</value>
</data>
<data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>786, 336</value>
<value>786, 343</value>
</data>
<data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -779,7 +779,7 @@
<value>0, 26</value>
</data>
<data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
<value>554, 286</value>
<value>561, 293</value>
</data>
<data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -826,10 +826,10 @@
<value>Ansicht eingeschränkt - Klick Bearbeiten für Entsperren</value>
</data>
<data name="statStripDoc.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 312</value>
<value>0, 319</value>
</data>
<data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
<value>554, 24</value>
<value>561, 24</value>
</data>
<data name="statStripDoc.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -856,7 +856,7 @@
<value>0, 0</value>
</data>
<data name="pnlDocToolStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>554, 26</value>
<value>561, 26</value>
</data>
<data name="pnlDocToolStrip.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -877,7 +877,7 @@
<value>Panel2</value>
</data>
<data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1356, 340</value>
<value>1356, 347</value>
</data>
<data name="SplitContainerDetails.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -1050,7 +1050,7 @@
<value>1</value>
</data>
<data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1356, 365</value>
<value>1356, 372</value>
</data>
<data name="TabDetails.Text" xml:space="preserve">
<value>Detailansicht</value>
@ -1068,7 +1068,7 @@
<value>0</value>
</data>
<data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1362, 396</value>
<value>1362, 403</value>
</data>
<data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
<value>1</value>

17
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@ -16,6 +16,7 @@ Imports System.IO
Imports WINDREAMLib
Imports System.Runtime.InteropServices
Imports DD_Rights
Imports DD_LIB_Standards
Public Class frmConstructor_Main
@ -274,7 +275,7 @@ Public Class frmConstructor_Main
'Try
Dim SQL
Dim DT_PROXY_ENTITY As DataTable
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
SQL = "SELECT * FROM TBPROXY_SYNC_ENTITY"
DT_PROXY_ENTITY = ClassDatabase.Return_Datatable(SQL, True)
End If
@ -288,7 +289,7 @@ Public Class frmConstructor_Main
DT_VWPMO_CONSTRUCTOR_FORMS = ClassDatabase.Return_Datatable(SQL, True)
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
If DT_VWPMO_CONSTRUCTOR_FORMS.Rows.Count = 0 Then
ClassHelper.MSGBOX_Handler("ERROR", "Missing Proxy-Configuration", String.Format("Attention: You are using Proxy-Server with synchronized data:" & vbNewLine & _
"Actually there is no data for this view synchronized or configured! Please inform Digital Data!" & vbNewLine & _
@ -1342,7 +1343,7 @@ Public Class frmConstructor_Main
Try
PWplainText = wrapper.DecryptData(_row.Item("AD_USER_PW").ToString())
Catch ex As Exception
clsLogger.Add("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted", False)
ClassLogger.Add("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted", False)
PWplainText = ""
End Try
FAU_AD_USER_PW = PWplainText
@ -1856,7 +1857,7 @@ Public Class frmConstructor_Main
CONTROL_HANDLING()
Dim DT_DOC_RESULT As DataTable = ClassDOC_SEARCH.Get_DOCRESULTS(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, "RECORD")
If IsNothing(DT_DOC_RESULT) Then
clsLogger.Add(">> DT_DOC_RESULT is nothing!", True)
ClassLogger.Add(">> DT_DOC_RESULT is nothing!", True)
End If
If ClassHelper.DeleteRecord(SELECTED_RECORD_ID) = True Then
RECORD_CHANGED = False
@ -3434,7 +3435,7 @@ Public Class frmConstructor_Main
End If
End If
Else
clsLogger.Add(">> No files 2 delete - after deleting record!", False)
ClassLogger.Add(">> No files 2 delete - after deleting record!", False)
End If
Cursor = Cursors.Default
Catch ex As Exception
@ -5700,7 +5701,7 @@ Public Class frmConstructor_Main
End If
End If
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", row.Item("DOC_ID"))
ClassDatabase.Execute_non_Query(proc, True)
End If
@ -5983,7 +5984,7 @@ Public Class frmConstructor_Main
Private Sub Load_Variants()
Try
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
Me.TBPMO_RECORD_VARIANTTableAdapter.Connection.ConnectionString = ClassProxy.MyPROXYConnectionString
Else
Me.TBPMO_RECORD_VARIANTTableAdapter.Connection.ConnectionString = MyConnectionString
@ -6147,7 +6148,7 @@ Public Class frmConstructor_Main
' Rename file.
My.Computer.FileSystem.RenameFile(OldName, NewName)
Cursor = Cursors.WaitCursor
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}", _
OnlyFilename, NewName, USER_USERNAME, ClassWindreamDocGrid.SELECTED_DOC_ID)
ClassDatabase.Execute_non_Query(upd, True)

2
app/DD-Record-Organiser/frmDocLink_to_Record.vb
View File

@ -399,7 +399,7 @@ Public Class frmDocLink_to_Record
If ClassDatabase.Execute_non_Query(ins) = False Then
MsgBox("Unexpected Error in Inserting Record-Doc Link. Please check logfile!", MsgBoxStyle.Critical)
Else
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DOC_REC_LINK {0},{1}", CURRENT_DOC_ID, RecordId)
ClassDatabase.Execute_non_Query(proc, True)
End If

2
app/DD-Record-Organiser/frmRight_Management.vb
View File

@ -80,7 +80,7 @@
Private Sub frmRight_Management_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
Save_Datagrid(TBPMO_RIGHT_GROUPDataGridView, "TBPMO_RIGHT_GROUPDataGridView")
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
MessageBox.Show("If You changed some data here, be aware that this data needs to be synchronized with Your proxy-data!" & vbNewLine & "The regualar processing-time are 30 minutes", "Attention", MessageBoxButtons.OK, MessageBoxIcon.Information)
End If
'Save_Datagrid(TBPMO_RIGHT_USERDataGridView, "TBPMO_RIGHT_USERDataGridView")

2
app/DD-Record-Organiser/frmWD_ChangeDoctype.vb
View File

@ -38,7 +38,7 @@ Public Class frmWD_ChangeDoctype
For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows
sql = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Doctype = '{0}' WHERE DocID = {1}", NewDoctype, row.Item("DOC_ID"))
If clsDatabase.Execute_non_Query(sql) = True Then
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then
clsDatabase.Execute_non_Query(sql, True)
sql = String.Format("UPDATE VWPMO_DOC_SEARCH SET Doctype = '{0}', Change_DateTime = GETDATE() WHERE DocID = {1}", NewDoctype, row.Item("DOC_ID"))
clsDatabase.Execute_non_Query(sql, True)

2
app/DD-Record-Organiser/frmWD_CreateVersion.vb
View File

@ -17,7 +17,7 @@ Public Class frmWD_CreateVersion
VERSION = VERSION + 1
Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Version = {0} WHERE DocID = {1}", VERSION, row.Item("DOC_ID"))
clsDatabase.Execute_non_Query(upd)
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then
clsDatabase.Execute_non_Query(upd, True)
End If
End If