diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 79576e1..753341a 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -11,26 +11,23 @@ Imports DigitalData.Modules.Language.Utils Public Class frmAdministration Private UNSAVED_CHANGES_PROFILE As Boolean = False Private UNSAVED_CHANGES_FI As Boolean = False - Private email As New ClassEmail - Public profile_guid As Integer = 0 - Dim formloaded As Boolean - - Private Property change_BindingSource As Boolean = False - - 'Dim FinalIndexChanging As Boolean = False + Private FORM_LOADED As Boolean = False Private INSERT_ACTIVE As Boolean = False - Dim DT_CHART_CONFIG As DataTable - Dim DT2Compare As DataTable - Dim PROF_ORIGIN As DataTable - 'Private CURR_TEXT_CONTROL_CONTENT As String - 'Private CURR_BOOL_CONTROL_CONTENT As CheckState = CheckState.Indeterminate - 'Private CURR_COMBOBOX_CONTROL_CONTENT As String - Private PROFILEBS_POS As Integer = 0 + Private BINDINGSOURCE_CHANGING As Boolean = False - Private Sub frmFormDesigner_Load(sender As Object, e As System.EventArgs) Handles Me.Load - formloaded = False + Private ReadOnly email As New ClassEmail + Private FormDesigner As frmFormDesigner + + Private Property profile_guid As Integer = 0 + Private Property DT_CHART_CONFIG As DataTable + Private Property PROF_ORIGIN As DataTable + + Private Sub frmAdministration_Load(sender As Object, e As System.EventArgs) Handles Me.Load + FORM_LOADED = False UNSAVED_CHANGES_PROFILE = False Try + FormDesigner = New frmFormDesigner() + TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM TBPM_PROFILETableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM PROF_ORIGIN = DD_DMSLiteDataSet.TBPM_PROFILE @@ -181,7 +178,7 @@ Public Class frmAdministration End Sub Sub Refresh_Profildaten() Try - change_BindingSource = True + BINDINGSOURCE_CHANGING = True CHANGES_FORM_DESIGN = True UNSAVED_CHANGES_PROFILE = False ' CURR_TEXT_CONTROL_CONTENT = String.Empty @@ -199,7 +196,7 @@ Public Class frmAdministration LOGGER.Error(ex) MsgBox("Fehler bei Refresh_Profildaten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") Finally - change_BindingSource = False + BINDINGSOURCE_CHANGING = False End Try End Sub Private Sub ObjekttypenEintragen() @@ -383,34 +380,9 @@ Public Class frmAdministration End Try End Sub - 'Private Sub BindingNavigatorDeleteItem_Click(sender As System.Object, e As System.EventArgs) - ' If viewAssignedUsers.GetSelectedRows().Length > 0 Then - ' For Each rowHandle In viewAssignedUsers.GetSelectedRows() - ' Dim rowView As DataRowView = viewAssignedUsers.GetRow(rowHandle) - ' Dim userId As Integer = rowView.Item("GUID") - - ' TBPROFILE_USERTableAdapter.cmdDelete(userId) - ' Next - ' End If - 'End Sub - - - 'Sub Save_Konfiguration() - ' TBPM_KONFIGURATIONBindingSource.EndEdit() - ' If DD_DMSLiteDataSet.TBPM_KONFIGURATION.GetChanges Is Nothing = False Then - ' GEAENDERTWERTextBox.Text = USER_USERNAME - ' TBPM_KONFIGURATIONBindingSource.EndEdit() - ' TBPM_KONFIGURATIONTableAdapter.Update(DD_DMSLiteDataSet.TBPM_KONFIGURATION) - ' tstrpinfo.Text = "Konfiguration wurde erfolgreich gespeichert" - ' tstrpinfo.Visible = True - ' Else - ' tstrpinfo.Visible = False - ' End If - 'End Sub - Private Sub frmProfileDesigner_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown TabControl1.SelectedIndex = 0 - formloaded = True + FORM_LOADED = True RibbonPageGroup2.Enabled = False RibbonPageGroup4.Enabled = False EditMode_Profile("Unlock") @@ -421,7 +393,7 @@ Public Class frmAdministration Private Sub Refresh_Final_indexe() Try 'Me.lblSaveFinalIndex.Visible = False - If formloaded = False Then Exit Sub + If FORM_LOADED = False Then Exit Sub If NAMETextBox.Text <> String.Empty Then TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, NAMETextBox.Text) End If @@ -546,160 +518,6 @@ Public Class frmAdministration MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Load Chart Konfig:") End Try End Sub - 'Private Sub cmbIndexe_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) - ' If cmbIndexe.SelectedIndex <> -1 Then - ' 'MsgBox(_windreamPM.GetTypeOfIndex(cmbIndexe.Text)) - ' btnInsert_FinalIndex.Enabled = True - ' Me.btnStampDate.Visible = False - ' Me.btnStampDate.Visible = False - ' Dim type = _windreamPM.GetTypeOfIndex(cmbIndexe.Text) - ' Select Case type - ' Case 1 'String - ' Me.lblIndex.Text = "Definieren Sie den festen Wert: (Text)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 2 'Integer - ' Me.lblIndex.Text = "Definieren Sie den festen Wert: (Zahl)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 3 'Float - ' Me.lblIndex.Text = "Definieren Sie den festen Wert: (Decimal)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = False - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4 ' Boolean - ' Me.lblIndex.Text = "Wählen Sie den Boolean-Wert: (Ja/Nein)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = False - ' Me.grbxSystemStamps.Visible = False - ' Me.chkbxfinalIndex.CheckState = CheckState.Checked - ' Me.chkbxfinalIndex.Visible = True - ' Case 5 'Date - ' Me.lblIndex.Text = "Definieren Sie den festen Wert: (Date)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = True - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4107 'Vektor Zahl - ' Me.lblIndex.Text = "Definieren Sie den festen Wert - Vektorfeld: (Zahl)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = False - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4097 'Vektor String - ' Me.lblIndex.Text = "Definieren Sie den festen Wert - Vektorfeld: (Text)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4100 'Vektor Bool - ' Me.lblIndex.Text = "Definieren Sie den festen Wert - Vektorfeld: (Boolean)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = False - ' Me.btnStampDate.Visible = False - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4101 'Vektor Date - ' Me.lblIndex.Text = "Definieren Sie den festen Wert - Vektorfeld: (Date)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = True - ' Me.btnStampDate.Visible = True - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case 4104 - ' Me.lblIndex.Text = "Definieren Sie den festen Wert - Vektorfeld: (Currency)" - ' Me.lblIndex.Visible = True - ' Me.txtindexwert_final.Visible = True - ' Me.grbxSystemStamps.Visible = False - ' Me.txtindexwert_final.Text = "" - ' Me.chkbxfinalIndex.Visible = False - ' Case Else - ' btnInsert_FinalIndex.Enabled = False - ' End Select - - ' End If - 'End Sub - - 'Private Sub btnInsert_FinalIndex_Click(sender As System.Object, e As System.EventArgs) - ' Me.lblSaveFinalIndex.Visible = False - ' If CheckBoxPMVEKTOR.Checked = False Then - ' If cmbIndexe.SelectedIndex <> -1 Then - ' Dim indexwert As String = "" - ' If txtindexwert_final.Visible = True Then - ' indexwert = txtindexwert_final.Text - ' Else - ' If chkbxfinalIndex.CheckState = CheckState.Checked Then - ' indexwert = 1 - ' Else - ' indexwert = 0 - ' End If - - ' End If - ' Try - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe.Text, indexwert, USER_USERNAME, 0, "") - ' Me.lblSaveFinalIndex.Text = "Der Index wurde erfolgreich angelegt - " & Now - ' Me.lblSaveFinalIndex.Visible = True - - ' Catch ex As Exception - ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Anlage Final Index:") - ' End Try - - ' End If - ' Else - ' If txtBezeichner.Text <> "" Then - ' Dim indexwert As String = "" - ' If txtindexwert_final.Visible = True Then - ' indexwert = txtindexwert_final.Text - ' Else - ' If chkbxfinalIndex.CheckState = CheckState.Checked Then - ' indexwert = "True" - ' Else - ' indexwert = "False" - ' End If - - ' End If - ' Try - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, "[%VKT" & txtBezeichner.Text, indexwert, USER_USERNAME, 0, "") - ' Me.lblSaveFinalIndex.Text = "Der Index wurde erfolgreich angelegt - " & Now - ' Me.lblSaveFinalIndex.Visible = True - ' Catch ex As Exception - ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Anlage Final Index in VEKTORFELD:") - ' End Try - ' End If - ' End If - ' Refresh_Final_indexe() - ' INSERT_ACTIVE = False - ' TabControlFinalIndices.Enabled = False - - 'End Sub - 'Private Sub ToolStripButton1_Click_1(sender As System.Object, e As System.EventArgs) - ' Refresh_Final_indexe() - ' INSERT_ACTIVE = False - ' TabControlFinalIndices.Enabled = False - - ' txtBezeichner.Text = String.Empty - ' txtindexwert_final.Text = String.Empty - 'End Sub - Private Sub tsbtnProfilkopieren_Click(sender As System.Object, e As System.EventArgs) End Sub @@ -763,7 +581,7 @@ Public Class frmAdministration Private Sub cmbObjekttypen_SelectedIndexChanged(sender As Object, e As EventArgs) - If formloaded = False Then + If FORM_LOADED = False Then Exit Sub End If If cmbObjekttypen.SelectedIndex <> -1 Then @@ -771,147 +589,6 @@ Public Class frmAdministration End If End Sub - 'Private Sub TabControlFinalIndices_SelectedIndexChanged(sender As Object, e As EventArgs) - ' If TabControlFinalIndices.SelectedIndex = 1 Then - ' Me.cmbIndexe2.Enabled = False - ' If INSERT_ACTIVE = True Then - ' Me.cmbIndexe2.Enabled = True - ' End If - ' End If - 'End Sub - - 'Private Sub btnSaveSQLCommand_Click(sender As Object, e As EventArgs) - ' If INSERT_ACTIVE = True Then - ' If cmbConnection.SelectedIndex = -1 Or SQL_COMMANDTextBox.Text = String.Empty Or cmbIndexe2.SelectedIndex = -1 Then - ' MsgBox("Bitte wählen Sie eine Connection und definieren einen SQL-Befehl!", MsgBoxStyle.Exclamation) - ' Exit Sub - ' End If - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe2.Text, "SQL-Command", USER_USERNAME, cmbConnection.SelectedValue, SQL_COMMANDTextBox.Text) - ' INSERT_ACTIVE = False - ' Else - ' Dim i, ID As Integer - ' i = TBPM_PROFILE_FINAL_INDEXINGDataGridView.CurrentRow.Index - ' ID = TBPM_PROFILE_FINAL_INDEXINGDataGridView.Item(0, i).Value - ' If ID > 0 Then - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.cmdUpdateSQL(cmbConnection.SelectedValue, SQL_COMMANDTextBox.Text, USER_USERNAME, ID) - ' End If - - ' End If - ' Refresh_Final_indexe() - 'End Sub - - 'Private Sub btnEditor_Click(sender As Object, e As EventArgs) - ' Try - ' Dim CONID = 0 - ' If cmbConnection.SelectedValue > 0 Then - ' CONID = cmbConnection.SelectedValue - ' End If - ' If INSERT_ACTIVE = True Then - ' If cmbIndexe2.SelectedIndex = -1 Then - ' MsgBox("Bitte wählen Sie einen Index!", MsgBoxStyle.Exclamation) - ' Exit Sub - ' End If - - ' TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe2.Text, "SQL-Command", USER_USERNAME, CONID, SQL_COMMANDTextBox.Text) - - ' End If - ' Dim i, ID As Integer - ' Try - ' i = TBPM_PROFILE_FINAL_INDEXINGDataGridView.CurrentRow.Index - ' ID = TBPM_PROFILE_FINAL_INDEXINGDataGridView.Item(0, i).Value - ' If ID > 0 Then - ' CURRENT_INDEX_ID = ID - ' CURRENT_DESIGN_TYPE = "FINAL_INDEX" - ' CURRENT_SQL_COMAMND = SQL_COMMANDTextBox.Text - ' CURRENT_SQL_CON = CONID - ' CURRENT_ProfilGUID = PROFILGUIDTextBox.Text - - ' frmSQL_DESIGNER.ShowDialog() - ' End If - ' Catch ex As Exception - ' clsLogger.Add("Error while operating on TBPM_PROFILE_FINAL_INDEXINGDataGridView: " & ex.Message) - ' End Try - - ' Refresh_Final_indexe() - ' Catch ex As Exception - ' MsgBox("Error while opening SQLEditor: " & ex.Message, MsgBoxStyle.Critical) - ' clsLogger.Add("Error while opening SQLEditor: " & ex.Message) - ' End Try - 'End Sub - 'Private Sub TBPM_PROFILE_FINAL_INDEXINGDataGridView_CellClick(sender As Object, e As DataGridViewCellEventArgs) - ' Try - ' TabControlFinalIndices.Enabled = False - ' TabControlFinalIndices.SelectedIndex = 0 - - ' Dim i, ID As Integer - ' i = TBPM_PROFILE_FINAL_INDEXINGDataGridView.CurrentRow.Index - ' ID = TBPM_PROFILE_FINAL_INDEXINGDataGridView.Item(0, i).Value - ' If ID > 0 Then - ' Dim sql = String.Format("SELECT T.*, T1.BEZEICHNUNG AS CON_STRING FROM TBPM_PROFILE_FINAL_INDEXING T,TBDD_CONNECTION T1 WHERE T.GUID = {0} AND T.CONNECTION_ID = T1.GUID ", ID) - ' CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(sql, True) - - ' Dim Type = TBPM_PROFILE_FINAL_INDEXINGDataGridView.Item(2, i).Value - ' If Type = "SQL-Command" Then - ' Dim Indexname = TBPM_PROFILE_FINAL_INDEXINGDataGridView.Item(1, i).Value - ' TabControlFinalIndices.Enabled = True - ' TabControlFinalIndices.SelectedIndex = 1 - ' cmbIndexe2.Text = Indexname - ' cmbConnection.SelectedValue = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CONNECTION_ID") - ' cmbConnection.FindStringExact(CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CON_STRING")) - ' SQL_COMMANDTextBox.Text = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("SQL_COMMAND") - ' End If - ' End If - ' Catch ex As Exception - ' MsgBox("Error while loading final Index: " & ex.Message, MsgBoxStyle.Critical) - ' clsLogger.Add("Error while loading final Index: " & ex.Message) - ' End Try - 'End Sub - - 'Private Sub btnShowConnections_Click(sender As Object, e As EventArgs) - ' frmConnection.ShowDialog() - 'End Sub - - 'Private Sub btnUserManager_Click(sender As Object, e As EventArgs) Handles btnUserManager.Click - ' Try - ' 'Dim userManagerPath As String = clsModules.GetModulePath("User Manager") - - ' 'If userManagerPath Is Nothing Then - ' ' MsgBox("Pfad zu User Manager konnte nicht gefunden werden!", MsgBoxStyle.Critical) - ' 'Else - - ' ' Dim exePath As String = Path.Combine(userManagerPath, "DDUserManager.exe") - - ' ' If File.Exists(exePath) Then - ' ' Dim psi As New ProcessStartInfo(exePath) - ' ' Process.Start(psi) - ' ' Else - ' ' MsgBox("Programm User Manager konnte nicht gefunden werden!", MsgBoxStyle.Critical) - ' ' End If - ' 'End If - - ' If USER_MANAGER_PATH = "" Then - ' With OpenFileDialog1 - ' ' Do - ' .Filter = "DDUserManager.Exe|*.exe" - ' .FilterIndex = 1 - ' .Title = "search DDUserManager.exe:" - ' If .ShowDialog() = DialogResult.OK Then - - ' USER_MANAGER_PATH = .FileName - ' CONFIG.Config.UserManagerPath = USER_MANAGER_PATH - ' CONFIG.Save() - ' 'SaveMySettingsValue("USRMNGRPATH", .FileName) - ' End If - ' End With - ' End If - ' If File.Exists(USER_MANAGER_PATH) Then - ' Process.Start(USER_MANAGER_PATH) - ' End If - ' Catch ex As Exception - ' LOGGER.Error(ex) - ' MsgBox("Error while startign User Manager:" & vbCrLf & ex.Message, MsgBoxStyle.Critical) - ' End Try - 'End Sub Private Sub frmProfileDesigner_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing If UNSAVED_CHANGES_PROFILE Or UNSAVED_CHANGES_FI Then @@ -1029,7 +706,7 @@ Public Class frmAdministration Private Sub PropertyGrid1_PropertyValueChanged(s As Object, e As PropertyValueChangedEventArgs) Handles PropertyGrid1.PropertyValueChanged - If formloaded = False Then + If FORM_LOADED = False Then Exit Sub End If @@ -1093,10 +770,10 @@ Public Class frmAdministration CURRENT_OBJECTTYPE = cmbObjekttypen.Text CURRENT_ProfilName = NAMETextBox.Text - frmFormDesigner.ProfileId = CURRENT_ProfilGUID - frmFormDesigner.ProfileName = CURRENT_ProfilName - frmFormDesigner.ProfileObjectType = cmbObjekttypen.Text - frmFormDesigner.ShowDialog() + FormDesigner.ProfileId = CURRENT_ProfilGUID + FormDesigner.ProfileName = CURRENT_ProfilName + FormDesigner.ProfileObjectType = cmbObjekttypen.Text + FormDesigner.ShowDialog() Else MsgBox("Eindeutiges Profil konnte nicht an den FormDesigner weitergegeben werden:", MsgBoxStyle.Exclamation) @@ -1460,7 +1137,7 @@ Public Class frmAdministration End Try End Sub Function CHECK_QUESTION_CHANGES() As Boolean - If formloaded = False Then + If FORM_LOADED = False Then Return False End If If UNSAVED_CHANGES_PROFILE Or UNSAVED_CHANGES_FI Then @@ -1492,42 +1169,14 @@ Public Class frmAdministration Return False End Function - 'Private Sub NAMETextBox_TextChanged(sender As Object, e As EventArgs) Handles WD_SEARCHTextBox.TextChanged, TITLETextBox.TextChanged, NAMETextBox.TextChanged, - ' FINAL_TEXTTextBox.TextChanged, DESCRIPTIONTextBox.TextChanged, WORK_HISTORY_ENTRYTextBox.TextChanged, MOVE2FOLDERTextBox.TextChanged - ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then - ' Exit Sub - ' End If - ' 'UNSAVED_CHANGES_PROFILE = True - 'End Sub - 'Private Sub ACTIVECheckBox_Enter(sender As Object, e As EventArgs) Handles ACTIVECheckBox.Enter, SORT_BY_LATESTCheckBox.Enter, FINAL_PROFILECheckBox.Enter - ' Dim ochk As CheckBox = sender - ' If formloaded = False Then - ' Exit Sub - ' End If - ' If change_BindingSource = True Then - ' Exit Sub - ' End If - ' If CURR_BOOL_CONTROL_CONTENT <> ochk.Checked Then - ' CURR_BOOL_CONTROL_CONTENT = ochk.Checked - ' End If - 'End Sub - 'Private Sub ACTIVECheckBox_CheckStateChanged(sender As Object, e As EventArgs) Handles SORT_BY_LATESTCheckBox.CheckStateChanged, FINAL_PROFILECheckBox.CheckStateChanged, ACTIVECheckBox.CheckStateChanged - ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Or CURR_BOOL_CONTROL_CONTENT = CheckState.Indeterminate Then - ' Exit Sub - ' End If - ' Dim ochk As CheckBox = sender - ' If CURR_BOOL_CONTROL_CONTENT <> ochk.Checked Then - ' ' UNSAVED_CHANGES_PROFILE = True - ' End If - 'End Sub Private Sub GridView1_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewProfile.FocusedRowChanged - If formloaded = False Or UNSAVED_CHANGES_PROFILE = True Or UNSAVED_CHANGES_FI = True Or change_BindingSource = True Then + If FORM_LOADED = False Or UNSAVED_CHANGES_PROFILE = True Or UNSAVED_CHANGES_FI = True Or BINDINGSOURCE_CHANGING = True Then Exit Sub End If - change_BindingSource = True - If TabControl1.SelectedIndex = 1 And formloaded Then + BINDINGSOURCE_CHANGING = True + If TabControl1.SelectedIndex = 1 And FORM_LOADED Then Try Dim profileId As Integer = GetCurrentProfileId() If Not IsNothing(profileId) Then @@ -1538,30 +1187,11 @@ Public Class frmAdministration MsgBox($"Error while calling FillProfile_User", MsgBoxStyle.Critical) End Try End If - change_BindingSource = False + BINDINGSOURCE_CHANGING = False End Sub - 'Private Sub TBPM_PROFILEBindingSource_ListChanged(sender As Object, e As ListChangedEventArgs) Handles TBPM_PROFILEBindingSource.ListChanged - ' If formloaded = False Then - ' Exit Sub - ' End If - ' 'Me.TBPM_PROFILEBindingSource.EndEdit() - ' 'If DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges Is Nothing = False Then - ' ' UNSAVED_CHANGES_PROFILE = True - ' ' CHECK_QUESTION_CHANGES() - ' 'End If - 'End Sub - 'Private Sub TBPM_PROFILEBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILEBindingSource.CurrentChanged - ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then - ' Exit Sub - ' End If - ' ' change_BindingSource = True - ' ' Check_Changes() - 'End Sub - 'Private Sub TBPM_PROFILEBindingSource_CurrentItemChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILEBindingSource.CurrentItemChanged - 'End Sub Private Sub TBPM_PROFILEBindingSource_PositionChanged(sender As System.Object, e As System.EventArgs) Handles TBPM_PROFILEBindingSource.PositionChanged - If formloaded = False Then + If FORM_LOADED = False Then Exit Sub End If 'If UNSAVED_CHANGES_PROFILE Then @@ -1755,50 +1385,17 @@ Public Class frmAdministration If IsNumeric(PROFILGUIDTextBox.Text) Then CURRENT_ProfilGUID = PROFILGUIDTextBox.Text 'UNSAVED_CHANGES_PROFILE = False - PROFILEBS_POS = TBPM_PROFILEBindingSource.Position 'change_BindingSource = False - TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, USER_LANGUAGE, CURRENT_ProfilGUID) - CURRENT_CONTROL_NAME_LIST = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS.AsEnumerable(). - Select(Function(row) row.NAME). - ToList() + 'TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, USER_LANGUAGE, CURRENT_ProfilGUID) + 'CURRENT_CONTROL_NAME_LIST = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS.AsEnumerable(). + ' Select(Function(row) row.NAME). + ' ToList() + + FormDesigner.Reload_ControlNameList() End If End Sub - 'Private Sub TextBox_GotFocus(sender As Object, e As EventArgs) Handles NAMETextBox.GotFocus, TITLETextBox.GotFocus, DESCRIPTIONTextBox.GotFocus, WD_SEARCHTextBox.GotFocus, FINAL_TEXTTextBox.GotFocus, MOVE2FOLDERTextBox.GotFocus, - ' WORK_HISTORY_ENTRYTextBox.GotFocus - ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Then - ' Exit Sub - ' End If - ' If change_BindingSource = True Then - ' Exit Sub - ' End If - ' Dim oBox As TextBox = sender - ' If Len(oBox.Text) > 0 Then - ' If CURR_TEXT_CONTROL_CONTENT <> oBox.Text Then - ' CURR_TEXT_CONTROL_CONTENT = oBox.Text - ' End If - ' End If - 'End Sub - - - - 'Private Sub TextBox_Leave(sender As Object, e As EventArgs) Handles NAMETextBox.Leave, TITLETextBox.Leave, DESCRIPTIONTextBox.Leave, WD_SEARCHTextBox.Leave, FINAL_TEXTTextBox.Leave, MOVE2FOLDERTextBox.Leave, WORK_HISTORY_ENTRYTextBox.Leave - ' If formloaded = False Or IsNothing(CURR_TEXT_CONTROL_CONTENT) Then - ' Exit Sub - ' End If - ' 'If change_BindingSource = True Then - ' ' Exit Sub - ' 'End If - ' Dim oBox As TextBox = sender - ' If Len(oBox.Text) > 0 Then - - ' If CURR_TEXT_CONTROL_CONTENT <> oBox.Text Then - ' ' UNSAVED_CHANGES_PROFILE = True - ' End If - ' End If - 'End Sub - Private Sub BarButtonItem26_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem26.ItemClick EditMode_Profile("") End Sub @@ -1834,14 +1431,6 @@ Public Class frmAdministration End If End Sub - 'Private Sub gridFinalIndex_Click(sender As Object, e As EventArgs) Handles gridFinalIndex.Click - ' FinalIndexChanging = False - 'End Sub - - 'Private Sub TBPM_PROFILE_FINAL_INDEXINGBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILE_FINAL_INDEXINGBindingSource.CurrentChanged - ' FinalIndexChanging = True - 'End Sub - Private Sub GridViewProfile_BeforeLeaveRow(sender As Object, e As RowAllowEventArgs) Handles GridViewProfile.BeforeLeaveRow EditMode_Profile("Unlock") End Sub diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 059bbdd..d12b6c0 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -15,7 +15,7 @@ Public Class frmFormDesigner Public ProfileName As String Public ProfileObjectType As String Public Designer_Locked As Boolean = True - Public ControlSelected As String + Public ControlSelected As String = "" ' Control Variables Private CurrentControl As Control = Nothing @@ -35,6 +35,14 @@ Public Class frmFormDesigner Private CurrentColumnId As Integer = 0 + Public Sub Reload_ControlNameList() + TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, USER_LANGUAGE, CURRENT_ProfilGUID) + CURRENT_CONTROL_NAME_LIST = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS.AsEnumerable(). + Where(Function(row) row.CTRL_TYPE <> "LBL"). + Select(Function(row) row.NAME). + OrderBy(Function(name) name). + ToList() + End Sub Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load Try @@ -1303,9 +1311,12 @@ Public Class frmFormDesigner Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {ProfileId}" Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL) Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { - .SQLCommand = oldSQL, - .SQLConnection = 1 - } + .SQLCommand = oldSQL, + .SQLConnection = 1, + .PlaceholdersManualPrefix = "CTRL", + .PlaceholdersManualTitle = "Controls", + .PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name) + } oForm.ShowDialog() If oForm.DialogResult = DialogResult.OK Then @@ -1368,6 +1379,7 @@ Public Class frmFormDesigner If Designer_Locked Then Exit Sub End If + Me.Cursor = Cursors.Cross Mouse_IsPressed = True CurrentControl = Nothing @@ -1412,7 +1424,8 @@ Public Class frmFormDesigner If Designer_Locked Then Exit Sub End If - If Me.Cursor = Cursors.Cross And Mouse_IsPressed = True Then + + If Cursor = Cursors.Cross And Mouse_IsPressed = True Then Dim cursorPosition As Point = pnldesigner.PointToClient(Cursor.Position) Mouse_IsPressed = False @@ -1552,9 +1565,13 @@ Public Class frmFormDesigner .ReadOnly = False } - pnldesigner.Controls.Add(oButton) End Select + + If IsNothing(ControlSelected) = False Then + Reload_ControlNameList() + End If + If Not IsNothing(CurrentControl) Then RibPGCtrlheight.Enabled = True RibPGCtrlWidth.Enabled = True @@ -1565,6 +1582,7 @@ Public Class frmFormDesigner LOGGER.Info(ex) End Try Me.Cursor = Cursors.Default + ControlSelected = "" End If End Sub