MS_18052016

2016-05-18 16:50:49 +02:00
parent fc54eae3ab
commit 5841c62393
5 changed files with 469 additions and 128 deletions
--- a/app/DD-Record-Organiser/frmFollowUp.Designer.vb
+++ b/app/DD-Record-Organiser/frmFollowUp.Designer.vb
@@ -58,9 +58,7 @@ Partial Class frmFollowUp
        Me.cmbConstructor = New System.Windows.Forms.ComboBox()
        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()
-        Me.cmbUser = New System.Windows.Forms.ComboBox()
        Me.btnAddUser_WV = New System.Windows.Forms.Button()
        Me.btndelete = New System.Windows.Forms.Button()
        Me.FOLLOW_UP_DAYSTextBox = New System.Windows.Forms.TextBox()
@@ -123,6 +121,21 @@ Partial Class frmFollowUp
        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()
+        Me.GridControlUsers2Group = New DevExpress.XtraGrid.GridControl()
+        Me.GridViewlUsers2Group = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.colSelect = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colID = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
+        Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
+        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource(Me.components)
        GUIDLabel = New System.Windows.Forms.Label()
        FOLLOW_UP_SEQUENCELabel = New System.Windows.Forms.Label()
        FOLLOW_UP_TIME_SPANLabel = New System.Windows.Forms.Label()
@@ -162,6 +175,13 @@ Partial Class frmFollowUp
        Me.XtraTabPage3.SuspendLayout()
        CType(Me.GridResult, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.grvwResult, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControlUsers2Group, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridViewlUsers2Group, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TBWH_Users1BindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'GUIDLabel
@@ -413,41 +433,25 @@ Partial Class frmFollowUp
        '
        'GroupBox3
        '
-        Me.GroupBox3.Controls.Add(Me.ListBoxUser2Profile)
+        resources.ApplyResources(Me.GroupBox3, "GroupBox3")
+        Me.GroupBox3.Controls.Add(Me.GridControl1)
+        Me.GroupBox3.Controls.Add(Me.GridControlUsers2Group)
        Me.GroupBox3.Controls.Add(Me.Label5)
-        Me.GroupBox3.Controls.Add(Me.cmbUser)
        Me.GroupBox3.Controls.Add(Me.btnAddUser_WV)
        Me.GroupBox3.Controls.Add(Me.btndelete)
-        resources.ApplyResources(Me.GroupBox3, "GroupBox3")
        Me.GroupBox3.Name = "GroupBox3"
        Me.GroupBox3.TabStop = False
        '
-        'ListBoxUser2Profile
-        '
-        resources.ApplyResources(Me.ListBoxUser2Profile, "ListBoxUser2Profile")
-        Me.ListBoxUser2Profile.FormattingEnabled = True
-        Me.ListBoxUser2Profile.Name = "ListBoxUser2Profile"
-        Me.ListBoxUser2Profile.TabStop = False
-        '
        'Label5
        '
        resources.ApplyResources(Me.Label5, "Label5")
        Me.Label5.Name = "Label5"
        '
-        'cmbUser
-        '
-        Me.cmbUser.DisplayMember = "FORM_TITLE"
-        resources.ApplyResources(Me.cmbUser, "cmbUser")
-        Me.cmbUser.FormattingEnabled = True
-        Me.cmbUser.Name = "cmbUser"
-        Me.cmbUser.TabStop = False
-        Me.cmbUser.ValueMember = "GUID"
-        '
        'btnAddUser_WV
        '
        Me.btnAddUser_WV.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(128, Byte), Integer))
        resources.ApplyResources(Me.btnAddUser_WV, "btnAddUser_WV")
-        Me.btnAddUser_WV.Image = Global.DD_Record_Organiser.My.Resources.Resources.add
+        Me.btnAddUser_WV.Image = Global.DD_Record_Organiser.My.Resources.Resources.arrow_left
        Me.btnAddUser_WV.Name = "btnAddUser_WV"
        Me.btnAddUser_WV.TabStop = False
        Me.btnAddUser_WV.UseVisualStyleBackColor = False
