3.4.4.0

app/DD-Record-Organizer/frmDocRecordLink.vb

@@ -23,6 +23,7 @@ Public Class frmDocRecordLink
         Dim DT_RECORDS As DataTable
         If current = True Then
             DT_RECORDS = GET_CURRENT_ENTITY_DATA()
+
         Else
             DT_RECORDS = ENTITY_DATATABLE
         End If
@@ -59,11 +60,11 @@ Public Class frmDocRecordLink
             grvwGrid.Columns.Clear()
             dgEntityRecords.DataSource = DT_RECORDS
             '  grvwGrid.Columns.Item("already linked").Fixed = True
-            grvwGrid.PopulateColumns()
-            dgEntityRecords.RefreshDataSource()
-            grvwGrid.OptionsView.ColumnAutoWidth = False
-            grvwGrid.Columns(0).Fixed = FixedStyle.Left
-            grvwGrid.BestFitColumns()
+            'grvwGrid.PopulateColumns()
+            'dgEntityRecords.RefreshDataSource()
+            'grvwGrid.OptionsView.ColumnAutoWidth = False
+            'grvwGrid.Columns(0).Fixed = FixedStyle.Left
+            'grvwGrid.BestFitColumns()
 
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in format grid", ex.Message, ex.StackTrace)
@@ -80,9 +81,6 @@ Public Class frmDocRecordLink
                 txtFileInfo.Text = String.Format("{0} files selected for linking to record", ClassDocGrid.DT_RESULTFILES.Rows.Count)
             End If
             Try
-                If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then
-                    Me.Close()
-                End If
                 If CURRENT_LINK_ENTITY_ID = 0 Then
                     Refresh_Grid_Data(True, Nothing)
                     CURRENT_LINK_ENTITY_ID = CURRENT_ENTITY_ID
@@ -257,9 +255,9 @@ Public Class frmDocRecordLink
     End Sub
 
     Private Sub btnloadData2Entity_Click(sender As Object, e As EventArgs) Handles btnloadData2Entity.Click
-        Dim entity As ClassEntity = DirectCast(cmbConstructorForms.SelectedItem, ClassEntity)
         Me.Cursor = Cursors.WaitCursor
         If cmbConstructorForms.SelectedIndex <> -1 Then
+            Dim entity As ClassEntity = DirectCast(cmbConstructorForms.SelectedItem, ClassEntity)
             ENTITY_LOAD_ACTIVE = True
             dgEntityRecords.DataSource = Nothing
             grvwGrid.Columns.Clear()