MS_08.04

2016-04-08 14:55:25 +02:00
parent d1eb7ecb5b
commit ef2a87d849
47 changed files with 12718 additions and 9964 deletions
--- a/app/DD-Record-Organiser/frmConstructorDesigner.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb
@@ -110,17 +110,30 @@ Public Class frmConstructorDesigner
    End Sub
    Public Sub Load_ConstructorUser()
        Try
-            Dim Sql = String.Format("SELECT GUID,USERNAME FROM TBDD_USER WHERE MODULE_RECORD_ORG = 1 AND GUID NOT IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0}) ORDER By USERNAME", CONSTRUCTOR_IDTextBox.Text)
+            Dim Sql = String.Format("SELECT GUID, USERNAME, EMAIL FROM TBDD_USER WHERE MODULE_RECORD_ORG = 1 AND GUID NOT IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0}) ORDER By USERNAME", CONSTRUCTOR_IDTextBox.Text)
            Dim DT_USER = ClassDatabase.Return_Datatable(Sql)
            Sql = String.Format("SELECT T1.GUID, T.USERNAME + ' - ' + CASE T1.HOME_MENUE WHEN 1 THEN 'HOME' ELSE 'STANDARD' END AS USERNAME FROM TBDD_USER T, TBPMO_CONSTRUCTOR_USER T1 WHERE T1.USER_ID = T.GUID AND T1.CONSTRUCT_ID = {0} ORDER BY T.USERNAME", CONSTRUCTOR_IDTextBox.Text)
            Dim DT_USER_CONSTR As DataTable = ClassDatabase.Return_Datatable(Sql, "LOAD USERS FOR CONSTRUCT")
            Try
-                chksbxUserConstructor.Items.Clear()
+                DD_ECMAdmin.TBAD_Users.Clear()
+
                For Each row As DataRow In DT_USER.Rows
-                    chksbxUserConstructor.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
+                    Dim newUserRow As DD_ECMAdmin.TBAD_UsersRow
+                    newUserRow = DD_ECMAdmin.TBAD_Users.NewTBAD_UsersRow
+
+                    newUserRow.Username = row.Item(1)
+                    Try
+                        newUserRow.Email = row.Item(2)
+                    Catch ex As Exception
+                        newUserRow.Email = ""
+                    End Try
+
+                    newUserRow.ID = row.Item(0)
+                    DD_ECMAdmin.TBAD_Users.Rows.Add(newUserRow)
+                    ' chklbxUserForGroup.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
                Next
            Catch ex As Exception
-
+                MsgBox("Error Load_Users for menues:" & vbNewLine & ex.Message)
            End Try
           

@@ -526,13 +539,23 @@ Public Class frmConstructorDesigner
    End Sub
    Public Sub Load_UserSQL()
        Try
-            lbxUserSQL.Items.Clear()
-
-            Dim sql = String.Format("SELECT DISTINCT T.GUID, T.USERNAME FROM TBDD_USER T, TBDD_CLIENT_USER T1 WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID = T1.USER_ID AND T1.CLIENT_ID IN ({0}) ORDER BY T.USERNAME", USER_CLIENTS_COMMA_SEPERATED)
+            Dim sql = String.Format("SELECT DISTINCT T.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T, TBDD_CLIENT_USER T1 WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID = T1.USER_ID AND T1.CLIENT_ID IN ({0}) ORDER BY T.USERNAME", USER_CLIENTS_COMMA_SEPERATED)
            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
-            lbxUserSQL.DataSource = DT
-            lbxUserSQL.DisplayMember = DT.Columns(1).ColumnName
-            lbxUserSQL.ValueMember = DT.Columns(0).ColumnName
+            DD_ECMAdmin.TBWH_Users1.Clear()
+            For Each row As DataRow In DT.Rows
+                Dim newUserRow As DD_ECMAdmin.TBWH_Users1Row
+                newUserRow = DD_ECMAdmin.TBWH_Users1.NewTBWH_Users1Row
+                newUserRow.Username = row.Item(1)
+                Try
+                    newUserRow.Email = row.Item(2)
+                Catch ex As Exception
+                    newUserRow.Email = ""
+                End Try
+
+                newUserRow.ID = row.Item(0)
+                DD_ECMAdmin.TBWH_Users1.Rows.Add(newUserRow)
+                ' chklbxUsersforClient.Items.Add(New MyListBoxItem() With {.Text = row.Item(1), .ExtraData = row.Item(0)})
+            Next
        Catch ex As Exception
            MsgBox("UnexpectedError Load_UserSQL:" & vbNewLine & ex.Message)
        End Try
@@ -652,15 +675,18 @@ Public Class frmConstructorDesigner

    Private Sub btnAddUser2ConstructorREL_Click(sender As Object, e As EventArgs) Handles btnAddUser2ConstructorREL.Click
        Try
