From 2b1ec0f68aa6cf408f478893125b77b518bbed99 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 25 Jan 2021 16:40:52 +0100 Subject: [PATCH] ms --- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb | 3 +++ app/DD_PM_WINDREAM/frmAdministration.resx | 2 +- app/DD_PM_WINDREAM/frmAdministration.vb | 27 +++++++++-------------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb index fb5fc2a..034ad6a 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.vb @@ -26,6 +26,9 @@ End Class Namespace DD_DMSLiteDataSetTableAdapters Partial Public Class TBPM_PROFILETableAdapter + Private Sub TBPM_PROFILETableAdapter_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed + + End Sub End Class Partial Public Class TBDD_USERTableAdapter diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 98d9fe2..f97c102 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -2134,7 +2134,7 @@ 3, 3, 3, 3 - 962, 313 + 962, 316 1 diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 1df9553..68adf31 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -1376,12 +1376,8 @@ Public Class frmAdministration If formloaded = False Then Exit Sub End If - If UNSAVED_CHANGES_PROFILE Then - CHECK_QUESTION_CHANGES() - End If ' Check_Changes() change_BindingSource = True - CHECK_QUESTION_CHANGES() End Sub Private Sub TBPM_PROFILEBindingSource_PositionChanged(sender As System.Object, e As System.EventArgs) Handles TBPM_PROFILEBindingSource.PositionChanged If formloaded = False Then @@ -1506,14 +1502,6 @@ Public Class frmAdministration ' End Sub - Private Sub GridView1_ValidateRow(sender As Object, e As ValidateRowEventArgs) Handles GridViewProfile.ValidateRow - If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then - Exit Sub - - End If - change_BindingSource = True - 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 @@ -1722,19 +1710,26 @@ Public Class frmAdministration 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 Then - Exit Sub - End If - If change_BindingSource = True Then + 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 TBPM_PROFILEBindingSource_DataError(sender As Object, e As BindingManagerDataErrorEventArgs) Handles TBPM_PROFILEBindingSource.DataError + End Sub + + Private Sub TBPM_PROFILETableAdapter_Disposed(sender As Object, e As EventArgs) Handles TBPM_PROFILETableAdapter.Disposed + + End Sub End Class \ No newline at end of file