diff --git a/app/DD-Record-Organiser/App.config b/app/DD-Record-Organiser/App.config index 8154e4a..63d1dc2 100644 --- a/app/DD-Record-Organiser/App.config +++ b/app/DD-Record-Organiser/App.config @@ -45,6 +45,9 @@ 764 + + False + \ No newline at end of file diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb index 4f6c855..6f048ed 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb +++ b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb @@ -13403,6 +13403,8 @@ Partial Public Class DD_DMSDataSet Private columnNAME As Global.System.Data.DataColumn + Private columnCONSTRUCTOR_ID As Global.System.Data.DataColumn + _ Public Sub New() @@ -13662,6 +13664,14 @@ Partial Public Class DD_DMSDataSet End Get End Property + _ + Public ReadOnly Property CONSTRUCTOR_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCONSTRUCTOR_ID + End Get + End Property + _ @@ -13726,9 +13736,10 @@ Partial Public Class DD_DMSDataSet ByVal PROCESS_SELECT8 As String, _ ByVal PROCESS_SELECT9 As String, _ ByVal PROCESS_SELECT10 As String, _ - ByVal NAME As String) As TBPMO_FOLLOW_UP_EMAILRow + ByVal NAME As String, _ + ByVal CONSTRUCTOR_ID As Integer) As TBPMO_FOLLOW_UP_EMAILRow Dim rowTBPMO_FOLLOW_UP_EMAILRow As TBPMO_FOLLOW_UP_EMAILRow = CType(Me.NewRow,TBPMO_FOLLOW_UP_EMAILRow) - Dim columnValuesArray() As Object = New Object() {Nothing, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, Nothing, Nothing, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, TIME_DIST, PROCESS_SELECT5, PROCESS_SELECT6, PROCESS_SELECT7, PROCESS_SELECT8, PROCESS_SELECT9, PROCESS_SELECT10, NAME} + Dim columnValuesArray() As Object = New Object() {Nothing, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, Nothing, Nothing, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, TIME_DIST, PROCESS_SELECT5, PROCESS_SELECT6, PROCESS_SELECT7, PROCESS_SELECT8, PROCESS_SELECT9, PROCESS_SELECT10, NAME, CONSTRUCTOR_ID} If (Not (parentTBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID) Is Nothing) Then columnValuesArray(4) = parentTBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID(0) End If @@ -13791,6 +13802,7 @@ Partial Public Class DD_DMSDataSet Me.columnPROCESS_SELECT9 = MyBase.Columns("PROCESS_SELECT9") Me.columnPROCESS_SELECT10 = MyBase.Columns("PROCESS_SELECT10") Me.columnNAME = MyBase.Columns("NAME") + Me.columnCONSTRUCTOR_ID = MyBase.Columns("CONSTRUCTOR_ID") End Sub _ + Public Property CONSTRUCTOR_ID() As Integer + Get + Return CType(Me(Me.tableTBPMO_FOLLOW_UP_EMAIL.CONSTRUCTOR_IDColumn),Integer) + End Get + Set + Me(Me.tableTBPMO_FOLLOW_UP_EMAIL.CONSTRUCTOR_IDColumn) = value + End Set + End Property + _ Public Property TBTEMP_QUICKDISPLAYRowByFK_TBPMO_FOLLOW_UP_EMAIL_DATE_CTRL_ID() As TBTEMP_QUICKDISPLAYRow @@ -39424,6 +39450,7 @@ Namespace DD_DMSDataSetTableAdapters tableMapping.ColumnMappings.Add("PROCESS_SELECT9", "PROCESS_SELECT9") tableMapping.ColumnMappings.Add("PROCESS_SELECT10", "PROCESS_SELECT10") tableMapping.ColumnMappings.Add("NAME", "NAME") + tableMapping.ColumnMappings.Add("CONSTRUCTOR_ID", "CONSTRUCTOR_ID") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -39436,15 +39463,16 @@ Namespace DD_DMSDataSetTableAdapters "FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL"& _ "_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY,"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4,"& _ - " ACTIVE, ADDED_WHO, TIME_DIST, NAME)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@FOLLOW_UP_SEQUENCE,@FOLLOW"& _ - "_UP_DAYS,@FOLLOW_UP_TIME_SPAN,@DEPENDENT_DATE_CTRL_ID,@DEPENDENT_DONE_CTRL_ID,@P"& _ - "ARENT_ID,@TIME_UNITY,@TIME_SPAN,@EMAIL_SUBJECT,@EMAIL_BODY,@PROCESS_SELECT1,@PRO"& _ - "CESS_SELECT2,@PROCESS_SELECT3,@PROCESS_SELECT4,@ACTIVE,@ADDED_WHO,@TIME_DIST,@NA"& _ - "ME); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, D"& _ - "EPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN,"& _ - " EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, P"& _ - "ROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TB"& _ - "PMO_FOLLOW_UP_EMAIL WHERE (GUID = SCOPE_IDENTITY())" + " ACTIVE, ADDED_WHO, TIME_DIST, NAME, CONSTRUCTOR_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@FOLLOW_UP_"& _ + "SEQUENCE,@FOLLOW_UP_DAYS,@FOLLOW_UP_TIME_SPAN,@DEPENDENT_DATE_CTRL_ID,@DEPENDENT"& _ + "_DONE_CTRL_ID,@PARENT_ID,@TIME_UNITY,@TIME_SPAN,@EMAIL_SUBJECT,@EMAIL_BODY,@PROC"& _ + "ESS_SELECT1,@PROCESS_SELECT2,@PROCESS_SELECT3,@PROCESS_SELECT4,@ACTIVE,@ADDED_WH"& _ + "O,@TIME_DIST,@NAME,@CONSTRUCTOR_ID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLO"& _ + "W_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, "& _ + "PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PR"& _ + "OCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, "& _ + "CHANGED_WHO, CHANGED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = SCOPE_IDENTIT"& _ + "Y())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLLOW_UP_SEQUENCE", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLLOW_UP_SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLLOW_UP_DAYS", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLLOW_UP_DAYS", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -39464,6 +39492,7 @@ Namespace DD_DMSDataSetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TIME_DIST", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "TIME_DIST", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCTOR_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCTOR_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBPMO_FOLLOW_UP_EMAIL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET FOLLOW_UP_SEQUENCE = @FOLL"& _ @@ -39478,12 +39507,12 @@ Namespace DD_DMSDataSetTableAdapters " PROCESS_SELECT5 = @PROCESS_SELECT5, PROCESS_SELECT6 = @PROCESS_SELECT6, "& _ "PROCESS_SELECT7 = @PROCESS_SELECT7, PROCESS_SELECT8 = @PROCESS_SELECT8, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " PROCESS_SELECT9 = @PROCESS_SELECT9, PROCESS_SELECT10 = @PROCE"& _ - "SS_SELECT10, NAME = @NAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID"& _ - ", FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_I"& _ - "D, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAI"& _ - "L_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTI"& _ - "VE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL "& _ - "WHERE (GUID = @GUID)" + "SS_SELECT10, NAME = @NAME, CONSTRUCTOR_ID = @CONSTRUCTOR_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID "& _ + "= @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_"& _ + "UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UN"& _ + "ITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PRO"& _ + "CESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANG"& _ + "ED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLLOW_UP_SEQUENCE", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLLOW_UP_SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLLOW_UP_DAYS", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLLOW_UP_DAYS", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -39509,6 +39538,7 @@ Namespace DD_DMSDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_SELECT9", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_SELECT9", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_SELECT10", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_SELECT10", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCTOR_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCTOR_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -39532,7 +39562,7 @@ Namespace DD_DMSDataSetTableAdapters "PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, PROCESS_SELECT5, PROCESS_SELE"& _ "CT6, PROCESS_SELECT7, PROCESS_SELECT8, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" PROCESS_SELECT"& _ "9, PROCESS_SELECT10, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, N"& _ - "AME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPMO_FOLLOW_UP_EMAIL" + "AME, CONSTRUCTOR_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPMO_FOLLOW_UP_EMAIL" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -39631,7 +39661,8 @@ Namespace DD_DMSDataSetTableAdapters ByVal ACTIVE As Boolean, _ ByVal ADDED_WHO As String, _ ByVal TIME_DIST As String, _ - ByVal NAME As String) As Integer + ByVal NAME As String, _ + ByVal CONSTRUCTOR_ID As Integer) As Integer If (FOLLOW_UP_SEQUENCE Is Nothing) Then Throw New Global.System.ArgumentNullException("FOLLOW_UP_SEQUENCE") Else @@ -39702,6 +39733,7 @@ Namespace DD_DMSDataSetTableAdapters Else Me.Adapter.InsertCommand.Parameters(17).Value = CType(NAME,String) End If + Me.Adapter.InsertCommand.Parameters(18).Value = CType(CONSTRUCTOR_ID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -39746,6 +39778,7 @@ Namespace DD_DMSDataSetTableAdapters ByVal PROCESS_SELECT9 As String, _ ByVal PROCESS_SELECT10 As String, _ ByVal NAME As String, _ + ByVal CONSTRUCTOR_ID As Integer, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer If (FOLLOW_UP_SEQUENCE Is Nothing) Then @@ -39848,8 +39881,9 @@ Namespace DD_DMSDataSetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(23).Value = CType(NAME,String) End If - Me.Adapter.UpdateCommand.Parameters(24).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(25).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(24).Value = CType(CONSTRUCTOR_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(25).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(26).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.xsd b/app/DD-Record-Organiser/DD_DMSDataSet.xsd index a8ca241..58dbeda 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.xsd +++ b/app/DD-Record-Organiser/DD_DMSDataSet.xsd @@ -1938,8 +1938,8 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBPMO_FOLLOW_UP_EMAIL (FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, - PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, TIME_DIST, NAME) -VALUES (@FOLLOW_UP_SEQUENCE,@FOLLOW_UP_DAYS,@FOLLOW_UP_TIME_SPAN,@DEPENDENT_DATE_CTRL_ID,@DEPENDENT_DONE_CTRL_ID,@PARENT_ID,@TIME_UNITY,@TIME_SPAN,@EMAIL_SUBJECT,@EMAIL_BODY,@PROCESS_SELECT1,@PROCESS_SELECT2,@PROCESS_SELECT3,@PROCESS_SELECT4,@ACTIVE,@ADDED_WHO,@TIME_DIST,@NAME); + PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, TIME_DIST, NAME, CONSTRUCTOR_ID) +VALUES (@FOLLOW_UP_SEQUENCE,@FOLLOW_UP_DAYS,@FOLLOW_UP_TIME_SPAN,@DEPENDENT_DATE_CTRL_ID,@DEPENDENT_DONE_CTRL_ID,@PARENT_ID,@TIME_UNITY,@TIME_SPAN,@EMAIL_SUBJECT,@EMAIL_BODY,@PROCESS_SELECT1,@PROCESS_SELECT2,@PROCESS_SELECT3,@PROCESS_SELECT4,@ACTIVE,@ADDED_WHO,@TIME_DIST,@NAME,@CONSTRUCTOR_ID); SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = SCOPE_IDENTITY()) @@ -1960,6 +1960,7 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_ + @@ -1967,7 +1968,7 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, TIME_DIST, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, PROCESS_SELECT5, PROCESS_SELECT6, PROCESS_SELECT7, PROCESS_SELECT8, - PROCESS_SELECT9, PROCESS_SELECT10, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME + PROCESS_SELECT9, PROCESS_SELECT10, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, CONSTRUCTOR_ID FROM TBPMO_FOLLOW_UP_EMAIL @@ -1980,8 +1981,8 @@ SET FOLLOW_UP_SEQUENCE = @FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS = @F TIME_SPAN = @TIME_SPAN, EMAIL_SUBJECT = @EMAIL_SUBJECT, EMAIL_BODY = @EMAIL_BODY, PROCESS_SELECT1 = @PROCESS_SELECT1, PROCESS_SELECT2 = @PROCESS_SELECT2, PROCESS_SELECT3 = @PROCESS_SELECT3, PROCESS_SELECT4 = @PROCESS_SELECT4, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO, TIME_DIST = @TIME_DIST, PROCESS_SELECT5 = @PROCESS_SELECT5, PROCESS_SELECT6 = @PROCESS_SELECT6, PROCESS_SELECT7 = @PROCESS_SELECT7, PROCESS_SELECT8 = @PROCESS_SELECT8, - PROCESS_SELECT9 = @PROCESS_SELECT9, PROCESS_SELECT10 = @PROCESS_SELECT10, NAME = @NAME -WHERE (GUID = @Original_GUID); + PROCESS_SELECT9 = @PROCESS_SELECT9, PROCESS_SELECT10 = @PROCESS_SELECT10, NAME = @NAME, CONSTRUCTOR_ID = @CONSTRUCTOR_ID +WHERE (GUID = @Original_GUID); SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_DATE_CTRL_ID, DEPENDENT_DONE_CTRL_ID, PARENT_ID, TIME_UNITY, TIME_SPAN, EMAIL_SUBJECT, EMAIL_BODY, PROCESS_SELECT1, PROCESS_SELECT2, PROCESS_SELECT3, PROCESS_SELECT4, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_FOLLOW_UP_EMAIL WHERE (GUID = @GUID) @@ -2008,6 +2009,7 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_ + @@ -2044,6 +2046,7 @@ SELECT GUID, FOLLOW_UP_SEQUENCE, FOLLOW_UP_DAYS, FOLLOW_UP_TIME_SPAN, DEPENDENT_ + @@ -2849,7 +2852,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -2890,7 +2893,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -2968,7 +2971,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3063,7 +3066,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3086,7 +3089,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3131,7 +3134,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3169,7 +3172,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3204,7 +3207,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3241,7 +3244,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3262,7 +3265,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3299,7 +3302,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3325,7 +3328,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3366,7 +3369,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3413,7 +3416,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3458,7 +3461,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3525,7 +3528,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3562,7 +3565,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3617,7 +3620,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3656,7 +3659,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3780,7 +3783,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3842,7 +3845,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3872,7 +3875,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3902,7 +3905,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3939,7 +3942,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3964,7 +3967,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3984,7 +3987,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4023,7 +4026,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4067,7 +4070,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4097,7 +4100,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4144,7 +4147,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4295,10 +4298,11 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) + - + @@ -4323,7 +4327,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4358,7 +4362,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4387,7 +4391,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4442,7 +4446,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4501,7 +4505,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4574,7 +4578,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4680,7 +4684,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4774,7 +4778,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4813,7 +4817,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4831,7 +4835,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4877,7 +4881,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -5044,27 +5048,27 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.xss b/app/DD-Record-Organiser/DD_DMSDataSet.xss index 4871d3d..31882e4 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.xss +++ b/app/DD-Record-Organiser/DD_DMSDataSet.xss @@ -4,25 +4,25 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + - + - - - + + + - + @@ -31,23 +31,23 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -242,7 +242,7 @@ - + 1632 @@ -254,7 +254,7 @@ - + 1358 @@ -266,7 +266,7 @@ - + 282 @@ -282,7 +282,7 @@ - + 299 @@ -294,7 +294,7 @@ - + 2461 @@ -310,7 +310,7 @@ - + 2358 @@ -322,7 +322,7 @@ - + 2134 @@ -330,15 +330,15 @@ 2134 - 605 + 406 - 1155 - 605 + 1061 + 406 - + 2142 @@ -346,11 +346,11 @@ 2142 - 613 + 414 - 1155 - 613 + 1061 + 414 diff --git a/app/DD-Record-Organiser/My Project/Settings.Designer.vb b/app/DD-Record-Organiser/My Project/Settings.Designer.vb index 5da050d..2e80244 100644 --- a/app/DD-Record-Organiser/My Project/Settings.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Settings.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.34014 +' Laufzeitversion:4.0.30319.34209 ' ' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' der Code erneut generiert wird. @@ -184,6 +184,18 @@ Namespace My Me("Constructor_DetailsSplitter") = value End Set End Property + + _ + Public Property User_InBoxScan_NotinFront() As Boolean + Get + Return CType(Me("User_InBoxScan_NotinFront"),Boolean) + End Get + Set + Me("User_InBoxScan_NotinFront") = value + End Set + End Property End Class End Namespace diff --git a/app/DD-Record-Organiser/My Project/Settings.Settings b/app/DD-Record-Organiser/My Project/Settings.Settings index d022b02..dfb3e6d 100644 --- a/app/DD-Record-Organiser/My Project/Settings.Settings +++ b/app/DD-Record-Organiser/My Project/Settings.Settings @@ -40,5 +40,8 @@ 764 + + False + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmForm_Constructor.vb b/app/DD-Record-Organiser/frmForm_Constructor.vb index 8b914a4..1f18842 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor.vb @@ -1249,7 +1249,7 @@ Public Class frmForm_Constructor Sub Refresh_TaskOverview() Dim frmCollection As New FormCollection() frmCollection = Application.OpenForms() - If frmTaskOverview.IsHandleCreated Then + If frmTaskOverview.IsHandleCreated = False Then If Sett_TaskOverviewKeepInFront = True Then frmTaskOverview.Refresh() End If diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb index 61da719..3febc48 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb @@ -23,9 +23,9 @@ Partial Class frmForm_Constructor_Main_2 _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() - Dim GridLevelNode5 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() - Dim GridLevelNode6 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmForm_Constructor_Main_2)) Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridControlMain = New DevExpress.XtraGrid.GridControl() @@ -179,6 +179,7 @@ Partial Class frmForm_Constructor_Main_2 Me.grvwGrid.GridControl = Me.GridControlMain Me.grvwGrid.GroupPanelText = "Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu la" & _ "ssen" + Me.grvwGrid.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always Me.grvwGrid.Name = "grvwGrid" Me.grvwGrid.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] Me.grvwGrid.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] @@ -188,6 +189,8 @@ Partial Class frmForm_Constructor_Main_2 Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = False Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = False Me.grvwGrid.OptionsSelection.EnableAppearanceHideSelection = False + Me.grvwGrid.OptionsSelection.MultiSelect = True + Me.grvwGrid.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect Me.grvwGrid.OptionsView.ColumnAutoWidth = False Me.grvwGrid.OptionsView.EnableAppearanceEvenRow = True Me.grvwGrid.OptionsView.EnableAppearanceOddRow = True @@ -200,16 +203,16 @@ Partial Class frmForm_Constructor_Main_2 Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid Me.GridControlMain.Dock = System.Windows.Forms.DockStyle.Fill Me.GridControlMain.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - GridLevelNode4.LevelTemplate = Me.grvwGrid - GridLevelNode4.RelationName = "Level1" - GridLevelNode5.LevelTemplate = Me.grvwCarousel - GridLevelNode5.RelationName = "Level2" - GridLevelNode6.RelationName = "Level3" - Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4, GridLevelNode5, GridLevelNode6}) + GridLevelNode1.LevelTemplate = Me.grvwGrid + GridLevelNode1.RelationName = "Level1" + GridLevelNode2.LevelTemplate = Me.grvwCarousel + GridLevelNode2.RelationName = "Level2" + GridLevelNode3.RelationName = "Level3" + Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2, GridLevelNode3}) Me.GridControlMain.Location = New System.Drawing.Point(0, 0) Me.GridControlMain.MainView = Me.grvwTiles Me.GridControlMain.Name = "GridControlMain" - Me.GridControlMain.Size = New System.Drawing.Size(795, 270) + Me.GridControlMain.Size = New System.Drawing.Size(788, 270) Me.GridControlMain.TabIndex = 0 Me.GridControlMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwCarousel, Me.grvwTiles, Me.grvwGrid}) ' @@ -464,7 +467,7 @@ Partial Class frmForm_Constructor_Main_2 Me.SplitContainerBottom.Panel1.Text = "Panel1" Me.SplitContainerBottom.Panel2.Controls.Add(Me.Panel2) Me.SplitContainerBottom.Panel2.Text = "Panel2" - Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 372) + Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 365) Me.SplitContainerBottom.SplitterPosition = 576 Me.SplitContainerBottom.TabIndex = 0 Me.SplitContainerBottom.Text = "SplitContainerControl1" @@ -480,7 +483,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TCDetails.Location = New System.Drawing.Point(0, 25) Me.TCDetails.Name = "TCDetails" Me.TCDetails.SelectedTabPage = Me.TabDetails - Me.TCDetails.Size = New System.Drawing.Size(1078, 347) + Me.TCDetails.Size = New System.Drawing.Size(1071, 340) Me.TCDetails.TabIndex = 1 Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabWindream, Me.TabFollowUp, Me.TabPos}) ' @@ -489,7 +492,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabDetails.Controls.Add(Me.pnlDetails) Me.TabDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD Me.TabDetails.Name = "TabDetails" - Me.TabDetails.Size = New System.Drawing.Size(1072, 316) + Me.TabDetails.Size = New System.Drawing.Size(1069, 312) Me.TabDetails.Text = "Detailansicht" ' 'pnlDetails @@ -498,7 +501,7 @@ Partial Class frmForm_Constructor_Main_2 Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetails.Location = New System.Drawing.Point(0, 0) Me.pnlDetails.Name = "pnlDetails" - Me.pnlDetails.Size = New System.Drawing.Size(1072, 316) + Me.pnlDetails.Size = New System.Drawing.Size(1069, 312) Me.pnlDetails.TabIndex = 0 ' 'TabWindream @@ -881,7 +884,7 @@ Partial Class frmForm_Constructor_Main_2 Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEditMode, Me.ToolStripDropDownButton1, Me.tsButtonShowTaskOverview, Me.tsButtonShowWorkflowTasks}) Me.ToolStripEdit.Location = New System.Drawing.Point(0, 0) Me.ToolStripEdit.Name = "ToolStripEdit" - Me.ToolStripEdit.Size = New System.Drawing.Size(1078, 25) + Me.ToolStripEdit.Size = New System.Drawing.Size(1071, 25) Me.ToolStripEdit.TabIndex = 0 Me.ToolStripEdit.Text = "ToolStrip1" ' diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx index c29eb22..340772b 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx @@ -154,23 +154,6 @@ 17, 93 - - 1157, 15 - - - 124, 93 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa - SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY - wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII= - - - - 773, 15 - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -262,6 +245,17 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa + SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY + wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII= + + + + 773, 15 + 162, 11 diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index 77a3039..3bbbf84 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -2082,7 +2082,7 @@ Public Class frmForm_Constructor_Main_2 Refresh_FollowUps() dtpFollowUp.Enabled = False lblWiedervorlage_Control.Text = "<< Waiting for Selection:" - ListBoxUser2Profile.Items.Clear() + 'ListBoxUser2Profile.Items.Clear() grpbxFU_Profile.Enabled = False End If ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! @@ -2909,7 +2909,12 @@ Public Class frmForm_Constructor_Main_2 dtpFollowUp.Value = CDate(Now) End If FOLL_UP_RECORD_DEFINED = True - dtpFollowUp.Value = CDate(datevalue) + Try + dtpFollowUp.Value = CDate(datevalue) + Catch ex As Exception + dtpFollowUp.Value = CDate(Now) + End Try + Else dtpFollowUp.Value = CDate(Now) FOLL_UP_RECORD_DEFINED = False diff --git a/app/DD-Record-Organiser/frmMain.Designer.vb b/app/DD-Record-Organiser/frmMain.Designer.vb index c3221e0..2bd1ed1 100644 --- a/app/DD-Record-Organiser/frmMain.Designer.vb +++ b/app/DD-Record-Organiser/frmMain.Designer.vb @@ -57,7 +57,7 @@ Partial Class frmMain Me.BarButtonItem17 = New DevExpress.XtraBars.BarButtonItem() Me.pageHome = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.groupQuickAccess = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.groupQuickAccessForm = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.pageForms = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.pageAdmin = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroupProgram = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -69,6 +69,7 @@ Partial Class frmMain Me.DefaultLookAndFeel1 = New DevExpress.LookAndFeel.DefaultLookAndFeel(Me.components) Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem() Me.TimerClose3Minutes = New System.Windows.Forms.Timer(Me.components) + Me.TimerScan = New System.Windows.Forms.Timer(Me.components) CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ribbonMain, System.ComponentModel.ISupportInitialize).BeginInit() @@ -340,7 +341,7 @@ Partial Class frmMain ' 'pageHome ' - Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccess}) + Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccessForm}) Me.pageHome.Image = Global.DD_Record_Organiser.My.Resources.Resources.HomeHS Me.pageHome.Name = "pageHome" Me.pageHome.Text = "Home" @@ -353,10 +354,10 @@ Partial Class frmMain Me.RibbonPageGroup2.ShowCaptionButton = False Me.RibbonPageGroup2.Text = "Kalender" ' - 'groupQuickAccessDemo + 'groupQuickAccessForm ' - Me.groupQuickAccess.Name = "groupQuickAccessDemo" - Me.groupQuickAccess.Text = "Schnellstart " + Me.groupQuickAccessForm.Name = "groupQuickAccessForm" + Me.groupQuickAccessForm.Text = "Schnellstart " ' 'pageForms ' @@ -443,6 +444,10 @@ Partial Class frmMain ' Me.TimerClose3Minutes.Interval = 180000 ' + 'TimerScan + ' + Me.TimerScan.Interval = 10000 + ' 'frmMain ' Me.Appearance.BackColor = System.Drawing.Color.White @@ -514,5 +519,7 @@ Partial Class frmMain Friend WithEvents BarButtonItem17 As DevExpress.XtraBars.BarButtonItem Friend WithEvents groupQuickAccess As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents TimerClose3Minutes As System.Windows.Forms.Timer + Friend WithEvents groupQuickAccessForm As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents TimerScan As System.Windows.Forms.Timer End Class diff --git a/app/DD-Record-Organiser/frmMain.resx b/app/DD-Record-Organiser/frmMain.resx index 549c6f4..7b367c5 100644 --- a/app/DD-Record-Organiser/frmMain.resx +++ b/app/DD-Record-Organiser/frmMain.resx @@ -1690,6 +1690,9 @@ 1365, 17 + + 17, 56 + AAABAAEAgIUAAAEAGAD4zwAAFgAAACgAAACAAAAACgEAAAEAGAAAAAAAAAAAAEgAAABIAAAAAAAAAAAA diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index d2405b0..f04da16 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -49,17 +49,7 @@ Public Class frmMain LoadQuickStartItems() VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString - Try - Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", Environment.UserName) - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1, "Load ScanFiles") - If Not IsNothing(DT) Then - If DT.Rows.Count > 0 Then - frmScanFiles.Show() - End If - End If - Catch ex As Exception - MsgBox("Error in Load InBox Scan:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try + End Sub Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Try @@ -157,69 +147,80 @@ Public Class frmMain End Sub Public Sub LoadQuickStartItems() - Dim SQL2 As String = "SELECT * FROM TBPMO_FORM_CONSTRUCTOR ORDER BY SEQUENCE_MENU" - Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2) - Dim image2 As Bitmap = LoadNoImage() + Try + Dim SQL2 As String = "SELECT * FROM TBPMO_FORM_CONSTRUCTOR ORDER BY SEQUENCE_MENU" + Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2) + Dim image2 As Bitmap = LoadNoImage() - 'Do While 0 < groupQuickAccess.ItemLinks.Count - ' groupQuickAccess.ItemLinks.Remove(groupQuickAccess.ItemLinks(0)) - 'Loop + 'Do While 0 < groupQuickAccess.ItemLinks.Count + ' groupQuickAccess.ItemLinks.Remove(groupQuickAccess.ItemLinks(0)) + 'Loop - 'If dt.Rows.Count <> 0 Then + 'If dt.Rows.Count <> 0 Then - ' For Each row As DataRow In dt.Rows - ' If Not IsDBNull(row.Item("MENU_IMG")) Then - ' Dim bimg() As Byte = row.Item("MENU_IMG") - ' Dim bitmap As Bitmap = ByteArrayToBitmap(bimg) - ' image2 = bitmap - ' End If + ' For Each row As DataRow In dt.Rows + ' If Not IsDBNull(row.Item("MENU_IMG")) Then + ' Dim bimg() As Byte = row.Item("MENU_IMG") + ' Dim bitmap As Bitmap = ByteArrayToBitmap(bimg) + ' image2 = bitmap + ' End If - ' Dim title As String = row.Item("FORM_TITLE") - ' Dim index As Integer = row.Item("SEQUENCE_MENU") - ' Dim tag As Integer = row.Item("GUID") - ' Dim item As New BarButtonItem(ribbonMain.Manager, title) - ' item.RibbonStyle = RibbonItemStyles.Large - ' item.Caption = title - ' item.Tag = tag - ' item.Glyph = image2 + ' Dim title As String = row.Item("FORM_TITLE") + ' Dim index As Integer = row.Item("SEQUENCE_MENU") + ' Dim tag As Integer = row.Item("GUID") + ' Dim item As New BarButtonItem(ribbonMain.Manager, title) + ' item.RibbonStyle = RibbonItemStyles.Large + ' item.Caption = title + ' item.Tag = tag + ' item.Glyph = image2 - ' AddHandler item.ItemClick, AddressOf ToolbarButtonItemClick + ' AddHandler item.ItemClick, AddressOf ToolbarButtonItemClick - ' groupQuickAccess.ItemLinks.Add(item) + ' groupQuickAccess.ItemLinks.Add(item) - ' Next + ' Next - 'End If - - - Do While 0 < groupQuickAccess.ItemLinks.Count - groupQuickAccess.ItemLinks.Remove(groupQuickAccess.ItemLinks(0)) - Loop - - If dt.Rows.Count <> 0 Then - - For Each row As DataRow In dt.Rows - If Not IsDBNull(row.Item("MENU_IMG")) Then - Dim bimg() As Byte = row.Item("MENU_IMG") - Dim bitmap As Bitmap = ByteArrayToBitmap(bimg) - image2 = bitmap + 'End If + Try + If Not IsNothing(groupQuickAccessForm) Then + Do While 0 < groupQuickAccessForm.ItemLinks.Count + groupQuickAccessForm.ItemLinks.Remove(groupQuickAccessForm.ItemLinks(0)) + Loop End If + Catch ex As Exception - Dim title As String = row.Item("FORM_TITLE") - Dim index As Integer = row.Item("SEQUENCE_MENU") - Dim tag As Integer = row.Item("GUID") - Dim item As New BarButtonItem(ribbonMain.Manager, title) - item.RibbonStyle = RibbonItemStyles.Large - item.Caption = title - item.Tag = tag - item.Glyph = image2 + End Try + + - AddHandler item.ItemClick, AddressOf ToolbarButtonItemClick - groupQuickAccess.ItemLinks.Add(item) + If dt.Rows.Count <> 0 Then - Next + For Each row As DataRow In dt.Rows + If Not IsDBNull(row.Item("MENU_IMG")) Then + Dim bimg() As Byte = row.Item("MENU_IMG") + Dim bitmap As Bitmap = ByteArrayToBitmap(bimg) + image2 = bitmap + End If - End If + Dim title As String = row.Item("FORM_TITLE") + Dim index As Integer = row.Item("SEQUENCE_MENU") + Dim tag As Integer = row.Item("GUID") + Dim item As New BarButtonItem(ribbonMain.Manager, title) + item.RibbonStyle = RibbonItemStyles.Large + item.Caption = title + item.Tag = tag + item.Glyph = image2 + + AddHandler item.ItemClick, AddressOf ToolbarButtonItemClick + groupQuickAccessForm.ItemLinks.Add(item) + + Next + + End If + Catch ex As Exception + MsgBox("Unexpected Error in Load QuickStart-Items:" & vbNewLine & ex.Message) + End Try + End Sub @@ -356,6 +357,7 @@ Public Class frmMain Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown Refresh_TaskReminder() Timer1.Start() + TimerScan.Start() If Sett_ConstructorStart <> 0 Then Cursor = Cursors.WaitCursor OpenFormConstructor(Sett_ConstructorStart) @@ -542,4 +544,41 @@ Public Class frmMain End Try End Select End Sub + + Private Sub TimerScan_Tick(sender As Object, e As EventArgs) Handles TimerScan.Tick + Check_Scan() + End Sub + Sub Check_scan() + Try + Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", Environment.UserName) + Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1, "Load ScanFiles") + If Not IsNothing(DT) Then + If DT.Rows.Count > 0 Then + Dim open As Boolean = False + For Each form In My.Application.OpenForms + If (form.name = frmScanFiles.Name) Then + 'form is loaded so can do work + 'if you need to check whether it is actually visible + If form.Visible Then + open = True + 'do work when visible + If My.Settings.User_InBoxScan_NotinFront = False Then + frmScanFiles.BringToFront() + End If + Else + + End If + End If + Next + If open = False Then + Dim frm As New frmScanFiles + frm = frmScanFiles.Instance() + frm.Show() + End If + End If + End If + Catch ex As Exception + MsgBox("Error in Load InBox Scan:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub End Class diff --git a/app/DD-Record-Organiser/frmScanFiles.Designer.vb b/app/DD-Record-Organiser/frmScanFiles.Designer.vb index 85412b4..2fd03f1 100644 --- a/app/DD-Record-Organiser/frmScanFiles.Designer.vb +++ b/app/DD-Record-Organiser/frmScanFiles.Designer.vb @@ -68,13 +68,12 @@ Partial Class frmScanFiles Me.PdfBarController1 = New DevExpress.XtraPdfViewer.Bars.PdfBarController() Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController() Me.btndelete = New System.Windows.Forms.Button() - Me.ImageListBoxControl1 = New DevExpress.XtraEditors.ImageListBoxControl() + Me.chkInFront = New System.Windows.Forms.CheckBox() Me.Panel1.SuspendLayout() Me.StatusStrip2.SuspendLayout() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PdfBarController1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PdfBarController2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ImageListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ListView1 @@ -96,7 +95,7 @@ Partial Class frmScanFiles ' 'ColumnHeader2 ' - Me.ColumnHeader2.Text = "Datei - Drag and Drop fähig" + Me.ColumnHeader2.Text = "Scandatei - Drag and Drop fähig" Me.ColumnHeader2.Width = 315 ' 'ImageList1 @@ -385,28 +384,33 @@ Partial Class frmScanFiles Me.btndelete.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btndelete.UseVisualStyleBackColor = True ' - 'ImageListBoxControl1 + 'chkInFront ' - Me.ImageListBoxControl1.Location = New System.Drawing.Point(26, 269) - Me.ImageListBoxControl1.Name = "ImageListBoxControl1" - Me.ImageListBoxControl1.Size = New System.Drawing.Size(293, 194) - Me.ImageListBoxControl1.TabIndex = 5 + Me.chkInFront.AutoSize = True + Me.chkInFront.Checked = Global.DD_Record_Organiser.My.MySettings.Default.User_InBoxScan_NotinFront + Me.chkInFront.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.DD_Record_Organiser.My.MySettings.Default, "User_InBoxScan_NotinFront", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.chkInFront.Location = New System.Drawing.Point(12, 256) + Me.chkInFront.Name = "chkInFront" + Me.chkInFront.Size = New System.Drawing.Size(193, 17) + Me.chkInFront.TabIndex = 5 + Me.chkInFront.Text = "Inaktiviere ""In den Vordergrund""" + Me.chkInFront.UseVisualStyleBackColor = True ' 'frmScanFiles ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(934, 577) - Me.Controls.Add(Me.ImageListBoxControl1) + Me.Controls.Add(Me.chkInFront) Me.Controls.Add(Me.btndelete) Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.btnrefresh) Me.Controls.Add(Me.ListView1) Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.MaximizeBox = False Me.Name = "frmScanFiles" - Me.Text = "Inbox - Scanned Files" - Me.TopMost = True + Me.Text = "Inbox - Scan" Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() Me.StatusStrip2.ResumeLayout(False) @@ -414,8 +418,8 @@ Partial Class frmScanFiles CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PdfBarController1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PdfBarController2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ImageListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents ListView1 As System.Windows.Forms.ListView @@ -462,5 +466,5 @@ Partial Class frmScanFiles Friend WithEvents PdfFormDataBarPageGroup1 As DevExpress.XtraPdfViewer.Bars.PdfFormDataBarPageGroup Friend WithEvents PdfBarController2 As DevExpress.XtraPdfViewer.Bars.PdfBarController Friend WithEvents btndelete As System.Windows.Forms.Button - Friend WithEvents ImageListBoxControl1 As DevExpress.XtraEditors.ImageListBoxControl + Friend WithEvents chkInFront As System.Windows.Forms.CheckBox End Class diff --git a/app/DD-Record-Organiser/frmScanFiles.resx b/app/DD-Record-Organiser/frmScanFiles.resx index 0aaf057..8635dc1 100644 --- a/app/DD-Record-Organiser/frmScanFiles.resx +++ b/app/DD-Record-Organiser/frmScanFiles.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADm - BwAAAk1TRnQBSQFMAwEBAAGQAQABkAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + BwAAAk1TRnQBSQFMAwEBAAHAAQABwAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm diff --git a/app/DD-Record-Organiser/frmScanFiles.vb b/app/DD-Record-Organiser/frmScanFiles.vb index 28edab0..0251549 100644 --- a/app/DD-Record-Organiser/frmScanFiles.vb +++ b/app/DD-Record-Organiser/frmScanFiles.vb @@ -1,8 +1,17 @@ Imports System.IO Public Class frmScanFiles + Dim DragID Dim MouseIsDown As Boolean = False + Private Shared _Instance As frmScanFiles = Nothing + Public Shared Function Instance() As frmScanFiles + If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then + _Instance = New frmScanFiles + End If + _Instance.BringToFront() + Return _Instance + End Function Private Sub frmScanFiles_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing ClassWindowLocation.SaveFormLocationSize(Me, 9999, CURRENT_SCREEN_ID, Me.Name) End Sub @@ -28,6 +37,7 @@ Public Class frmScanFiles If extension.Contains("pdf") Then 'Add the file to the ListView, with the executable path as the key to the ImageList's image ListView1.Items.Add(filename, 0) + Else ListView1.Items.Add(filename) End If @@ -138,7 +148,15 @@ Public Class frmScanFiles Catch ex As Exception MsgBox("Unexpected Error in Delete Scanfile:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - + End Sub + + Private Sub frmScanFiles_Shown(sender As Object, e As EventArgs) Handles Me.Shown + Me.BringToFront() + End Sub + + Private Sub chkInFront_CheckedChanged(sender As Object, e As EventArgs) Handles chkInFront.CheckedChanged + My.Settings.Save() + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmWiedervorlage.Designer.vb b/app/DD-Record-Organiser/frmWiedervorlage.Designer.vb index 7c1a9eb..802665f 100644 --- a/app/DD-Record-Organiser/frmWiedervorlage.Designer.vb +++ b/app/DD-Record-Organiser/frmWiedervorlage.Designer.vb @@ -45,9 +45,14 @@ Partial Class frmWiedervorlage Dim PROCESS_SELECT4Label As System.Windows.Forms.Label Dim PROCESS_SELECT5Label As System.Windows.Forms.Label Dim Label6 As System.Windows.Forms.Label + Dim Label8 As System.Windows.Forms.Label Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWiedervorlage)) Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.cmbConstructor = New System.Windows.Forms.ComboBox() + Me.TBPMO_FOLLOW_UP_EMAILBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() + Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.ListBoxUser2Profile = New System.Windows.Forms.ListBox() Me.Label5 = New System.Windows.Forms.Label() @@ -55,8 +60,6 @@ Partial Class frmWiedervorlage Me.btnAddUser_WV = New System.Windows.Forms.Button() Me.btndelete = New System.Windows.Forms.Button() Me.FOLLOW_UP_DAYSTextBox = New System.Windows.Forms.TextBox() - Me.TBPMO_FOLLOW_UP_EMAILBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.chkSonntag = New System.Windows.Forms.CheckBox() Me.CheckBox1 = New System.Windows.Forms.CheckBox() @@ -116,6 +119,7 @@ Partial Class frmWiedervorlage Me.Label7 = New System.Windows.Forms.Label() Me.TBPMO_FOLLOW_UP_EMAILTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FOLLOW_UP_EMAILTableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() + Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter() GUIDLabel = New System.Windows.Forms.Label() FOLLOW_UP_SEQUENCELabel = New System.Windows.Forms.Label() FOLLOW_UP_TIME_SPANLabel = New System.Windows.Forms.Label() @@ -138,12 +142,14 @@ Partial Class frmWiedervorlage PROCESS_SELECT4Label = New System.Windows.Forms.Label() PROCESS_SELECT5Label = New System.Windows.Forms.Label() Label6 = New System.Windows.Forms.Label() + Label8 = New System.Windows.Forms.Label() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPage1.SuspendLayout() - Me.GroupBox3.SuspendLayout() CType(Me.TBPMO_FOLLOW_UP_EMAILBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox3.SuspendLayout() Me.GroupBox1.SuspendLayout() CType(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.SuspendLayout() @@ -176,7 +182,7 @@ Partial Class frmWiedervorlage FOLLOW_UP_TIME_SPANLabel.AutoSize = True FOLLOW_UP_TIME_SPANLabel.Location = New System.Drawing.Point(620, 99) FOLLOW_UP_TIME_SPANLabel.Name = "FOLLOW_UP_TIME_SPANLabel" - FOLLOW_UP_TIME_SPANLabel.Size = New System.Drawing.Size(60, 13) + FOLLOW_UP_TIME_SPANLabel.Size = New System.Drawing.Size(57, 13) FOLLOW_UP_TIME_SPANLabel.TabIndex = 8 FOLLOW_UP_TIME_SPANLabel.Text = "Uhrzeiten:" ' @@ -186,7 +192,7 @@ Partial Class frmWiedervorlage DEPENDENT_DATE_CTRL_IDLabel.ForeColor = System.Drawing.Color.OrangeRed DEPENDENT_DATE_CTRL_IDLabel.Location = New System.Drawing.Point(356, 150) DEPENDENT_DATE_CTRL_IDLabel.Name = "DEPENDENT_DATE_CTRL_IDLabel" - DEPENDENT_DATE_CTRL_IDLabel.Size = New System.Drawing.Size(87, 13) + DEPENDENT_DATE_CTRL_IDLabel.Size = New System.Drawing.Size(81, 13) DEPENDENT_DATE_CTRL_IDLabel.TabIndex = 10 DEPENDENT_DATE_CTRL_IDLabel.Text = "Datum-Control:" ' @@ -196,7 +202,7 @@ Partial Class frmWiedervorlage DEPENDENT_DONE_CTRL_IDLabel.ForeColor = System.Drawing.Color.OrangeRed DEPENDENT_DONE_CTRL_IDLabel.Location = New System.Drawing.Point(551, 148) DEPENDENT_DONE_CTRL_IDLabel.Name = "DEPENDENT_DONE_CTRL_IDLabel" - DEPENDENT_DONE_CTRL_IDLabel.Size = New System.Drawing.Size(92, 13) + DEPENDENT_DONE_CTRL_IDLabel.Size = New System.Drawing.Size(85, 13) DEPENDENT_DONE_CTRL_IDLabel.TabIndex = 12 DEPENDENT_DONE_CTRL_IDLabel.Text = "Erledigt Control:" ' @@ -205,7 +211,7 @@ Partial Class frmWiedervorlage PARENT_IDLabel.AutoSize = True PARENT_IDLabel.Location = New System.Drawing.Point(64, 190) PARENT_IDLabel.Name = "PARENT_IDLabel" - PARENT_IDLabel.Size = New System.Drawing.Size(123, 13) + PARENT_IDLabel.Size = New System.Drawing.Size(116, 13) PARENT_IDLabel.TabIndex = 14 PARENT_IDLabel.Text = "Nachfolgevorlage von:" ' @@ -214,7 +220,7 @@ Partial Class frmWiedervorlage TIME_UNITYLabel.AutoSize = True TIME_UNITYLabel.Location = New System.Drawing.Point(137, 149) TIME_UNITYLabel.Name = "TIME_UNITYLabel" - TIME_UNITYLabel.Size = New System.Drawing.Size(68, 13) + TIME_UNITYLabel.Size = New System.Drawing.Size(64, 13) TIME_UNITYLabel.TabIndex = 16 TIME_UNITYLabel.Text = "Zeit Einheit:" ' @@ -223,7 +229,7 @@ Partial Class frmWiedervorlage TIME_SPANLabel.AutoSize = True TIME_SPANLabel.Location = New System.Drawing.Point(64, 149) TIME_SPANLabel.Name = "TIME_SPANLabel" - TIME_SPANLabel.Size = New System.Drawing.Size(70, 13) + TIME_SPANLabel.Size = New System.Drawing.Size(67, 13) TIME_SPANLabel.TabIndex = 18 TIME_SPANLabel.Text = "Zeit Distanz:" ' @@ -232,7 +238,7 @@ Partial Class frmWiedervorlage TIME_DISTLabel.AutoSize = True TIME_DISTLabel.Location = New System.Drawing.Point(229, 149) TIME_DISTLabel.Name = "TIME_DISTLabel" - TIME_DISTLabel.Size = New System.Drawing.Size(96, 13) + TIME_DISTLabel.Size = New System.Drawing.Size(89, 13) TIME_DISTLabel.TabIndex = 22 TIME_DISTLabel.Text = "Zeit-Abhängikeit:" ' @@ -281,7 +287,7 @@ Partial Class frmWiedervorlage NAMELabel.AutoSize = True NAMELabel.Location = New System.Drawing.Point(64, 59) NAMELabel.Name = "NAMELabel" - NAMELabel.Size = New System.Drawing.Size(77, 13) + NAMELabel.Size = New System.Drawing.Size(71, 13) NAMELabel.TabIndex = 78 NAMELabel.Text = "Bezeichnung:" ' @@ -290,7 +296,7 @@ Partial Class frmWiedervorlage EMAIL_SUBJECTLabel.AutoSize = True EMAIL_SUBJECTLabel.Location = New System.Drawing.Point(64, 230) EMAIL_SUBJECTLabel.Name = "EMAIL_SUBJECTLabel" - EMAIL_SUBJECTLabel.Size = New System.Drawing.Size(76, 13) + EMAIL_SUBJECTLabel.Size = New System.Drawing.Size(73, 13) EMAIL_SUBJECTLabel.TabIndex = 80 EMAIL_SUBJECTLabel.Text = "Email-Betreff:" ' @@ -299,7 +305,7 @@ Partial Class frmWiedervorlage EMAIL_BODYLabel.AutoSize = True EMAIL_BODYLabel.Location = New System.Drawing.Point(64, 271) EMAIL_BODYLabel.Name = "EMAIL_BODYLabel" - EMAIL_BODYLabel.Size = New System.Drawing.Size(67, 13) + EMAIL_BODYLabel.Size = New System.Drawing.Size(63, 13) EMAIL_BODYLabel.TabIndex = 81 EMAIL_BODYLabel.Text = "Email-Body:" ' @@ -308,7 +314,7 @@ Partial Class frmWiedervorlage PROCESS_SELECT1Label.AutoSize = True PROCESS_SELECT1Label.Location = New System.Drawing.Point(551, 230) PROCESS_SELECT1Label.Name = "PROCESS_SELECT1Label" - PROCESS_SELECT1Label.Size = New System.Drawing.Size(102, 13) + PROCESS_SELECT1Label.Size = New System.Drawing.Size(104, 13) PROCESS_SELECT1Label.TabIndex = 82 PROCESS_SELECT1Label.Text = "Select [%pattern1]:" ' @@ -317,7 +323,7 @@ Partial Class frmWiedervorlage PROCESS_SELECT2Label.AutoSize = True PROCESS_SELECT2Label.Location = New System.Drawing.Point(551, 271) PROCESS_SELECT2Label.Name = "PROCESS_SELECT2Label" - PROCESS_SELECT2Label.Size = New System.Drawing.Size(102, 13) + PROCESS_SELECT2Label.Size = New System.Drawing.Size(104, 13) PROCESS_SELECT2Label.TabIndex = 83 PROCESS_SELECT2Label.Text = "Select [%pattern2]:" ' @@ -326,7 +332,7 @@ Partial Class frmWiedervorlage PROCESS_SELECT3Label.AutoSize = True PROCESS_SELECT3Label.Location = New System.Drawing.Point(551, 312) PROCESS_SELECT3Label.Name = "PROCESS_SELECT3Label" - PROCESS_SELECT3Label.Size = New System.Drawing.Size(102, 13) + PROCESS_SELECT3Label.Size = New System.Drawing.Size(104, 13) PROCESS_SELECT3Label.TabIndex = 84 PROCESS_SELECT3Label.Text = "Select [%pattern3]:" ' @@ -335,7 +341,7 @@ Partial Class frmWiedervorlage PROCESS_SELECT4Label.AutoSize = True PROCESS_SELECT4Label.Location = New System.Drawing.Point(551, 353) PROCESS_SELECT4Label.Name = "PROCESS_SELECT4Label" - PROCESS_SELECT4Label.Size = New System.Drawing.Size(102, 13) + PROCESS_SELECT4Label.Size = New System.Drawing.Size(104, 13) PROCESS_SELECT4Label.TabIndex = 85 PROCESS_SELECT4Label.Text = "Select [%pattern4]:" ' @@ -344,7 +350,7 @@ Partial Class frmWiedervorlage PROCESS_SELECT5Label.AutoSize = True PROCESS_SELECT5Label.Location = New System.Drawing.Point(551, 394) PROCESS_SELECT5Label.Name = "PROCESS_SELECT5Label" - PROCESS_SELECT5Label.Size = New System.Drawing.Size(102, 13) + PROCESS_SELECT5Label.Size = New System.Drawing.Size(104, 13) PROCESS_SELECT5Label.TabIndex = 92 PROCESS_SELECT5Label.Text = "Select [%pattern5]:" ' @@ -358,6 +364,15 @@ Partial Class frmWiedervorlage Label6.TabIndex = 102 Label6.Text = "Tage:" ' + 'Label8 + ' + Label8.AutoSize = True + Label8.Location = New System.Drawing.Point(441, 59) + Label8.Name = "Label8" + Label8.Size = New System.Drawing.Size(172, 13) + Label8.TabIndex = 105 + Label8.Text = "Constructor für Jump To Function:" + ' 'XtraTabControl1 ' Me.XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer)) @@ -376,6 +391,8 @@ Partial Class frmWiedervorlage 'XtraTabPage1 ' Me.XtraTabPage1.AutoScroll = True + Me.XtraTabPage1.Controls.Add(Label8) + Me.XtraTabPage1.Controls.Add(Me.cmbConstructor) Me.XtraTabPage1.Controls.Add(Me.GroupBox3) Me.XtraTabPage1.Controls.Add(Label6) Me.XtraTabPage1.Controls.Add(Me.FOLLOW_UP_DAYSTextBox) @@ -429,9 +446,36 @@ Partial Class frmWiedervorlage Me.XtraTabPage1.Controls.Add(Me.Label1) Me.XtraTabPage1.Controls.Add(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(991, 617) + Me.XtraTabPage1.Size = New System.Drawing.Size(987, 614) Me.XtraTabPage1.Text = "Wiedervorlage per E-Mail" ' + 'cmbConstructor + ' + Me.cmbConstructor.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "CONSTRUCTOR_ID", True)) + Me.cmbConstructor.DataSource = Me.TBPMO_FORM_CONSTRUCTORBindingSource + Me.cmbConstructor.DisplayMember = "FORM_TITLE" + Me.cmbConstructor.FormattingEnabled = True + Me.cmbConstructor.Location = New System.Drawing.Point(444, 76) + Me.cmbConstructor.Name = "cmbConstructor" + Me.cmbConstructor.Size = New System.Drawing.Size(259, 21) + Me.cmbConstructor.TabIndex = 104 + Me.cmbConstructor.ValueMember = "GUID" + ' + 'TBPMO_FOLLOW_UP_EMAILBindingSource + ' + Me.TBPMO_FOLLOW_UP_EMAILBindingSource.DataMember = "TBPMO_FOLLOW_UP_EMAIL" + Me.TBPMO_FOLLOW_UP_EMAILBindingSource.DataSource = Me.DD_DMSDataSet + ' + 'DD_DMSDataSet + ' + Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" + Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' + 'TBPMO_FORM_CONSTRUCTORBindingSource + ' + Me.TBPMO_FORM_CONSTRUCTORBindingSource.DataMember = "TBPMO_FORM_CONSTRUCTOR" + Me.TBPMO_FORM_CONSTRUCTORBindingSource.DataSource = Me.DD_DMSDataSet + ' 'GroupBox3 ' Me.GroupBox3.Controls.Add(Me.ListBoxUser2Profile) @@ -514,20 +558,10 @@ Partial Class frmWiedervorlage Me.FOLLOW_UP_DAYSTextBox.Location = New System.Drawing.Point(554, 545) Me.FOLLOW_UP_DAYSTextBox.Name = "FOLLOW_UP_DAYSTextBox" Me.FOLLOW_UP_DAYSTextBox.ReadOnly = True - Me.FOLLOW_UP_DAYSTextBox.Size = New System.Drawing.Size(99, 22) + Me.FOLLOW_UP_DAYSTextBox.Size = New System.Drawing.Size(99, 21) Me.FOLLOW_UP_DAYSTextBox.TabIndex = 101 Me.FOLLOW_UP_DAYSTextBox.TabStop = False ' - 'TBPMO_FOLLOW_UP_EMAILBindingSource - ' - Me.TBPMO_FOLLOW_UP_EMAILBindingSource.DataMember = "TBPMO_FOLLOW_UP_EMAIL" - Me.TBPMO_FOLLOW_UP_EMAILBindingSource.DataSource = Me.DD_DMSDataSet - ' - 'DD_DMSDataSet - ' - Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" - Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' 'GroupBox1 ' Me.GroupBox1.Controls.Add(Me.chkSonntag) @@ -549,7 +583,7 @@ Partial Class frmWiedervorlage Me.chkSonntag.AutoSize = True Me.chkSonntag.Location = New System.Drawing.Point(472, 18) Me.chkSonntag.Name = "chkSonntag" - Me.chkSonntag.Size = New System.Drawing.Size(70, 17) + Me.chkSonntag.Size = New System.Drawing.Size(66, 17) Me.chkSonntag.TabIndex = 100 Me.chkSonntag.Text = "Sonntag" Me.chkSonntag.UseVisualStyleBackColor = True @@ -559,7 +593,7 @@ Partial Class frmWiedervorlage Me.CheckBox1.AutoSize = True Me.CheckBox1.Location = New System.Drawing.Point(10, 18) Me.CheckBox1.Name = "CheckBox1" - Me.CheckBox1.Size = New System.Drawing.Size(67, 17) + Me.CheckBox1.Size = New System.Drawing.Size(62, 17) Me.CheckBox1.TabIndex = 94 Me.CheckBox1.Text = "Montag" Me.CheckBox1.UseVisualStyleBackColor = True @@ -569,7 +603,7 @@ Partial Class frmWiedervorlage Me.chkSamstag.AutoSize = True Me.chkSamstag.Location = New System.Drawing.Point(402, 18) Me.chkSamstag.Name = "chkSamstag" - Me.chkSamstag.Size = New System.Drawing.Size(69, 17) + Me.chkSamstag.Size = New System.Drawing.Size(67, 17) Me.chkSamstag.TabIndex = 99 Me.chkSamstag.Text = "Samstag" Me.chkSamstag.UseVisualStyleBackColor = True @@ -579,7 +613,7 @@ Partial Class frmWiedervorlage Me.chkDienstag.AutoSize = True Me.chkDienstag.Location = New System.Drawing.Point(83, 18) Me.chkDienstag.Name = "chkDienstag" - Me.chkDienstag.Size = New System.Drawing.Size(72, 17) + Me.chkDienstag.Size = New System.Drawing.Size(68, 17) Me.chkDienstag.TabIndex = 95 Me.chkDienstag.Text = "Dienstag" Me.chkDienstag.UseVisualStyleBackColor = True @@ -589,7 +623,7 @@ Partial Class frmWiedervorlage Me.chkFreitag.AutoSize = True Me.chkFreitag.Location = New System.Drawing.Point(335, 18) Me.chkFreitag.Name = "chkFreitag" - Me.chkFreitag.Size = New System.Drawing.Size(62, 17) + Me.chkFreitag.Size = New System.Drawing.Size(60, 17) Me.chkFreitag.TabIndex = 98 Me.chkFreitag.Text = "Freitag" Me.chkFreitag.UseVisualStyleBackColor = True @@ -599,7 +633,7 @@ Partial Class frmWiedervorlage Me.chkMittwoch.AutoSize = True Me.chkMittwoch.Location = New System.Drawing.Point(162, 18) Me.chkMittwoch.Name = "chkMittwoch" - Me.chkMittwoch.Size = New System.Drawing.Size(75, 17) + Me.chkMittwoch.Size = New System.Drawing.Size(69, 17) Me.chkMittwoch.TabIndex = 96 Me.chkMittwoch.Text = "Mittwoch" Me.chkMittwoch.UseVisualStyleBackColor = True @@ -609,7 +643,7 @@ Partial Class frmWiedervorlage Me.chkDonnerstag.AutoSize = True Me.chkDonnerstag.Location = New System.Drawing.Point(243, 18) Me.chkDonnerstag.Name = "chkDonnerstag" - Me.chkDonnerstag.Size = New System.Drawing.Size(87, 17) + Me.chkDonnerstag.Size = New System.Drawing.Size(82, 17) Me.chkDonnerstag.TabIndex = 97 Me.chkDonnerstag.Text = "Donnerstag" Me.chkDonnerstag.UseVisualStyleBackColor = True @@ -619,7 +653,7 @@ Partial Class frmWiedervorlage Me.PROCESS_SELECT5TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT5", True)) Me.PROCESS_SELECT5TextBox.Location = New System.Drawing.Point(554, 410) Me.PROCESS_SELECT5TextBox.Name = "PROCESS_SELECT5TextBox" - Me.PROCESS_SELECT5TextBox.Size = New System.Drawing.Size(420, 22) + Me.PROCESS_SELECT5TextBox.Size = New System.Drawing.Size(420, 21) Me.PROCESS_SELECT5TextBox.TabIndex = 93 ' 'Label4 @@ -627,7 +661,7 @@ Partial Class frmWiedervorlage Me.Label4.AutoSize = True Me.Label4.Location = New System.Drawing.Point(706, 26) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(119, 13) + Me.Label4.Size = New System.Drawing.Size(111, 13) Me.Label4.TabIndex = 88 Me.Label4.Text = "Wiedervorlageprofile:" ' @@ -636,7 +670,7 @@ Partial Class frmWiedervorlage Me.PROCESS_SELECT4TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT4", True)) Me.PROCESS_SELECT4TextBox.Location = New System.Drawing.Point(554, 369) Me.PROCESS_SELECT4TextBox.Name = "PROCESS_SELECT4TextBox" - Me.PROCESS_SELECT4TextBox.Size = New System.Drawing.Size(420, 22) + Me.PROCESS_SELECT4TextBox.Size = New System.Drawing.Size(420, 21) Me.PROCESS_SELECT4TextBox.TabIndex = 15 ' 'PROCESS_SELECT3TextBox @@ -644,7 +678,7 @@ Partial Class frmWiedervorlage Me.PROCESS_SELECT3TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT3", True)) Me.PROCESS_SELECT3TextBox.Location = New System.Drawing.Point(554, 328) Me.PROCESS_SELECT3TextBox.Name = "PROCESS_SELECT3TextBox" - Me.PROCESS_SELECT3TextBox.Size = New System.Drawing.Size(420, 22) + Me.PROCESS_SELECT3TextBox.Size = New System.Drawing.Size(420, 21) Me.PROCESS_SELECT3TextBox.TabIndex = 14 ' 'PROCESS_SELECT2TextBox @@ -652,7 +686,7 @@ Partial Class frmWiedervorlage Me.PROCESS_SELECT2TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT2", True)) Me.PROCESS_SELECT2TextBox.Location = New System.Drawing.Point(554, 287) Me.PROCESS_SELECT2TextBox.Name = "PROCESS_SELECT2TextBox" - Me.PROCESS_SELECT2TextBox.Size = New System.Drawing.Size(420, 22) + Me.PROCESS_SELECT2TextBox.Size = New System.Drawing.Size(420, 21) Me.PROCESS_SELECT2TextBox.TabIndex = 13 ' 'PROCESS_SELECT1TextBox @@ -660,7 +694,7 @@ Partial Class frmWiedervorlage Me.PROCESS_SELECT1TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "PROCESS_SELECT1", True)) Me.PROCESS_SELECT1TextBox.Location = New System.Drawing.Point(554, 246) Me.PROCESS_SELECT1TextBox.Name = "PROCESS_SELECT1TextBox" - Me.PROCESS_SELECT1TextBox.Size = New System.Drawing.Size(420, 22) + Me.PROCESS_SELECT1TextBox.Size = New System.Drawing.Size(420, 21) Me.PROCESS_SELECT1TextBox.TabIndex = 12 ' 'EMAIL_BODYTextBox @@ -679,7 +713,7 @@ Partial Class frmWiedervorlage Me.EMAIL_SUBJECTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "EMAIL_SUBJECT", True)) Me.EMAIL_SUBJECTTextBox.Location = New System.Drawing.Point(67, 246) Me.EMAIL_SUBJECTTextBox.Name = "EMAIL_SUBJECTTextBox" - Me.EMAIL_SUBJECTTextBox.Size = New System.Drawing.Size(479, 22) + Me.EMAIL_SUBJECTTextBox.Size = New System.Drawing.Size(479, 21) Me.EMAIL_SUBJECTTextBox.TabIndex = 10 ' 'NAMETextBox @@ -687,7 +721,7 @@ Partial Class frmWiedervorlage Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "NAME", True)) Me.NAMETextBox.Location = New System.Drawing.Point(67, 74) Me.NAMETextBox.Name = "NAMETextBox" - Me.NAMETextBox.Size = New System.Drawing.Size(227, 22) + Me.NAMETextBox.Size = New System.Drawing.Size(227, 21) Me.NAMETextBox.TabIndex = 0 ' 'ListBox1 @@ -704,11 +738,10 @@ Partial Class frmWiedervorlage ' 'lblSaveWVEmail ' - Me.lblSaveWVEmail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblSaveWVEmail.AutoSize = True Me.lblSaveWVEmail.BackColor = System.Drawing.Color.Yellow Me.lblSaveWVEmail.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblSaveWVEmail.Location = New System.Drawing.Point(724, 196) + Me.lblSaveWVEmail.Location = New System.Drawing.Point(706, 192) Me.lblSaveWVEmail.Name = "lblSaveWVEmail" Me.lblSaveWVEmail.Size = New System.Drawing.Size(219, 17) Me.lblSaveWVEmail.TabIndex = 78 @@ -772,7 +805,7 @@ Partial Class frmWiedervorlage 'ACTIVECheckBox ' Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "ACTIVE", True)) - Me.ACTIVECheckBox.Location = New System.Drawing.Point(469, 72) + Me.ACTIVECheckBox.Location = New System.Drawing.Point(623, 26) Me.ACTIVECheckBox.Name = "ACTIVECheckBox" Me.ACTIVECheckBox.Size = New System.Drawing.Size(58, 24) Me.ACTIVECheckBox.TabIndex = 21 @@ -785,7 +818,7 @@ Partial Class frmWiedervorlage Me.TIME_SPANTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "TIME_SPAN", True)) Me.TIME_SPANTextBox.Location = New System.Drawing.Point(67, 165) Me.TIME_SPANTextBox.Name = "TIME_SPANTextBox" - Me.TIME_SPANTextBox.Size = New System.Drawing.Size(67, 22) + Me.TIME_SPANTextBox.Size = New System.Drawing.Size(67, 21) Me.TIME_SPANTextBox.TabIndex = 4 ' 'TIME_UNITYComboBox @@ -836,7 +869,7 @@ Partial Class frmWiedervorlage Me.FOLLOW_UP_TIME_SPANTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FOLLOW_UP_EMAILBindingSource, "FOLLOW_UP_TIME_SPAN", True)) Me.FOLLOW_UP_TIME_SPANTextBox.Location = New System.Drawing.Point(623, 120) Me.FOLLOW_UP_TIME_SPANTextBox.Name = "FOLLOW_UP_TIME_SPANTextBox" - Me.FOLLOW_UP_TIME_SPANTextBox.Size = New System.Drawing.Size(80, 22) + Me.FOLLOW_UP_TIME_SPANTextBox.Size = New System.Drawing.Size(80, 21) Me.FOLLOW_UP_TIME_SPANTextBox.TabIndex = 3 ' 'FOLLOW_UP_SEQUENCEComboBox @@ -886,7 +919,7 @@ Partial Class frmWiedervorlage Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.Name = "TBPMO_FOLLOW_UP_EMAILBindingNavigator" Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem - Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.Size = New System.Drawing.Size(991, 25) + Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.Size = New System.Drawing.Size(987, 25) Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.TabIndex = 1 Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator.Text = "BindingNavigator1" ' @@ -1021,7 +1054,7 @@ Partial Class frmWiedervorlage Me.Label2.AutoSize = True Me.Label2.Location = New System.Drawing.Point(8, 16) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(283, 13) + Me.Label2.Size = New System.Drawing.Size(261, 13) Me.Label2.TabIndex = 3 Me.Label2.Text = "Email-Profil zur Versendung der Wiedervorlage Emails" ' @@ -1030,7 +1063,7 @@ Partial Class frmWiedervorlage Me.chkbxLogErrorsonly.AutoSize = True Me.chkbxLogErrorsonly.Location = New System.Drawing.Point(11, 69) Me.chkbxLogErrorsonly.Name = "chkbxLogErrorsonly" - Me.chkbxLogErrorsonly.Size = New System.Drawing.Size(152, 17) + Me.chkbxLogErrorsonly.Size = New System.Drawing.Size(147, 17) Me.chkbxLogErrorsonly.TabIndex = 1 Me.chkbxLogErrorsonly.Text = "Log Errors Only (Ja/Nein)" Me.chkbxLogErrorsonly.UseVisualStyleBackColor = True @@ -1067,9 +1100,9 @@ Partial Class frmWiedervorlage ' Me.ListBox2.Dock = System.Windows.Forms.DockStyle.Fill Me.ListBox2.FormattingEnabled = True - Me.ListBox2.Location = New System.Drawing.Point(3, 18) + Me.ListBox2.Location = New System.Drawing.Point(3, 17) Me.ListBox2.Name = "ListBox2" - Me.ListBox2.Size = New System.Drawing.Size(464, 560) + Me.ListBox2.Size = New System.Drawing.Size(464, 561) Me.ListBox2.TabIndex = 0 ' 'Label7 @@ -1077,7 +1110,7 @@ Partial Class frmWiedervorlage Me.Label7.AutoSize = True Me.Label7.Location = New System.Drawing.Point(11, 9) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(414, 13) + Me.Label7.Size = New System.Drawing.Size(378, 13) Me.Label7.TabIndex = 0 Me.Label7.Text = "Folgende Wiedervorlagen werden aktuell auf Ausführungsgültigkeit überprüft" ' @@ -1117,6 +1150,10 @@ Partial Class frmWiedervorlage Me.TableAdapterManager.TBPMO_WORKFLOWTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' + 'TBPMO_FORM_CONSTRUCTORTableAdapter + ' + Me.TBPMO_FORM_CONSTRUCTORTableAdapter.ClearBeforeFill = True + ' 'frmWiedervorlage ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1131,10 +1168,11 @@ Partial Class frmWiedervorlage Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabPage1.ResumeLayout(False) Me.XtraTabPage1.PerformLayout() - Me.GroupBox3.ResumeLayout(False) - Me.GroupBox3.PerformLayout() CType(Me.TBPMO_FOLLOW_UP_EMAILBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupBox3.ResumeLayout(False) + Me.GroupBox3.PerformLayout() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() CType(Me.TBPMO_FOLLOW_UP_EMAILBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit() @@ -1218,4 +1256,7 @@ Partial Class frmWiedervorlage Friend WithEvents Label7 As System.Windows.Forms.Label Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox Friend WithEvents Label3 As System.Windows.Forms.Label + Friend WithEvents cmbConstructor As System.Windows.Forms.ComboBox + Friend WithEvents TBPMO_FORM_CONSTRUCTORBindingSource As System.Windows.Forms.BindingSource + Friend WithEvents TBPMO_FORM_CONSTRUCTORTableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter End Class diff --git a/app/DD-Record-Organiser/frmWiedervorlage.resx b/app/DD-Record-Organiser/frmWiedervorlage.resx index b82d914..6507808 100644 --- a/app/DD-Record-Organiser/frmWiedervorlage.resx +++ b/app/DD-Record-Organiser/frmWiedervorlage.resx @@ -183,12 +183,18 @@ False + + False + 160, 17 17, 17 + + 17, 56 + 896, 17 @@ -270,6 +276,9 @@ 723, 17 + + 318, 56 + AAABAAgAEBAAAAEACABoBQAAhgAAABAQAAABACAAaAQAAO4FAAAYGAAAAQAIAMgGAABWCgAAGBgAAAEA diff --git a/app/DD-Record-Organiser/frmWiedervorlage.vb b/app/DD-Record-Organiser/frmWiedervorlage.vb index 8470c1d..7368cbc 100644 --- a/app/DD-Record-Organiser/frmWiedervorlage.vb +++ b/app/DD-Record-Organiser/frmWiedervorlage.vb @@ -19,6 +19,8 @@ End Try End Sub Private Sub frmWiedervorlage_Load(sender As Object, e As EventArgs) Handles MyBase.Load + 'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_DMSDataSet.TBPMO_FORM_CONSTRUCTOR". Sie können sie bei Bedarf verschieben oder entfernen. + Try Dim DT1 As DataTable = ClassDatabase.Return_Datatable("SELECT [CONTROL_ID] ,[FORM_NAME] + ' | ' + [CONTROL_NAME] AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID = 4 ORDER BY FORM_ID") Dim DT2 As DataTable = ClassDatabase.Return_Datatable("SELECT [CONTROL_ID] ,[FORM_NAME] + ' | ' + [CONTROL_NAME] AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID = 10 ORDER BY FORM_ID") @@ -39,6 +41,9 @@ cmbUser.DisplayMember = DTUser.Columns(1).ColumnName cmbUser.ValueMember = DTUser.Columns(0).ColumnName TBPMO_FOLLOW_UP_EMAILTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBPMO_FORM_CONSTRUCTORTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBPMO_FORM_CONSTRUCTORTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_FORM_CONSTRUCTOR) + Load_WV_Profiles() Catch ex As Exception MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -134,6 +139,7 @@ Load_User_2_Profile(GUIDTextBox.Text) SetCheckbox() End If + lblSaveWVEmail.Visible = False End Sub Private Sub btnAddUser_WV_Click(sender As Object, e As EventArgs) Handles btnAddUser_WV.Click