diff --git a/app/DD-Record-Organiser/ClassAsyncReturnDT.vb b/app/DD-Record-Organiser/ClassAsyncReturnDT.vb new file mode 100644 index 0000000..92eff7b --- /dev/null +++ b/app/DD-Record-Organiser/ClassAsyncReturnDT.vb @@ -0,0 +1,15 @@ +Imports System.ComponentModel +Public Class ClassAsyncReturnDT + Private sql As String, comment As String + Public WithEvents bw As BackgroundWorker + Public dt As DataTable + Public Sub New(sqlCommand As String, Comment As String) + bw = New BackgroundWorker() + bw.WorkerReportsProgress = False + bw.WorkerSupportsCancellation = False + Me.sql = sqlCommand + End Sub + Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs) Handles bw.DoWork + Me.dt = ClassDatabase.Return_Datatable(Me.sql, comment) + End Sub +End Class diff --git a/app/DD-Record-Organiser/ClassAsyncSQL.vb b/app/DD-Record-Organiser/ClassAsyncSQL.vb index c53f7d2..d0b0eae 100644 --- a/app/DD-Record-Organiser/ClassAsyncSQL.vb +++ b/app/DD-Record-Organiser/ClassAsyncSQL.vb @@ -1,5 +1,4 @@ Imports System.ComponentModel - Public Class ClassAsyncSQL Private sql As String Public WithEvents bw As BackgroundWorker diff --git a/app/DD-Record-Organiser/ClassBackgroundHelper.vb b/app/DD-Record-Organiser/ClassBackgroundHelper.vb index ec18a09..c757acc 100644 --- a/app/DD-Record-Organiser/ClassBackgroundHelper.vb +++ b/app/DD-Record-Organiser/ClassBackgroundHelper.vb @@ -68,56 +68,67 @@ Public Class ClassBackgroundHelper End Function Private Sub GenerateBackgroundImage() - Dim gvInfo As GridViewInfo = TryCast(_grid.GetViewInfo(), GridViewInfo) - Dim _processedImage As New Bitmap(gvInfo.ViewRects.Client.Width + 1, gvInfo.ViewRects.Client.Height + 1) - Using g As Graphics = Graphics.FromImage(_processedImage) - Dim p As Point = CalculateImageLocation(_originalImage.Width, _originalImage.Height, gvInfo, _pictureAlignment) - Dim transparentImage As Bitmap = SetImgageOpacity(_originalImage, 0.5) - g.DrawImage(transparentImage, p) - g.Save() - End Using - _grid.GridControl.BackgroundImage = _processedImage + Try + Dim gvInfo As GridViewInfo = TryCast(_grid.GetViewInfo(), GridViewInfo) + Dim _processedImage As New Bitmap(gvInfo.ViewRects.Client.Width + 1, gvInfo.ViewRects.Client.Height + 1) + Using g As Graphics = Graphics.FromImage(_processedImage) + Dim p As Point = CalculateImageLocation(_originalImage.Width, _originalImage.Height, gvInfo, _pictureAlignment) + Dim transparentImage As Bitmap = SetImgageOpacity(_originalImage, 0.5) + g.DrawImage(transparentImage, p) + g.Save() + End Using + _grid.GridControl.BackgroundImage = _processedImage + Catch ex As Exception + ClassLogger.Add("Unexpected Error in GenerateBackgroundImage: " & ex.Message) + End Try + End Sub Private Function CalculateImageLocation(imageWidth As Integer, imageHeight As Integer, gvInfo As GridViewInfo, alignment As ContentAlignment) As Point - Dim location As Point = Point.Empty - Dim rect As Rectangle = gvInfo.ViewRects.Rows - Dim indicatorWidth As Integer = gvInfo.ViewRects.IndicatorWidth - Dim vScrollSize As Integer = If(gvInfo.VScrollBarPresence = ScrollBarPresence.Visible, 20, 0) - Dim hSctollSize As Integer = If(gvInfo.HScrollBarPresence = ScrollBarPresence.Visible, 20, 0) + Try + Dim location As Point = Point.Empty + Dim rect As Rectangle = gvInfo.ViewRects.Rows + Dim indicatorWidth As Integer = gvInfo.ViewRects.IndicatorWidth + Dim vScrollSize As Integer = If(gvInfo.VScrollBarPresence = ScrollBarPresence.Visible, 20, 0) + Dim hSctollSize As Integer = If(gvInfo.HScrollBarPresence = ScrollBarPresence.Visible, 20, 0) - Select Case alignment - Case ContentAlignment.BottomCenter - location.Offset((rect.Width / 2) - (imageWidth / 2), rect.Bottom - imageHeight - hSctollSize) - Exit Select - Case ContentAlignment.BottomLeft - location.Offset(indicatorWidth, rect.Bottom - imageHeight - hSctollSize) - Exit Select - Case ContentAlignment.BottomRight - location.Offset(rect.Right - imageWidth - vScrollSize, rect.Bottom - imageHeight - hSctollSize) - Exit Select - Case ContentAlignment.MiddleCenter - location.Offset((rect.Width / 2) - (imageWidth / 2), (rect.Height / 2) - (imageHeight / 2)) - Exit Select - Case ContentAlignment.MiddleLeft - location.Offset(indicatorWidth, (rect.Height / 2) - (imageHeight / 2)) - Exit Select - Case ContentAlignment.MiddleRight - location.Offset(rect.Width - imageWidth - vScrollSize, (rect.Height / 2) - (imageHeight / 2)) - Exit Select - Case ContentAlignment.TopCenter - location.Offset((rect.Width / 2) - (imageWidth / 2), rect.Top) - Exit Select - Case ContentAlignment.TopLeft - location.Offset(indicatorWidth, rect.Top) - Exit Select - Case ContentAlignment.TopRight - location.Offset(rect.Right - imageWidth - vScrollSize, rect.Top) - Exit Select - Case Else - Exit Select - End Select - Return location + Select Case alignment + Case ContentAlignment.BottomCenter + location.Offset((rect.Width / 2) - (imageWidth / 2), rect.Bottom - imageHeight - hSctollSize) + Exit Select + Case ContentAlignment.BottomLeft + location.Offset(indicatorWidth, rect.Bottom - imageHeight - hSctollSize) + Exit Select + Case ContentAlignment.BottomRight + location.Offset(rect.Right - imageWidth - vScrollSize, rect.Bottom - imageHeight - hSctollSize) + Exit Select + Case ContentAlignment.MiddleCenter + location.Offset((rect.Width / 2) - (imageWidth / 2), (rect.Height / 2) - (imageHeight / 2)) + Exit Select + Case ContentAlignment.MiddleLeft + location.Offset(indicatorWidth, (rect.Height / 2) - (imageHeight / 2)) + Exit Select + Case ContentAlignment.MiddleRight + location.Offset(rect.Width - imageWidth - vScrollSize, (rect.Height / 2) - (imageHeight / 2)) + Exit Select + Case ContentAlignment.TopCenter + location.Offset((rect.Width / 2) - (imageWidth / 2), rect.Top) + Exit Select + Case ContentAlignment.TopLeft + location.Offset(indicatorWidth, rect.Top) + Exit Select + Case ContentAlignment.TopRight + location.Offset(rect.Right - imageWidth - vScrollSize, rect.Top) + Exit Select + Case Else + Exit Select + End Select + Return location + Catch ex As Exception + ClassLogger.Add("Unexpected Error in CalculateImageLocation: " & ex.Message) + Return Nothing + End Try + End Function Private Sub InitializingBlendingComponent() diff --git a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb index b48ee59..a065090 100644 --- a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb @@ -5,7 +5,8 @@ Public Class ClassDOC_SEARCH Private Shared DT_RESULTLIST_SEL_VALUES As DataTable Private Shared ENTITY_ID As Integer Private Shared RECORD_ID As Integer - Private Shared Function GET_DOCSEARCH_DATATABLE(Type As String) + Private Shared AsyncRunning As Boolean = False + Private Shared Function GET_DOCSEARCH_DATATABLE(Type As String, Optional fulltext_String As String = "", Optional BG As Boolean = False) Try Dim OPTION1 Dim OPTION2 @@ -58,40 +59,72 @@ Public Class ClassDOC_SEARCH Dim SQL_DOC_SEARCH If Type = "ENTITY" Then - SQL_DOC_SEARCH = String.Format("SELECT T.* ," & vbNewLine & _ - "ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _ - "ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _ - "ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine & _ - "ISNULL(T4.VALUE,'') AS OPTION4," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX1') AS DOCIDX1," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX2') AS DOCIDX2," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX3') AS DOCIDX3," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX4') AS DOCIDX4," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN1','{7}') AS DROPDOWN1," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN2','{7}') AS DROPDOWN2," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN3','{7}') AS DROPDOWN3," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN4','{7}') AS DROPDOWN4," & vbNewLine & _ - "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC.GUID) AS VALUE1," & vbNewLine & _ - "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC1.GUID) AS VALUE2," & vbNewLine & _ - "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC2.GUID) AS VALUE3," & vbNewLine & _ - "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC3.GUID) AS VALUE4" & vbNewLine & _ - "FROM " & vbNewLine & _ - "VWPMO_WD_DOC_SEARCH T " & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON T.ENTITY_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON T.ENTITY_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON T.ENTITY_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON T.ENTITY_ID = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T1 ON T.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T2 ON T.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T3 ON T.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T4 ON T.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & _ - "WHERE T.ENTITY_ID = {1} AND T.DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = T.DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4) + SQL_DOC_SEARCH = String.Format("SELECT T.*," & vbNewLine & _ + "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({3},T.DocID,{0}) AS OPTION1," & vbNewLine & _ + "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({4},T.DocID,{0}) AS OPTION2," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX1') AS DOCIDX1," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX2') AS DOCIDX2," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX3') AS DOCIDX3," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX4') AS DOCIDX4," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN1','{1}') AS DROPDOWN1," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN2','{1}') AS DROPDOWN2," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN3','{1}') AS DROPDOWN3," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN4','{1}') AS DROPDOWN4" & vbNewLine & _ + "FROM " & vbNewLine & _ + "VWPMO_DOC_SEARCH T" & vbNewLine & _ + "WHERE T.DocID IN (select DISTINCT DOC_ID from TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0}) " & vbNewLine & _ + "AND T.DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {2} AND dwObjectID = T.DocID)", ENTITY_ID, USER_LANGUAGE, USERID_FK_INT_ECM, OPTION1, OPTION2) + 'SQL_DOC_SEARCH = String.Format("SELECT T.* ," & vbNewLine & _ + '"ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _ + '"ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _ + '"ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine & _ + '"ISNULL(T4.VALUE,'') AS OPTION4," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX1') AS DOCIDX1," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX2') AS DOCIDX2," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX3') AS DOCIDX3," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX4') AS DOCIDX4," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN1','{7}') AS DROPDOWN1," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN2','{7}') AS DROPDOWN2," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN3','{7}') AS DROPDOWN3," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN4','{7}') AS DROPDOWN4," & vbNewLine & _ + '"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC.GUID) AS VALUE1," & vbNewLine & _ + '"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC1.GUID) AS VALUE2," & vbNewLine & _ + '"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC2.GUID) AS VALUE3," & vbNewLine & _ + '"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC3.GUID) AS VALUE4" & vbNewLine & _ + '"FROM " & vbNewLine & _ + '"VWPMO_WD_DOC_SEARCH T " & vbNewLine & _ + '"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON T.ENTITY_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & _ + '"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON T.ENTITY_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & _ + '"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON T.ENTITY_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & _ + '"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON T.ENTITY_ID = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine & _ + '"LEFT JOIN TBPMO_CONTROL_VALUE T1 ON T.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine & _ + '"LEFT JOIN TBPMO_CONTROL_VALUE T2 ON T.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & _ + '"LEFT JOIN TBPMO_CONTROL_VALUE T3 ON T.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & _ + '"LEFT JOIN TBPMO_CONTROL_VALUE T4 ON T.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & _ + '"WHERE T.ENTITY_ID = {1} AND T.DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = T.DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4) If CURRENT_ENTITYSQL.ToUpper.Contains("WHERE") Then Dim where = CURRENT_ENTITYSQL.ToUpper.Replace("SELECT T.*", "SELECT '#' + CONVERT(VARCHAR(10),T.[Record-ID]) + '#'") SQL_DOC_SEARCH = SQL_DOC_SEARCH & String.Format(" AND RECORD_ID IN ({0})", where) End If - Else + If BG = True Then + If IsNothing(CURRENT_DT_DOC_ENTITY_SEARCH) Then + If AsyncRunning = True Then + MsgBox("Entity-Search already running in background! Please wait a while!", MsgBoxStyle.Information) + Return Nothing + End If + Dim async As New ClassAsyncReturnDT(SQL_DOC_SEARCH, "LOAD_ENTITY_SEARCH_AT STARTUP") + async.bw.RunWorkerAsync() + While async.bw.IsBusy + Application.DoEvents() + End While + CURRENT_DT_DOC_ENTITY_SEARCH = async.dt + AsyncRunning = False + End If + + End If + + ElseIf Type = "RECORD" Then SQL_DOC_SEARCH = String.Format("SELECT T.* ," & vbNewLine & _ "ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _ "ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _ @@ -120,41 +153,69 @@ Public Class ClassDOC_SEARCH "LEFT JOIN TBPMO_CONTROL_VALUE T3 ON T.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & _ "LEFT JOIN TBPMO_CONTROL_VALUE T4 ON T.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & _ "WHERE T.RECORD_ID = {0} AND T.ENTITY_ID = {1} AND T.DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = T.DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4) - ' SQL_DOC_SEARCH = String.Format("SELECT * ," & _ - ' "(CASE (SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}) " & _ - ' "WHEN {1} THEN " & _ - ' " (SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {2} AND RECORD_ID = {0}) " & _ - ' "ELSE '' END) AS OPTION1," & _ - ' "CASE (SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}) " & _ - ' "WHEN {1} THEN " & _ - ' " (SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {3} AND RECORD_ID = {0}) " & _ - ' "ELSE '' END AS OPTION2," & _ - ' "CASE (SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}) " & _ - ' "WHEN {1} THEN " & _ - ' " (SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {4} AND RECORD_ID = {0}) " & _ - ' "ELSE '' END AS OPTION3," & _ - ' "CASE (SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}) " & _ - ' "WHEN {1} THEN " & _ - ' " (SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {5} AND RECORD_ID = {0}) " & _ - ' "ELSE '' END AS OPTION4 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX1')) AS DOCIDX1 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX2')) AS DOCIDX2 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX3')) AS DOCIDX3 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX4')) AS DOCIDX4 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN1','{7}')) AS DROPDOWN1 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN2','{7}')) AS DROPDOWN2 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN3','{7}')) AS DROPDOWN3 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN4','{7}')) AS DROPDOWN4 " & _ - '"FROM VWPMO_WD_DOC_SEARCH WHERE RECORD_ID = {0} AND ENTITY_ID = {1} AND DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE) + ElseIf Type = "FULLTEXT" Then + Dim sqlft = SQL_FULLTEXT + sqlft = sqlft.Replace("@FULLTEXT", fulltext_String) + SQL_DOC_SEARCH = String.Format("SELECT T.*," & vbNewLine & _ + "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({3},T.DocID,{0}) AS OPTION1," & vbNewLine & _ + "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({4},T.DocID,{0}) AS OPTION2," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX1') AS DOCIDX1," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX2') AS DOCIDX2," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX3') AS DOCIDX3," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX4') AS DOCIDX4," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN1','{1}') AS DROPDOWN1," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN2','{1}') AS DROPDOWN2," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN3','{1}') AS DROPDOWN3," & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{0},'DROPDOWN4','{1}') AS DROPDOWN4" & vbNewLine & _ + "FROM " & vbNewLine & _ + "VWPMO_DOC_SEARCH T" & vbNewLine & _ + "WHERE T.DocID IN (select DISTINCT DOC_ID from TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0}) " & vbNewLine & _ + "AND T.DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {2} AND dwObjectID = T.DocID) AND " & vbNewLine & _ + "T.DocID IN ({5})", ENTITY_ID, USER_LANGUAGE, USERID_FK_INT_ECM, OPTION1, OPTION2, sqlft) + ' SQL_DOC_SEARCH = String.Format("SELECT T.* ," & vbNewLine & _ + '"ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _ + '"ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _ + '"ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine & _ + '"ISNULL(T4.VALUE,'') AS OPTION4," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX1') AS DOCIDX1," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX2') AS DOCIDX2," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX3') AS DOCIDX3," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX4') AS DOCIDX4," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN1','{7}') AS DROPDOWN1," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN2','{7}') AS DROPDOWN2," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN3','{7}') AS DROPDOWN3," & vbNewLine & _ + '"[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN4','{7}') AS DROPDOWN4," & vbNewLine & _ + '"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC.GUID) AS VALUE1," & vbNewLine & _ + '"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC1.GUID) AS VALUE2," & vbNewLine & _ + '"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC2.GUID) AS VALUE3," & vbNewLine & _ + '"(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC3.GUID) AS VALUE4" & vbNewLine & _ + '"FROM " & vbNewLine & _ + '"VWPMO_WD_DOC_SEARCH T " & vbNewLine & _ + '"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON T.ENTITY_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & _ + '"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON T.ENTITY_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & _ + '"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON T.ENTITY_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & _ + '"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON T.ENTITY_ID = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine & _ + '"LEFT JOIN TBPMO_CONTROL_VALUE T1 ON T.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine & _ + '"LEFT JOIN TBPMO_CONTROL_VALUE T2 ON T.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & _ + '"LEFT JOIN TBPMO_CONTROL_VALUE T3 ON T.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & _ + '"LEFT JOIN TBPMO_CONTROL_VALUE T4 ON T.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & _ + '"WHERE T.ENTITY_ID = {1} AND T.DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = T.DocID) AND " & vbNewLine & _ + '"T.DocID IN ({12})", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4, sqlft) End If If LogErrorsOnly = False Then ClassLogger.Add(" >> SQL_DOC_SEARCH: " & SQL_DOC_SEARCH, False) + If BG = True And Type = "ENTITY" Then + If Not IsNothing(CURRENT_DT_DOC_ENTITY_SEARCH) Then + Return CURRENT_DT_DOC_ENTITY_SEARCH + End If + + End If Return ClassDatabase.Return_Datatable_Connection(SQL_DOC_SEARCH, 1) Catch ex As Exception ClassLogger.Add("Unexpected Error in GET_DOCSEARCH_DATATABLE: " & ex.Message, True) Return Nothing End Try End Function - Public Shared Function Get_DOC_RESULTTABLE(vDT_RESULTLIST_OPTIONS As DataTable, vDT_RESULTLIST_SELVALUES As DataTable, DT_WINDREAM_RESULTLIST As DataTable, ENT_ID As Integer, REC_ID As Integer, vType As String) + Public Shared Function Get_DOC_RESULTTABLE(vDT_RESULTLIST_OPTIONS As DataTable, vDT_RESULTLIST_SELVALUES As DataTable, DT_WINDREAM_RESULTLIST As DataTable, ENT_ID As Integer, REC_ID As Integer, vType As String, Optional ftString As String = "", Optional BG As Boolean = False, Optional Preload As Boolean = False) Dim COL_ARRAY_RESULTLIST As List(Of String) ENTITY_ID = ENT_ID DT_RESULTLIST_OPTIONS = vDT_RESULTLIST_OPTIONS @@ -164,7 +225,7 @@ Public Class ClassDOC_SEARCH Dim sw As New Stopwatch sw.Start() Dim elapsed As Double - Dim DT_FILE_RESULT As DataTable = GET_DOCSEARCH_DATATABLE(vType) + Dim DT_FILE_RESULT As DataTable = GET_DOCSEARCH_DATATABLE(vType, ftString, BG) CURRENT_DOC_RESULTS = DT_FILE_RESULT If IsNothing(DT_FILE_RESULT) Then ClassLogger.Add(">> ATTENTION: GET_DOCSEARCH_DATATABLE IS NOTHING!!", False) @@ -175,6 +236,9 @@ Public Class ClassDOC_SEARCH sw.Reset() Console.WriteLine(">> GET_DOCSEARCH_DATATABLE took " & Format(elapsed, "0.000000000") & " seconds") If LogErrorsOnly = False Then ClassLogger.Add(" >> Run GET_DOCSEARCH_DATATABLE took " & Format(elapsed, "0.000000000") & " seconds", False) + If Preload = True Then + Return Nothing + End If sw.Start() Dim DTGrid As New DataTable Dim ColArrayDEFINITION As New List(Of String) @@ -265,6 +329,12 @@ Public Class ClassDOC_SEARCH NewRow.Item(0) = My.Resources.ppt Case ".dwg".ToUpper NewRow.Item(0) = My.Resources.dwg + Case ".dxf".ToUpper + NewRow.Item(0) = My.Resources.dxf + Case ".msg".ToUpper + NewRow.Item(0) = My.Resources.email_go + Case ".msg".ToUpper + NewRow.Item(0) = My.Resources.email_go Case Else NewRow.Item(0) = My.Resources._blank End Select @@ -277,13 +347,18 @@ Public Class ClassDOC_SEARCH Dim rowvalue Try rowvalue = FILE_ROW.Item(Colname) - If LogErrorsOnly = False Then ClassLogger.Add(" >> rowvalue for Colname '" & Colname & "': '" & rowvalue.ToString & "'", False) + 'If LogErrorsOnly = False Then ClassLogger.Add(" >> rowvalue for Colname '" & Colname & "': '" & rowvalue.ToString & "'", False) Catch ex As Exception - ClassLogger.Add("Unexpected Error in GetVariableValue for Column '" & Colname & "'- Error: " & ex.Message) + If vType = "RECORD" Then ClassLogger.Add("Unexpected Error in GetVariableValue for Column '" & Colname & "'- Error: " & ex.Message) If Colname.ToString.StartsWith("doct") Or Colname.ToString.StartsWith("Dokum") Then rowvalue = "" Else - rowvalue = "Error getting rowvalue" + If vType <> "RECORD" Then + rowvalue = "Not displayable in Group-Search" + Else + rowvalue = "Error getting rowvalue" + End If + End If End Try NewRow.Item(i) = rowvalue.ToString diff --git a/app/DD-Record-Organiser/ClassInit.vb b/app/DD-Record-Organiser/ClassInit.vb index 7cf30eb..b943599 100644 --- a/app/DD-Record-Organiser/ClassInit.vb +++ b/app/DD-Record-Organiser/ClassInit.vb @@ -90,11 +90,12 @@ Public Class ClassInit If KONFIG_DT.Rows.Count = 1 Then Try MY_WIKISTRING = KONFIG_DT.Rows(0).Item("WIKI_STRING") - WD_GROUP1 = KONFIG_DT.Rows(0).Item("WD_GROUP1") + Catch ex As Exception MY_WIKISTRING = "" End Try WD_UNICODE = KONFIG_DT.Rows(0).Item("WD_UNICODE") + SQL_FULLTEXT = KONFIG_DT.Rows(0).Item("SQL_FULLTEXT") End If Catch ex As Exception MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) diff --git a/app/DD-Record-Organiser/ClassWindreamDocGrid.vb b/app/DD-Record-Organiser/ClassWindreamDocGrid.vb index a4f2abe..c7ac544 100644 --- a/app/DD-Record-Organiser/ClassWindreamDocGrid.vb +++ b/app/DD-Record-Organiser/ClassWindreamDocGrid.vb @@ -121,7 +121,7 @@ Public Class ClassWindreamDocGrid End If End Sub - Public Shared Sub FillColumns(gridView As GridView, DT_RESULT As DataTable, DT_WINDREAM_RESULTLIST As DataTable, DT_DOCRESULT_DROPDOWN_ITEMS As DataTable, DropdownValueChangedHandler As EventHandler, DatepickerValueChangedHandler As EventHandler, TextValueChangedHandler As EventHandler) + Public Shared Sub FillColumns(gridView As GridView, DT_RESULT As DataTable, DT_WINDREAM_RESULTLIST As DataTable, DT_DOCRESULT_DROPDOWN_ITEMS As DataTable, DropdownValueChangedHandler As EventHandler, DatepickerValueChangedHandler As EventHandler, TextValueChangedHandler As EventHandler, SearchType As String) ' Handler speichern _dropdownValueChangedHandler = DropdownValueChangedHandler _datepickerValueChangedHandler = DatepickerValueChangedHandler @@ -137,7 +137,12 @@ Public Class ClassWindreamDocGrid Dim guid As Integer = row.Item("GUID") Dim typeID As Integer = row.Item("TYPE_ID") Dim isVisible As Boolean = row.Item("VISIBLE") - Dim isEditable As Boolean = row.Item("EDITABLE") + Dim isEditable As Boolean + If SearchType = "RECORD" Then + isEditable = row.Item("EDITABLE") + Else + isEditable = False + End If Dim columnTitle As String = row.Item("HEADER_CAPTION") RESULT_CONFIG_IDS.Add(columnTitle, guid) @@ -206,7 +211,13 @@ Public Class ClassWindreamDocGrid Dim width As Integer = row.Item("WIDTH") Dim typeID As Integer = row.Item("TYPE_ID") Dim isVisible As Boolean = row.Item("VISIBLE") - Dim isEditable As Boolean = row.Item("EDITABLE") + Dim isEditable As Boolean + If SearchType = "RECORD" Then + isEditable = row.Item("EDITABLE") + Else + isEditable = False + End If + Dim columnTitle As String = row.Item("HEADER_CAPTION") ' Breite der Spalten setzen @@ -228,10 +239,14 @@ Public Class ClassWindreamDocGrid If Not IsNothing(col) Then col.ColumnEdit = textedit col.OptionsColumn.AllowEdit = True + col.AppearanceCell.BackColor = Color.LightCyan End If ' Handler zuweisen AddHandler textedit.Leave, _textValueChangedHandler + 'ElseIf typeID = 1 And isVisible And isEditable = False Then + ' Dim col As GridColumn = gridView.Columns(columnTitle) + ' col.AppearanceCell.BackColor = Color.WhiteSmoke End If If typeID = 2 And isVisible Then @@ -248,6 +263,7 @@ Public Class ClassWindreamDocGrid If isEditable Then col.OptionsColumn.AllowEdit = True + col.AppearanceCell.BackColor = Color.LightCyan Else col.OptionsColumn.AllowEdit = False End If @@ -263,6 +279,7 @@ Public Class ClassWindreamDocGrid If Not IsNothing(col) Then col.ColumnEdit = dateedit col.OptionsColumn.AllowEdit = True + col.AppearanceCell.BackColor = Color.LightGray col.DisplayFormat.FormatType = FormatType.DateTime col.DisplayFormat.FormatString = CURRENT_DATE_FORMAT '& " HH:MM:ss" End If @@ -294,9 +311,13 @@ Public Class ClassWindreamDocGrid If Not IsNothing(col) Then col.OptionsColumn.AllowEdit = True col.ColumnEdit = dropdown + col.AppearanceCell.BackColor = Color.LightCyan End If ' Handler zuweisen AddHandler dropdown.SelectedValueChanged, _dropdownValueChangedHandler + 'ElseIf typeID = 4 And isVisible And isEditable = False Then + ' Dim col As GridColumn = gridView.Columns(columnTitle) + ' col.AppearanceCell.BackColor = Color.WhiteSmoke End If Next End Sub diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 222bc86..b9a3075 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -246,6 +246,7 @@ + @@ -997,7 +998,7 @@ VbMyResourcesResXFileCodeGenerator My.Resources Designer - Resources.Designer.vb + Resources1.Designer.vb @@ -1294,6 +1295,12 @@ + + + + + + @@ -1389,6 +1396,9 @@ + + + diff --git a/app/DD-Record-Organiser/ModuleMySettings.vb b/app/DD-Record-Organiser/ModuleMySettings.vb index 644c659..970df3a 100644 --- a/app/DD-Record-Organiser/ModuleMySettings.vb +++ b/app/DD-Record-Organiser/ModuleMySettings.vb @@ -17,6 +17,7 @@ Module ModuleMySettings Public MY_WIKISTRING As String Public WD_GROUP1 As String Public WD_UNICODE As Boolean = False + Public SQL_FULLTEXT As String Public WD_ShowEnitityDocs As Boolean = True Public WD_ShowDocs As Boolean = False diff --git a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb index d5267d0..3c9dfdb 100644 --- a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb @@ -83,6 +83,7 @@ Public CURRENT_SQL_AUTO_VALUES_DT As DataTable Public CURRENT_TBPMO_INDEX_MAN As DataTable Public CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS As DataTable + Public CURRENT_DT_DOC_ENTITY_SEARCH As DataTable Public CURRENT_DOC_RESULTS As DataTable Public CURRENT_DOC_DROPDOWN As DataTable diff --git a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb index 0cd399b..152eff1 100644 --- a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index 6a2298f..592d0fc 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -420,6 +420,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property bmp() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("bmp", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -880,6 +890,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property dxf() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("dxf", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -940,6 +960,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property eps() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("eps", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1740,6 +1770,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property text1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("text1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1899,5 +1939,15 @@ Namespace My.Resources Return CType(obj,System.Drawing.Bitmap) End Get End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property zip() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("zip", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property End Module End Namespace diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index 57248fc..5b0a6cc 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\dxf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\database_table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -130,11 +133,8 @@ ..\Resources\UserInterfaceEditor_5845_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\windream-Logo-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Carousel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\DD_Icons-ADDI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,18 +169,24 @@ ..\Resources\Files_7954.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\asset_pie-series-chart_on_12X12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Men3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\4(four)rows_9716.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\sql.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Arrow_RedoRetry_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Login_6031_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,8 +208,11 @@ ..\Resources\userAccounts.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mail.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\user_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -214,9 +223,6 @@ ..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\checkbox_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -256,18 +262,21 @@ ..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\changechartlegendalignment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\page_excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\dtp.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Reports-collapsed_12995_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\text1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\FilteredObject_13400_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -280,20 +289,26 @@ ..\Resources\application_view_detail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\brick_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\calendar_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Carousel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\f5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -307,6 +322,9 @@ ..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ComboBox_672.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -319,8 +337,8 @@ ..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -328,12 +346,6 @@ ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -343,9 +355,6 @@ ..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_Forward_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Arrow_RedoRetry_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -373,6 +382,9 @@ ..\Resources\WMI_Task_21x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Connection_Manager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -391,15 +403,9 @@ ..\Resources\lock_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\database_lightning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -412,8 +418,8 @@ ..\Resources\Label_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bug_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -454,17 +460,23 @@ ..\Resources\txt.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Task_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\windream-Logo-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\xml.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Men6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -472,8 +484,8 @@ ..\Resources\f2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\brainpool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -499,15 +511,18 @@ ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\folder_Open_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bmp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WebUserControl(ascx)_11270_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -529,11 +544,11 @@ ..\Resources\action_add_16xSM.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_Forward_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Connection_Manager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\mail.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bricks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -544,6 +559,9 @@ ..\Resources\database_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\module_32xSM.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -556,14 +574,17 @@ ..\Resources\folder_Open_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\note_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -574,23 +595,23 @@ ..\Resources\database_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Men4.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\asset_pie-series-chart_on_12X12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\keinbild.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\changechartlegendalignment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Login_6031_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -598,8 +619,8 @@ ..\Resources\f1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -643,8 +664,8 @@ ..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -655,6 +676,9 @@ ..\Resources\EditLabel_13239.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\eps.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\HomeHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -667,7 +691,4 @@ ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Reports-collapsed_12995_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/app/DD-Record-Organiser/Resources/Compare_RefreshScriptPreview.png b/app/DD-Record-Organiser/Resources/Compare_RefreshScriptPreview.png new file mode 100644 index 0000000..4a84cd8 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/Compare_RefreshScriptPreview.png differ diff --git a/app/DD-Record-Organiser/Resources/bmp.png b/app/DD-Record-Organiser/Resources/bmp.png new file mode 100644 index 0000000..98ef182 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/bmp.png differ diff --git a/app/DD-Record-Organiser/Resources/dxf.png b/app/DD-Record-Organiser/Resources/dxf.png new file mode 100644 index 0000000..18abb2a Binary files /dev/null and b/app/DD-Record-Organiser/Resources/dxf.png differ diff --git a/app/DD-Record-Organiser/Resources/eps.png b/app/DD-Record-Organiser/Resources/eps.png new file mode 100644 index 0000000..41fc8dc Binary files /dev/null and b/app/DD-Record-Organiser/Resources/eps.png differ diff --git a/app/DD-Record-Organiser/Resources/sql.png b/app/DD-Record-Organiser/Resources/sql.png new file mode 100644 index 0000000..0664ed5 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/sql.png differ diff --git a/app/DD-Record-Organiser/Resources/text1.png b/app/DD-Record-Organiser/Resources/text1.png new file mode 100644 index 0000000..26909be Binary files /dev/null and b/app/DD-Record-Organiser/Resources/text1.png differ diff --git a/app/DD-Record-Organiser/Resources/xml.png b/app/DD-Record-Organiser/Resources/xml.png new file mode 100644 index 0000000..8bdd012 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/xml.png differ diff --git a/app/DD-Record-Organiser/Resources/zip.png b/app/DD-Record-Organiser/Resources/zip.png new file mode 100644 index 0000000..db988ad Binary files /dev/null and b/app/DD-Record-Organiser/Resources/zip.png differ diff --git a/app/DD-Record-Organiser/email.png b/app/DD-Record-Organiser/email.png new file mode 100644 index 0000000..7348aed Binary files /dev/null and b/app/DD-Record-Organiser/email.png differ diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index 62ae353..d0064f5 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmConstructor_Main 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main)) Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() @@ -29,14 +30,18 @@ Partial Class frmConstructor_Main Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl() Me.TreeViewMain = New System.Windows.Forms.TreeView() - Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip() + Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator14 = New System.Windows.Forms.ToolStripSeparator() Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator13 = New System.Windows.Forms.ToolStripSeparator() Me.EntitätssucheStartenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator() Me.AuswertungAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridControlMain = New DevExpress.XtraGrid.GridControl() - Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -63,7 +68,7 @@ Partial Class frmConstructor_Main Me.pnlDetails = New System.Windows.Forms.Panel() Me.TabWindream = New DevExpress.XtraTab.XtraTabPage() Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() - Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator() Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -80,12 +85,19 @@ Partial Class frmConstructor_Main Me.TsMI_DocRemoveLink = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() Me.PropertiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator16 = New System.Windows.Forms.ToolStripSeparator() Me.AnsichtZurücksetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SucheAnzeigenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView() Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip() Me.tslblWindreamView = New System.Windows.Forms.ToolStripLabel() Me.ToolStripDropDownButton2 = New System.Windows.Forms.ToolStripDropDownButton() Me.KonfigurationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator17 = New System.Windows.Forms.ToolStripSeparator() + Me.tsTextboxFulltext = New System.Windows.Forms.ToolStripTextBox() + Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel() + Me.ToolStripSeparator18 = New System.Windows.Forms.ToolStripSeparator() + Me.tsbtnEntitySearch = New System.Windows.Forms.ToolStripButton() Me.TabFollowUp = New DevExpress.XtraTab.XtraTabPage() Me.ListViewFollowUps = New System.Windows.Forms.ListView() Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) @@ -107,7 +119,7 @@ Partial Class frmConstructor_Main Me.Panel1 = New System.Windows.Forms.Panel() Me.GridControlPos = New DevExpress.XtraGrid.GridControl() Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator() + Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() @@ -141,7 +153,7 @@ Partial Class frmConstructor_Main Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.AnwendungscacheFreigebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer1 = New DevExpress.XtraEditors.SplitContainerControl() - Me.BindingSource_Entity = New System.Windows.Forms.BindingSource() + Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components) Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane() Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton() Me.NavButtonRefresh = New DevExpress.XtraBars.Navigation.NavButton() @@ -153,18 +165,18 @@ Partial Class frmConstructor_Main Me.progressLoadEntity = New System.Windows.Forms.ToolStripProgressBar() Me.labelLoadEntity = New System.Windows.Forms.ToolStripStatusLabel() Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin() - Me.ImageCollection1 = New DevExpress.Utils.ImageCollection() - Me.ttToolTip = New System.Windows.Forms.ToolTip() - Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip() + Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) + Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components) + Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() - Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() + Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter() - Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() + Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() - Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource() - Me.ToolTipController = New DevExpress.Utils.ToolTipController() + Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components) CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.SuspendLayout() CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() @@ -242,7 +254,7 @@ Partial Class frmConstructor_Main ' 'CMSEntity ' - Me.CMSEntity.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.DateiimportEntitätToolStripMenuItem, Me.FormDesignerToolStripMenuItem, Me.EntitätssucheStartenToolStripMenuItem, Me.AuswertungAnzeigenToolStripMenuItem}) + Me.CMSEntity.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.ToolStripSeparator14, Me.DateiimportEntitätToolStripMenuItem, Me.ToolStripSeparator15, Me.FormDesignerToolStripMenuItem, Me.ToolStripSeparator13, Me.EntitätssucheStartenToolStripMenuItem, Me.ToolStripSeparator12, Me.AuswertungAnzeigenToolStripMenuItem}) Me.CMSEntity.Name = "ContextMenuStrip2" resources.ApplyResources(Me.CMSEntity, "CMSEntity") ' @@ -251,23 +263,43 @@ Partial Class frmConstructor_Main Me.ResetEbenenAuswahlToolStripMenuItem.Name = "ResetEbenenAuswahlToolStripMenuItem" resources.ApplyResources(Me.ResetEbenenAuswahlToolStripMenuItem, "ResetEbenenAuswahlToolStripMenuItem") ' + 'ToolStripSeparator14 + ' + Me.ToolStripSeparator14.Name = "ToolStripSeparator14" + resources.ApplyResources(Me.ToolStripSeparator14, "ToolStripSeparator14") + ' 'DateiimportEntitätToolStripMenuItem ' Me.DateiimportEntitätToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.folder_Open_32xMD Me.DateiimportEntitätToolStripMenuItem.Name = "DateiimportEntitätToolStripMenuItem" resources.ApplyResources(Me.DateiimportEntitätToolStripMenuItem, "DateiimportEntitätToolStripMenuItem") ' + 'ToolStripSeparator15 + ' + Me.ToolStripSeparator15.Name = "ToolStripSeparator15" + resources.ApplyResources(Me.ToolStripSeparator15, "ToolStripSeparator15") + ' 'FormDesignerToolStripMenuItem ' Me.FormDesignerToolStripMenuItem.Name = "FormDesignerToolStripMenuItem" resources.ApplyResources(Me.FormDesignerToolStripMenuItem, "FormDesignerToolStripMenuItem") ' + 'ToolStripSeparator13 + ' + Me.ToolStripSeparator13.Name = "ToolStripSeparator13" + resources.ApplyResources(Me.ToolStripSeparator13, "ToolStripSeparator13") + ' 'EntitätssucheStartenToolStripMenuItem ' Me.EntitätssucheStartenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG Me.EntitätssucheStartenToolStripMenuItem.Name = "EntitätssucheStartenToolStripMenuItem" resources.ApplyResources(Me.EntitätssucheStartenToolStripMenuItem, "EntitätssucheStartenToolStripMenuItem") ' + 'ToolStripSeparator12 + ' + Me.ToolStripSeparator12.Name = "ToolStripSeparator12" + resources.ApplyResources(Me.ToolStripSeparator12, "ToolStripSeparator12") + ' 'AuswertungAnzeigenToolStripMenuItem ' Me.AuswertungAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Reports_collapsed_12995_32x @@ -485,7 +517,7 @@ Partial Class frmConstructor_Main ' 'ContextMenuStripResultFiles ' - Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.ToolStripSeparator7, Me.CopyToolStripMenuItem, Me.ToolStripSeparator10, Me.UmbenennenToolStripMenuItem, Me.TSMIDisplayname, Me.TSMI_inWork, Me.TSMI_linkRecord, Me.tsmiRights, Me.ToolStripSeparator8, Me.ToolStripMI_DeleteFile, Me.TsMI_DocRemoveLink, Me.ToolStripSeparator9, Me.PropertiesToolStripMenuItem, Me.AnsichtZurücksetzenToolStripMenuItem}) + Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.ToolStripSeparator7, Me.CopyToolStripMenuItem, Me.ToolStripSeparator10, Me.UmbenennenToolStripMenuItem, Me.TSMIDisplayname, Me.TSMI_inWork, Me.TSMI_linkRecord, Me.tsmiRights, Me.ToolStripSeparator8, Me.ToolStripMI_DeleteFile, Me.TsMI_DocRemoveLink, Me.ToolStripSeparator9, Me.PropertiesToolStripMenuItem, Me.ToolStripSeparator16, Me.AnsichtZurücksetzenToolStripMenuItem, Me.SucheAnzeigenToolStripMenuItem1}) Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles" resources.ApplyResources(Me.ContextMenuStripResultFiles, "ContextMenuStripResultFiles") ' @@ -582,11 +614,21 @@ Partial Class frmConstructor_Main Me.PropertiesToolStripMenuItem.Name = "PropertiesToolStripMenuItem" resources.ApplyResources(Me.PropertiesToolStripMenuItem, "PropertiesToolStripMenuItem") ' + 'ToolStripSeparator16 + ' + Me.ToolStripSeparator16.Name = "ToolStripSeparator16" + resources.ApplyResources(Me.ToolStripSeparator16, "ToolStripSeparator16") + ' 'AnsichtZurücksetzenToolStripMenuItem ' Me.AnsichtZurücksetzenToolStripMenuItem.Name = "AnsichtZurücksetzenToolStripMenuItem" resources.ApplyResources(Me.AnsichtZurücksetzenToolStripMenuItem, "AnsichtZurücksetzenToolStripMenuItem") ' + 'SucheAnzeigenToolStripMenuItem1 + ' + Me.SucheAnzeigenToolStripMenuItem1.Name = "SucheAnzeigenToolStripMenuItem1" + resources.ApplyResources(Me.SucheAnzeigenToolStripMenuItem1, "SucheAnzeigenToolStripMenuItem1") + ' 'GridViewDoc_Search ' Me.GridViewDoc_Search.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFullFocus @@ -606,8 +648,8 @@ Partial Class frmConstructor_Main 'ToolStripDokumente ' Me.ToolStripDokumente.AllowDrop = True - Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.ToolStripDropDownButton2}) resources.ApplyResources(Me.ToolStripDokumente, "ToolStripDokumente") + Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.ToolStripDropDownButton2, Me.ToolStripSeparator17, Me.tsTextboxFulltext, Me.ToolStripLabel1, Me.ToolStripSeparator18, Me.tsbtnEntitySearch}) Me.ToolStripDokumente.Name = "ToolStripDokumente" ' 'tslblWindreamView @@ -627,6 +669,38 @@ Partial Class frmConstructor_Main Me.KonfigurationToolStripMenuItem.Name = "KonfigurationToolStripMenuItem" resources.ApplyResources(Me.KonfigurationToolStripMenuItem, "KonfigurationToolStripMenuItem") ' + 'ToolStripSeparator17 + ' + Me.ToolStripSeparator17.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripSeparator17.Name = "ToolStripSeparator17" + resources.ApplyResources(Me.ToolStripSeparator17, "ToolStripSeparator17") + ' + 'tsTextboxFulltext + ' + Me.tsTextboxFulltext.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.tsTextboxFulltext.BackColor = System.Drawing.Color.LemonChiffon + resources.ApplyResources(Me.tsTextboxFulltext, "tsTextboxFulltext") + Me.tsTextboxFulltext.Name = "tsTextboxFulltext" + ' + 'ToolStripLabel1 + ' + Me.ToolStripLabel1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + resources.ApplyResources(Me.ToolStripLabel1, "ToolStripLabel1") + Me.ToolStripLabel1.Name = "ToolStripLabel1" + ' + 'ToolStripSeparator18 + ' + Me.ToolStripSeparator18.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripSeparator18.Name = "ToolStripSeparator18" + resources.ApplyResources(Me.ToolStripSeparator18, "ToolStripSeparator18") + ' + 'tsbtnEntitySearch + ' + Me.tsbtnEntitySearch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.tsbtnEntitySearch.Image = Global.DD_Record_Organiser.My.Resources.Resources.f6 + resources.ApplyResources(Me.tsbtnEntitySearch, "tsbtnEntitySearch") + Me.tsbtnEntitySearch.Name = "tsbtnEntitySearch" + ' 'TabFollowUp ' Me.TabFollowUp.Controls.Add(Me.ListViewFollowUps) @@ -1350,4 +1424,15 @@ Partial Class frmConstructor_Main Friend WithEvents ToolStripMI_DeleteFile As System.Windows.Forms.ToolStripMenuItem Friend WithEvents tsstlblDocID As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents AuswertungAnzeigenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents ToolStripSeparator14 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents ToolStripSeparator15 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents ToolStripSeparator13 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents ToolStripSeparator12 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents ToolStripSeparator16 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents SucheAnzeigenToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents ToolStripSeparator17 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents ToolStripLabel1 As System.Windows.Forms.ToolStripLabel + Friend WithEvents tsTextboxFulltext As System.Windows.Forms.ToolStripTextBox + Friend WithEvents tsbtnEntitySearch As System.Windows.Forms.ToolStripButton + Friend WithEvents ToolStripSeparator18 As System.Windows.Forms.ToolStripSeparator End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx b/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx index 822cfb7..e51cb45 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx @@ -117,6 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Default + + + Default + 188, 22 @@ -124,23 +131,69 @@ Reset Entity-Selection + + 185, 6 + 188, 22 FileImport Entity + + 185, 6 + 188, 22 + + 185, 6 + 188, 22 Start Entity-Search + + 185, 6 + + + 188, 22 + + + Show Charts + - 189, 92 + 189, 138 + + + + + + + + + + + + + None + + + + + + + + + + + + None + + + Default 226, 22 @@ -223,9 +276,123 @@ 227, 270 + + + + + + + + + + + None + + + + + + + + + + Default + + + Top, Left + + + + + + Tile + + + Inherit + + + 0, 0 + + + + Center + + + + + + None + + + + + + + 0 + + + Regular + + + Horizontal + + + + + + 0 + + + Regular + + + Horizontal + + + + + + + + + + + + 0 + + + Regular + + + Horizontal + + + + + + Default + + + + + + + + + + + + None + Details + + + + + Default + 190, 22 @@ -298,17 +465,74 @@ Properties + + 187, 6 + 190, 22 Set stored layout back - - 191, 270 + + 190, 22 - - 174, 22 + + 191, 298 + + + + + + + + + + + + None + + + + + + + + + Default + + + Top, Left + + + + + + Tile + + + Inherit + + + 0, 0 + + + Center + + + + + + None + + + + + + + + + Default Configuration User @@ -327,14 +551,59 @@ - 194, 22 + 195, 22 configuration windream-View + + 128, 22 + + + Entity-wide search + + + + + + + + + + + + None + windream-files + + + + + Default + + + + + + + + + + + + None + + + Default + + + Default + + + Default + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m @@ -355,33 +624,288 @@ delete user + + + + + + + + + + + None + + + Default + Add user tu follow up + + + + + + + + + + + None + + + Default + + + + + + + + + + + + None + + + Default + + + + + + + + + + + + None + + + Default + + + + + + + + + + + + None + + + Default + 216, 13 Attention: this list overdrives the general list. + + + + + + + + + + + None + Special recipient for record: + + + + + + + + + + + None + + + Default + 92, 15 Follow Up saved + + + + + + + + + + + None + + + Default + + + + + + + + + + + + None + + + Default + + + + + + + + + + + + None + + + Default + + + + + + + + + + + + None + + + + + + + + + + + + None + + + Default + 91, 13 Saved Follow Ups + + + + + + + + + + + None + Follow Up + + + + + Default + + + + + + + + + Default + + + Top, Left + + + + + + Tile + + + Inherit + + + 0, 0 + + + Center + + + + + + None + + + + + + 0 + + + Regular + + + Horizontal + + + + + + + + + + + + + + + + + + None + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -394,6 +918,9 @@ rkJggg== + + Default + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -446,6 +973,18 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + + + + + + + None + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -457,6 +996,15 @@ positions + + + + + + + + Default + 49, 22 @@ -573,6 +1121,24 @@ record functions + + + + + + + + + + + None + + + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -600,7 +1166,24 @@ uIEEMbxns0OpzYNRITMZmOv/PZbXJi3WJC3WJC3Wo939Ao+TPgKX3Mi+AAAAAElFTkSuQmCC - + + + + + Default + + + + + + + + + + + + None + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu @@ -608,6 +1191,24 @@ ZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0cmVhbWVyAAAAAAIAAAAL + + Default + + + + + + + + + + + + None + + + Default + AAABAAgAEBAAAAEACABoBQAAhgAAABAQAAABACAAaAQAAO4FAAAYGAAAAQAIAMgGAABWCgAAGBgAAAEA @@ -1057,4 +1658,16 @@ AAAADwAA/gAAAAAPAAD//4AAAB8AAP///8AP/wAA////////AAD///////8AAP///////wAA + + + + + + + + + + + None + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 8f2c49b..f906f93 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -140,24 +140,36 @@ Reset Ebenen-Auswahl + + 191, 6 + 194, 22 Dateiimport Entität + + 191, 6 + 194, 22 Form-Designer + + 191, 6 + 194, 22 Entitätssuche starten + + 191, 6 + 194, 22 @@ -165,7 +177,7 @@ Auswertung anzeigen - 195, 136 + 195, 138 CMSEntity @@ -531,14 +543,23 @@ Eigenschaften + + 236, 6 + 239, 22 Ansicht zurücksetzen + + 239, 22 + + + Suche anzeigen + - 240, 270 + 240, 298 ContextMenuStripResultFiles @@ -573,6 +594,9 @@ 9, 57 + + Tahoma, 9pt + Segoe UI, 8.25pt, style=Bold, Italic @@ -583,7 +607,7 @@ Windream-Dokumente - 173, 22 + 174, 22 Konfiguration User @@ -605,11 +629,41 @@ Magenta - 210, 22 + 209, 22 Konfiguration windream-Ansicht + + 6, 25 + + + Segoe UI Semibold, 9pt, style=Bold, Italic + + + 200, 25 + + + Tahoma, 9pt, style=Bold + + + 57, 22 + + + Fulltext: + + + 6, 25 + + + Magenta + + + 138, 22 + + + Entitätsweite Suche + 0, 0 @@ -2256,24 +2310,48 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator14 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DateiimportEntitätToolStripMenuItem System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator15 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + FormDesignerToolStripMenuItem System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator13 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + EntitätssucheStartenToolStripMenuItem System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator12 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + AuswertungAnzeigenToolStripMenuItem @@ -2502,12 +2580,24 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator16 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + AnsichtZurücksetzenToolStripMenuItem System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + SucheAnzeigenToolStripMenuItem1 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + GridViewDoc_Search @@ -2532,6 +2622,36 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator17 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsTextboxFulltext + + + System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripLabel1 + + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator18 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsbtnEntitySearch + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ColumnHeader1 diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 4867d7f..22f56f1 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -52,6 +52,8 @@ Public Class frmConstructor_Main Private DT_TREEVIEW_PER_CONTROLS As DataTable Private DT_TREEVIEW_CONFIGURATION As DataTable + Private SEARCH_TYPE As String + Private DT_ADDING_USERS As DataTable Private DT_CONTROL_SCREEN As DataTable @@ -159,6 +161,7 @@ Public Class frmConstructor_Main Private LOAD_DIRECT As Boolean = False Private IS_SINGLE_RECORD As Boolean = False + Private LOAD_ENTITY_SEARCH_AT_STARTUP As Boolean = False Private RECORD_ID As Integer Private PARENT_ENTITYID As Integer Private SQL_RIGHT_READ_AND_VIEW_ONLY As String = "" @@ -243,6 +246,7 @@ Public Class frmConstructor_Main Dim sw As New Stopwatch Try sw.Start() + CURRENT_DT_DOC_ENTITY_SEARCH = Nothing tsslblRecord.Text = "" tsslblStatus.Text = "" _FormClosing = False @@ -2238,6 +2242,7 @@ Public Class frmConstructor_Main IS_SINGLE_RECORD = ENTITY_ROW.Item("SINGLE_RECORD") POS_ENTITY = ENTITY_ROW.Item("POS_ENTITY") REDUNDANT_FORM = ENTITY_ROW.Item("REDUNDANT_ENTITY") + LOAD_ENTITY_SEARCH_AT_STARTUP = ENTITY_ROW.Item("LOAD_ENT_SEARCH_AT_SU") If REDUNDANT_FORM <> 0 Then CURRENT_ENTITY_REDUNDANT_ID = REDUNDANT_FORM Else @@ -2267,7 +2272,6 @@ Public Class frmConstructor_Main GridControlMain.MainView = grvwGrid End Select SELECTED_RECORD_ID = 0 - Dim DT As DataTable ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS Dim result1 = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() @@ -2281,6 +2285,10 @@ Public Class frmConstructor_Main 'Anzahl der Datensätze ENTITY_RECORD_COUNT = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_RECORD where FORM_ID = " & ENTITY_ID, True) + + If CBool(LOAD_ENTITY_SEARCH_AT_STARTUP) = True Then + ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, "ENTITY", "", True, True) + End If Select Case ClickedLevel Case 1 EBENE1_ENTITY = "" @@ -3552,315 +3560,7 @@ Public Class frmConstructor_Main End Try End Sub - Private Sub RUN_WD_SEARCH(BaseSearch As String, Type As String) - Dim sw As New Stopwatch - sw.Start() - Dim elapsed As Double - Try - Dim windream_temp_search - If Not windream_Docshow = True Or Sett_LoadWD_Docs = False Or TCDetails.SelectedTabPageIndex <> 1 Then - Exit Sub - End If - Cursor = Cursors.WaitCursor - Dim DTWD As DataTable - If Type = "ENTITY" Then - Dim _sql = "SELECT WINDREAM_SEARCH,SEARCH_PATTERN1,SEARCH_PATTERN2,SEARCH_PATTERN3,SEARCH_PATTERN4,SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE WINDREAM_SEARCH <> '' AND FORM_ID = " & ENTITY_ID - DTWD = ClassDatabase.Return_Datatable(_sql) - If DTWD.Rows.Count = 1 Then - If IsDBNull(DTWD.Rows(0).Item(0)) Then - Clear_Windream_ResultList() - Cursor = Cursors.Default - Exit Sub - End If - Dim msg = "Windream-Dokumente für Entität: " & ACT_EBENE_STRING - If USER_LANGUAGE <> "de-DE" Then - msg = "windream-files for entity: " & ACT_EBENE_STRING - End If - tslblWindreamView.Text = msg - Else - Clear_Windream_ResultList() - Cursor = Cursors.Default - Exit Sub - Exit Sub - End If - Else - Dim sql = "SELECT WINDREAM_SEARCH,SEARCH_PATTERN1,SEARCH_PATTERN2,SEARCH_PATTERN3,SEARCH_PATTERN4,SEARCH_PATTERN5 FROM TBPMO_FORM_VIEW WHERE WINDREAM_SEARCH <> '' AND FORM_ID = " & ENTITY_ID - DTWD = ClassDatabase.Return_Datatable(sql) - If DTWD.Rows.Count = 1 Then - If IsDBNull(DTWD.Rows(0).Item(0)) Then - Clear_Windream_ResultList() - Cursor = Cursors.Default - Exit Sub - Exit Sub - End If - Dim msg = "Windream-Dokumente für Record: " & RECORD_ID - If USER_LANGUAGE <> "de-DE" Then - msg = "windream-files for record: " & RECORD_ID - End If - tslblWindreamView.Text = msg - Else - Clear_Windream_ResultList() - Cursor = Cursors.Default - Exit Sub - Exit Sub - End If - End If - 'Die SearchPatterns durchlaufen und zwischenspeichern - If IsDBNull(DTWD.Rows(0).Item(0)) Then - Clear_Windream_ResultList() - Cursor = Cursors.Default - Exit Sub - Exit Sub - End If - BaseSearch = DTWD.Rows(0).Item(0) - SP1 = DTWD.Rows(0).Item(1) - If IsDBNull(DTWD.Rows(0).Item(2)) Then - SP2 = "" - Else - SP2 = DTWD.Rows(0).Item(2) - End If - If IsDBNull(DTWD.Rows(0).Item(3)) Then - SP3 = "" - Else - SP3 = DTWD.Rows(0).Item(3) - End If - If IsDBNull(DTWD.Rows(0).Item(4)) Then - SP4 = "" - Else - SP4 = DTWD.Rows(0).Item(4) - End If - If IsDBNull(DTWD.Rows(0).Item(5)) Then - SP5 = "" - Else - SP5 = DTWD.Rows(0).Item(5) - End If - - 'Eine tempfile generieren - Dim tempFilename1 = My.Computer.FileSystem.GetTempFileName() - 'Nur den Filenamen ohne Erweiterung - Dim tempName = Path.GetFileNameWithoutExtension(tempFilename1) - 'tempfile lsöchen - If My.Computer.FileSystem.FileExists(tempFilename1) Then - My.Computer.FileSystem.DeleteFile(tempFilename1) - End If - Try - Dim temppath = Path.GetTempPath - - Dim EncodingFormat As Encoding - - If WD_UNICODE = True Then - EncodingFormat = Encoding.GetEncoding(1252) '1252 - If LogErrorsOnly = False Then ClassLogger.Add(" >> Unicode is used (Encoding.GetEncoding(1252))", False) - Else - If LogErrorsOnly = False Then ClassLogger.Add(" >> UTF8 (Encoding.GetEncoding(65001))", False) - EncodingFormat = Encoding.GetEncoding(65001) - End If - - - Dim fileContents As String - If LogErrorsOnly = False Then ClassLogger.Add(" >> ReadAlltext: " & windream_temp_search, False) - fileContents = My.Computer.FileSystem.ReadAllText(BaseSearch, EncodingFormat) ', System.Text.Encoding.Unicode - If LogErrorsOnly = False Then ClassLogger.Add(" >> fileContents geladen", False) - fileContents = fileContents.Replace("Í", "Ö") - Dim _sp1 = SP1 - Dim _sp2 = SP2 - Dim _sp3 = SP3 - Dim _sp4 = SP4 - Dim _sp5 = SP5 - - If _sp1.ToString <> String.Empty Then - _sp1 = Return_SearchPattern(_sp1.ToString) - fileContents = fileContents.Replace("%pattern1%", _sp1) - fileContents = fileContents.Replace("471101", _sp1) - End If - If _sp2.ToString <> String.Empty Then - _sp2 = Return_SearchPattern(_sp2.ToString) - If _sp2 = 0 Then - _sp2 = "" - End If - fileContents = fileContents.Replace("%pattern2%", _sp2) - fileContents = fileContents.Replace("471102", _sp2) - End If - If _sp3.ToString <> String.Empty Then - _sp3 = Return_SearchPattern(_sp3.ToString) - If _sp3 = 0 Then - _sp3 = "" - End If - fileContents = fileContents.Replace("%pattern3%", _sp3) - fileContents = fileContents.Replace("471103", _sp3) - End If - If _sp4.ToString <> String.Empty Then - _sp4 = Return_SearchPattern(_sp4.ToString) - If _sp4 = 0 Then - _sp4 = "" - End If - fileContents = fileContents.Replace("%pattern4%", _sp4) - fileContents = fileContents.Replace("471104", _sp4) - End If - If _sp5.ToString <> String.Empty Then - _sp5 = Return_SearchPattern(_sp5.ToString) - If _sp5 = 0 Then - _sp5 = "" - End If - fileContents = fileContents.Replace("%pattern5%", _sp5) - fileContents = fileContents.Replace("471105", _sp5) - End If - 'Die windream File zusammensetzen - windream_temp_search = temppath & tempName & ".wdf" - TEMP_FILES.Add(windream_temp_search) - 'Die File schreiben - My.Computer.FileSystem.WriteAllText(windream_temp_search, fileContents, False, EncodingFormat) - My.Computer.FileSystem.WriteAllText(temppath & "SEARCH_COPY.wdf", fileContents, False, EncodingFormat) - ' XML-Datei öffnen und laden - Dim Stream As New IO.StreamReader(CStr(windream_temp_search), EncodingFormat) - Dim Reader As New System.Xml.XmlTextReader(Stream) - - ' XML-Datei initialisieren - Dim xml As New System.Xml.XmlDocument() - ' XML-Datei öffnen und laden - xml.Load(Reader) - Reader.Close() - xml.Save(windream_temp_search) - If LogErrorsOnly = False Then ClassLogger.Add(" >> Xml Generiert: " & windream_temp_search, False) - - Dim windreamSucheErgebnisse As WINDREAMLib.WMObjects - Try - windreamSucheErgebnisse = ClassWindream.GetSearchDocuments(windream_temp_search) - Catch ex As Exception - MsgBox("Error in windreamSucheErgebnisse:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - elapsed = sw.Elapsed.TotalSeconds - If LogErrorsOnly = False Then ClassLogger.Add(" >> GetSearchDocuments took " & Format(elapsed, "0.000000000") & " seconds", False) - If windreamSucheErgebnisse.Count > 0 Then - - - Dim stg As String - If USER_LANGUAGE = "de-DE" Then - stg = "windream-Dateien" - Else - stg = "windream-files" - End If - TabWindream.Text = stg & " (" & windreamSucheErgebnisse.Count & ")" - - 'AxObjectListControl.SetIconMode(True) - 'AxObjectListControl.RemoveAllColumnHeader() - 'Me.AxObjectListControl.SetSession(ClassWindream.oSession, "", "") - 'Change the status icon - 'ICON STATES: - 'Me.AxObjectListControl.SetStatusIcon(0) - 'Change the icon - ' Me.AxObjectListControl.SetStatusIcon(2) - - Try - Dim sql_ResultList = "select * from TBPMO_WINDREAM_RESULTLIST_CONFIG where guid = 1" - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql_ResultList, "GET RESULTLIST KONFIG") - If Not DT Is Nothing And DT.Rows.Count = 1 Then - Dim anzparam As Integer = 1 - For Each Column As DataColumn In DT.Columns - If Column.ColumnName.StartsWith("COLUMN") And Column.ColumnName.EndsWith("WIDTH") = False Then - Dim sql = String.Format("select {0} from TBPMO_WINDREAM_RESULTLIST_CONFIG Where GUID = 1", Column.ColumnName) - Dim ColumnName = ClassDatabase.Execute_Scalar(sql, True) - If Not IsDBNull(ColumnName) Then - If Not IsDBNull(ColumnName) Or IsNothing(ColumnName) Or ColumnName <> "" Or ColumnName <> "{}" Then - 'Jetzt die Spalten aus Array hinzufügen und Breite konfigurieren - sql = String.Format("select COLUMN{0}_WIDTH from TBPMO_WINDREAM_RESULTLIST_CONFIG Where GUID = 1", anzparam) - Dim Width = ClassDatabase.Execute_Scalar(sql, True) - If IsNothing(Width) Or IsDBNull(Width) Then - Width = 200 - End If - 'You need to use the column name here - 'Please note that some attributes or indices will not be displayed - 'Try not to add the same header twice, it will throw cause problems if you do that - ' Me.AxObjectListControl.AddColumnHeader(ColumnName, Width) - anzparam += 1 - End If - End If - End If - Next - Else - Dim param As New List(Of String) - 'The file name - param.Add("szLongName") - 'The document-Type - param.Add("szText37") - 'Versionsnummer - param.Add("dwVersionNumber") - 'Datumsangaben - param.Add("dwCreationDate") - param.Add("dwCreation_Time") - - 'Add all search params - For Each spar As String In param - Dim width As Integer = 200 - Select Case spar - Case "szLongName" - 'Dateiname - width = 300 - Case "szText37" - 'Dokumentart - width = 160 - Case "dwCreationDate" - 'Erstelldatum - width = 90 - Case "dwCreation_Time" - 'Erstell-Zeit - width = 120 - End Select - 'You need to use the column name here - 'Please note that some attributes or indices will not be displayed - 'Try not to add the same header twice, it will throw cause problems if you do that - ' Me.AxObjectListControl.AddColumnHeader(spar, width) - Next - - End If - Catch ex As Exception - MsgBox("Unexpected Error in Construct windreamResultList: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - If LogErrorsOnly = False Then ClassLogger.Add(" >> AxObjectListControl loaded ", False) - 'Execute the search - Dim results As WINDREAMLib.WMObjects = windreamSucheErgebnisse - If LogErrorsOnly = False Then ClassLogger.Add(" >> results loaded ", False) - 'Set the contents without displaying them - 'AxObjectListControl.SetContentsEx(results) - 'Change the icon - ' AxObjectListControl.SetStatusIcon(5) - 'Display the results... - 'The Previous Object Count - Dim poc As Integer = 0 - 'Display new objects, as long as the objectcount changes after displaying the objects - - 'Do Until (poc <> AxObjectListControl.GetObjectCount) - ' poc = AxObjectListControl.GetObjectCount - ' 'If you want, you can display more items at a timeRefresh_FollowUp_TabHeader - ' 'But do not display to many at a time or the user interface could freeze - ' 'Maybe try 50 - ' AxObjectListControl.DisplayResults(WDResultListCount) - 'Loop - 'AxObjectListControl.SetStatusIcon(3) - Else - Dim msg = "Windream-Dokumente für Record: " & RECORD_ID & " - Keine Dateien gefunden" - If USER_LANGUAGE <> "de-DE" Then - msg = "windream-files for record: " & RECORD_ID & " - no files found" - End If - tslblWindreamView.Text = "Windream-Dokumente für Record: " & RECORD_ID & " - Keine Dateien gefunden" - Clear_Windream_ResultList() - End If - - Catch ex As Exception - MsgBox("Error in execute-windreamSearch:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - - Cursor = Cursors.Default - Catch ex As Exception - MsgBox("Error in RUN_WD_SEARCH:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - - End Try - elapsed = sw.Elapsed.TotalSeconds - sw.Stop() - sw.Reset() - If LogErrorsOnly = False Then ClassLogger.Add(" >> Run WD Search took " & Format(elapsed, "0.000000000") & " seconds", False) - Cursor = Cursors.Default - End Sub + Private Sub WD_DELETE_DOCS() Dim sw As New Stopwatch sw.Start() @@ -3925,13 +3625,19 @@ Public Class frmConstructor_Main If LogErrorsOnly = False Then ClassLogger.Add(" >> Run WD Delete Docs took " & Format(elapsed, "0.000000000") & " seconds", False) Cursor = Cursors.Default End Sub - Private Sub RUN_WDSEARCH_GRID(Type As String) + Private Sub RUN_WDSEARCH_GRID(Type As String, Optional ftString As String = "") Me.Cursor = Cursors.WaitCursor + SEARCH_TYPE = Type + If SEARCH_TYPE <> "FULLTEXT" Then + tsTextboxFulltext.Text = "" + End If Try Dim sw As New Stopwatch sw.Start() Dim elapsed As Double - Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, Type) + Dim DT_RESULT As DataTable + DT_RESULT = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, Type, ftString, CBool(LOAD_ENTITY_SEARCH_AT_STARTUP)) + If IsNothing(DT_RESULT) Then Dim msg = "wrong DocSearch-Configuration - Check logfile and contact Digital Data" tslblWindreamView.Text = msg @@ -3956,7 +3662,7 @@ Public Class frmConstructor_Main msg = "windream-files for entity: " & Entitystring End If msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" - Else + ElseIf Type = "RECORD" Then If NODE_NAVIGATION Then If NODE_TEXT.Contains(" (") Then NODE_TEXT = NODE_TEXT.Substring(0, NODE_TEXT.IndexOf("(") - 1) @@ -3973,7 +3679,12 @@ Public Class frmConstructor_Main End If msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" End If - + Else + msg = String.Format("Dateien für Volltextsuche") + If USER_LANGUAGE <> "de-DE" Then + msg = String.Format("Files for Fulltext-Search") + End If + msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" End If tslblWindreamView.Text = msg @@ -3987,7 +3698,7 @@ Public Class frmConstructor_Main DT_DOCRESULT_DROPDOWN_ITEMS, AddressOf OnCBSelectedValueChanged, AddressOf OnDateSelectedValueChanged, - AddressOf OnTextSelectedValueChanged) + AddressOf OnTextSelectedValueChanged, Type) If TCDetails.SelectedTabPageIndex <> 1 Then TCDetails.SelectedTabPageIndex = 1 @@ -4009,7 +3720,7 @@ Public Class frmConstructor_Main If USER_LANGUAGE <> "de-DE" Then msg = "No windream-files found for entity: " & Entitystring End If - Else + ElseIf Type = "RECORD" Then If NODE_NAVIGATION Then If NODE_TEXT.Contains(" (") Then NODE_TEXT = NODE_TEXT.Substring(0, NODE_TEXT.IndexOf("(") - 1) @@ -4024,6 +3735,11 @@ Public Class frmConstructor_Main If USER_LANGUAGE <> "de-DE" Then msg = "No files found for record " & RECORD_ID End If + Else + msg = "Keine Dateien für Volltextsuche gefunden" + If USER_LANGUAGE <> "de-DE" Then + msg = "No windream-files found for fulltext-search" + End If End If tslblWindreamView.Text = msg @@ -4046,6 +3762,9 @@ Public Class frmConstructor_Main 'ItemComboBox = sender Dim item As ClassWindreamDocGrid.WindreamDocGridComboboxItem = ComboBox.SelectedItem Dim value As String = item.Value + If value.ToUpper = "Not displayable in Group-Search".ToUpper Then + Exit Sub + End If Dim configId As Integer = item.ConfigID Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID Dim user As String = Environment.UserName @@ -4079,6 +3798,9 @@ Public Class frmConstructor_Main Try Dim TextBox As TextEdit = sender Dim value = TextBox.EditValue + If value.ToUpper = "Not displayable in Group-Search".ToUpper Then + Exit Sub + End If Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle) Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID @@ -4329,17 +4051,17 @@ Public Class frmConstructor_Main ' If RIGHT_WINDREAM_FORBIDDEN = False Then 'tsButtonEdit.Enabled = False If RECORD_ID = 0 Then - Dim result As MsgBoxResult - Dim msg = String.Format("Wollen Sie eine Entitätsweite Suche ausführen?") - - If USER_LANGUAGE <> "de-DE" Then - msg = String.Format("Would You like to run a entity-wide docsearch?") - End If - result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - If result = MsgBoxResult.Yes Then - RUN_WDSEARCH_GRID("ENTITY") - End If + 'Dim result As MsgBoxResult + 'Dim msg = String.Format("Wollen Sie eine Entitätsweite Suche ausführen?") + 'If USER_LANGUAGE <> "de-DE" Then + ' msg = String.Format("Would You like to run a entity-wide docsearch?") + 'End If + 'result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + 'If result = MsgBoxResult.Yes Then + ' RUN_WDSEARCH_GRID("ENTITY") + 'End If + Exit Sub Else ' RUN_WD_SEARCH(WD_Suche, "RECORD") RUN_WDSEARCH_GRID("RECORD") @@ -5174,17 +4896,22 @@ Public Class frmConstructor_Main End If End Sub Private Sub grvwGrid_MouseDown(sender As Object, e As MouseEventArgs) Handles grvwGrid.MouseDown, grvwTiles.MouseDown, grvwCarousel.MouseDown - Dim view As BaseView = CType(sender, BaseView) + Try + Dim view As BaseView = CType(sender, BaseView) - If e.Button = Windows.Forms.MouseButtons.Right Then - GRIDRightMouse_Clicked = True - Else - GRIDRightMouse_Clicked = False - End If - Dim hitInfo As GridHitInfo = View.CalcHitInfo(New Point(e.X, e.Y)) - If e.Button = Windows.Forms.MouseButtons.Left AndAlso hitInfo.InRow AndAlso hitInfo.HitTest <> GridHitTest.RowIndicator Then - GRIDdownHitInfo = hitInfo - End If + If e.Button = Windows.Forms.MouseButtons.Right Then + GRIDRightMouse_Clicked = True + Else + GRIDRightMouse_Clicked = False + End If + Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y)) + If e.Button = Windows.Forms.MouseButtons.Left AndAlso hitInfo.InRow AndAlso hitInfo.HitTest <> GridHitTest.RowIndicator Then + GRIDdownHitInfo = hitInfo + End If + Catch ex As Exception + ClassLogger.Add(">> Unexpected Error in grvwGrid_MouseDown: " & ex.Message, False) + End Try + End Sub Private Sub grvwGrid_MouseMove(sender As Object, e As MouseEventArgs) Handles grvwGrid.MouseMove, grvwTiles.MouseMove, grvwCarousel.MouseMove Dim view As BaseView = CType(sender, BaseView) @@ -6112,7 +5839,7 @@ Public Class frmConstructor_Main End Sub Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ToolStripMI_DeleteFile.Click - If RECORD_ID = 0 Then + If RECORD_ID = 0 And SEARCH_TYPE <> "ENTITY" Then MsgBox("Please select a record!", MsgBoxStyle.Exclamation) Exit Sub End If @@ -6120,19 +5847,23 @@ Public Class frmConstructor_Main MsgBox("Could not read File Parameters (DELETE FILES)!", MsgBoxStyle.Exclamation) Exit Sub End If - For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows - If row.Item("DOC_PATH") <> "" Then - Dim msg = "Sind Sie sicher, dass Sie die Datei " & vbNewLine & row.Item("DOC_PATH") & vbNewLine & "endgültig löschen wollen?" - If USER_LANGUAGE <> "de-DE" Then - msg = "Are You sure You want to permanently delete this file?" & vbNewLine & row.Item("DOC_PATH") - End If - Dim result1 As MsgBoxResult - result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - If result1 = MsgBoxResult.Yes Then + If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 0 Then + MsgBox("Please choose a file!", MsgBoxStyle.Exclamation) + Exit Sub + End If + Dim msg = "Sind Sie sicher, dass Sie die Datei(en) endgültig löschen wollen?" + If USER_LANGUAGE <> "de-DE" Then + msg = "Are You sure You want to permanently delete this file(s)?" + End If + Dim result1 As MsgBoxResult + result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result1 = MsgBoxResult.Yes Then + For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows + If row.Item("DOC_PATH") <> "" Then Try If Not IsNothing(row.Item("DOC_ID")) Then Dim Count As Integer = ClassDatabase.Execute_Scalar("SELECT COUNT(GUID) FROM TBPMO_DOC_RECORD_LINK WHERE DOC_ID = " & row.Item("DOC_ID")) - If Count > 1 Then + If Count > 1 And SEARCH_TYPE = "RECORD" Then msg = "Diese Datei ist noch mit anderen Datensätzen verknüpft! Lediglich die Verknüpfung zum aktuellen Datensatz wird gelöscht!" If USER_LANGUAGE <> "de-DE" Then msg = "This file is also linked to other records! Only the link for this Record will be deleted!" @@ -6143,11 +5874,14 @@ Public Class frmConstructor_Main End If RUN_WDSEARCH_GRID("RECORD") Else + If SEARCH_TYPE = "FULLTEXT" Or SEARCH_TYPE = "ENTITY" Then + RECORD_ID = 0 + End If If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID"), RECORD_ID, 1) = True Then If ClassWindream.Delete_WDFile(row.Item("DOC_PATH")) = True Then ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "FILE DELETED BY USER") End If - RUN_WDSEARCH_GRID("RECORD") + Else msg = String.Format("Die Datei {0} konnte nicht gelöscht werden! Prüfen Sie die logfile!", row.Item("DOC_PATH")) If USER_LANGUAGE <> "de-DE" Then @@ -6161,9 +5895,15 @@ Public Class frmConstructor_Main Catch ex As Exception MsgBox("Unexpected Error in Delete file:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - End If + + End If + Next + If SEARCH_TYPE = "ENTITY" Then + CURRENT_DT_DOC_ENTITY_SEARCH = Nothing End If - Next + RUN_WDSEARCH_GRID(SEARCH_TYPE) + End If + End Sub @@ -6251,4 +5991,35 @@ Public Class frmConstructor_Main 'frm.MdiParent = MAIN_FORM frm.Show() End Sub + + Private Sub SucheAnzeigenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles SucheAnzeigenToolStripMenuItem1.Click + GridViewDoc_Search.ShowFindPanel() + End Sub + + Private Sub tsTextboxFulltext_KeyUp(sender As Object, e As KeyEventArgs) Handles tsTextboxFulltext.KeyUp + If e.KeyCode = Keys.Return Then + If tsTextboxFulltext.Text <> "" Then + RUN_WDSEARCH_GRID("FULLTEXT", tsTextboxFulltext.Text) + End If + End If + End Sub + + Private Sub GridViewDoc_Search_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewDoc_Search.ColumnFilterChanged + Try + Dim origtext As String = tslblWindreamView.Text + If origtext.Contains(" (") Then + Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1) + tslblWindreamView.Text = String.Format("{0} ({1})", existingstring, GridViewDoc_Search.RowCount) + Else + tslblWindreamView.Text = String.Format("{0} ({1})", tslblWindreamView.Text, GridViewDoc_Search.RowCount) + End If + Catch ex As Exception + + End Try + + End Sub + + Private Sub tsbtnEntitySearch_Click(sender As Object, e As EventArgs) Handles tsbtnEntitySearch.Click + RUN_WDSEARCH_GRID("ENTITY") + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmLicense_User.resx b/app/DD-Record-Organiser/frmLicense_User.resx index ac60c05..d363a18 100644 --- a/app/DD-Record-Organiser/frmLicense_User.resx +++ b/app/DD-Record-Organiser/frmLicense_User.resx @@ -123,13 +123,13 @@ - Segoe UI Semibold, 9.75pt, style=Bold + Tahoma, 9.75pt, style=Bold 12, 26 - 130, 17 + 139, 16 0 @@ -174,13 +174,13 @@ True - Segoe UI Semibold, 9.75pt, style=Bold + Tahoma, 9.75pt, style=Bold 12, 68 - 106, 17 + 116, 16 2 @@ -204,13 +204,13 @@ True - Segoe UI Semibold, 9.75pt, style=Bold + Tahoma, 9.75pt, style=Bold 12, 94 - 90, 17 + 99, 16 3 @@ -234,13 +234,13 @@ True - Segoe UI Semibold, 9.75pt, style=Bold + Tahoma, 9.75pt, style=Bold 12, 118 - 90, 17 + 98, 16 6 @@ -264,13 +264,13 @@ True - Segoe UI Semibold, 9.75pt, style=Bold + Tahoma, 9.75pt, style=Bold 12, 143 - 69, 17 + 73, 16 8 @@ -291,7 +291,7 @@ 5 - Segoe UI, 9.75pt + Tahoma, 9.75pt 264, 65 @@ -321,7 +321,7 @@ 4 - Segoe UI, 9.75pt + Tahoma, 9.75pt 264, 91 @@ -351,7 +351,7 @@ 3 - Segoe UI, 9.75pt + Tahoma, 9.75pt 264, 115 @@ -381,7 +381,7 @@ 2 - Segoe UI, 9.75pt + Tahoma, 9.75pt 264, 140 @@ -440,6 +440,9 @@ 376, 179 + + Tahoma, 8.25pt + AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -606,6 +609,10 @@ AAA= + + + CenterScreen + Lizenzinformationen diff --git a/app/DD-Record-Organiser/frmRecordView.vb b/app/DD-Record-Organiser/frmRecordView.vb index 6b58ef4..4ee16da 100644 --- a/app/DD-Record-Organiser/frmRecordView.vb +++ b/app/DD-Record-Organiser/frmRecordView.vb @@ -101,7 +101,6 @@ Public Class frmRecordView Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle) Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID Dim user As String = Environment.UserName - Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, dateString, user) @@ -156,7 +155,7 @@ Public Class frmRecordView DT_DOCRESULT_DROPDOWN_ITEMS, AddressOf OnCBSelectedValueChanged, AddressOf OnDateSelectedValueChanged, - AddressOf OnTextSelectedValueChanged) + AddressOf OnTextSelectedValueChanged, "RECORD") End If Else Dim msg = "Keine Windream-Dokumente für Record: " & JUMP_RECORD_ID & " gefunden" diff --git a/app/DD-Record-Organiser/frmTask_Management.vb b/app/DD-Record-Organiser/frmTask_Management.vb index 00e7c53..2910ac5 100644 --- a/app/DD-Record-Organiser/frmTask_Management.vb +++ b/app/DD-Record-Organiser/frmTask_Management.vb @@ -139,21 +139,6 @@ Private Sub BindingNavigatorDeleteItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem.Click End Sub - - Private Sub TBPMO_WORKFLOW_FORMDataGridView_DragDrop(sender As Object, e As DragEventArgs) - 'Try - ' Dim i As Integer - ' i = TBPMO_WORKFLOWDataGridView.CurrentRow.Index - ' If TBPMO_WORKFLOWDataGridView.Item(0, i).Value Is Nothing = False Then - ' TBPMO_WORKFLOW_FORMTableAdapter.Insert(_FORMID, e.Data.GetData(DataFormats.Text), 1, Environment.UserName) - ' toolstriplabel(True, "Task erfolgreich zugeordnet - " & Now) - ' Refresh_Workflow_Form(_FORMID) - ' End If - 'Catch ex As Exception - ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Hinzufügen eines Users:") - 'End Try - End Sub - Private Sub TBPMO_WORKFLOW_FORMDataGridView_DragEnter(sender As Object, e As DragEventArgs) ' Check the format of the data being dropped. If (e.Data.GetDataPresent(DataFormats.Text)) Then diff --git a/app/DD-Record-Organiser/frmWD_IndexFile.vb b/app/DD-Record-Organiser/frmWD_IndexFile.vb index b5a66c4..1e06db1 100644 --- a/app/DD-Record-Organiser/frmWD_IndexFile.vb +++ b/app/DD-Record-Organiser/frmWD_IndexFile.vb @@ -326,24 +326,30 @@ Public Class frmWD_IndexFile 'End Function Private Sub btnindex_Click(sender As Object, e As EventArgs) Handles btnindex.Click - If CURRENT_RECORD_ID = 0 Then - MsgBox("No Record chosen or the documenttype was not chosen!", MsgBoxStyle.Information) - Exit Sub - End If - If lvwIndices.Items.Count = 0 Then - MsgBox("Please choose a documenttxpe!", MsgBoxStyle.Information) - Exit Sub - End If - If CURRENT_TBPMO_INDEX_MAN.Rows.Count > 0 Then - If CheckWrite_IndexeMan() = False Then + Try + If CURRENT_RECORD_ID = 0 Then + MsgBox("No Record chosen or the documenttype was not chosen!", MsgBoxStyle.Information) Exit Sub End If - End If - If cmbDokumentart.SelectedIndex <> -1 Then - My.Settings.WD_INDEXDOKART_SAVE = cmbDokumentart.Text - My.Settings.Save() - Indexing_File(cmbDokumentart.SelectedValue) - End If + If lvwIndices.Items.Count = 0 Then + MsgBox("Please choose a documenttxpe!", MsgBoxStyle.Information) + Exit Sub + End If + If Not IsNothing(CURRENT_TBPMO_INDEX_MAN) Then + If CURRENT_TBPMO_INDEX_MAN.Rows.Count > 0 Then + If CheckWrite_IndexeMan() = False Then + Exit Sub + End If + End If + End If + If cmbDokumentart.SelectedIndex <> -1 Then + My.Settings.WD_INDEXDOKART_SAVE = cmbDokumentart.Text + My.Settings.Save() + Indexing_File(cmbDokumentart.SelectedValue) + End If + Catch ex As Exception + MsgBox("Unexpected Error in Prepare indexing: " & ex.Message, MsgBoxStyle.Critical) + End Try End Sub Function Return_CURRENT_TBPMO_INDEX_MAN_VALUE(CONTROL_GUID As Integer, COL_NAME As String) @@ -1123,7 +1129,8 @@ Public Class frmWD_IndexFile Private Sub frmWD_Index_Dokart_Shown(sender As Object, e As EventArgs) Handles Me.Shown Try If My.Settings.WD_INDEXDOKART_SAVE <> String.Empty Then - cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(My.Settings.WD_INDEXDOKART_SAVE) + Me.cmbDokumentart.SelectedItem = Me.cmbDokumentart.Items.IndexOf(My.Settings.WD_INDEXDOKART_SAVE) + ' cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(My.Settings.WD_INDEXDOKART_SAVE) Else If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 1 Then cmbDokumentart.SelectedIndex = 0 diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs index e1f732a..42d2b2d 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupWiX/Product.wxs @@ -171,6 +171,7 @@ +