@@ -901,6 +905,125 @@ Partial Class frmFollowUp
        '
        Me.TBPMO_FORM_CONSTRUCTORTableAdapter.ClearBeforeFill = True
        '
+        'GridControlUsers2Group
+        '
+        resources.ApplyResources(Me.GridControlUsers2Group, "GridControlUsers2Group")
+        Me.GridControlUsers2Group.DataSource = Me.TBAD_UsersBindingSource
+        Me.GridControlUsers2Group.MainView = Me.GridViewlUsers2Group
+        Me.GridControlUsers2Group.Name = "GridControlUsers2Group"
+        Me.GridControlUsers2Group.ShowOnlyPredefinedDetails = True
+        Me.GridControlUsers2Group.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewlUsers2Group})
+        '
+        'GridViewlUsers2Group
+        '
+        Me.GridViewlUsers2Group.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewlUsers2Group.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridViewlUsers2Group.Appearance.EvenRow.Options.UseBackColor = True
+        Me.GridViewlUsers2Group.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewlUsers2Group.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridViewlUsers2Group.Appearance.FocusedRow.Options.UseBackColor = True
+        Me.GridViewlUsers2Group.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelect, Me.GridColumn1, Me.GridColumn2, Me.colID})
+        Me.GridViewlUsers2Group.GridControl = Me.GridControlUsers2Group
+        Me.GridViewlUsers2Group.Name = "GridViewlUsers2Group"
+        Me.GridViewlUsers2Group.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewlUsers2Group.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewlUsers2Group.OptionsBehavior.CopyToClipboardWithColumnHeaders = False
+        Me.GridViewlUsers2Group.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridViewlUsers2Group.OptionsView.ColumnAutoWidth = False
+        Me.GridViewlUsers2Group.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridViewlUsers2Group.OptionsView.ShowAutoFilterRow = True
+        Me.GridViewlUsers2Group.OptionsView.ShowGroupPanel = False
+        '
+        'colSelect
+        '
+        resources.ApplyResources(Me.colSelect, "colSelect")
+        Me.colSelect.FieldName = "Select"
+        Me.colSelect.Name = "colSelect"
+        '
+        'GridColumn1
+        '
+        Me.GridColumn1.FieldName = "Username"
+        Me.GridColumn1.Name = "GridColumn1"
+        Me.GridColumn1.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn1, "GridColumn1")
+        '
+        'GridColumn2
+        '
+        Me.GridColumn2.FieldName = "Email"
+        Me.GridColumn2.Name = "GridColumn2"
+        Me.GridColumn2.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn2, "GridColumn2")
+        '
+        'colID
+        '
+        Me.colID.FieldName = "ID"
+        Me.colID.Name = "colID"
+        '
+        'DD_ECMAdmin
+        '
+        Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin"
+        Me.DD_ECMAdmin.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
+        'TBAD_UsersBindingSource
+        '
+        Me.TBAD_UsersBindingSource.DataMember = "TBAD_Users"
+        Me.TBAD_UsersBindingSource.DataSource = Me.DD_ECMAdmin
+        '
+        'GridControl1
+        '
+        resources.ApplyResources(Me.GridControl1, "GridControl1")
+        Me.GridControl1.DataSource = Me.TBWH_Users1BindingSource
+        Me.GridControl1.MainView = Me.GridView1
+        Me.GridControl1.Name = "GridControl1"
+        Me.GridControl1.ShowOnlyPredefinedDetails = True
+        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
+        '
+        'GridView1
+        '
+        Me.GridView1.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView1.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True
+        Me.GridView1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True
+        Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn4, Me.GridColumn5, Me.GridColumn6})
+        Me.GridView1.GridControl = Me.GridControl1
+        Me.GridView1.Name = "GridView1"
+        Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView1.OptionsBehavior.CopyToClipboardWithColumnHeaders = False
+        Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridView1.OptionsView.ColumnAutoWidth = False
+        Me.GridView1.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridView1.OptionsView.ShowAutoFilterRow = True
+        Me.GridView1.OptionsView.ShowGroupPanel = False
+        '
+        'GridColumn3
+        '
+        resources.ApplyResources(Me.GridColumn3, "GridColumn3")
+        Me.GridColumn3.FieldName = "Select"
+        Me.GridColumn3.Name = "GridColumn3"
+        '
+        'GridColumn4
+        '
+        Me.GridColumn4.FieldName = "Username"
+        Me.GridColumn4.Name = "GridColumn4"
+        Me.GridColumn4.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn4, "GridColumn4")
+        '
+        'GridColumn5
+        '
+        Me.GridColumn5.FieldName = "Email"
+        Me.GridColumn5.Name = "GridColumn5"
+        Me.GridColumn5.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn5, "GridColumn5")
+        '
+        'GridColumn6
+        '
+        Me.GridColumn6.FieldName = "ID"
+        Me.GridColumn6.Name = "GridColumn6"
+        '
+        'TBWH_Users1BindingSource
+        '
+        Me.TBWH_Users1BindingSource.DataMember = "TBWH_Users1"
+        Me.TBWH_Users1BindingSource.DataSource = Me.DD_ECMAdmin
+        '
        'frmFollowUp
        '
        resources.ApplyResources(Me, "$this")
