refactor

src/module/Common_Functions.bas

@@ -15,7 +15,15 @@ Option Explicit
 ' Common Functions
 
 ' Get CSV header from specified row and columns
-Function GetCSVHeader(ByVal ws As Worksheet, ByVal colLetters As Variant, ByVal headerRow As Long) As Variant
+Function GetCSVHeader(ByVal ws As Worksheet) As Variant
+    On Error GoTo ErrorHandler
+    '
+    Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
+    Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
+
+    Dim colLetters As Variant: colLetters = sheetConf("HeaderColumns")
+    Dim headerRow As Long: headerRow = sheetConf("HeaderRow")
+
     Dim colCount As Long: colCount = UBound(colLetters) - LBound(colLetters) + 1
     Dim headerArr() As String
     ReDim headerArr(1 To 1, 1 To colCount)
@@ -23,7 +31,10 @@ Function GetCSVHeader(ByVal ws As Worksheet, ByVal colLetters As Variant, ByVal
     Dim i As Long
     Dim cellValue As String
     For i = 0 To colCount - 1
-        cellValue = Trim(ws.Cells(headerRow, Columns(colLetters(i)).Column).Value)
+        Dim colIndex As Long
+        colIndex = Columns(colLetters(i)).Column
+
+        cellValue = Trim(ws.Cells(headerRow, colIndex).Value)
         cellValue = Replace(cellValue, vbLf, "")
         cellValue = Replace(cellValue, vbCr, "")
         cellValue = Replace(cellValue, vbCrLf, "")
@@ -31,8 +42,13 @@ Function GetCSVHeader(ByVal ws As Worksheet, ByVal colLetters As Variant, ByVal
     Next i
     
     GetCSVHeader = headerArr
+    Exit Function
+
+ErrorHandler:
+    Err.Raise 1005, "GetCSVHeader", "Invalid column letter in HeaderColumns: '" & colLetters(i) & "'"
 End Function
 
+'
 Function CleanCSVField(ByVal inputStr As String) As String
     Dim s As String
     s = Trim(inputStr)
@@ -139,16 +155,16 @@ End Function
 ' obtain
 Function GetLastDataRowInRange(ws As Worksheet) As Long
 
-    If dataRangeDict Is Nothing Then Call RefreshDataRangeDict
+    Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
 
-    If dataRangeDict.Exists(ws.CodeName) Then
-        Dim dataRange As Variant: dataRange = dataRangeDict(ws.CodeName)
+    If sheetConfDict.Exists(ws.CodeName) Then
+        Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
 
         Dim startCol As Long, endCol As Long, startRow As Long
         On Error GoTo InvalidColumn
-        startCol = ws.Range(dataRange(0) & "1").Column
-        endCol = ws.Range(dataRange(1) & "1").Column
-        startRow = dataRange(3)
+        startCol = ws.Range(sheetConf("StartCol") & "1").Column
+        endCol = ws.Range(sheetConf("EndCol") & "1").Column
+        startRow = sheetConf("StartRow")
         On Error GoTo 0
 
         ' --- query max row ---
@@ -179,15 +195,37 @@ Function ClearDataRow(ByVal ws As Worksheet, ByVal startCol As Long, ByVal endCo
     End If
 End Function
 
-Function ClearDataRows(ByVal ws As Worksheet, ByVal startCol As Long, ByVal endCol As Long, Optional ByVal startRow As Long = 7)
-    Dim lastDataRow As Long: lastDataRow = GetLastDataRowInRange(ws, startCol, endCol, startRow)
+Sub ClearDataRows(ByVal ws As Worksheet)
+    ' 
+    Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
+    ' 
+    If Not sheetConfDict.Exists(ws.CodeName) Then
+        Err.Raise 1004, "ClearDataRows", "Sheet not configured: " & ws.CodeName
+    End If
 
+    Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
+
+    '
+    Dim startRow As Long: startRow = sheetConf("StartRow")
+    Dim startCol As String: startCol = sheetConf("StartCol")
+    Dim endCol As String: endCol = sheetConf("EndCol")
+    Dim errorCol As String: errorCol = sheetConf("ErrorCol")
+    '
+    Dim lastDataRow As Long: lastDataRow = GetLastDataRowInRange(ws)
+    
+    '
     If lastDataRow >= startRow Then
-        Dim clearRange As Range: Set clearRange = ws.Range(ws.Cells(startRow, startCol), ws.Cells(lastDataRow, endCol))
+        Dim clearRange As Range
+        Set clearRange = ws.Range(ws.Cells(startRow, ws.Range(startCol & "1").Column), ws.Cells(lastDataRow, ws.Range(endCol & "1").Column))
         clearRange.ClearContents
         clearRange.Interior.Color = vbWhite
+
+        Dim clearErrorRange As Range
+        Set clearErrorRange = ws.Range(ws.Cells(startRow, ws.Range(errorCol & "1").Column), ws.Cells(lastDataRow, ws.Range(errorCol & "1").Column))
+        clearErrorRange.ClearContents
+        clearErrorRange.Interior.Color = vbWhite
     End If
-End Function
+End Sub
 
 Sub SortDataRows(Optional ByVal sortColumn As Long = 3)
     Dim ws As Worksheet
@@ -226,26 +264,6 @@ Sub SortDataRows(Optional ByVal sortColumn As Long = 3)
         Header:=xlNo
 End Sub
 
-Sub ToggleAutoFilter(ByVal startColumn As Long, ByVal endColumn As Long, Optional ByVal filterRow As Long = 6)
-    Dim ws As Worksheet: Set ws = ActiveSheet
-    
-    ' Check if auto filter is already on
-    If ws.AutoFilterMode Then
-        ws.AutoFilterMode = False
-        Exit Sub
-    End If
-    If startColumn < 1 Or endColumn < startColumn Then Exit Sub
-    Dim filterRange As Range: Set filterRange = ws.Range(ws.Cells(filterRow, startColumn), ws.Cells(filterRow, endColumn))
-    filterRange.AutoFilter
-End Sub
-
-Sub AutoFitColumnWidth(ByVal fitColumnStart As Long, ByVal fitColumnEnd As Long)
-    Dim ws As Worksheet: Set ws = ActiveSheet
-    If fitColumnStart <= fitColumnEnd Then
-        ws.Range(ws.Columns(fitColumnStart), ws.Columns(fitColumnEnd)).AutoFit
-    End If
-End Sub
-
 ' Format: code:value (no space around colon)
 Function MakeSelect(ByVal code As String, ByVal value As String) As String
     MakeSelect = Trim(code) & ":" & Trim(value)