-            For Each obj As Object In chksbxUserConstructor.CheckedItems
-                Dim item As MyListBoxItem = CType(obj, MyListBoxItem)
-                Dim home As Integer = CInt(CheckBoxHome.Checked)
-                Dim insert = "INSERT INTO TBPMO_CONSTRUCTOR_USER (CONSTRUCT_ID, USER_ID,ADDED_WHO,HOME_MENUE) VALUES (" & CONSTRUCTOR_IDTextBox.Text & ", " & item.ExtraData & ",'" & Environment.UserName & "'," & home & ")"
-                If ClassDatabase.Execute_non_Query(insert, True) Then
+            For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
+                If row.Item(0) = CBool(True) Then
+                    Dim home As Integer = CInt(CheckBoxHome.Checked)
+                    Dim insert = "INSERT INTO TBPMO_CONSTRUCTOR_USER (CONSTRUCT_ID, USER_ID,ADDED_WHO,HOME_MENUE) VALUES (" & CONSTRUCTOR_IDTextBox.Text & ", " & row.Item(5) & ",'" & Environment.UserName & "'," & home & ")"
+                    If ClassDatabase.Execute_non_Query(insert, True) Then

+                    End If
                End If
            Next
-            chksbxUserConstructor.ClearSelected()
+            For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
+                row.Item(0) = CBool(False)
+            Next
            Load_ConstructorUser()
        Catch ex As Exception
            MsgBox("Error while adding user to Constructor-Relation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -717,27 +743,6 @@ Public Class frmConstructorDesigner
            MsgBox("Error while deleting user to Constructor-Relation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
-
-    Private Sub txtSearchUser_TextChanged(sender As Object, e As EventArgs) Handles txtSearchUser.TextChanged
-        Dim i As Integer = lbxUserSQL.FindString(txtSearchUser.Text)
-        lbxUserSQL.SelectedIndex = i
-        If txtSearchUser.Text = "" Then
-            lbxUserSQL.SelectedIndex = -1
-        End If
-    End Sub
-
-    Private Sub lbxUserSQL_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lbxUserSQL.SelectedIndexChanged
-        Try
-            Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL, SELECTED_CONSTRUCTOR_DETAIL_ID, lbxUserSQL.SelectedValue)
-        Catch ex As System.Exception
-            If Not ex.Message.ToLower.Contains("atarowview") Then
-                MsgBox("Error while loading User-Restrictions:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            End If
-        End Try
-        lblsaveSQLUser.Visible = False
-    End Sub
-
    Private Sub btnAddUserSQL_Click(sender As Object, e As EventArgs) Handles btnAddUserSQL.Click
        If GUIDTextBox.Text = "" Then
            TBPMO_CONSTRUCTOR_USER_SQLBindingSource.AddNew()
@@ -746,9 +751,13 @@ Public Class frmConstructorDesigner

    Private Sub TBPMO_CONSTRUCTOR_USER_SQLBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_CONSTRUCTOR_USER_SQLBindingSource.AddingNew
        Try
-            DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.ADDED_WHOColumn.DefaultValue = Environment.UserName
-            DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.CONSTR_DET_IDColumn.DefaultValue = SELECTED_CONSTRUCTOR_DETAIL_ID
-            DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.USER_IDColumn.DefaultValue = lbxUserSQL.SelectedValue
+            Dim USERID = GridViewUserSQL.GetFocusedRowCellValue(GridViewUserSQL.Columns("ID"))
+            If Not USERID Is Nothing Then
+                DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.ADDED_WHOColumn.DefaultValue = Environment.UserName
+                DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.CONSTR_DET_IDColumn.DefaultValue = SELECTED_CONSTRUCTOR_DETAIL_ID
+                DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL.USER_IDColumn.DefaultValue = USERID
+            End If
+           
        Catch ex As Exception
            MsgBox("Error while Adding User-Restrictions:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
@@ -772,12 +781,12 @@ Public Class frmConstructorDesigner
        Dim matches As MatchCollection = atPlaceholderRegex.Matches(text)

        dgvPlaceholders.Rows.Clear()
-
+        Dim USERID = GridViewUserSQL.GetFocusedRowCellValue(GridViewUserSQL.Columns("ID"))
        For Each match As Match In matches
            Dim placeholder = ""
            Select Case match.Value.ToUpper
                Case "@USER_ID"
-                    placeholder = lbxUserSQL.SelectedValue
+                    placeholder = USERID
            End Select
            dgvPlaceholders.Rows.Add({match.Value, placeholder})
        Next
@@ -839,4 +848,27 @@ Public Class frmConstructorDesigner
        Next
        Load_ClientsforEntity()
    End Sub
+
+    Private Sub TBWH_Users1BindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBWH_Users1BindingSource.CurrentChanged
+        Load_SQL_ForUSer()
+    End Sub
+    Sub Load_SQL_ForUSer()
+        Try
+            Try
+                Dim USERID = GridViewUserSQL.GetFocusedRowCellValue(GridViewUserSQL.Columns("ID"))
+                If Not USERID Is Nothing Then
+                    Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Connection.ConnectionString = MyConnectionString
+                    Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL, SELECTED_CONSTRUCTOR_DETAIL_ID, USERID)
+                End If
+
+            Catch ex As System.Exception
+                If Not ex.Message.ToLower.Contains("atarowview") Then
+                    MsgBox("Error while loading User-Restrictions:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                End If
+            End Try
+            lblsaveSQLUser.Visible = False
+        Catch ex As Exception
+            MsgBox("Error in Load SQL for User:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
 End Class