@@ -926,6 +1049,13 @@ Partial Class frmFollowUp
        Me.XtraTabPage3.ResumeLayout(False)
        CType(Me.GridResult, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.grvwResult, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControlUsers2Group, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridViewlUsers2Group, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TBWH_Users1BindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
@@ -971,7 +1101,6 @@ Partial Class frmFollowUp
    Friend WithEvents lblSaveWVEmail As System.Windows.Forms.Label
    Friend WithEvents ListBox1 As System.Windows.Forms.ListBox
    Friend WithEvents NAMETextBox As System.Windows.Forms.TextBox
-    Friend WithEvents ListBoxUser2Profile As System.Windows.Forms.ListBox
    Friend WithEvents PROCESS_SELECT4TextBox As System.Windows.Forms.TextBox
    Friend WithEvents PROCESS_SELECT3TextBox As System.Windows.Forms.TextBox
    Friend WithEvents PROCESS_SELECT2TextBox As System.Windows.Forms.TextBox
@@ -981,7 +1110,6 @@ Partial Class frmFollowUp
    Friend WithEvents Label4 As System.Windows.Forms.Label
    Friend WithEvents Label5 As System.Windows.Forms.Label
    Friend WithEvents btnAddUser_WV As System.Windows.Forms.Button
-    Friend WithEvents cmbUser As System.Windows.Forms.ComboBox
    Friend WithEvents btndelete As System.Windows.Forms.Button
    Friend WithEvents PROCESS_SELECT5TextBox As System.Windows.Forms.TextBox
    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
@@ -1003,4 +1131,19 @@ Partial Class frmFollowUp
    Friend WithEvents cmbCTRLUser_direct As System.Windows.Forms.ComboBox
    Friend WithEvents GridResult As DevExpress.XtraGrid.GridControl
    Friend WithEvents grvwResult As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents GridControlUsers2Group As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridViewlUsers2Group As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents colSelect As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colID As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
+    Friend WithEvents TBWH_Users1BindingSource As System.Windows.Forms.BindingSource
+    Friend WithEvents DD_ECMAdmin As DD_Record_Organiser.DD_ECMAdmin
+    Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents GridColumn3 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridColumn4 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridColumn5 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridColumn6 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents TBAD_UsersBindingSource As System.Windows.Forms.BindingSource
 End Class