diff --git a/app/DD-Record-Organizer/ClassControlBuilder.vb b/app/DD-Record-Organizer/ClassControlBuilder.vb index 10e2c91..c41efad 100644 --- a/app/DD-Record-Organizer/ClassControlBuilder.vb +++ b/app/DD-Record-Organizer/ClassControlBuilder.vb @@ -356,20 +356,20 @@ Public Class ClassControlBuilder If match.Success Then Dim sqlguid = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", CONTROL_ID, CURRENT_RECORD_ID) Dim ctrlvalID = ClassDatabase.Execute_Scalar(sqlguid, True) - Select Case row.Item("FORMAT_TYPE") - Case "Currency" - value = Decimal.Parse(value, Globalization.NumberStyles.Currency).ToString - Case "Decimal" - value = Decimal.Parse(value, Globalization.NumberStyles.Integer) - End Select - Select Case row.Item("CONTROL_TYPE_ID") - Case 4 'DatePicker - Try - value = CStr(CDate(value)) 'Format(value, "dd-MM-yyyy")) - Catch ex As Exception - ClassLogger.Add("Unexpected Error in converting Value '" & value & "' to date - Control-ID: " & CONTROL_ID.ToString & "- Error: " & ex.Message) - End Try - End Select + 'Select Case row.Item("FORMAT_TYPE") + ' Case "Currency" + ' value = Decimal.Parse(value, Globalization.NumberStyles.Currency).ToString + ' Case "Decimal" + ' value = Decimal.Parse(value, Globalization.NumberStyles.Integer) + 'End Select + 'Select Case row.Item("CONTROL_TYPE_ID") + ' Case 4 'DatePicker + ' Try + ' value = CStr(CDate(value)) 'Format(value, "dd-MM-yyyy")) + ' Catch ex As Exception + ' ClassLogger.Add("Unexpected Error in converting Value '" & value & "' to date - Control-ID: " & CONTROL_ID.ToString & "- Error: " & ex.Message) + ' End Try + 'End Select ' Diese Abfrage verhindert, dass Werte, die aus z.B. CheckedListBoxen kommen, ' nicht überschrieben werden. Diese Werte werden bereits mit UpdateMultipleValues gespeichert If (Not value.Contains(";")) Then diff --git a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb index 359295f..3ff8d40 100644 --- a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb @@ -59,24 +59,23 @@ Public Class ClassDOC_SEARCH Dim SQL_DOC_SEARCH If CURRENT_SEARCH_TYPE = "ENTITY" Then - SQL_DOC_SEARCH = String.Format("SELECT DISTINCT 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 T.DOC_ID from TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0}) " & vbNewLine & _ + SQL_DOC_SEARCH = String.Format("SELECT DISTINCT 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_VALUE] (T.DocID,{0},'DROPDOWN1','{1}',0) AS DROPDOWN1," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{0},'DROPDOWN2','{1}',0) AS DROPDOWN2," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{0},'DROPDOWN3','{1}',0) AS DROPDOWN3," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{0},'DROPDOWN4','{1}',0) AS DROPDOWN4" & vbNewLine & + "FROM " & vbNewLine & + "VWPMO_DOC_SEARCH T" & vbNewLine & + "WHERE T.DocID IN (select DISTINCT T.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) If CURRENT_ENTITYSQL_WHERE <> "" Then Dim where = CURRENT_ENTITYSQL_WHERE.Replace("WHERE [RECORD-ID] IN ", "") - SQL_DOC_SEARCH = SQL_DOC_SEARCH & " " & vbNewLine & String.Format("AND T.DocID IN (SELECT DISTINCT DOC_ID from TBPMO_DOC_RECORD_LINK WHERE RECORD_ID IN ({0}))", where) End If If BG = True Then @@ -97,115 +96,115 @@ Public Class ClassDOC_SEARCH End If ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then - SQL_DOC_SEARCH = String.Format("SELECT DISTINCT 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_DOC_SEARCH T " & vbNewLine & _ - "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & _ - "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & _ - "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON TR.FORM_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON TR.FORM_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON TR.FORM_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON TR.FORM_ID = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T1 ON TRL.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T2 ON TRL.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T3 ON TRL.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T4 ON TRL.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & _ + SQL_DOC_SEARCH = String.Format("SELECT DISTINCT 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_VALUE] (T.DocID,{1},'DROPDOWN1','{7}',TRL.RECORD_ID) AS DROPDOWN1," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN2','{7}',TRL.RECORD_ID) AS DROPDOWN2," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN3','{7}',TRL.RECORD_ID) AS DROPDOWN3," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN4','{7}',TRL.RECORD_ID) AS DROPDOWN4," & vbNewLine & + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC.GUID) AS VALUE1," & vbNewLine & + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC1.GUID) AS VALUE2," & vbNewLine & + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC2.GUID) AS VALUE3," & vbNewLine & + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND RECORD_ID = TRL.RECORD_ID AND CONFIG_ID = TRC3.GUID) AS VALUE4" & vbNewLine & + "FROM " & vbNewLine & + "VWPMO_DOC_SEARCH T " & vbNewLine & + "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & + "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & + "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON TR.FORM_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON TR.FORM_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON TR.FORM_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON TR.FORM_ID = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine & + "LEFT JOIN TBPMO_CONTROL_VALUE T1 ON TRL.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine & + "LEFT JOIN TBPMO_CONTROL_VALUE T2 ON TRL.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & + "LEFT JOIN TBPMO_CONTROL_VALUE T3 ON TRL.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & + "LEFT JOIN TBPMO_CONTROL_VALUE T4 ON TRL.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & "WHERE TRL.RECORD_ID = {0} AND TR.FORM_ID = {1} AND TRIGHTS.dwUserOrGroupID = {6}", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4) ElseIf CURRENT_SEARCH_TYPE = "FULLTEXT" Then Dim sqlft = SQL_FULLTEXT sqlft = sqlft.Replace("@FULLTEXT", CURRENT_FULLTEXT_PATTERN) - SQL_DOC_SEARCH = String.Format("SELECT DISTINCT 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 & _ - "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & _ - "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & _ - "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & _ - "LEFT OUTER JOIN TBPMO_CONTROL_VALUE TCTRL ON TR.GUID = TCTRL.RECORD_ID" & vbNewLine & _ - "WHERE TR.FORM_ID = {0} AND TRIGHTS.dwUserOrGroupID = {2} AND (" & vbNewLine & _ - "TCTRL.VALUE LIKE '%{6}%' OR" & vbNewLine & _ - "T.DocID IN ({5}" & vbNewLine & _ + SQL_DOC_SEARCH = String.Format("SELECT DISTINCT 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_VALUE] (T.DocID,{0},'DROPDOWN1','{1}',TRL.RECORD_ID) AS DROPDOWN1," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{0},'DROPDOWN2','{1}',TRL.RECORD_ID) AS DROPDOWN2," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{0},'DROPDOWN3','{1}',TRL.RECORD_ID) AS DROPDOWN3," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{0},'DROPDOWN4','{1}',TRL.RECORD_ID) AS DROPDOWN4" & vbNewLine & + "FROM " & vbNewLine & + "VWPMO_DOC_SEARCH T" & vbNewLine & + "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & + "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & + "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & + "LEFT OUTER JOIN TBPMO_CONTROL_VALUE TCTRL ON TR.GUID = TCTRL.RECORD_ID" & vbNewLine & + "WHERE TR.FORM_ID = {0} AND TRIGHTS.dwUserOrGroupID = {2} AND (" & vbNewLine & + "TCTRL.VALUE LIKE '%{6}%' OR" & vbNewLine & + "T.DocID IN ({5}" & vbNewLine & "))", ENTITY_ID, USER_LANGUAGE, USERID_FK_INT_ECM, OPTION1, OPTION2, sqlft, CURRENT_FULLTEXT_PATTERN) ElseIf CURRENT_SEARCH_TYPE = "NODE_DOWN" Then - SQL_DOC_SEARCH = String.Format("SELECT DISTINCT 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_DOC_SEARCH T " & vbNewLine & _ - "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & _ - "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & _ - "INNER JOIN TBPMO_STRUCTURE_NODES_USER_TEMP TTEMP ON TR.GUID = TTEMP.RECORD_ID" & vbNewLine & _ - "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON TR.FORM_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON TR.FORM_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON TR.FORM_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & _ - "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON TR.FORM_ID = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T1 ON TRL.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T2 ON TRL.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T3 ON TRL.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & _ - "LEFT JOIN TBPMO_CONTROL_VALUE T4 ON TRL.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & _ + SQL_DOC_SEARCH = String.Format("SELECT DISTINCT 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_VALUE] (T.DocID,{1},'DROPDOWN1','{7}',TRL.RECORD_ID) AS DROPDOWN1," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN2','{7}',TRL.RECORD_ID) AS DROPDOWN2," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN3','{7}',TRL.RECORD_ID) AS DROPDOWN3," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN4','{7}',TRL.RECORD_ID) 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_DOC_SEARCH T " & vbNewLine & + "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & + "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & + "INNER JOIN TBPMO_STRUCTURE_NODES_USER_TEMP TTEMP ON TR.GUID = TTEMP.RECORD_ID" & vbNewLine & + "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON TR.FORM_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON TR.FORM_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON TR.FORM_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON TR.FORM_ID = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine & + "LEFT JOIN TBPMO_CONTROL_VALUE T1 ON TRL.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine & + "LEFT JOIN TBPMO_CONTROL_VALUE T2 ON TRL.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & + "LEFT JOIN TBPMO_CONTROL_VALUE T3 ON TRL.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & + "LEFT JOIN TBPMO_CONTROL_VALUE T4 ON TRL.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & "WHERE TR.FORM_ID = {1} AND TTEMP.USER_ID = {0} AND TRIGHTS.dwUserOrGroupID = {6}", USER_GUID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4) ElseIf CURRENT_SEARCH_TYPE = "FULLTEXT_SUBNODES" Then Dim sqlft = SQL_FULLTEXT sqlft = sqlft.Replace("@FULLTEXT", CURRENT_FULLTEXT_PATTERN) - SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.*," & vbNewLine & _ - "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({4},T.DocID,{1}) AS OPTION1," & vbNewLine & _ - "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({5},T.DocID,{1}) AS OPTION2," & 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','{0}') AS DROPDOWN1," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN2','{0}') AS DROPDOWN2," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN3','{0}') AS DROPDOWN3," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN4','{0}') AS DROPDOWN4" & vbNewLine & _ - "FROM " & vbNewLine & _ - "VWPMO_DOC_SEARCH T" & vbNewLine & _ - "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & _ - "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & _ - "INNER JOIN TBPMO_STRUCTURE_NODES_USER_TEMP TTEMP ON TR.GUID = TTEMP.RECORD_ID" & vbNewLine & _ - "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & _ - "WHERE TR.FORM_ID = {1} AND TTEMP.USER_ID = {2} AND TRIGHTS.dwUserOrGroupID = {3}" & vbNewLine & _ + SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.*," & vbNewLine & + "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({4},T.DocID,{1}) AS OPTION1," & vbNewLine & + "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({5},T.DocID,{1}) AS OPTION2," & 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_VALUE] (T.DocID,{1},'DROPDOWN1','{0}',TRL.RECORD_ID) AS DROPDOWN1," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN2','{0}',TRL.RECORD_ID) AS DROPDOWN2," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN3','{0}',TRL.RECORD_ID) AS DROPDOWN3," & vbNewLine & + "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN4','{0}',TRL.RECORD_ID) AS DROPDOWN4" & vbNewLine & + "FROM " & vbNewLine & + "VWPMO_DOC_SEARCH T" & vbNewLine & + "INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine & + "INNER JOIN TBPMO_RECORD TR ON TRL.RECORD_ID = TR.GUID" & vbNewLine & + "INNER JOIN TBPMO_STRUCTURE_NODES_USER_TEMP TTEMP ON TR.GUID = TTEMP.RECORD_ID" & vbNewLine & + "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine & + "WHERE TR.FORM_ID = {1} AND TTEMP.USER_ID = {2} AND TRIGHTS.dwUserOrGroupID = {3}" & vbNewLine & "AND T.DocID IN ({6})", USER_LANGUAGE, ENTITY_ID, USER_GUID, USERID_FK_INT_ECM, OPTION1, OPTION2, sqlft) End If If LogErrorsOnly = False Then ClassLogger.Add(" >> SQL_DOC_SEARCH: " & SQL_DOC_SEARCH, False) @@ -430,7 +429,7 @@ Public Class ClassDOC_SEARCH Try Dim execute = String.Format("EXEC [dbo].[PRPMO_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME) If ClassDatabase.Execute_non_Query(execute) = True Then - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then execute = String.Format("EXEC [dbo].[PRPROXY_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME) ClassDatabase.Execute_non_Query(execute, True) End If diff --git a/app/DD-Record-Organizer/ClassDatabase.vb b/app/DD-Record-Organizer/ClassDatabase.vb index eb1dd72..41eed59 100644 --- a/app/DD-Record-Organizer/ClassDatabase.vb +++ b/app/DD-Record-Organizer/ClassDatabase.vb @@ -203,7 +203,7 @@ Public Class ClassDatabase SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo SQLcommand.CommandText = ExecuteCMD - + SQLcommand.CommandTimeout = 120 SQLcommand.ExecuteNonQuery() SQLcommand.Dispose() SQLconnect.Close() @@ -234,6 +234,7 @@ Public Class ClassDatabase SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo SQLcommand.CommandText = ExecuteCMD + SQLcommand.CommandTimeout = 120 SQLcommand.ExecuteNonQuery() SQLcommand.Dispose() SQLconnect.Close() @@ -265,6 +266,7 @@ Public Class ClassDatabase SQLcommand = SQLconnect.CreateCommand() 'Update Last Created Record in Foo SQLcommand.CommandText = ExecuteCMD + SQLcommand.CommandTimeout = 120 SQLcommand.BeginExecuteNonQuery(callback, SQLcommand) Catch ex As Exception @@ -305,6 +307,7 @@ Public Class ClassDatabase SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo SQLcommand.CommandText = cmdscalar + SQLcommand.CommandTimeout = 120 result = SQLcommand.ExecuteScalar() SQLcommand.Dispose() SQLconnect.Close() @@ -335,6 +338,7 @@ Public Class ClassDatabase SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo SQLcommand.CommandText = cmdscalar + SQLcommand.CommandTimeout = 120 result = SQLcommand.ExecuteScalar() SQLcommand.Dispose() SQLconnect.Close() diff --git a/app/DD-Record-Organizer/ClassFileResult.vb b/app/DD-Record-Organizer/ClassFileResult.vb index 30ce02b..b54535c 100644 --- a/app/DD-Record-Organizer/ClassFileResult.vb +++ b/app/DD-Record-Organizer/ClassFileResult.vb @@ -11,7 +11,7 @@ upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET IN_WORK = {0}, IN_WORK_USER = '{1}', IN_WORK_COMMENT = '{2}' WHERE DocID = {3}", state, USER_USERNAME, comment, DocID) End If If ClassDatabase.Execute_non_Query(upd) = True Then - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then ClassDatabase.Execute_non_Query(upd, True) End If InWork = True @@ -29,7 +29,7 @@ Dim upd As String upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET DISPLAY_NAME = '{0}' WHERE DocID = {1}", Displayname, DocID) If ClassDatabase.Execute_non_Query(upd) = True Then - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then ClassDatabase.Execute_non_Query(upd, True) End If Return True @@ -85,7 +85,7 @@ Try Dim proc = String.Format("EXEC PRPMO_DELETE_RESULTFILE {0},{1},{2}", RESULT_DOC_ID, RECORD_ID, DELETE_FILE) If ClassDatabase.Execute_non_Query(proc) = True Then - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", RESULT_DOC_ID) ClassDatabase.Execute_non_Query(proc, True) End If diff --git a/app/DD-Record-Organizer/ClassHelper.vb b/app/DD-Record-Organizer/ClassHelper.vb index 5c3ef83..f031a1a 100644 --- a/app/DD-Record-Organizer/ClassHelper.vb +++ b/app/DD-Record-Organizer/ClassHelper.vb @@ -311,4 +311,16 @@ Public Class ClassHelper Return False End Try End Function + Public Shared Function DecryptString(ciphertext As String, MethodName As String) + Dim result As String + Dim wrapper As New ClassEncryption("!35452didalog=") + ' DecryptData throws if the wrong password is used. + Try + result = wrapper.DecryptData(ciphertext) + Return result + Catch ex As Exception + ClassLogger.Add("The ciphertext for Method'" & MethodName & "' could not be decrypted", False) + Return "" + End Try + End Function End Class diff --git a/app/DD-Record-Organizer/ClassInit.vb b/app/DD-Record-Organizer/ClassInit.vb index 29473fa..6f946a5 100644 --- a/app/DD-Record-Organizer/ClassInit.vb +++ b/app/DD-Record-Organizer/ClassInit.vb @@ -269,7 +269,7 @@ Public Class ClassInit End Try End If - If LICENSE_SITE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""')" End If Return True diff --git a/app/DD-Record-Organizer/ClassLicence.vb b/app/DD-Record-Organizer/ClassLicence.vb index 0528445..48ab40b 100644 --- a/app/DD-Record-Organizer/ClassLicence.vb +++ b/app/DD-Record-Organizer/ClassLicence.vb @@ -1,9 +1,13 @@ -Imports DLLLicenseManager +Imports System.Globalization +Imports DLLLicenseManager Public Class ClassLicence Private Shared _lizenzManager As ClassLicenseManager Public Shared Sub Refresh_Licence(CLIENT_ID As Integer) Try + + Dim todayDate As Date = New Date(Now.Year, Now.Month, Now.Day) + If LogErrorsOnly = False Then ClassLogger.Add(" >> todayDate: " & todayDate.ToString, False) _lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "") Dim sql As String = String.Format("SELECT LICENSE_PMO FROM TBDD_CLIENT WHERE GUID = {0}", CLIENT_ID) @@ -22,15 +26,70 @@ Public Class ClassLicence Else LICENSE_COUNT = 0 End If - LICENSE_DATE = CDate(split(1)) - If CDate(split(1)) < CDate(Now.ToShortDateString) Then + Dim LicDATEsplit() = split(1).ToString.Split("-") + Dim LICENSE_FILE_DATE As Date + Try + LICENSE_FILE_DATE = New Date(LicDATEsplit(0), LicDATEsplit(1), LicDATEsplit(2)) + If LogErrorsOnly = False Then ClassLogger.Add(" >> LICENSE_FILE_DATE: " & LICENSE_FILE_DATE.ToString, False) + Try + Try + LICENSE_DATE = CDate(LICENSE_FILE_DATE) + Catch ex As Exception + ClassLogger.Add(">> Could not read LICENSE_DATE2: " & ex.Message, False) + End Try + + Catch ex As Exception + ClassLogger.Add(">> Could not read LICENSE_DATE1: " & ex.Message, False) + End Try + Catch ex As Exception + ClassLogger.Add(">> Could not read LICENSE_DATE3: " & ex.Message, False) + LICENSE_FILE_DATE = New Date(Now.Year, Now.Month, Now.Day) + End Try + + + + + If LICENSE_FILE_DATE < CDate(todayDate) Then MsgBox("Your license evaluated!" & vbNewLine & "Last valid date: " & split(1) & vbNewLine & "Please contact Digital Data.", MsgBoxStyle.Exclamation) LICENSE_EXPIRED = True LICENSE_COUNT = 0 End If - ''Die Anzahl der Userlizenzen - 'LICENSE_COUNT = split(1) + sql = String.Format("SELECT NAME, VALID_DATE, '' AS State FROM TBDD_LICENSE_ADD_ON WHERE CLIENT_ID = {0} AND MODULE = 'Record-Organizer'", CLIENT_ID) + DT_LICENSE_ADDONS = ClassDatabase.Return_Datatable(sql) + For Each license_Row As DataRow In DT_LICENSE_ADDONS.Rows + Dim expired As Boolean = False + If LogErrorsOnly = False Then ClassLogger.Add(" >> AddOnName: " & license_Row.Item("NAME"), False) + Dim result = ClassHelper.DecryptString(license_Row.Item("VALID_DATE"), license_Row.Item("NAME")) + If result <> "" Then + Dim datesplit() = result.ToString.Split("-") + Dim licdate As Date = New Date(datesplit(0), datesplit(1), datesplit(2)) + Dim license_date = CDate(result) + If CDate(licdate) < CDate(todayDate) Then + expired = True + license_Row.Item("State") = "Expired" + Else + expired = False + license_Row.Item("State") = "Valid" + End If + Else + expired = True + End If + + If license_Row.Item("NAME") = "Proxy-Server" Then + If expired = False Then + LICENSE_PROXY = True + End If + ElseIf license_Row.Item("NAME") = "Site-AddOn" Then + If expired = False Then + LICENSE_SITE = True + End If + ElseIf license_Row.Item("NAME") = "SAP-Connect" Then + If expired = False Then + LICENSE_SAP_Connect = True + End If + End If + Next Try LICENSE_DOSSIER_COUNT = split(2) @@ -38,18 +97,7 @@ Public Class ClassLicence ClassLogger.Add(">> Could not read License for LICENSE_DOSSIER_COUNT: " & ex.Message, False) LICENSE_DOSSIER_COUNT = 0 End Try - Try - LICENSE_SAP_Connect = CBool(split(3)) - Catch ex As Exception - ClassLogger.Add(">> Could not read License for LICENSE_SAP_Connect: " & ex.Message, False) - LICENSE_SAP_Connect = False - End Try - Try - LICENSE_SITE_PROXY = CBool(split(4)) - Catch ex As Exception - ClassLogger.Add(">> Could not read License for LICENSE_SITE_Proxy: " & ex.Message, False) - LICENSE_SITE_PROXY = False - End Try + Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in licensemanager:") End Try @@ -57,7 +105,7 @@ Public Class ClassLicence Public Shared Function license_is_Valid() If LICENSE_EXPIRED Then - MsgBox("Your license has expired!" & vbNewLine & "Last valid date: " & License_Date & vbNewLine & "Please contact Digital Data!", MsgBoxStyle.Exclamation) + MsgBox("Your license has expired!" & vbNewLine & "Last valid date: " & LICENSE_DATE & vbNewLine & "Please contact Digital Data!", MsgBoxStyle.Exclamation) Return False Else : Return True diff --git a/app/DD-Record-Organizer/ClassProxy.vb b/app/DD-Record-Organizer/ClassProxy.vb index 2ed0dec..cceb9f2 100644 --- a/app/DD-Record-Organizer/ClassProxy.vb +++ b/app/DD-Record-Organizer/ClassProxy.vb @@ -3,11 +3,11 @@ Public Class ClassProxy Public Shared MyPROXYConnectionString As String = "" Public Shared MyLinkedServer As String Public Shared Function Refresh_Object_Data() - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If - Dim sel = "DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRPROXY_SYNC_OBJECTS]" & vbNewLine & _ + Dim sel = "DECLARE @return_value int" & vbNewLine & + "EXEC @return_value = [dbo].[PRPROXY_SYNC_OBJECTS]" & vbNewLine & "SELECT 'Return Value' = @return_value" Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -21,11 +21,11 @@ Public Class ClassProxy End If End Function Public Shared Function PRPROXY_SYNC_DOC_OBJECTS() - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If - Dim sel = "DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRPROXY_SYNC_DOC_OBJECTS]" & vbNewLine & _ + Dim sel = "DECLARE @return_value int" & vbNewLine & + "EXEC @return_value = [dbo].[PRPROXY_SYNC_DOC_OBJECTS]" & vbNewLine & "SELECT 'Return Value' = @return_value" Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -39,11 +39,11 @@ Public Class ClassProxy End If End Function Public Shared Function PRPROXY_RECORD_DEL(RECID As Integer, ENTITY_ID As Integer) - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If - Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRPROXY_RECORD_DEL] {0},{1} " & vbNewLine & _ + Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & + "EXEC @return_value = [dbo].[PRPROXY_RECORD_DEL] {0},{1} " & vbNewLine & "SELECT 'Return Value' = @return_value", RECID, ENTITY_ID) Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -57,11 +57,11 @@ Public Class ClassProxy End If End Function Public Shared Function PRPROXY_RECORD_UPD_INS(ENT_ID As Integer, RECID As Integer) - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If - Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRPROXY_RECORD_UPD_INS] {0},{1} " & vbNewLine & _ + Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & + "EXEC @return_value = [dbo].[PRPROXY_RECORD_UPD_INS] {0},{1} " & vbNewLine & "SELECT 'Return Value' = @return_value", ENT_ID, RECID) Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -75,11 +75,11 @@ Public Class ClassProxy End If End Function Public Shared Function PRPROXY_RECORD_CONNECT(PARENT_RECID As Integer, RECID As Integer) - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If - Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRPROXY_RECORD_CONNECT] {0},{1} " & vbNewLine & _ + Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & + "EXEC @return_value = [dbo].[PRPROXY_RECORD_CONNECT] {0},{1} " & vbNewLine & "SELECT 'Return Value' = @return_value", PARENT_RECID, RECID) Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -93,11 +93,11 @@ Public Class ClassProxy End If End Function Public Shared Function PRPROXY_CONTROL_DEL(REC_ID As Integer, ENT_ID As Integer, CONTROL_ID As Integer) - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If - Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRPROXY_CONTROL_DEL] {0},{1},{2}" & vbNewLine & _ + Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & + "EXEC @return_value = [dbo].[PRPROXY_CONTROL_DEL] {0},{1},{2}" & vbNewLine & "SELECT 'Return Value' = @return_value", REC_ID, ENT_ID, CONTROL_ID) Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -111,11 +111,11 @@ Public Class ClassProxy End If End Function Public Shared Function Refresh_Workflow_Data() - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If - Dim sel = "DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRPROXY_SYNC_WORKFLOWS]" & vbNewLine & _ + Dim sel = "DECLARE @return_value int" & vbNewLine & + "EXEC @return_value = [dbo].[PRPROXY_SYNC_WORKFLOWS]" & vbNewLine & "SELECT 'Return Value' = @return_value" Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -129,11 +129,11 @@ Public Class ClassProxy End If End Function Public Shared Function PRPROXY_SYNC_DETAIL_OBJECT(Objectname As String) - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If - Dim sel = "DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRPROXY_SYNC_DETAIL_OBJECT] '" & Objectname & "'" & vbNewLine & _ + Dim sel = "DECLARE @return_value int" & vbNewLine & + "EXEC @return_value = [dbo].[PRPROXY_SYNC_DETAIL_OBJECT] '" & Objectname & "'" & vbNewLine & "SELECT 'Return Value' = @return_value" Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -147,11 +147,11 @@ Public Class ClassProxy End If End Function Public Shared Function PRPROXY_CONTROL_VALUE_UPD_INS(EntityID As Integer, ControlID As Integer, RecordID As Integer, Value As String) - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If - Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ - "EXEC @return_value = [dbo].[PRPROXY_CONTROL_VALUE_UPD_INS] {0},{1},{2},'{3}','{4}'" & vbNewLine & _ + Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & + "EXEC @return_value = [dbo].[PRPROXY_CONTROL_VALUE_UPD_INS] {0},{1},{2},'{3}','{4}'" & vbNewLine & "SELECT 'Return Value' = @return_value", EntityID, ControlID, RecordID, Value, USER_USERNAME) Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True) If Not IsNothing(Result) Then @@ -165,7 +165,7 @@ Public Class ClassProxy End If End Function Public Shared Function IS_PROXY_BUSY() - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If Dim sql = "SELECT SYNC_RUNNING FROM TBPROXY_CONFIG WHERE GUID = 1" @@ -178,7 +178,7 @@ Public Class ClassProxy End If End Function Public Shared Function PRPROXY_DOC_VALUES(DocID As Integer) - If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False End If Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _ diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index 6a05a66..aed1a22 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -80,8 +80,10 @@ Public LICENSE_COUNT As Integer = 0 Public LICENSE_DOSSIER_COUNT As Integer = 0 Public LICENSE_SAP_Connect As Boolean = False - Public LICENSE_SITE_PROXY As Boolean = False + Public LICENSE_PROXY As Boolean = False + Public LICENSE_SITE As Boolean = False Public LICENSE_DATE As Date + Public DT_LICENSE_ADDONS As DataTable Public CONNECTION_CHANGED As Boolean = False diff --git a/app/DD-Record-Organizer/My Project/licenses.licx b/app/DD-Record-Organizer/My Project/licenses.licx index e69de29..5dbe817 100644 --- a/app/DD-Record-Organizer/My Project/licenses.licx +++ b/app/DD-Record-Organizer/My Project/licenses.licx @@ -0,0 +1,3 @@ +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organizer/frmConfig_Basic.resx b/app/DD-Record-Organizer/frmConfig_Basic.resx index 93f833e..44efcf1 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.resx +++ b/app/DD-Record-Organizer/frmConfig_Basic.resx @@ -608,7 +608,7 @@ 3, 3, 3, 3 - 687, 333 + 687, 259 0 @@ -1059,7 +1059,7 @@ 138, 15 - 201, 17 + 200, 17 1 @@ -1086,7 +1086,7 @@ 3, 3, 3, 3 - 687, 333 + 687, 259 1 @@ -1170,7 +1170,7 @@ 11, 102 - 192, 153 + 192, 79 15 @@ -1341,7 +1341,7 @@ 3, 3, 3, 3 - 687, 333 + 687, 259 2 @@ -1440,7 +1440,7 @@ 3, 3, 3, 3 - 687, 333 + 687, 259 3 @@ -1467,7 +1467,7 @@ 0, 0 - 695, 359 + 695, 285 0 @@ -1491,7 +1491,7 @@ 6, 13 - 695, 359 + 695, 285 Segoe UI, 8.25pt diff --git a/app/DD-Record-Organizer/frmConfig_Basic.vb b/app/DD-Record-Organizer/frmConfig_Basic.vb index d97ff21..b1ccac8 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.vb +++ b/app/DD-Record-Organizer/frmConfig_Basic.vb @@ -108,7 +108,7 @@ Public Class frmConfig_Basic Cursor = Cursors.Default End Sub Private Sub frmConfig_Basic_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If LICENSE_SITE_PROXY = True Then + If LICENSE_PROXY = True Then Me.rbConn_Proxy.Visible = True Else Me.rbConn_Proxy.Visible = False diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index a7a969f..ab115be 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb @@ -386,8 +386,8 @@ Partial Class frmConstructor_Main 'tsmINewText ' Me.tsmINewText.BackColor = System.Drawing.Color.Yellow - resources.ApplyResources(Me.tsmINewText, "tsmINewText") Me.tsmINewText.Name = "tsmINewText" + resources.ApplyResources(Me.tsmINewText, "tsmINewText") ' 'ToolStripSeparator15 ' @@ -1310,8 +1310,8 @@ Partial Class frmConstructor_Main 'CMDoc_TextBoxRenameFile ' Me.CMDoc_TextBoxRenameFile.BackColor = System.Drawing.Color.Orange - resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile") Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile" + resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile") ' 'DisplaynameUmbenennenToolStripMenuItem ' @@ -1322,8 +1322,8 @@ Partial Class frmConstructor_Main 'CMDoc_TextBoxRenameDisplay ' Me.CMDoc_TextBoxRenameDisplay.BackColor = System.Drawing.Color.DarkOrange - resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay") Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay" + resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay") ' 'docCM_InWork ' diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index 508ea62..b5d3d57 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -285,9 +285,6 @@ Knotentext: - - Segoe UI, 9pt - 152, 23 @@ -528,7 +525,7 @@ 0, 25 - 1074, 212 + 1067, 212 2 @@ -537,7 +534,7 @@ GridControlMain - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerTop.Panel2 @@ -656,7 +653,7 @@ Neu laden - Neu laden (strg&R) + Daten zu Entität neu laden (strg&R) Magenta @@ -671,7 +668,7 @@ 0, 0 - 1074, 25 + 1067, 25 1 @@ -707,7 +704,7 @@ SplitContainerTop - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerMain.Panel1 @@ -755,7 +752,7 @@ 0, 0 - 699, 343 + 699, 336 4 @@ -785,7 +782,7 @@ 0, 26 - 648, 293 + 641, 286 5 @@ -832,10 +829,10 @@ Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 0, 319 + 0, 312 - 648, 24 + 641, 24 0 @@ -862,7 +859,7 @@ 0, 0 - 648, 26 + 641, 26 0 @@ -883,7 +880,7 @@ Panel2 - 1356, 347 + 1356, 340 1 @@ -895,7 +892,7 @@ SplitContainerDetails - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabDetails @@ -1059,7 +1056,7 @@ 1 - 1356, 372 + 1356, 365 Detailansicht @@ -1068,7 +1065,7 @@ TabDetails - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TCDetails @@ -1077,7 +1074,7 @@ 0 - 1362, 403 + 1362, 396 3 @@ -1101,7 +1098,7 @@ GridControlPos - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a Panel1 @@ -1212,9 +1209,6 @@ False - - Segoe UI, 9pt - 50, 23 @@ -1382,7 +1376,7 @@ TabPos - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TCDetails @@ -1444,7 +1438,7 @@ GridControlDocSearch - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabWindream @@ -1546,7 +1540,7 @@ TabWindream - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TCDetails @@ -1977,7 +1971,7 @@ TabFollowUp - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TCDetails @@ -2088,7 +2082,7 @@ GridControl1 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabPageVariant @@ -2160,7 +2154,7 @@ TabPageVariant - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TCDetails @@ -2172,7 +2166,7 @@ TCDetails - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerMain.Panel2 @@ -2196,7 +2190,7 @@ SplitContainerMain - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerFORM.Panel2 @@ -2229,7 +2223,7 @@ SplitContainerFORM - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -2285,9 +2279,6 @@ 248, 6 - - Segoe UI, 9pt - 152, 23 @@ -2300,9 +2291,6 @@ Dateinamen umbenennen - - Segoe UI, 9pt - 152, 23 @@ -2508,7 +2496,7 @@ NavPane - DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -2538,7 +2526,7 @@ DocID: - 121, 19 + 120, 19 ToolStripStatusLabel1 @@ -2585,12 +2573,12 @@ 444, 17 - + - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu - OS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAAAChE - ZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0cmVhbWVyAAAAAAIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu + MTUuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo + RGV2RXhwcmVzcy5VdGlscy5JbWFnZUNvbGxlY3Rpb25TdHJlYW1lcgAAAAACAAAACw== @@ -3328,19 +3316,19 @@ grvwGrid - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grvwCarousel - DevExpress.XtraGrid.Views.Layout.LayoutView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Layout.LayoutView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a grvwTiles - DevExpress.XtraGrid.Views.Tile.TileView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Tile.TileView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a tslbldisplayRecords @@ -3508,7 +3496,7 @@ grvwGridPos - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BindingNavigatorAddNewItem @@ -3610,7 +3598,7 @@ GridViewDoc_Search - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a tslblWindreamView @@ -3670,49 +3658,49 @@ DD_DMSDataSet - DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null GridViewVariants - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn1 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colREASON_CODE - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colCOMMENT - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colADDED_WHO - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colADDED_WHEN - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colRECORD_ID - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a tslblVariantsCount @@ -3904,19 +3892,19 @@ TileNavCategory1 - DevExpress.XtraBars.Navigation.TileNavCategory, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Navigation.TileNavCategory, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a NavButtonHome - DevExpress.XtraBars.Navigation.NavButton, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Navigation.NavButton, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a NavButtonRefresh - DevExpress.XtraBars.Navigation.NavButton, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Navigation.NavButton, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a tsslblStatus @@ -3958,13 +3946,13 @@ DD_ECMAdmin - DD_Record_Organizer.DD_ECMAdmin, DD_ECMAdmin.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_ECMAdmin, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ImageCollection1 - DevExpress.Utils.ImageCollection, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.Utils.ImageCollection, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ttToolTip @@ -3988,19 +3976,19 @@ TableAdapterManager - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ToolTipController - DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TBPMO_RECORD_VARIANTTableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_RECORD_VARIANTTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_RECORD_VARIANTTableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TimerClearResultfiles diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index d496b77..754cc26 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -274,7 +274,7 @@ Public Class frmConstructor_Main 'Try Dim SQL Dim DT_PROXY_ENTITY As DataTable - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then SQL = "SELECT * FROM TBPROXY_SYNC_ENTITY" DT_PROXY_ENTITY = ClassDatabase.Return_Datatable(SQL, True) End If @@ -282,15 +282,15 @@ Public Class frmConstructor_Main ClassWindowLocation.LoadFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "CONSTRUCTOR_MAIN") ' VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString ClassWorkflow.Refresh_Workflows_Entity() - SQL = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & _ + SQL = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & "FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {2} AND CONSTRUCT_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_SCREEN_ID, CONSTRUCTORID) DT_VWPMO_CONSTRUCTOR_FORMS = ClassDatabase.Return_Datatable(SQL, True) - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then If DT_VWPMO_CONSTRUCTOR_FORMS.Rows.Count = 0 Then - ClassHelper.MSGBOX_Handler("ERROR", "Missing Proxy-Configuration", String.Format("Attention: You are using Proxy-Server with synchronized data:" & vbNewLine & _ - "Actually there is no data for this view synchronized or configured! Please inform Digital Data!" & vbNewLine & _ + ClassHelper.MSGBOX_Handler("ERROR", "Missing Proxy-Configuration", String.Format("Attention: You are using Proxy-Server with synchronized data:" & vbNewLine & + "Actually there is no data for this view synchronized or configured! Please inform Digital Data!" & vbNewLine & "View will now be terminated!")) ERROR_FORM_LOAD = True Exit Sub @@ -307,8 +307,8 @@ Public Class frmConstructor_Main Entity_Exists = True Next If Entity_Exists = False Then - ClassHelper.MSGBOX_Handler("ERROR", "Missing Proxy-Configuration", String.Format("Attention: You are using Proxy-Server with synchronized data:" & _ - "The entity '{0}' used in this view is not configured for Your proxy-server! Please inform Digital Data!" & _ + ClassHelper.MSGBOX_Handler("ERROR", "Missing Proxy-Configuration", String.Format("Attention: You are using Proxy-Server with synchronized data:" & + "The entity '{0}' used in this view is not configured for Your proxy-server! Please inform Digital Data!" & "View will now be terminated!", Entity_Name)) ERROR_FORM_LOAD = True Exit Sub @@ -381,9 +381,9 @@ Public Class frmConstructor_Main 'Die Standards ein/ausblenden End If - Dim sql_ResultList = "select T1.ENTITY_ID,T.GUID,T.TITLE,T.MANUALLY,T.CREATE_ON_REC_CREATE,T.CREATE_ON_FOLL_UP " & _ - "FROM TBPMO_WORKFLOW T,TBPMO_WORKFLOW_ENTITY_STATE T1 " & _ - "WHERE T.GUID = T1.WF_ID " & _ + Dim sql_ResultList = "select T1.ENTITY_ID,T.GUID,T.TITLE,T.MANUALLY,T.CREATE_ON_REC_CREATE,T.CREATE_ON_FOLL_UP " & + "FROM TBPMO_WORKFLOW T,TBPMO_WORKFLOW_ENTITY_STATE T1 " & + "WHERE T.GUID = T1.WF_ID " & "GROUP BY T1.ENTITY_ID,T.GUID,T.TITLE,T.MANUALLY,T.CREATE_ON_REC_CREATE,T.CREATE_ON_FOLL_UP" DT_WORKFLOWS_MANUAL = ClassDatabase.Return_Datatable(sql_ResultList) Load_Tree_View(CONSTRUCTORID) @@ -655,6 +655,7 @@ Public Class frmConstructor_Main End Sub Sub Refresh_Entity_Data() If TrySave_Automatic() = True Then + Save_Grid_Layout() ' Setzt die RECORD_ID auf Null ' damit beim Refresh keine alten Werte ' in die Datenbank geschrieben werden @@ -1184,9 +1185,9 @@ Public Class frmConstructor_Main Else ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS Dim query1 = From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() - Select form - Order By form.Item("SEQUENCE") - Where form.Item("PARENT_ID") = 0 + Select form + Order By form.Item("SEQUENCE") + Where form.Item("PARENT_ID") = 0 Dim Rows1 = query1.ToList() @@ -1210,9 +1211,9 @@ Public Class frmConstructor_Main Dim LEVEL1_NODE As TreeNode Dim query2 = From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() - Select form - Order By form.Item("SEQUENCE") - Where form.Item("PARENT_ID") = NODE1_ENTITY_ID + Select form + Order By form.Item("SEQUENCE") + Where form.Item("PARENT_ID") = NODE1_ENTITY_ID Dim Rows2 = query2.ToList() For Each Row2 In Rows2 @@ -1228,9 +1229,9 @@ Public Class frmConstructor_Main LEVEL0_NODE.Nodes.Add(LEVEL1_NODE) '##### LEVEL 3 wird geladen ######### Dim query3 = From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() - Select form - Order By form.Item("SEQUENCE") - Where form.Item("PARENT_ID") = LEVEL2_ID + Select form + Order By form.Item("SEQUENCE") + Where form.Item("PARENT_ID") = LEVEL2_ID Dim Rows3 = query3.ToList() @@ -1288,8 +1289,8 @@ Public Class frmConstructor_Main ENTITY_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag) CURRENT_ENTITY_ID = ENTITY_ID Dim result = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() - Select form - Where form.Item("FORM_ID") = ENTITY_ID).Single() + Select form + Where form.Item("FORM_ID") = ENTITY_ID).Single() CONSTRUCTOR_DETAIL_ID = result.Item("GUID") ' CONSTRUCT_EXPAND = result.Item("EXPAND") Dim FORM_DATE_FORMAT = result.Item("DATE_FORMAT") @@ -1324,7 +1325,7 @@ Public Class frmConstructor_Main ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS Dim query2 = From form In DT_WORKFLOWS_MANUAL.AsEnumerable() - Select form Where form.Item("ENTITY_ID") = ENTITY_ID + Select form Where form.Item("ENTITY_ID") = ENTITY_ID Dim Rows = query2.ToList() _MANUAL_WORKFLOW = False For Each _row In Rows @@ -1338,7 +1339,7 @@ Public Class frmConstructor_Main If DT_ADDING_USERS.Rows.Count > 0 Then 'Überprüfen ob für diese Entität ein spezifischer windream-User verwendet wird, wenn Dateien abgelegt werden? Dim query1 = From _user In DT_ADDING_USERS.AsEnumerable() - Select _user Where _user.Item("ENTITY_ID") = ENTITY_ID + Select _user Where _user.Item("ENTITY_ID") = ENTITY_ID Dim Rows1 = query1.ToList() For Each _row In Rows1 FAU_AD_DOMAIN = _row.Item("AD_DOMAIN").ToString() @@ -1869,11 +1870,12 @@ Public Class frmConstructor_Main ' MsgBox("Proxy-Server is actually synchronizing! Please wait until synchronisation is finished!" & vbNewLine & "This might take up to 3 minutes!", MsgBoxStyle.Information) ' Exit Sub 'End If + Save_Grid_Layout() Dim msg As String If RIGHT_RECORD_AND_FILE_READ_ONLY = False Then msg = "Sind Sie sicher, dass Sie diesen Record/Datensatz '" & SELECTED_RECORD_ID.ToString & "' löschen wollen?" If USER_LANGUAGE <> "de-DE" Then - msg = "Are You sure You want to delete the selected record'" & SELECTED_RECORD_ID.ToString & "'?" + msg = "Are You sure You want to delete the selected record '" & SELECTED_RECORD_ID.ToString & "'?" End If Dim result As MsgBoxResult result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) @@ -1881,7 +1883,10 @@ Public Class frmConstructor_Main RECORD_ID = SELECTED_RECORD_ID ClassRightManagement.Check_Set_Rights(RECORD_ID, ENTITY_ID) CONTROL_HANDLING() - Dim DT_DOC_RESULT As DataTable = ClassDOC_SEARCH.Get_DOCRESULTS(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, "RECORD") + Dim sql = String.Format("select TRL.DOC_ID, TDRL.FULL_FILENAME FROM TBPMO_DOC_RECORD_LINK TRL, TBPMO_DOCRESULT_LIST TDRL WHERE TRL.DOC_ID = TDRL.DocID AND TRL.RECORD_ID = {0}", RECORD_ID) + + Dim DT_DOC_RESULT As DataTable = DD_LIB_Standards.clsDatabase.Return_Datatable(sql, False) + If IsNothing(DT_DOC_RESULT) Then ClassLogger.Add(">> DT_DOC_RESULT is nothing!", True) End If @@ -2115,8 +2120,8 @@ Public Class frmConstructor_Main End If Dim result = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() - Select form - Where form.Item("FORM_ID") = ENTITY_ID).Single() + Select form + Where form.Item("FORM_ID") = ENTITY_ID).Single() LOAD_DIRECT = result.Item("LOAD_DIRECT") CURRENT_CONSTRUCTOR_DETAIL_ID = result.Item("GUID") @@ -2156,8 +2161,8 @@ Public Class frmConstructor_Main sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE) DT_RESULTLIST_VARIABLE_VALUE = ClassDatabase.Return_Datatable(sql, True) Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable() - Select form - Where form.Item("GUID") = ENTITY_ID).Single() + Select form + Where form.Item("GUID") = ENTITY_ID).Single() FORM_TYPE = ENTITY_ROW.Item("FORM_TYPE_ID") IS_SINGLE_RECORD = ENTITY_ROW.Item("SINGLE_RECORD") @@ -2202,8 +2207,8 @@ Public Class frmConstructor_Main ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS Dim result1 = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() - Select form - Where form.Item("FORM_ID") = ENTITY_ID).Single() + Select form + Where form.Item("FORM_ID") = ENTITY_ID).Single() PARENT_ENTITYID = result1.Item("PARENT_ID") CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID @@ -2277,8 +2282,8 @@ Public Class frmConstructor_Main End If Dim result3 = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() - Select form - Where form.Item("FORM_ID") = ENTITY_ID).Single() + Select form + Where form.Item("FORM_ID") = ENTITY_ID).Single() EBENE2_COLUMNNAME = result3.Item("COLUMN_NAME1") EBENE3_COLUMNNAME = "" @@ -2291,8 +2296,8 @@ Public Class frmConstructor_Main If LogErrorsOnly = False Then ClassLogger.Add(" >> Level 3 selected in TreeView", False) Dim result4 = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() - Select form - Where form.Item("FORM_ID") = ENTITY_ID).Single() + Select form + Where form.Item("FORM_ID") = ENTITY_ID).Single() EBENE3_COLUMNNAME = result4.Item("COLUMN_NAME1") 'Wenn bereits ein Record für Ebene 1 gewählt wurde dann eisnchränken @@ -2672,8 +2677,8 @@ Public Class frmConstructor_Main Try ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS Dim result1 = (From form In DT_CONTROLS_ENTITY.AsEnumerable() - Select form - Where form.Item("CONTROL_ID") = CONTROL_ID).Single() + Select form + Where form.Item("CONTROL_ID") = CONTROL_ID).Single() Dim locked = result1.Item("CONTROL_READ_ONLY") If state = False And locked = True Then state = True @@ -2785,8 +2790,8 @@ Public Class frmConstructor_Main Private Function GET_LINKED_RECORD(RECORDID As Integer, ENTITY_ID As Integer) Try Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable() - Select form - Where form.Item("GUID") = ENTITY_ID).Single() + Select form + Where form.Item("GUID") = ENTITY_ID).Single() 'Je nach der Ebene muss evtl die übergeordnete Entität ausgelesen werden Select Case ACT_EBENE @@ -2808,7 +2813,7 @@ Public Class frmConstructor_Main End If Case 3 Dim Parent_EntityID = ENTITY_ROW.Item("PARENT_ID") 'ClassDatabase.Execute_Scalar(sqlp, True) - Dim sql As String = String.Format("SELECT T.RECORD2_ID FROM TBPMO_RECORD_CONNECT T, TBPMO_RECORD T1 WHERE T.RECORD2_ID = T1.GUID AND T.RECORD1_ID = (SELECT T.RECORD2_ID FROM TBPMO_RECORD_CONNECT T, TBPMO_RECORD T1 WHERE " & _ + Dim sql As String = String.Format("SELECT T.RECORD2_ID FROM TBPMO_RECORD_CONNECT T, TBPMO_RECORD T1 WHERE T.RECORD2_ID = T1.GUID AND T.RECORD1_ID = (SELECT T.RECORD2_ID FROM TBPMO_RECORD_CONNECT T, TBPMO_RECORD T1 WHERE " & "T.RECORD2_ID = T1.GUID AND T.RECORD1_ID = {0} and T1.FORM_ID = {1}) and T1.FORM_ID = {2}", RECORDID, Parent_EntityID, ENTITY_ID) Dim PARENT_RECORD2 = ClassDatabase.Execute_Scalar(sql, True) If IsNothing(PARENT_RECORD2) Then @@ -2965,8 +2970,8 @@ Public Class frmConstructor_Main Private Sub Show_Selected_Record_Data(Rec_ID As Integer, EntityLoad As Boolean) Try Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable() - Select form - Where form.Item("GUID") = ENTITY_ID).Single() + Select form + Where form.Item("GUID") = ENTITY_ID).Single() Update_Status_Label(False, "") If LogErrorsOnly = False Then ClassLogger.Add(" >> GRID_RECORD ID: " & Rec_ID.ToString, False) @@ -3411,10 +3416,10 @@ Public Class frmConstructor_Main result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result1 = MsgBoxResult.Yes Then For Each row As DataRow In DT_RESULT.Rows - Dim DOC_ID = row.Item("DocID") + Dim DOC_ID = row.Item(0) Dim path Try - path = row.Item("FULL_FILENAME") + path = row.Item(1) Catch ex As Exception path = row.Item(1) End Try @@ -3467,8 +3472,8 @@ Public Class frmConstructor_Main If CURRENT_SEARCH_TYPE = "NODE_DOWN" Then Dim node As TreeNode = TreeViewMain.SelectedNode Dim NODE_GUID = ClassNodeNavigation.Return_NODEID_forTag(node.Tag) - Dim sql = String.Format("DECLARE @return_value int " & vbNewLine & _ - "EXEC @return_value = [dbo].[PRPMO_NODES_GET_CHILD_RECORDS] @USER_ID = {0}, @NODE_ID = {1} " & vbNewLine & _ + Dim sql = String.Format("DECLARE @return_value int " & vbNewLine & + "EXEC @return_value = [dbo].[PRPMO_NODES_GET_CHILD_RECORDS] @USER_ID = {0}, @NODE_ID = {1} " & vbNewLine & "SELECT 'Return Value' = @return_value", USER_GUID, NODE_GUID) Me.Cursor = Cursors.WaitCursor Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) @@ -4410,7 +4415,7 @@ Public Class frmConstructor_Main Sub Show_act_WFTask() Try Dim query = From table In CURRENT_VWPMO_WF_ACTIVE.AsEnumerable() - Select table Where table.Item("ENTITY_ID") = ENTITY_ID + Select table Where table.Item("ENTITY_ID") = ENTITY_ID Dim Entity_rows = query.ToList() If Entity_rows.Count > 0 Then If _MANUAL_WORKFLOW = True Then @@ -5309,6 +5314,7 @@ Public Class frmConstructor_Main MASS_COLUMN_LIST = collist MASS_RECORD_IDs2CHANGE = list CURRENT_ENTITY_ID = ENTITY_ID + Save_Grid_Layout() frmMass_Change.ShowDialog() If SUCCESSFULL = True Then Cursor = Cursors.WaitCursor @@ -5752,7 +5758,7 @@ Public Class frmConstructor_Main End If End If - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", row.Item("DOC_ID")) ClassDatabase.Execute_non_Query(proc, True) End If @@ -5790,10 +5796,10 @@ Public Class frmConstructor_Main Me.Cursor = Cursors.Default Exit Sub End If - sql = String.Format("SELECT [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & _ + sql = String.Format("SELECT [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & "FROM VWPMO_CONSTRUCTOR_FORMS WHERE FORM_ID = {2}", USER_LANGUAGE, CURRENT_SCREEN_ID, node_tag.ToString) ENTITY_STRING = ClassDatabase.Execute_Scalar(sql) - sql = String.Format("select count(guid) from TBPMO_CONTROL_ENTITY_LINK where ORIGIN_CTRL_ID in (SELECT GUID FROM TBPMO_CONTROL where FORM_ID = {0}) " & _ + sql = String.Format("select count(guid) from TBPMO_CONTROL_ENTITY_LINK where ORIGIN_CTRL_ID in (SELECT GUID FROM TBPMO_CONTROL where FORM_ID = {0}) " & "AND LINKED_CTRL_ID IN (SELECT GUID FROM TBPMO_CONTROL where FORM_ID = {1})", ENTITY_ID, node_tag) Dim count = ClassDatabase.Execute_Scalar(sql) If Not IsNothing(count) Then @@ -5825,7 +5831,7 @@ Public Class frmConstructor_Main clsWD_SET.REMOVE_VEKTOR_LINK(doc.Item("FULL_FILENAME"), DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID) Next - sql = String.Format("select ORIGIN_CTRL_ID,LINKED_CTRL_ID from TBPMO_CONTROL_ENTITY_LINK where ORIGIN_CTRL_ID in (SELECT GUID FROM TBPMO_CONTROL where FORM_ID = {0}) " & _ + sql = String.Format("select ORIGIN_CTRL_ID,LINKED_CTRL_ID from TBPMO_CONTROL_ENTITY_LINK where ORIGIN_CTRL_ID in (SELECT GUID FROM TBPMO_CONTROL where FORM_ID = {0}) " & "AND LINKED_CTRL_ID IN (SELECT GUID FROM TBPMO_CONTROL where FORM_ID = {1})", ENTITY_ID, node_tag) Dim DT_CHANGE_CTR As DataTable = ClassDatabase.Return_Datatable(sql) For Each row As DataRow In DT_CHANGE_CTR.Rows @@ -6041,7 +6047,7 @@ Public Class frmConstructor_Main Private Sub Load_Variants() Try - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then Me.TBPMO_RECORD_VARIANTTableAdapter.Connection.ConnectionString = ClassProxy.MyPROXYConnectionString Else Me.TBPMO_RECORD_VARIANTTableAdapter.Connection.ConnectionString = MyConnectionString @@ -6205,10 +6211,10 @@ Public Class frmConstructor_Main ' Rename file. My.Computer.FileSystem.RenameFile(OldName, NewName) Cursor = Cursors.WaitCursor - Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}", _ + Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}", OnlyFilename, NewName, USER_USERNAME, ClassWindreamDocGrid.SELECTED_DOC_ID) If DD_LIB_Standards.clsDatabase.Execute_non_Query(upd) Then - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then ClassDatabase.Execute_non_Query(upd, True) End If End If diff --git a/app/DD-Record-Organizer/frmDocLink_to_Record.vb b/app/DD-Record-Organizer/frmDocLink_to_Record.vb index c8abfac..2595269 100644 --- a/app/DD-Record-Organizer/frmDocLink_to_Record.vb +++ b/app/DD-Record-Organizer/frmDocLink_to_Record.vb @@ -405,7 +405,7 @@ Public Class frmDocLink_to_Record If ClassDatabase.Execute_non_Query(ins) = False Then MsgBox("Unexpected Error in Inserting Record-Doc Link. Please check logfile!", MsgBoxStyle.Critical) Else - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DOC_REC_LINK {0},{1}", CURRENT_DOC_ID, RecordId) ClassDatabase.Execute_non_Query(proc, True) End If diff --git a/app/DD-Record-Organizer/frmLicense.designer.vb b/app/DD-Record-Organizer/frmLicense.designer.vb index a50265d..627628f 100644 --- a/app/DD-Record-Organizer/frmLicense.designer.vb +++ b/app/DD-Record-Organizer/frmLicense.designer.vb @@ -27,10 +27,15 @@ Partial Class frmLicense Me.txtPW = New System.Windows.Forms.TextBox() Me.lblPW = New System.Windows.Forms.Label() Me.grbBoxlicense = New System.Windows.Forms.GroupBox() - Me.chkSiteProxy = New System.Windows.Forms.CheckBox() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.Button1 = New System.Windows.Forms.Button() + Me.DataGridViewAddOns = New System.Windows.Forms.DataGridView() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.dtpLicenseAddon = New System.Windows.Forms.DateTimePicker() + Me.cmbAddOn = New System.Windows.Forms.ComboBox() Me.lblClient = New System.Windows.Forms.Label() Me.cmbClients = New System.Windows.Forms.ComboBox() - Me.chkSAPConnect = New System.Windows.Forms.CheckBox() Me.Label5 = New System.Windows.Forms.Label() Me.dtpGueltig_GI = New System.Windows.Forms.DateTimePicker() Me.txtDossierCount = New System.Windows.Forms.TextBox() @@ -39,6 +44,8 @@ Partial Class frmLicense Me.txtNewlicences = New System.Windows.Forms.TextBox() Me.lblnewlicenses = New System.Windows.Forms.Label() Me.grbBoxlicense.SuspendLayout() + Me.GroupBox1.SuspendLayout() + CType(Me.DataGridViewAddOns, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'btnPW_check @@ -60,10 +67,9 @@ Partial Class frmLicense ' 'grbBoxlicense ' - Me.grbBoxlicense.Controls.Add(Me.chkSiteProxy) + Me.grbBoxlicense.Controls.Add(Me.GroupBox1) Me.grbBoxlicense.Controls.Add(Me.lblClient) Me.grbBoxlicense.Controls.Add(Me.cmbClients) - Me.grbBoxlicense.Controls.Add(Me.chkSAPConnect) Me.grbBoxlicense.Controls.Add(Me.Label5) Me.grbBoxlicense.Controls.Add(Me.dtpGueltig_GI) Me.grbBoxlicense.Controls.Add(Me.txtDossierCount) @@ -75,11 +81,58 @@ Partial Class frmLicense Me.grbBoxlicense.Name = "grbBoxlicense" Me.grbBoxlicense.TabStop = False ' - 'chkSiteProxy + 'GroupBox1 ' - resources.ApplyResources(Me.chkSiteProxy, "chkSiteProxy") - Me.chkSiteProxy.Name = "chkSiteProxy" - Me.chkSiteProxy.UseVisualStyleBackColor = True + Me.GroupBox1.Controls.Add(Me.Button1) + Me.GroupBox1.Controls.Add(Me.DataGridViewAddOns) + Me.GroupBox1.Controls.Add(Me.Label4) + Me.GroupBox1.Controls.Add(Me.Label3) + Me.GroupBox1.Controls.Add(Me.dtpLicenseAddon) + Me.GroupBox1.Controls.Add(Me.cmbAddOn) + resources.ApplyResources(Me.GroupBox1, "GroupBox1") + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.TabStop = False + ' + 'Button1 + ' + Me.Button1.Image = Global.DD_Record_Organizer.My.Resources.Resources.key_go1 + resources.ApplyResources(Me.Button1, "Button1") + Me.Button1.Name = "Button1" + Me.Button1.UseVisualStyleBackColor = True + ' + 'DataGridViewAddOns + ' + Me.DataGridViewAddOns.AllowUserToAddRows = False + Me.DataGridViewAddOns.AllowUserToDeleteRows = False + Me.DataGridViewAddOns.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + resources.ApplyResources(Me.DataGridViewAddOns, "DataGridViewAddOns") + Me.DataGridViewAddOns.MultiSelect = False + Me.DataGridViewAddOns.Name = "DataGridViewAddOns" + Me.DataGridViewAddOns.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect + Me.DataGridViewAddOns.ShowEditingIcon = False + ' + 'Label4 + ' + resources.ApplyResources(Me.Label4, "Label4") + Me.Label4.Name = "Label4" + ' + 'Label3 + ' + resources.ApplyResources(Me.Label3, "Label3") + Me.Label3.Name = "Label3" + ' + 'dtpLicenseAddon + ' + Me.dtpLicenseAddon.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + resources.ApplyResources(Me.dtpLicenseAddon, "dtpLicenseAddon") + Me.dtpLicenseAddon.Name = "dtpLicenseAddon" + Me.dtpLicenseAddon.Value = New Date(2099, 12, 31, 0, 0, 0, 0) + ' + 'cmbAddOn + ' + resources.ApplyResources(Me.cmbAddOn, "cmbAddOn") + Me.cmbAddOn.FormattingEnabled = True + Me.cmbAddOn.Name = "cmbAddOn" ' 'lblClient ' @@ -92,12 +145,6 @@ Partial Class frmLicense Me.cmbClients.FormattingEnabled = True Me.cmbClients.Name = "cmbClients" ' - 'chkSAPConnect - ' - resources.ApplyResources(Me.chkSAPConnect, "chkSAPConnect") - Me.chkSAPConnect.Name = "chkSAPConnect" - Me.chkSAPConnect.UseVisualStyleBackColor = True - ' 'Label5 ' resources.ApplyResources(Me.Label5, "Label5") @@ -150,6 +197,9 @@ Partial Class frmLicense Me.Name = "frmLicense" Me.grbBoxlicense.ResumeLayout(False) Me.grbBoxlicense.PerformLayout() + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() + CType(Me.DataGridViewAddOns, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -166,8 +216,13 @@ Partial Class frmLicense Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents Label5 As System.Windows.Forms.Label Friend WithEvents dtpGueltig_GI As System.Windows.Forms.DateTimePicker - Friend WithEvents chkSAPConnect As System.Windows.Forms.CheckBox Friend WithEvents lblClient As System.Windows.Forms.Label Friend WithEvents cmbClients As System.Windows.Forms.ComboBox - Friend WithEvents chkSiteProxy As System.Windows.Forms.CheckBox + Friend WithEvents DataGridViewAddOns As DataGridView + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents Button1 As Button + Friend WithEvents Label4 As Label + Friend WithEvents Label3 As Label + Friend WithEvents dtpLicenseAddon As DateTimePicker + Friend WithEvents cmbAddOn As ComboBox End Class diff --git a/app/DD-Record-Organizer/frmLicense.resx b/app/DD-Record-Organizer/frmLicense.resx index 3426c7b..feda30f 100644 --- a/app/DD-Record-Organizer/frmLicense.resx +++ b/app/DD-Record-Organizer/frmLicense.resx @@ -118,8 +118,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAHVJREFUOE/tkTsOgCAQRDkbJ/AmHNlGbSgJtJiHbLISosTY6SQTlmVm+Jkf94gx + TiGEOaWUITW9unwNhN777JzL1tpCanqnEEnvUZt1CCep9iOgFbVcl61Q5niq/aUACdEjHLoC6AUMPyKQ + HTXpI3z8jZ+AMTvOnQxA9nO5IAAAAABJRU5ErkJggg== + + + + MiddleLeft + - 318, 2 + 337, 2 @@ -135,6 +146,9 @@ Open License Manager + + MiddleRight + btnPW_check @@ -154,7 +168,7 @@ 3, 4, 3, 4 - 192, 23 + 163, 23 28 @@ -198,37 +212,196 @@ 2 - - True + + MiddleLeft - + NoControl - - 147, 144 + + 331, 23 - - Yes + + 3, 4, 3, 4 - - 125, 20 + + 159, 39 - + + 23 + + + Refresh AddOn + + + MiddleRight + + + Button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 0 + + + 9, 68 + + + 481, 136 + + + 21 + + + DataGridViewAddOns + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 1 + + + True + + + NoControl + + + 6, 20 + + + 51, 16 + + + 22 + + + AddOn: + + + TopRight + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 2 + + + True + + + NoControl + + + 218, 20 + + + 69, 16 + + + 21 + + + Valid until: + + + TopRight + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 3 + + + 221, 39 + + + 104, 23 + + 20 - - Site/Proxy Addon + + dtpLicenseAddon - - chkSiteProxy + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBox1 - + + 4 + + + Tahoma, 9.75pt + + + 9, 38 + + + 206, 24 + + + 19 + + + cmbAddOn + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 5 + + + 10, 146 + + + 503, 214 + + + 31 + + + License AddOns: + + + GroupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + grbBoxlicense - + 0 @@ -288,36 +461,6 @@ 2 - - True - - - 10, 144 - - - Yes - - - 131, 20 - - - 17 - - - SAP-Connect aktiv - - - chkSAPConnect - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grbBoxlicense - - - 3 - True @@ -346,7 +489,7 @@ grbBoxlicense - 4 + 3 396, 72 @@ -367,7 +510,7 @@ grbBoxlicense - 5 + 4 241, 109 @@ -394,7 +537,7 @@ grbBoxlicense - 6 + 5 True @@ -421,19 +564,19 @@ grbBoxlicense - 7 + 6 MiddleLeft - 307, 134 + 326, 101 3, 4, 3, 4 - 193, 38 + 174, 38 5 @@ -454,7 +597,7 @@ grbBoxlicense - 8 + 7 241, 74 @@ -481,7 +624,7 @@ grbBoxlicense - 9 + 8 True @@ -508,7 +651,7 @@ grbBoxlicense - 10 + 9 11, 42 @@ -520,7 +663,7 @@ 3, 4, 3, 4 - 519, 182 + 519, 369 26 @@ -550,7 +693,7 @@ 7, 16 - 542, 233 + 549, 419 Tahoma, 9.75pt @@ -558,6 +701,9 @@ 3, 4, 3, 4 + + CenterScreen + Lizenzmanager diff --git a/app/DD-Record-Organizer/frmLicense.vb b/app/DD-Record-Organizer/frmLicense.vb index bbb3e0b..63b83c5 100644 --- a/app/DD-Record-Organizer/frmLicense.vb +++ b/app/DD-Record-Organizer/frmLicense.vb @@ -1,7 +1,8 @@ Imports DLLLicenseManager Public Class frmLicense - Dim CLIENT_ID As Integer Public _lizenzManager As ClassLicenseManager + Dim CLIENT_ID As Integer + Private Sub btnPW_check_Click(sender As System.Object, e As System.EventArgs) Handles btnPW_check.Click OpenLicenseManager() End Sub @@ -41,10 +42,15 @@ Public Class frmLicense Private Sub btnnewLicenses_Click(sender As System.Object, e As System.EventArgs) Handles btnnewLicenses.Click Try + If cmbClients.SelectedIndex = -1 Or CLIENT_ID = 99 Then + MsgBox("Please choose a valid client!", MsgBoxStyle.Critical) + Exit Sub + End If _lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "") If Me.txtNewlicences.Text <> "" And txtDossierCount.Text <> "" Then 'Encode the license - Dim result As String = Me._lizenzManager.EncodeLicenseKey(txtNewlicences.Text & "#" & dtpGueltig_GI.Text & "#" & txtDossierCount.Text & "#" & chkSAPConnect.Checked & "#" & chkSiteProxy.Checked, "#DigitalData35452!#") + Dim ressultstring = txtNewlicences.Text & "#" & dtpGueltig_GI.Value.ToString("yyyy-MM-dd") & "#" & txtDossierCount.Text + Dim result As String = Me._lizenzManager.EncodeLicenseKey(ressultstring, "#DigitalData35452!#") Dim sql As String = String.Format("UPDATE TBDD_CLIENT SET LICENSE_PMO = '" & result & "' WHERE GUID = {0}", CLIENT_ID) If ClassDatabase.Execute_non_Query(sql) = True Then @@ -61,17 +67,27 @@ Public Class frmLicense Try ClassLicence.Refresh_Licence(CLIENT_ID) + cmbAddOn.Items.Clear() + + For Each row As DataRow In DT_LICENSE_ADDONS.Rows + cmbAddOn.Items.Add(row.Item("NAME")) + Next + DataGridViewAddOns.DataSource = DT_LICENSE_ADDONS + DataGridViewAddOns.Columns(0).Width = 200 + DataGridViewAddOns.Columns(1).Visible = False + DataGridViewAddOns.Columns(2).Width = 100 + GridColor() txtNewlicences.Text = LICENSE_COUNT - dtpGueltig_GI.Value = LICENSE_DATE - txtDossierCount.Text = LICENSE_DOSSIER_COUNT Try - chkSAPConnect.Checked = LICENSE_SAP_Connect + dtpGueltig_GI.Value = LICENSE_DATE Catch ex As Exception - ClassLogger.Add(">> Could not read License for SAP-Connect: " & ex.Message, False) - LICENSE_SAP_Connect = False - chkSAPConnect.Checked = False + Dim dateTime As String = LICENSE_DATE.ToString + Dim dt As DateTime = Convert.ToDateTime(dateTime) + Dim format As String = "yyyy-MM-dd" + dtpGueltig_GI.Value = CDate(dt) End Try - chkSiteProxy.Checked = LICENSE_SITE_PROXY + + txtDossierCount.Text = LICENSE_DOSSIER_COUNT If Neu = True Then If CInt(LICENSE_COUNT) > 0 Then Dim msg As String = "Die Lizenz wurde aktualisiert!" & vbNewLine & Now @@ -117,4 +133,44 @@ Public Class frmLicense End If End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + If CLIENT_ID <> 99 Then + Dim wrapper As New ClassEncryption("!35452didalog=") + Dim cipherText As String = wrapper.EncryptData(dtpLicenseAddon.Value.ToString("yyyy-MM-dd")) + Dim sql = String.Format("SELECT COUNT(GUID) FROM TBDD_LICENSE_ADD_ON WHERE CLIENT_ID = {0} AND MODULE = 'Record-Organizer' AND UPPER(NAME) = UPPER('{1}')", CLIENT_ID, cmbAddOn.Text) + Dim count = ClassDatabase.Execute_Scalar(sql, False) + If count = 0 Then + sql = String.Format("INSERT INTO TBDD_LICENSE_ADD_ON (CLIENT_ID, MODULE,NAME,VALID_DATE) VALUES ({0},'Record-Organizer','{1}','{2}')", CLIENT_ID, cmbAddOn.Text, cipherText) + ClassDatabase.Execute_non_Query(sql) + Else + sql = String.Format("UPDATE TBDD_LICENSE_ADD_ON SET VALID_DATE = '{0}' WHERE CLIENT_ID = {1} AND UPPER(MODULE) = UPPER('Record-Organizer') AND UPPER(NAME) = UPPER('{2}')", cipherText, CLIENT_ID, cmbAddOn.Text) + ClassDatabase.Execute_non_Query(sql) + End If + Refresh_Licence(False) + Else + MsgBox("Please choose a Client!", MsgBoxStyle.Exclamation) + End If + + End Sub + + Sub GridColor() + Try + For i = 0 To DataGridViewAddOns.RowCount - 1 + If DataGridViewAddOns.Rows(i).Cells(2).Value.ToString = "Valid" Then + DataGridViewAddOns.Rows(i).DefaultCellStyle.BackColor = Color.LimeGreen + Else + DataGridViewAddOns.Rows(i).DefaultCellStyle.BackColor = Color.Red + End If + Next + Catch ex As Exception + + End Try + + + End Sub + + Private Sub grbBoxlicense_Enter(sender As Object, e As EventArgs) Handles grbBoxlicense.Enter + + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmLicense_User.Designer.vb b/app/DD-Record-Organizer/frmLicense_User.Designer.vb index 536f348..a1881f6 100644 --- a/app/DD-Record-Organizer/frmLicense_User.Designer.vb +++ b/app/DD-Record-Organizer/frmLicense_User.Designer.vb @@ -27,15 +27,14 @@ Partial Class frmLicense_User Me.cmbClients = New System.Windows.Forms.ComboBox() Me.Label2 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() Me.lbLicenceCount = New System.Windows.Forms.Label() Me.lbDossierCount = New System.Windows.Forms.Label() Me.lbValidUntil = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.Label6 = New System.Windows.Forms.Label() - Me.chkSAP = New System.Windows.Forms.CheckBox() - Me.chkSite = New System.Windows.Forms.CheckBox() + Me.DataGridViewAddOns = New System.Windows.Forms.DataGridView() + Me.Label4 = New System.Windows.Forms.Label() + CType(Me.DataGridViewAddOns, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Label1 @@ -59,11 +58,6 @@ Partial Class frmLicense_User resources.ApplyResources(Me.Label3, "Label3") Me.Label3.Name = "Label3" ' - 'Label4 - ' - resources.ApplyResources(Me.Label4, "Label4") - Me.Label4.Name = "Label4" - ' 'Label5 ' resources.ApplyResources(Me.Label5, "Label5") @@ -91,41 +85,39 @@ Partial Class frmLicense_User Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.TabStop = False ' - 'Label6 + 'DataGridViewAddOns ' - resources.ApplyResources(Me.Label6, "Label6") - Me.Label6.Name = "Label6" + Me.DataGridViewAddOns.AllowUserToAddRows = False + Me.DataGridViewAddOns.AllowUserToDeleteRows = False + Me.DataGridViewAddOns.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + resources.ApplyResources(Me.DataGridViewAddOns, "DataGridViewAddOns") + Me.DataGridViewAddOns.MultiSelect = False + Me.DataGridViewAddOns.Name = "DataGridViewAddOns" + Me.DataGridViewAddOns.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect + Me.DataGridViewAddOns.ShowEditingIcon = False ' - 'chkSAP + 'Label4 ' - resources.ApplyResources(Me.chkSAP, "chkSAP") - Me.chkSAP.Name = "chkSAP" - Me.chkSAP.UseVisualStyleBackColor = True - ' - 'chkSite - ' - resources.ApplyResources(Me.chkSite, "chkSite") - Me.chkSite.Name = "chkSite" - Me.chkSite.UseVisualStyleBackColor = True + resources.ApplyResources(Me.Label4, "Label4") + Me.Label4.Name = "Label4" ' 'frmLicense_User ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.chkSite) - Me.Controls.Add(Me.chkSAP) - Me.Controls.Add(Me.Label6) + Me.Controls.Add(Me.Label4) + Me.Controls.Add(Me.DataGridViewAddOns) Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.lbValidUntil) Me.Controls.Add(Me.lbDossierCount) Me.Controls.Add(Me.lbLicenceCount) Me.Controls.Add(Me.Label5) - Me.Controls.Add(Me.Label4) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.cmbClients) Me.Controls.Add(Me.Label1) Me.Name = "frmLicense_User" + CType(Me.DataGridViewAddOns, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -134,13 +126,11 @@ Partial Class frmLicense_User Friend WithEvents cmbClients As System.Windows.Forms.ComboBox Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents Label4 As System.Windows.Forms.Label Friend WithEvents Label5 As System.Windows.Forms.Label Friend WithEvents lbLicenceCount As System.Windows.Forms.Label Friend WithEvents lbDossierCount As System.Windows.Forms.Label Friend WithEvents lbValidUntil As System.Windows.Forms.Label Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents Label6 As System.Windows.Forms.Label - Friend WithEvents chkSAP As System.Windows.Forms.CheckBox - Friend WithEvents chkSite As System.Windows.Forms.CheckBox + Friend WithEvents DataGridViewAddOns As DataGridView + Friend WithEvents Label4 As Label End Class diff --git a/app/DD-Record-Organizer/frmLicense_User.resx b/app/DD-Record-Organizer/frmLicense_User.resx index 75474da..aac74f8 100644 --- a/app/DD-Record-Organizer/frmLicense_User.resx +++ b/app/DD-Record-Organizer/frmLicense_User.resx @@ -147,7 +147,7 @@ $this - 12 + 10 175, 25 @@ -168,7 +168,7 @@ $this - 11 + 9 True @@ -198,7 +198,7 @@ $this - 10 + 8 True @@ -228,37 +228,7 @@ $this - 9 - - - True - - - Tahoma, 9.75pt, style=Bold - - - 12, 118 - - - 98, 16 - - - 6 - - - SAP-Connect: - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 8 + 7 True @@ -267,7 +237,7 @@ Tahoma, 9.75pt, style=Bold - 12, 171 + 12, 122 73, 16 @@ -288,7 +258,7 @@ $this - 7 + 6 Tahoma, 9.75pt @@ -318,7 +288,7 @@ $this - 6 + 5 Tahoma, 9.75pt @@ -348,13 +318,13 @@ $this - 5 + 4 Tahoma, 9.75pt - 264, 168 + 264, 119 100, 23 @@ -378,7 +348,7 @@ $this - 4 + 3 15, 52 @@ -399,94 +369,61 @@ $this - 3 + 2 - + + 15, 167 + + + 349, 136 + + + 22 + + + DataGridViewAddOns + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + True - + Tahoma, 9.75pt, style=Bold - + NoControl - - 13, 144 + + 12, 148 - - 85, 16 + + 63, 16 - - 15 + + 23 - - Site AddOn: + + AddOns: - - Label6 + + Label4 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 2 - - - True - - - False - - - 349, 120 - - - 15, 14 - - - 16 - - - chkSAP - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - True - - - False - - - 349, 146 - - - 15, 14 - - - 17 - - - chkSite - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - + 0 @@ -496,7 +433,7 @@ 6, 13 - 376, 209 + 376, 315 Tahoma, 8.25pt diff --git a/app/DD-Record-Organizer/frmLicense_User.vb b/app/DD-Record-Organizer/frmLicense_User.vb index da58ea0..48d2a16 100644 --- a/app/DD-Record-Organizer/frmLicense_User.vb +++ b/app/DD-Record-Organizer/frmLicense_User.vb @@ -43,16 +43,27 @@ Else lbValidUntil.Text = LICENSE_DATE.ToString("MM-dd-yyyy") End If + DataGridViewAddOns.DataSource = DT_LICENSE_ADDONS + DataGridViewAddOns.Columns(0).Width = 200 + DataGridViewAddOns.Columns(1).Visible = False + DataGridViewAddOns.Columns(2).Width = 100 + GridColor() - If (CBool(LICENSE_SAP_Connect) = True) Then - chkSAP.Checked = True - Else - chkSAP.Checked = False - End If - If (CBool(LICENSE_SITE_PROXY) = True) Then - chkSite.Checked = True - Else - chkSite.Checked = False - End If End Sub + Sub GridColor() + Try + For i = 0 To DataGridViewAddOns.RowCount - 1 + If DataGridViewAddOns.Rows(i).Cells(2).Value.ToString = "Valid" Then + DataGridViewAddOns.Rows(i).DefaultCellStyle.BackColor = Color.LimeGreen + Else + DataGridViewAddOns.Rows(i).DefaultCellStyle.BackColor = Color.Red + End If + Next + Catch ex As Exception + + End Try + + + End Sub + End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index c8c4c25..9a1fbf2 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -107,7 +107,7 @@ Public Class frmMain End If End Sub Sub Proxy_Server_Controls() - If LICENSE_SITE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then + If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then itemRefreshProxy.Visibility = BarItemVisibility.Always LabelProxyServer.Visibility = BarItemVisibility.Always ClassLogger.Add(">> PROXY-SERVER is being used", False) @@ -146,6 +146,9 @@ Public Class frmMain If ERROR_INIT = "NONE" Then If USER_IS_ADMIN = True Then pageAdmin.Visible = True + itemRefreshProxy.Visibility = BarItemVisibility.Always + Else + itemRefreshProxy.Visibility = BarItemVisibility.Never End If LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString() diff --git a/app/DD-Record-Organizer/frmMass_Change.Designer.vb b/app/DD-Record-Organizer/frmMass_Change.Designer.vb index 1589d5a..bcd68d7 100644 --- a/app/DD-Record-Organizer/frmMass_Change.Designer.vb +++ b/app/DD-Record-Organizer/frmMass_Change.Designer.vb @@ -33,17 +33,20 @@ Partial Class frmMass_Change Me.Label5 = New System.Windows.Forms.Label() Me.btnRefresh = New System.Windows.Forms.Button() Me.btncancel = New System.Windows.Forms.Button() + Me.ProgressBar1 = New System.Windows.Forms.ProgressBar() + Me.BackgroundWorker = New System.ComponentModel.BackgroundWorker() + Me.lblStateBW = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.SuspendLayout() ' 'GroupBox1 ' - resources.ApplyResources(Me.GroupBox1, "GroupBox1") Me.GroupBox1.Controls.Add(Me.lblCount) Me.GroupBox1.Controls.Add(Me.cmbColumn) Me.GroupBox1.Controls.Add(Me.Label1) Me.GroupBox1.Controls.Add(Me.lblHinweis) + resources.ApplyResources(Me.GroupBox1, "GroupBox1") Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.TabStop = False ' @@ -55,8 +58,8 @@ Partial Class frmMass_Change ' 'cmbColumn ' - resources.ApplyResources(Me.cmbColumn, "cmbColumn") Me.cmbColumn.FormattingEnabled = True + resources.ApplyResources(Me.cmbColumn, "cmbColumn") Me.cmbColumn.Name = "cmbColumn" ' 'Label1 @@ -71,9 +74,9 @@ Partial Class frmMass_Change ' 'GroupBox2 ' - resources.ApplyResources(Me.GroupBox2, "GroupBox2") Me.GroupBox2.Controls.Add(Me.txtNewValue) Me.GroupBox2.Controls.Add(Me.Label5) + resources.ApplyResources(Me.GroupBox2, "GroupBox2") Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.TabStop = False ' @@ -101,10 +104,27 @@ Partial Class frmMass_Change Me.btncancel.Name = "btncancel" Me.btncancel.UseVisualStyleBackColor = True ' + 'ProgressBar1 + ' + resources.ApplyResources(Me.ProgressBar1, "ProgressBar1") + Me.ProgressBar1.Name = "ProgressBar1" + ' + 'BackgroundWorker + ' + Me.BackgroundWorker.WorkerReportsProgress = True + Me.BackgroundWorker.WorkerSupportsCancellation = True + ' + 'lblStateBW + ' + resources.ApplyResources(Me.lblStateBW, "lblStateBW") + Me.lblStateBW.Name = "lblStateBW" + ' 'frmMass_Change ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblStateBW) + Me.Controls.Add(Me.ProgressBar1) Me.Controls.Add(Me.btncancel) Me.Controls.Add(Me.btnRefresh) Me.Controls.Add(Me.GroupBox2) @@ -118,6 +138,7 @@ Partial Class frmMass_Change Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox @@ -130,4 +151,7 @@ Partial Class frmMass_Change Friend WithEvents Label5 As System.Windows.Forms.Label Friend WithEvents btnRefresh As System.Windows.Forms.Button Friend WithEvents btncancel As System.Windows.Forms.Button + Friend WithEvents ProgressBar1 As ProgressBar + Friend WithEvents BackgroundWorker As System.ComponentModel.BackgroundWorker + Friend WithEvents lblStateBW As Label End Class diff --git a/app/DD-Record-Organizer/frmMass_Change.resx b/app/DD-Record-Organizer/frmMass_Change.resx index bd91554..817a6e8 100644 --- a/app/DD-Record-Organizer/frmMass_Change.resx +++ b/app/DD-Record-Organizer/frmMass_Change.resx @@ -118,55 +118,208 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - - 625, 176 - - - True + + Segoe UI Semibold, 8.25pt, style=Bold, Italic 378, 49 - - 1 + + 38, 13 - - 12, 27 + + 4 - - - Bottom, Right + + Label3 - - 254, 25 - - - 87, 32 - - - 3 - - - 7 - - - 5 - - - Top + + lblCount System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBox1 + + + 0 + + + 118, 43 + + + 254, 25 + + + 2 + + + cmbColumn + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + GroupBox1 - - MiddleLeft + + 1 + + + True + + + 12, 46 + + + 100, 17 + + + 1 + + + Spaltenauswahl: + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 2 + + + True + + + 12, 18 + + + 394, 17 + + + 0 + + + Bitte wählen Sie die Spalte, deren Werte Sie überschreiben wollen? + + + lblHinweis + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 3 + + + + Top + + + Segoe UI, 9.75pt + + + 0, 0 + + + 625, 73 + + + 0 + + + 1. Zusammenfassung und Auswahl Spalte: + + + GroupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + 118, 24 + + + 364, 25 + + + 2 + + + txtNewValue + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 0 + + + True + + + 12, 27 + + + 78, 17 + + + 1 + + + Neuer Wert: + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 1 + + + Top + + + Segoe UI, 9.75pt + + + 0, 73 + + + 625, 57 + + + 5 + + + 2. Werteingabe: GroupBox2 @@ -174,59 +327,149 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + $this + + + 4 + + + Segoe UI, 9.75pt, style=Bold + + + MiddleLeft + + + 118, 180 + + + 364, 32 + + + 6 + + + Werte ändern + + + btnRefresh + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - 6, 13 - - - 1 - - - Label3 - - - Neuer Wert: - - - GroupBox2 - - - 12, 18 - - - Bitte wählen Sie die Spalte, deren Werte Sie überschreiben wollen? - - - GroupBox1 - - - CenterScreen - - - Label1 - - - Segoe UI Semibold, 8.25pt, style=Bold, Italic - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 118, 24 - $this - + + 3 + + + Bottom, Right + + + MiddleLeft + + + NoControl + + + 15, 181 + + + 87, 32 + + + 7 + + + Schliessen + + + MiddleRight + + + btncancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 118, 155 + + + 364, 19 + + + 8 + + + False + + + ProgressBar1 + + + System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + 17, 17 + + + True + + + NoControl + + + 115, 139 + + + 92, 13 + + + 5 + + + Spaltenauswahl: + + + False + + + lblStateBW + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 - - 1 + + True + + + 6, 13 + + + 625, 215 + + + Segoe UI, 8.25pt @@ -677,199 +920,22 @@ AAAAAQAAgAAAAAABAADAAAAAAAMAAP///////wAA////////AAD///////8AAP///////wAA - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 118, 136 - - - 2 - - - 364, 25 - - - Schliessen - - - 2 - - - 118, 43 - - - Top - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - lblCount - - - 3 - - - 2 - - - MiddleLeft - - - 0 - - - GroupBox1 - - - 0 - - - Segoe UI, 8.25pt - - - 395, 17 - - - Spaltenauswahl: - - - $this - - - $this - - - 1. Zusammenfassung und Auswahl Spalte: - - - 79, 17 - - - lblHinweis - - - Label5 - - - Segoe UI, 9.75pt, style=Bold - - - cmbColumn - - - 1 - - - GroupBox1 - - - 625, 73 - - - Segoe UI, 9.75pt - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0, 73 - - - 0 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2. Werteingabe: - - - 15, 136 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - MiddleRight - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 + + CenterScreen Massen Änderung - - txtNewValue + + BackgroundWorker - - 0, 0 - - - 625, 57 - - - btnRefresh - - - Segoe UI, 9.75pt - - - 364, 32 - - - 100, 17 - - - NoControl - - - $this - - - 4 - - - GroupBox2 - - - 6 - - - 12, 46 - - - 0 + + System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 frmMass_Change - - 1 + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - btncancel - - - 38, 13 - - - Werte ändern - - - GroupBox1 - - - True - \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmMass_Change.vb b/app/DD-Record-Organizer/frmMass_Change.vb index 11ed48f..25db5e1 100644 --- a/app/DD-Record-Organizer/frmMass_Change.vb +++ b/app/DD-Record-Organizer/frmMass_Change.vb @@ -1,11 +1,13 @@ -Public Class frmMass_Change +Imports System.ComponentModel +Public Class frmMass_Change + Dim SQL As String Private Sub frmMass_Change_Load(sender As Object, e As EventArgs) Handles Me.Load Try SUCCESSFULL = False Dim msg = "Anzahl zu ändernde Datensätze: " If USER_LANGUAGE <> "de-DE" Then - msg = "Count of records to be changed:" + msg = "Count of records to be changed: " End If lblCount.Text = msg & MASS_RECORD_IDs2CHANGE.Count cmbColumn.Items.Clear() @@ -19,7 +21,7 @@ Catch ex As Exception MsgBox("Unexpected Error in load form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - + End Sub Private Sub btncancel_Click(sender As Object, e As EventArgs) Handles btncancel.Click Me.Close() @@ -36,85 +38,15 @@ Dim result As MsgBoxResult result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then - Dim val = txtNewValue.Text - Dim SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL WHERE COL_NAME = '{0}' AND FORM_ID = {1}", cmbColumn.Text, CURRENT_ENTITY_ID) - Dim control_Id = ClassDatabase.Execute_Scalar(SQL, True) - If Not IsNothing(control_Id) Then - If control_Id > 0 Then - SQL = String.Format("SELECT CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = {0}", control_Id) - Dim control_type_ID = ClassDatabase.Execute_Scalar(SQL, True) - If control_type_ID = 4 Then - - Try - val = CDate(val) - Catch ex As Exception - MsgBox("Error in Converting value '" & val & "' to date", MsgBoxStyle.Critical) - Cursor = Cursors.Default - Exit Sub - End Try - End If - If control_type_ID = 7 Or control_type_ID = 12 Or control_type_ID = 14 Then - msg = "Achtung: für diese Spalte existieren mehrere Werte. Diese Werte werden gelöscht." & vbNewLine & "Wollen Sie dennoch fortfahren?" - If USER_LANGUAGE <> "de-DE" Then - msg = "Attention: there are multiple values for this column. These values will be deleted." & vbNewLine & "Would You like to continue?" - End If - Dim result1 As MsgBoxResult - result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - If result1 = MsgBoxResult.No Then - Exit Sub - Else - For Each Record As String In MASS_RECORD_IDs2CHANGE - Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record)) - ClassDatabase.Execute_non_Query(del, False) - ClassProxy.PRPROXY_CONTROL_DEL(CInt(Record), CURRENT_ENTITY_ID, control_Id) - Next - - End If - End If - Try - Dim err As Boolean = False - Dim RIGHT_ONLY_READ_RECORD_FILE = False - For Each Record As String In MASS_RECORD_IDs2CHANGE - If SQL_RECORD_AND_FILE_READ_ONLY <> "" Then - RIGHT_ONLY_READ_RECORD_FILE = ClassHelper.Check_Record_Read_only(CInt(Record), CURRENT_ENTITY_ID) - End If - If RIGHT_ONLY_READ_RECORD_FILE = False Then - SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record)) - Dim ex_GUID = ClassDatabase.Execute_Scalar(SQL, True) - If Not IsNothing(ex_GUID) Then - SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", val, USER_USERNAME, ex_GUID) - If ClassDatabase.Execute_non_Query(SQL, False) = False Then - MsgBox("Error in updating the value for Record: " & Record & vbNewLine & "Please check the logfile.", MsgBoxStyle.Exclamation) - Else - ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, control_Id, CInt(Record), val) - End If - Else - SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", control_Id, CInt(Record), val, USER_USERNAME) - If ClassDatabase.Execute_non_Query(SQL, False) = False Then - MsgBox("Error in inserting the value for Record: " & Record & vbNewLine & "Please check the logfile.", MsgBoxStyle.Exclamation) - Else - ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, control_Id, CInt(Record), val) - End If - End If - End If - - - Next - SUCCESSFULL = True - msg = "Alle Änderungen wurden ausgeführt!" - If USER_LANGUAGE <> "de-DE" Then - msg = "All changes were executed!" - End If - MsgBox(msg, MsgBoxStyle.Information) - Catch ex As Exception - MsgBox("Unexpected Error in Getting record to be changed:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - Else - MsgBox("No defined column found! (1)", MsgBoxStyle.Information) - End If - Else - MsgBox("No defined column found! (2)", MsgBoxStyle.Information) - End If + Me.Cursor = Cursors.WaitCursor + SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL WHERE COL_NAME = '{0}' AND FORM_ID = {1}", cmbColumn.Text, CURRENT_ENTITY_ID) + ProgressBar1.Visible = True + lblStateBW.Text = "Preparing BackgroundWorker..." + lblStateBW.Visible = True + ProgressBar1.Maximum = MASS_RECORD_IDs2CHANGE.Count + AddHandler BackgroundWorker.DoWork, AddressOf bwDowork + '.. und starten + BackgroundWorker.RunWorkerAsync() End If End If @@ -123,4 +55,113 @@ End Try Cursor = Cursors.Default End Sub + Dim _Error = False + Sub bwDowork(ByVal sender As Object, ByVal e As DoWorkEventArgs) + Dim worker As BackgroundWorker = CType(sender, BackgroundWorker) + Dim val = txtNewValue.Text + + Dim control_Id = ClassDatabase.Execute_Scalar(SQL, True) + If Not IsNothing(control_Id) Then + If control_Id > 0 Then + SQL = String.Format("SELECT CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = {0}", control_Id) + Dim control_type_ID = ClassDatabase.Execute_Scalar(SQL, True) + If control_type_ID = 4 Then + Try + val = CDate(val) + Catch ex As Exception + MsgBox("Error in Converting value '" & val & "' to date", MsgBoxStyle.Critical) + Cursor = Cursors.Default + Exit Sub + End Try + End If + If control_type_ID = 7 Or control_type_ID = 12 Or control_type_ID = 14 Then + stateBW = "Deleting the old values..." + 'Dim msg As String + 'msg = "Achtung: für diese Spalte existieren mehrere Werte. Diese Werte werden gelöscht." & vbNewLine & "Wollen Sie dennoch fortfahren?" + 'If USER_LANGUAGE <> "de-DE" Then + ' msg = "Attention: there are multiple values for this column. These values will be deleted." & vbNewLine & "Would You like to continue?" + 'End If + 'Dim result1 As MsgBoxResult + 'result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + For Each Record As String In MASS_RECORD_IDs2CHANGE + Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record)) + ClassDatabase.Execute_non_Query(del, False) + ClassProxy.PRPROXY_CONTROL_DEL(CInt(Record), CURRENT_ENTITY_ID, control_Id) + Next + End If + Try + Dim RIGHT_ONLY_READ_RECORD_FILE = False + Dim i As Integer = 1 + For Each Record As String In MASS_RECORD_IDs2CHANGE + stateBW = String.Format("Working on record {0} of {1}...", i, MASS_RECORD_IDs2CHANGE.Count.ToString) + If SQL_RECORD_AND_FILE_READ_ONLY <> "" Then + RIGHT_ONLY_READ_RECORD_FILE = ClassHelper.Check_Record_Read_only(CInt(Record), CURRENT_ENTITY_ID) + End If + If RIGHT_ONLY_READ_RECORD_FILE = False Then + SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", control_Id, CInt(Record)) + Dim ex_GUID = ClassDatabase.Execute_Scalar(SQL, True) + If Not IsNothing(ex_GUID) Then + SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", val, USER_USERNAME, ex_GUID) + If ClassDatabase.Execute_non_Query(SQL, False) = False Then + _Error = True + ClassLogger.Add(">> Error in updating the value for Record: " & Record, False) + + Else + ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, control_Id, CInt(Record), val) + End If + Else + SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", control_Id, CInt(Record), val, USER_USERNAME) + If ClassDatabase.Execute_non_Query(SQL, False) = False Then + _Error = True + ClassLogger.Add(">> Error in inserting the value for Record: " & Record, False) + Else + ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, control_Id, CInt(Record), val) + End If + End If + End If + BackgroundWorker.ReportProgress(i) + i += 1 + Next + SUCCESSFULL = True + + Catch ex As Exception + ClassLogger.Add("Unexpected Error in Getting record to be changed:" & ex.Message) + _Error = True + End Try + Else + ClassLogger.Add("No defined column found! (1)") + _Error = True + End If + Else + ClassLogger.Add("No defined column found! (2)") + _Error = True + End If + + End Sub + Dim stateBW As String + Private Sub BackgroundWorker_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles BackgroundWorker.ProgressChanged + Me.ProgressBar1.Value = e.ProgressPercentage + lblStateBW.Text = stateBW + End Sub + + Private Sub BackgroundWorker_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles BackgroundWorker.RunWorkerCompleted + Me.ProgressBar1.Visible = False + Me.lblStateBW.Visible = False + Dim msg As String + msg = "Alle Änderungen wurden ausgeführt!" + + If USER_LANGUAGE <> "de-DE" Then + msg = "All changes were executed!" + End If + If _Error = True Then + If USER_LANGUAGE <> "de-DE" Then + msg = msg & vbNewLine & "But errors occured while updating values! Check the log" + Else + msg = msg & vbNewLine & "Aber während des Update-Vorgangs erreigneten sich Fehler! Prüfen Sie die Logdatei!" + End If + + End If + MsgBox(msg, MsgBoxStyle.Information) + Me.Cursor = Cursors.Default + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmRight_Management.vb b/app/DD-Record-Organizer/frmRight_Management.vb index 861d480..2968397 100644 --- a/app/DD-Record-Organizer/frmRight_Management.vb +++ b/app/DD-Record-Organizer/frmRight_Management.vb @@ -80,7 +80,7 @@ Private Sub frmRight_Management_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Save_Datagrid(TBPMO_RIGHT_GROUPDataGridView, "TBPMO_RIGHT_GROUPDataGridView") - If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then MessageBox.Show("If You changed some data here, be aware that this data needs to be synchronized with Your proxy-data!" & vbNewLine & "The regualar processing-time are 30 minutes", "Attention", MessageBoxButtons.OK, MessageBoxIcon.Information) End If 'Save_Datagrid(TBPMO_RIGHT_USERDataGridView, "TBPMO_RIGHT_USERDataGridView") diff --git a/app/DD-Record-Organizer/frmWD_ChangeDoctype.vb b/app/DD-Record-Organizer/frmWD_ChangeDoctype.vb index c61559b..60d54e9 100644 --- a/app/DD-Record-Organizer/frmWD_ChangeDoctype.vb +++ b/app/DD-Record-Organizer/frmWD_ChangeDoctype.vb @@ -34,7 +34,7 @@ Public Class frmWD_ChangeDoctype For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows sql = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Doctype = '{0}' WHERE DocID = {1}", NewDoctype, row.Item("DOC_ID")) If clsDatabase.Execute_non_Query(sql) = True Then - If LICENSE_SITE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then clsDatabase.Execute_non_Query(sql, True) sql = String.Format("UPDATE VWPMO_DOC_SEARCH SET Doctype = '{0}', Change_DateTime = GETDATE() WHERE DocID = {1}", NewDoctype, row.Item("DOC_ID")) clsDatabase.Execute_non_Query(sql, True) diff --git a/app/DD-Record-Organizer/frmWD_CreateVersion.vb b/app/DD-Record-Organizer/frmWD_CreateVersion.vb index 51322c8..e825d14 100644 --- a/app/DD-Record-Organizer/frmWD_CreateVersion.vb +++ b/app/DD-Record-Organizer/frmWD_CreateVersion.vb @@ -16,7 +16,7 @@ Public Class frmWD_CreateVersion VERSION = VERSION + 1 Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Version = {0} WHERE DocID = {1}", VERSION, row.Item("DOC_ID")) clsDatabase.Execute_non_Query(upd) - If LICENSE_SITE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then + If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then clsDatabase.Execute_non_Query(upd, True) End If End If diff --git a/app/DD-Record-Organizer/frmWD_IndexFile.Designer.vb b/app/DD-Record-Organizer/frmWD_IndexFile.Designer.vb index dc0244f..a495bc3 100644 --- a/app/DD-Record-Organizer/frmWD_IndexFile.Designer.vb +++ b/app/DD-Record-Organizer/frmWD_IndexFile.Designer.vb @@ -27,7 +27,6 @@ Partial Class frmWD_IndexFile Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWD_IndexFile)) Dim FW_DOCTYPE_IDLabel As System.Windows.Forms.Label Dim PATHLabel As System.Windows.Forms.Label - Dim Label3 As System.Windows.Forms.Label Me.Label1 = New System.Windows.Forms.Label() Me.txtFilepath = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() @@ -38,9 +37,6 @@ Partial Class frmWD_IndexFile Me.OBJECT_TYPETextBox = New System.Windows.Forms.TextBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.PATHTextBox = New System.Windows.Forms.TextBox() - Me.lvwIndices = New System.Windows.Forms.ListView() - Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.DOCTYPE_IDTextBox = New System.Windows.Forms.TextBox() Me.chkdelete_origin = New System.Windows.Forms.CheckBox() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) @@ -53,7 +49,6 @@ Partial Class frmWD_IndexFile OBJECT_TYPELabel = New System.Windows.Forms.Label() FW_DOCTYPE_IDLabel = New System.Windows.Forms.Label() PATHLabel = New System.Windows.Forms.Label() - Label3 = New System.Windows.Forms.Label() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() CType(Me.VWDDINDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -74,11 +69,6 @@ Partial Class frmWD_IndexFile resources.ApplyResources(PATHLabel, "PATHLabel") PATHLabel.Name = "PATHLabel" ' - 'Label3 - ' - resources.ApplyResources(Label3, "Label3") - Label3.Name = "Label3" - ' 'Label1 ' resources.ApplyResources(Me.Label1, "Label1") @@ -97,6 +87,7 @@ Partial Class frmWD_IndexFile ' 'cmbDokumentart ' + Me.cmbDokumentart.DisplayMember = "DOKUMENTTYPE_ID" resources.ApplyResources(Me.cmbDokumentart, "cmbDokumentart") Me.cmbDokumentart.FormattingEnabled = True Me.cmbDokumentart.Name = "cmbDokumentart" @@ -166,10 +157,8 @@ Partial Class frmWD_IndexFile 'GroupBox1 ' Me.GroupBox1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption - Me.GroupBox1.Controls.Add(Label3) Me.GroupBox1.Controls.Add(PATHLabel) Me.GroupBox1.Controls.Add(Me.PATHTextBox) - Me.GroupBox1.Controls.Add(Me.lvwIndices) Me.GroupBox1.Controls.Add(FW_DOCTYPE_IDLabel) Me.GroupBox1.Controls.Add(Me.DOCTYPE_IDTextBox) Me.GroupBox1.Controls.Add(OBJECT_TYPELabel) @@ -183,22 +172,6 @@ Partial Class frmWD_IndexFile resources.ApplyResources(Me.PATHTextBox, "PATHTextBox") Me.PATHTextBox.Name = "PATHTextBox" ' - 'lvwIndices - ' - resources.ApplyResources(Me.lvwIndices, "lvwIndices") - Me.lvwIndices.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2}) - Me.lvwIndices.Name = "lvwIndices" - Me.lvwIndices.UseCompatibleStateImageBehavior = False - Me.lvwIndices.View = System.Windows.Forms.View.Details - ' - 'ColumnHeader1 - ' - resources.ApplyResources(Me.ColumnHeader1, "ColumnHeader1") - ' - 'ColumnHeader2 - ' - resources.ApplyResources(Me.ColumnHeader2, "ColumnHeader2") - ' 'DOCTYPE_IDTextBox ' resources.ApplyResources(Me.DOCTYPE_IDTextBox, "DOCTYPE_IDTextBox") @@ -284,9 +257,6 @@ Partial Class frmWD_IndexFile Friend WithEvents OBJECT_TYPETextBox As System.Windows.Forms.TextBox Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox Friend WithEvents DOCTYPE_IDTextBox As System.Windows.Forms.TextBox - Friend WithEvents lvwIndices As System.Windows.Forms.ListView - Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader Friend WithEvents PATHTextBox As System.Windows.Forms.TextBox Friend WithEvents chkdelete_origin As System.Windows.Forms.CheckBox Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip diff --git a/app/DD-Record-Organizer/frmWD_IndexFile.resx b/app/DD-Record-Organizer/frmWD_IndexFile.resx index 6c847d0..10169f3 100644 --- a/app/DD-Record-Organizer/frmWD_IndexFile.resx +++ b/app/DD-Record-Organizer/frmWD_IndexFile.resx @@ -147,7 +147,7 @@ GroupBox1 - 6 + 4 False @@ -181,7 +181,7 @@ GroupBox1 - 4 + 2 False @@ -211,36 +211,6 @@ GroupBox1 - 1 - - - False - - - True - - - 6, 93 - - - 46, 15 - - - 10 - - - Indizes: - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - 0 @@ -277,7 +247,7 @@ 15, 27 - 562, 23 + 559, 23 1 @@ -370,7 +340,7 @@ MiddleLeft - 419, 523 + 416, 592 158, 28 @@ -418,8 +388,59 @@ GroupBox1 + 5 + + + PATHTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 1 + + + DOCTYPE_IDTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 3 + + + Segoe UI, 9pt, style=Italic + + + 15, 117 + + + 560, 80 + + 7 + + Gewählte Indexierungsdaten - Automatik: + + + GroupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + Top, Left, Right @@ -442,31 +463,7 @@ GroupBox1 - 2 - - - Top, Bottom, Left, Right - - - 85, 93 - - - 281, 96 - - - 8 - - - lvwIndices - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 3 + 1 Top, Right @@ -490,46 +487,7 @@ GroupBox1 - 5 - - - Segoe UI, 9pt, style=Italic - - - 15, 117 - - - 560, 195 - - - 7 - - - Gewählte Indexierungsdaten - Automatik: - - - GroupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - - - Indexname - - - 100 - - - Value - - - 120 + 3 Bottom, Left @@ -541,7 +499,7 @@ Verdana, 9.75pt, style=Italic - 24, 529 + 24, 598 178, 20 @@ -552,6 +510,9 @@ Lösche Ursprungsdatei + + 891, 17 + Die gedroppte Datei wird nach Ablage in windream gelöscht - Wird für nächste Eingabe gespeichert @@ -567,9 +528,6 @@ 4 - - 891, 17 - Bottom, Left @@ -580,7 +538,7 @@ Verdana, 9.75pt, style=Bold, Italic - 24, 555 + 24, 624 520, 20 @@ -616,10 +574,10 @@ Top, Bottom, Left, Right - 15, 318 + 15, 203 - 562, 152 + 559, 336 10 @@ -652,7 +610,7 @@ Segoe UI Semibold, 9pt, style=Bold, Italic - 21, 476 + 21, 545 134, 15 @@ -685,7 +643,7 @@ Segoe UI Semibold, 9pt, style=Bold, Italic - 24, 494 + 24, 563 551, 24 @@ -715,7 +673,7 @@ 7, 15 - 592, 592 + 589, 661 Segoe UI, 9pt @@ -1176,25 +1134,13 @@ DD_DMSDataSet - DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - ColumnHeader1 - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ColumnHeader2 - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ToolTip1 @@ -1212,7 +1158,7 @@ VWDDINDEX_AUTOMTableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWDDINDEX_AUTOMTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWDDINDEX_AUTOMTableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null frmWD_IndexFile diff --git a/app/DD-Record-Organizer/frmWD_IndexFile.vb b/app/DD-Record-Organizer/frmWD_IndexFile.vb index 6c79e22..d2d0f4e 100644 --- a/app/DD-Record-Organizer/frmWD_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWD_IndexFile.vb @@ -393,7 +393,11 @@ Public Class frmWD_IndexFile If cmbDokumentart.SelectedIndex <> -1 Then My.Settings.WD_INDEXDOKART_SAVE = cmbDokumentart.Text My.Settings.Save() - Handle_File(cmbDokumentart.SelectedValue) + If clsWindream.Create_Session = True Then + Handle_File(cmbDokumentart.SelectedValue) + Else + MsgBox("Could not create a windream-session! Please contact Your admin!", MsgBoxStyle.Critical) + End If End If Catch ex As Exception MsgBox("Unexpected Error in Prepare indexing: " & ex.Message, MsgBoxStyle.Critical) @@ -927,49 +931,50 @@ Public Class frmWD_IndexFile Dim sql = "SELECT OBJEKTTYP FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKARTID OBJECT_TYPETextBox.Text = ClassDatabase.Execute_Scalar(sql, True) DOCTYPE_IDTextBox.Text = CURRENT_DOKARTID - sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = " & CURRENT_DOKARTID - Dim dt As DataTable = ClassDatabase.Return_Datatable(sql, True) - Dim Count As Integer = 0 - lvwIndices.Items.Clear() - If dt.Rows.Count > 0 Then - For Each row As DataRow In dt.Rows - lvwIndices.Items.Add(row.Item("INDEXNAME").ToString) + Dim dt As DataTable + 'sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = " & CURRENT_DOKARTID + 'Dim dt As DataTable = ClassDatabase.Return_Datatable(sql, True) + 'Dim Count As Integer = 0 + 'lvwIndices.Items.Clear() + 'If dt.Rows.Count > 0 Then + ' For Each row As DataRow In dt.Rows + ' lvwIndices.Items.Add(row.Item("INDEXNAME").ToString) - Dim Value As String - Dim _case = row.Item("VALUE").ToString.ToUpper - Select Case row.Item("VALUE").ToString.ToUpper - Case "@DOKART" - Value = CURRENT_DOKARTSTRING - Case "@RECORD-ID" - Value = CURRENT_RECORD_ID - End Select - lvwIndices.Items(Count).SubItems.Add(Value) - Count += 1 - Next - End If + ' Dim Value As String + ' Dim _case = row.Item("VALUE").ToString.ToUpper + ' Select Case row.Item("VALUE").ToString.ToUpper + ' Case "@DOKART" + ' Value = CURRENT_DOKARTSTRING + ' Case "@RECORD-ID" + ' Value = CURRENT_RECORD_ID + ' End Select + ' lvwIndices.Items(Count).SubItems.Add(Value) + ' Count += 1 + ' Next + 'End If 'den Entity-Key auslesen sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & OBJECT_TYPETextBox.Text & "')" dt = ClassDatabase.Return_Datatable(sql, True) If Not dt Is Nothing Then If dt.Rows.Count = 1 Then - lvwIndices.Items.Add(dt.Rows(0).Item("IDXNAME_ENTITYID").ToString) - lvwIndices.Items(Count).SubItems.Add(CURRENT_ENTITY_ID) - Count = Count + 1 - lvwIndices.Items.Add(dt.Rows(0).Item("IDXNAME_PARENTID").ToString) - If CURRENT_REDUNDANT_FORM_ID <> 0 Then - sql = "SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_REDUNDANT_FORM_ID - Else - sql = "SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_ENTITY_ID - End If - Dim ParentID = ClassDatabase.Execute_Scalar(sql, True) - Try - If IsNumeric(ParentID) And ParentID > 0 Then - lvwIndices.Items(Count).SubItems.Add(ParentID) - End If - Catch ex As Exception - MsgBox("Unexpected Error in Setting Parent-ID" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - Count = Count + 1 + 'lvwIndices.Items.Add(dt.Rows(0).Item("IDXNAME_ENTITYID").ToString) + 'lvwIndices.Items(Count).SubItems.Add(CURRENT_ENTITY_ID) + 'Count = Count + 1 + 'lvwIndices.Items.Add(dt.Rows(0).Item("IDXNAME_PARENTID").ToString) + 'If CURRENT_REDUNDANT_FORM_ID <> 0 Then + ' sql = "SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_REDUNDANT_FORM_ID + 'Else + ' sql = "SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_ENTITY_ID + 'End If + 'Dim ParentID = ClassDatabase.Execute_Scalar(sql, True) + 'Try + ' If IsNumeric(ParentID) And ParentID > 0 Then + ' lvwIndices.Items(Count).SubItems.Add(ParentID) + ' End If + 'Catch ex As Exception + ' MsgBox("Unexpected Error in Setting Parent-ID" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + 'End Try + 'Count = Count + 1 ''den Record-Key auslesen 'lvwIndices.Items.Add(dt.Rows(0).Item("IDXNAME_RECORDID").ToString) 'lvwIndices.Items(Count).SubItems.Add(CURRENT_RECORD_ID) diff --git a/app/RecordOrganizer_RightManager/My Project/licenses.licx b/app/RecordOrganizer_RightManager/My Project/licenses.licx index e69de29..01da061 100644 --- a/app/RecordOrganizer_RightManager/My Project/licenses.licx +++ b/app/RecordOrganizer_RightManager/My Project/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx index 505509c..0e6b9b3 100644 --- a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx +++ b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx @@ -123,10 +123,10 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAB0SURBVDhPpY27DYAwFAOZjalCHZYEhgCa1ByyhB5RvmC5 - iJ7unCF05hbG5vwTjv0sVExFWJeNu/czbzEVAZQ7Gm8xJcHOUzElwc5TMbHg3MQDKJrPCg8XzWcFKpTY - eapjQtAnxM5THRNCrmJeQku+Ch0J4QLYS+ifBfoIBAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAHRJREFUOE+ljbsNgDAUA5mNqUIdlgSGAJrUHLKEHlG+YLmInu6cIXTmFsbm/BOO + /SxUTEVYl4279zNvMRUBlDsabzElwc5TMSXBzlMxseDcxAMoms8KDxfNZwUqlNh5qmNC0CfEzlMdE0Ku + Yl5CS74KHQnhAthL6J8F+ggEAAAAAElFTkSuQmCC diff --git a/app/VERSION_CHECKER/ClassInit.vb b/app/VERSION_CHECKER/ClassInit.vb index 3eac908..46c6886 100644 --- a/app/VERSION_CHECKER/ClassInit.vb +++ b/app/VERSION_CHECKER/ClassInit.vb @@ -31,7 +31,6 @@ Public Class ClassInit End Function Public Sub InitBasics() Try - Dim UPDATE_ID As Integer If InitInstallPath() = False Then End If @@ -48,6 +47,7 @@ Public Class ClassInit VERSION_SERVER = DT_UPDATE.Rows(0).Item("VERSION_NO") FORCE_UPDATE = DT_UPDATE.Rows(0).Item("FORCE_UPD") VERSIONS_FOR_FORCE_UPDATE = DT_UPDATE.Rows(0).Item("VERSION_FORCE_UPD") + ALL_USERS = DT_UPDATE.Rows(0).Item("ALL_USERS") sql = String.Format("SELECT * FROM TBDD_VERSION_ITEMS WHERE UPDATE_ID = {0} ORDER BY GUID", UPDATE_ID) DT_UPDATE_ITEMS = clsDatabase.Return_Datatable(sql) End If @@ -120,7 +120,6 @@ Public Class ClassInit Return False End If End If - Catch ex As Exception ClassLogger.Add("Unexpected Error in InitInstallPath: " & ex.Message, True) Return False @@ -131,19 +130,22 @@ Public Class ClassInit Dim f As String Try For Each d In Directory.GetDirectories(sDir) - If RecExe_found = False Then - For Each f In Directory.GetFiles(d, "DD-Record-Organizer.exe") - RecExe_found = True - MY_INSTALL_PATH = Path.GetDirectoryName(f) - Exit Sub - Next - End If - If RecExe_found = False Then - DirSearch(d) + If d.Contains("$Recycle") = False Or d.Contains("System Volume") = False Then + If RecExe_found = False Then + For Each f In Directory.GetFiles(d, "DD-Record-Organizer.exe") + RecExe_found = True + MY_INSTALL_PATH = Path.GetDirectoryName(f) + Exit Sub + Next + End If + If RecExe_found = False Then + DirSearch(d) + End If End If Next Catch excpt As System.Exception ClassLogger.Add("Unexpected Error in DirSearch: " & excpt.Message, True) + MY_INSTALL_PATH = "" End Try End Sub Public Shared Function InsertEssential_Log(REFERENCE_KEY As Integer, REFERENCE_STRING As String, COMMENT As String) diff --git a/app/VERSION_CHECKER/ClassLogger.vb b/app/VERSION_CHECKER/ClassLogger.vb index c7b4a7f..6b8c83a 100644 --- a/app/VERSION_CHECKER/ClassLogger.vb +++ b/app/VERSION_CHECKER/ClassLogger.vb @@ -62,10 +62,15 @@ Public Class ClassLogger Try If ACHTUNG Then ClassLogger.StreamWriter.WriteLine("#ERROR# (" & System.DateTime.Now & "): " & information) - ERROR_WHILE_UPDATING = True - + If (information.Contains("Der Zugriff auf den Pfad")) Then + + Else + ERROR_WHILE_UPDATING = True + End If + + Else - ClassLogger.StreamWriter.WriteLine(information) + ClassLogger.StreamWriter.WriteLine(information) End If ClassLogger.CloseFile() Catch e As Exception diff --git a/app/VERSION_CHECKER/ModuleMySettings.vb b/app/VERSION_CHECKER/ModuleMySettings.vb index 0176995..e2768fc 100644 --- a/app/VERSION_CHECKER/ModuleMySettings.vb +++ b/app/VERSION_CHECKER/ModuleMySettings.vb @@ -15,6 +15,8 @@ Module ModuleMySettings Public VERSION_SERVER = "1.0.0.0" Public VERSION_USER = "1.0.0.0" Public FORCE_UPDATE As Boolean = False + Public UPDATE_ID As Integer + Public ALL_USERS As Boolean = False Public VERSIONS_FOR_FORCE_UPDATE As String = "" Public FOLDER_TEMP As String Public LogErrorsOnly As Boolean = True diff --git a/app/VERSION_CHECKER/frmVersionCheck.vb b/app/VERSION_CHECKER/frmVersionCheck.vb index 8a8d5ee..4e2bdd4 100644 --- a/app/VERSION_CHECKER/frmVersionCheck.vb +++ b/app/VERSION_CHECKER/frmVersionCheck.vb @@ -56,6 +56,13 @@ Public Class frmVersionCheck End If End If If FORCE_UPDATE = False Then + If ALL_USERS = False Then + Dim sql = String.Format("SELECT COUNT(GUID) FROM TBDD_VERSION_USER_UPDATE WHERE USER_ID = {0} AND UPDATE_ID = {1}", USER_GUID, UPDATE_ID) + If clsDatabase.Execute_Scalar(sql) = 0 Then + ClassInit.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("VersionChecker: User is not part of update-group - UPDATE-ID: {0}", UPDATE_ID)) + Exit Sub + End If + End If Dim msg = "Auf dem Server liegt ein Update für ADDI bereit!" & vbNewLine & "Wollen Sie das Update nun durchführen? Die Dauer ist abhängig von Ihrer Netzwerkverbindung!" If USER_LANGUAGE <> "de-DE" Then msg = "There is a new release available for ADDI!" & vbNewLine & "Would You like to install the update now? This might take some minutes!" @@ -258,6 +265,8 @@ Public Class frmVersionCheck Process.Start(startInfo) Else MsgBox("Can not find ADDI-Executable in regular path! Please inform your systemadmin.", MsgBoxStyle.Critical) + startInfo.FileName = "E:\SchreiberM\Visual Studio\GIT\RecordOrganizer\app\DD-Record-Organizer\bin\Debug\DD-Record-Organizer.exe" + Process.Start(startInfo) End If Catch ex As Exception