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

MS 2.4.6.4 Nach tests MK

Browse Source
This commit is contained in:
SchreiberM 2021-01-28 11:37:08 +01:00
parent bbf7f3ae2f
commit 3ba2e62665
6 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD_PM_WINDREAM/App.config
View File

@ -15,7 +15,7 @@
<value>False</value>
</setting>
<setting name="UserConfig_Prefix" serializeAs="String">
<value>TEST</value>
<value>PROD</value>
</setting>
</DD_ProcessManager.My.MySettings>
<DevExpress.LookAndFeel.Design.AppSettings>

2
app/DD_PM_WINDREAM/My Project/Settings.Designer.vb generated
View File

@ -300,7 +300,7 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("TEST")> _
Global.System.Configuration.DefaultSettingValueAttribute("PROD")> _
Public ReadOnly Property UserConfig_Prefix() As String
Get
Return CType(Me("UserConfig_Prefix"),String)

2
app/DD_PM_WINDREAM/My Project/Settings.settings
View File

@ -68,7 +68,7 @@
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="UserConfig_Prefix" Type="System.String" Scope="Application">
<Value Profile="(Default)">TEST</Value>
<Value Profile="(Default)">PROD</Value>
</Setting>
</Settings>
</SettingsFile>

28
app/DD_PM_WINDREAM/frmAdministration.resx
View File

@ -1843,7 +1843,7 @@
<value>246</value>
</data>
<data name="gridFinalIndex.Size" type="System.Drawing.Size, System.Drawing">
<value>630, 299</value>
<value>630, 385</value>
</data>
<data name="gridFinalIndex.TabIndex" type="System.Int32, mscorlib">
<value>93</value>
@ -1870,7 +1870,7 @@
<value>630, 0</value>
</data>
<data name="PropertyGrid1.Size" type="System.Drawing.Size, System.Drawing">
<value>323, 299</value>
<value>323, 385</value>
</data>
<data name="PropertyGrid1.TabIndex" type="System.Int32, mscorlib">
<value>91</value>
@ -1891,7 +1891,7 @@
<value>3, 23</value>
</data>
<data name="Panel5.Size" type="System.Drawing.Size, System.Drawing">
<value>953, 299</value>
<value>953, 385</value>
</data>
<data name="Panel5.TabIndex" type="System.Int32, mscorlib">
<value>94</value>
@ -1948,7 +1948,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="TabPage11.Size" type="System.Drawing.Size, System.Drawing">
<value>962, 313</value>
<value>962, 399</value>
</data>
<data name="TabPage11.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -2164,7 +2164,7 @@
<value>3, 3</value>
</data>
<data name="TabControl2.Size" type="System.Drawing.Size, System.Drawing">
<value>970, 342</value>
<value>970, 428</value>
</data>
<data name="TabControl2.TabIndex" type="System.Int32, mscorlib">
<value>92</value>
@ -2188,7 +2188,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="TabPageAfterIndex.Size" type="System.Drawing.Size, System.Drawing">
<value>976, 348</value>
<value>976, 434</value>
</data>
<data name="TabPageAfterIndex.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -2212,7 +2212,7 @@
<value>6, 62</value>
</data>
<data name="tabctrl_Profilkonfig.Size" type="System.Drawing.Size, System.Drawing">
<value>984, 377</value>
<value>984, 463</value>
</data>
<data name="tabctrl_Profilkonfig.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -2263,7 +2263,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
<value>1082, 439</value>
<value>1082, 525</value>
</data>
<data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -3552,7 +3552,7 @@ Top Kreditoren: </value>
<value>276, 0</value>
</data>
<data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>1090, 468</value>
<value>1090, 554</value>
</data>
<data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -3591,7 +3591,7 @@ Top Kreditoren: </value>
<value>129</value>
</data>
<data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>276, 468</value>
<value>276, 554</value>
</data>
<data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
<value>84</value>
@ -3627,7 +3627,7 @@ Top Kreditoren: </value>
<value>False</value>
</data>
<data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 614</value>
<value>0, 700</value>
</data>
<data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>1366, 22</value>
@ -3666,7 +3666,7 @@ Top Kreditoren: </value>
<value>0, 146</value>
</data>
<data name="pnlMain.Size" type="System.Drawing.Size, System.Drawing">
<value>1366, 468</value>
<value>1366, 554</value>
</data>
<data name="pnlMain.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -4575,7 +4575,7 @@ Top Kreditoren: </value>
<value>1366, 146</value>
</data>
<data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 636</value>
<value>0, 722</value>
</data>
<data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>1366, 21</value>
@ -4617,7 +4617,7 @@ Top Kreditoren: </value>
<value>7, 16</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1366, 657</value>
<value>1366, 743</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 9.75pt</value>

10
app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb
View File

@ -50,9 +50,13 @@ Public Class frmSQL_DESIGNER
End If
If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Or CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" Or CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" Then
If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then
cmbConnection.SelectedValue = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CONNECTION_ID")
cmbConnection.FindStringExact(CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CON_STRING"))
If Not IsNothing(CURRENT_DT_SQL_CONFIG_TABLE) Then
If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then
cmbConnection.SelectedValue = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CONNECTION_ID")
cmbConnection.FindStringExact(CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CON_STRING"))
End If
End If
If CURRENT_DESIGN_TYPE <> "SQL_SOURCE_TABLE_COLUMN" Then
Dim oSQL = String.Format("SELECT NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND CTRL_TYPE <> 'LBL' ORDER BY NAME", CURRENT_ProfilGUID)

3
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -450,7 +450,9 @@ Public Class frmValidator
End Try
End If
Try
DocumentViewerValidator.CloseDocument()
DocumentViewerValidator.Done()
Catch ex As Exception
LOGGER.Warn($"Unexpected error in DocumentViewerValidator.Done: {ex.Message}")
End Try
@ -5212,6 +5214,7 @@ Public Class frmValidator
result = MessageBox.Show("Sind Sie sicher dass Sie dieses Dokument unwiderruflich löschen wollen?" & vbNewLine & "Danach wird die nächste Datei angezeigt!", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then
Try
DocumentViewerValidator.CloseDocument()
DocumentViewerValidator.Done()
Catch ex As Exception
LOGGER.Warn($"Unexpected error in delete_active_File DocumentViewerValidator.Done: {ex.Message}")