From 31fc4d5a70ea31b4a0d16afc9ac30872826426c8 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 13 Jun 2018 14:13:46 +0200 Subject: [PATCH] jj: fix TBDD_GROUPS / FillByProfileId_NotAssigned --- .../DD_DMSLiteDataSet.Designer.vb | 21 +++---- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 57 +++++++++---------- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 20 +++---- 3 files changed, 47 insertions(+), 51 deletions(-) diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index f2b8018..5aa1524 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -20721,24 +20721,22 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT T1.GUID, T1.NAME, T1.ECM_FK_ID, T1.AD_SYNC, T1.INTERNAL, T1.ACTIVE,"& _ " T1.COMMENT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ - " TBDD_GROUPS_MODULES AS T INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBDD_GR"& _ - "OUPS AS T1 ON T.GROUP_ID = T1.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (T.MODULE_ID ="&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " (SELECT GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" FROM "& _ - " TBDD_MODULES"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE (SHORT_NAME = 'PM'))"& _ - ") AND (T.GROUP_ID NOT IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (SELECT GROUP_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ - " FROM TBPM_PROFILE_GROUP"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " WHERE (PROFIL_ID = @PROFILE_ID)))" + "TBDD_GROUPS T1"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"LEFT JOIN TBDD_GROUPS_MODULES T ON T.GROUP_ID = T1.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ + " (T.MODULE_ID ="&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (SELECT GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " FROM TBDD_MODULES"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " WHERE (SHORT_NAME = 'PM'))) "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"AND (T.GROUP_ID NOT IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " (SELECT GROUP_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" FROM "& _ + " TBPM_PROFILE_GROUP"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WHERE (PROFIL_ID"& _ + " = 2)))" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub _ - Public Overloads Overridable Function FillByProfileId_NotAssigned(ByVal dataTable As DD_DMSLiteDataSet.TBDD_GROUPSDataTable, ByVal PROFILE_ID As Integer) As Integer + Public Overloads Overridable Function FillByProfileId_NotAssigned(ByVal dataTable As DD_DMSLiteDataSet.TBDD_GROUPSDataTable) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_ID,Integer) If (Me.ClearBeforeFill = true) Then dataTable.Clear End If @@ -20750,9 +20748,8 @@ Namespace DD_DMSLiteDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetDataByProfileId_NotAssigned(ByVal PROFILE_ID As Integer) As DD_DMSLiteDataSet.TBDD_GROUPSDataTable + Public Overloads Overridable Function GetDataByProfileId_NotAssigned() As DD_DMSLiteDataSet.TBDD_GROUPSDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_ID,Integer) Dim dataTable As DD_DMSLiteDataSet.TBDD_GROUPSDataTable = New DD_DMSLiteDataSet.TBDD_GROUPSDataTable() Me.Adapter.Fill(dataTable) Return dataTable diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index 632f553..6a868e7 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -1914,18 +1914,17 @@ WHERE (GUID = @GUID) SELECT T1.GUID, T1.NAME, T1.ECM_FK_ID, T1.AD_SYNC, T1.INTERNAL, T1.ACTIVE, T1.COMMENT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN -FROM TBDD_GROUPS_MODULES AS T INNER JOIN - TBDD_GROUPS AS T1 ON T.GROUP_ID = T1.GUID +FROM TBDD_GROUPS T1 +LEFT JOIN TBDD_GROUPS_MODULES T ON T.GROUP_ID = T1.GUID WHERE (T.MODULE_ID = (SELECT GUID FROM TBDD_MODULES - WHERE (SHORT_NAME = 'PM'))) AND (T.GROUP_ID NOT IN + WHERE (SHORT_NAME = 'PM'))) +AND (T.GROUP_ID NOT IN (SELECT GROUP_ID FROM TBPM_PROFILE_GROUP - WHERE (PROFIL_ID = @PROFILE_ID))) - - - + WHERE (PROFIL_ID = 2))) + @@ -2018,7 +2017,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2063,7 +2062,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2159,7 +2158,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2224,7 +2223,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2254,7 +2253,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2277,7 +2276,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2367,7 +2366,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2440,7 +2439,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2489,7 +2488,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2504,7 +2503,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2525,7 +2524,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2633,7 +2632,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2706,7 +2705,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2757,7 +2756,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2849,7 +2848,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2906,7 +2905,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2947,7 +2946,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -3063,11 +3062,11 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - - - - - + + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index d642ef5..5039a4f 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,24 +4,24 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - - - + + + - + - - - - + + + +