AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo

Browse Source
This commit is contained in:
SchreiberM
2022-05-31 15:55:24 +02:00
parent c830f21590 8bb3b83826
commit be401fa264
17 changed files with 606 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
GUIs.ZooFlow/App.config
View File

@@ -7,8 +7,12 @@
</sectionGroup>
</configSections>
<connectionStrings>
<add name="DigitalData.GUIs.ZooFlow.Settings.IDBConnectionStringDEFAULT" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=IDB;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient" />
<add name="DigitalData.GUIs.ZooFlow.Settings.DD_ECMConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient" />
<add name="DigitalData.GUIs.ZooFlow.Settings.IDBConnectionStringDEFAULT"
connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=IDB;Persist Security Info=True;User ID=sa;Password=dd"
providerName="System.Data.SqlClient" />
<add name="DigitalData.GUIs.ZooFlow.Settings.DD_ECMConnectionString"
connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd"
providerName="System.Data.SqlClient" />
</connectionStrings>
<applicationSettings>
<DigitalData.GUIs.ZooFlow.Settings>
@@ -16,7 +20,7 @@
<value>True</value>
</setting>
<setting name="UserConfig_Prefix" serializeAs="String">
<value>DEV</value>
<value>PROD</value>
</setting>
</DigitalData.GUIs.ZooFlow.Settings>
<DevExpress.LookAndFeel.Design.AppSettings>

4
GUIs.ZooFlow/My Project/AssemblyInfo.vb
View File

@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("ZooFlow")>
<Assembly: AssemblyCopyright("Copyright © 2022")>
<Assembly: AssemblyTrademark("")>
<Assembly: AssemblyTrademark("1.3.0.0")>
<Assembly: AssemblyCulture("")>
' Setting ComVisible to false makes the types in this assembly not visible
@@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:
' [assembly: AssemblyVersion("1.0.*")]
<Assembly: AssemblyVersion("1.2.0.0")>
<Assembly: AssemblyVersion("1.3.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

4
GUIs.ZooFlow/My Project/Settings.Designer.vb generated
View File

@@ -14,7 +14,7 @@ Option Explicit On
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0"), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class Settings
Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -86,7 +86,7 @@ Partial Friend NotInheritable Class Settings
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("DEV")> _
Global.System.Configuration.DefaultSettingValueAttribute("PROD")> _
Public ReadOnly Property UserConfig_Prefix() As String
Get
Return CType(Me("UserConfig_Prefix"),String)

2
GUIs.ZooFlow/My Project/Settings.settings
View File

@@ -22,7 +22,7 @@
<Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</Value>
</Setting>
<Setting Name="UserConfig_Prefix" Type="System.String" Scope="Application">
<Value Profile="(Default)">DEV</Value>
<Value Profile="(Default)">PROD</Value>
</Setting>
</Settings>
</SettingsFile>

5
GUIs.ZooFlow/Search/frmFlowSearch2.vb
View File

@@ -52,6 +52,7 @@ Public Class frmFlowSearch2
Public Function GetTokensFromTable(Of T As {New, Token})(pTable As DataTable) As List(Of T)
Dim oTokens As New List(Of T)
Dim oTermValueBlackList As New List(Of String) From {"", " "}
For Each oRow As DataRow In pTable.Rows
Dim oTermValue = oRow.Item("TERM")
@@ -59,6 +60,10 @@ Public Class frmFlowSearch2
Dim oAttributeTitle = oRow.Item("ATTR_TITLE")
Dim oAttributeId = oRow.ItemEx("ATTR_ID", 0)
If oTermValueBlackList.Contains(oTermValue) Then
Continue For
End If
oTokens.Add(New T() With {
.AttributeId = oAttributeId,
.AttributeTitle = oAttributeTitle,