refactor
This commit is contained in:
@@ -108,6 +108,7 @@ Private Sub Worksheet_Change(ByVal Target As Range)
|
||||
If intersectRng Is Nothing Then Exit Sub
|
||||
|
||||
If Target.Row < 7 Then Exit Sub
|
||||
Dim idx As Long
|
||||
|
||||
Application.EnableEvents = False
|
||||
On Error GoTo Finally
|
||||
@@ -139,7 +140,6 @@ Private Sub Worksheet_Change(ByVal Target As Range)
|
||||
End If
|
||||
|
||||
' === Transport column changes (T, AA, AH, AO) ===
|
||||
Dim idx As Long
|
||||
idx = GetIdx(Target.Column, KUKAN_TRANSPORT_COLS)
|
||||
If idx >= 0 Then
|
||||
Dim cellT As Range
|
||||
@@ -260,7 +260,7 @@ End Sub
|
||||
|
||||
' Fill kukan info from M1 cache (key: kukan code, value: 7 elements)
|
||||
Private Sub FillKukanFromM1(ByVal rowNum As Long, ByVal idx As Long)
|
||||
If m1Cache Is Nothing Then Call RefreshM1Cache
|
||||
Dim m1Cache As Object: Set m1Cache = GetM1Cache()
|
||||
|
||||
Dim codeCol As Long: codeCol = KUKAN_CODE_COLS(idx)
|
||||
Dim transportCol As Long: transportCol = KUKAN_TRANSPORT_COLS(idx)
|
||||
@@ -293,7 +293,7 @@ End Sub
|
||||
|
||||
' Fill address dropdown from O1 cache
|
||||
Private Sub FillAddressFromO1(ByVal rowNum As Long)
|
||||
If o1Cache Is Nothing Then Call RefreshO1Cache
|
||||
Dim o1Cache As Object: Set o1Cache = GetO1Cache()
|
||||
|
||||
Dim empNo As String
|
||||
empNo = Trim(Me.Cells(rowNum, 3).Value)
|
||||
@@ -329,7 +329,7 @@ End Sub
|
||||
|
||||
' Create station (利用区間発) dropdown from M1_KukanD cache
|
||||
Private Sub CreateFromStationDropdown(ByVal rowNum As Long, ByVal transportCol As Long, ByVal stationCol As Long)
|
||||
If m1KukanDCache Is Nothing Then Call RefreshM1KukanDCache
|
||||
Dim m1KukanDCache As Object: Set m1KukanDCache = GetM1KukanDCache()
|
||||
|
||||
Dim transport As String: transport = GetCode(Me.Cells(rowNum, transportCol).Value)
|
||||
If transport = "" Then Exit Sub
|
||||
@@ -361,7 +361,7 @@ End Sub
|
||||
' Create destination (利用区間着) dropdown from M1_KukanD cache
|
||||
' Structure: { D: { F: [G] } }
|
||||
Private Sub CreateToStationDropdown(ByVal rowNum As Long, ByVal transportCol As Long, ByVal stationFromCol As Long, ByVal stationToCol As Long)
|
||||
If m1KukanDCache Is Nothing Then Call RefreshM1KukanDCache
|
||||
Dim m1KukanDCache As Object: Set m1KukanDCache = GetM1KukanDCache()
|
||||
|
||||
Dim transport As String: transport = GetCode(Me.Cells(rowNum, transportCol).Value)
|
||||
Dim stationFrom As String: stationFrom = GetCode(Me.Cells(rowNum, stationFromCol).Value)
|
||||
@@ -396,7 +396,7 @@ End Sub
|
||||
|
||||
' Find kukan code by transport + station_from + station_to (reverse lookup)
|
||||
Private Function FindKukanCodeByStation(ByVal rowNum As Long, ByVal transportCol As Long, ByVal stationFromCol As Long, ByVal stationToCol As Long) As String
|
||||
If m1Cache Is Nothing Then Call RefreshM1Cache
|
||||
Dim m1Cache As Object: Set m1Cache = GetM1Cache()
|
||||
|
||||
Dim transportKbn As String: transportKbn = GetCode(Trim(Me.Cells(rowNum, transportCol).Value))
|
||||
Dim stationFrom As String: stationFrom = Trim(Me.Cells(rowNum, stationFromCol).Value)
|
||||
@@ -427,7 +427,7 @@ End Sub
|
||||
|
||||
' Create dropdown from M2 cache: get code (J列) list for kukanCode + kanshu
|
||||
Private Sub CreateM2CodeDropdown(ByVal rowNum As Long, ByVal kukanCodeCol As Long, ByVal kanshuCol As Long, ByVal codeCol As Long)
|
||||
If m2Cache Is Nothing Then Call RefreshM2Cache
|
||||
Dim m2Cache As Object: Set m2Cache = GetM2Cache()
|
||||
|
||||
Dim kukanCode As String: kukanCode = Trim(Me.Cells(rowNum, kukanCodeCol).Value)
|
||||
Dim kanshu As String: kanshu = Trim(Me.Cells(rowNum, kanshuCol).Value)
|
||||
@@ -465,34 +465,19 @@ Private Sub ClearRowData(ByVal rowNum As Long)
|
||||
Me.Cells(rowNum, ERROR_COL).ClearContents
|
||||
End Sub
|
||||
|
||||
' ====== Button Macros ======
|
||||
Private Sub validateButton()
|
||||
Dim lastRow As Long, r As Long, errorCount As Long
|
||||
lastRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
|
||||
If lastRow < 7 Then
|
||||
MsgBox "No data found.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
errorCount = 0
|
||||
For r = 7 To lastRow
|
||||
Call Validate(r)
|
||||
If Trim(Cells(r, ERROR_COL).Value) <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
MsgBox "Validation complete. Errors: " & errorCount, vbInformation
|
||||
End Sub
|
||||
|
||||
' Validation logic
|
||||
Private Private Sub validate(ByVal rowNum As Long)
|
||||
Set ws = Me
|
||||
|
||||
' Clear background color
|
||||
Me.Range(Me.Cells(rowNum, START_COL), Me.Cells(rowNum, END_COL)).Interior.Color = vbWhite
|
||||
|
||||
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
|
||||
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
|
||||
Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
|
||||
|
||||
Dim startCol As String: startCol = sheetConf("StartCol")
|
||||
Dim endCol As String: endCol = sheetConf("EndCol")
|
||||
Dim errorCol As String: errorCol = sheetConf("ErrorCol")
|
||||
|
||||
Dim clearRange As Range: Set clearRange = ws.Range(ws.Cells(rowNum, startCol), ws.Cells(rowNum, endCol))
|
||||
clearRange.Interior.Color = vbWhite
|
||||
|
||||
' Required columns: C-G, K-N, AW
|
||||
Dim requiredCols As Variant
|
||||
requiredCols = Array("C", "D", "E", "F", "G", "K", "L", "M", "N", "AW")
|
||||
@@ -507,15 +492,3 @@ Private Private Sub validate(ByVal rowNum As Long)
|
||||
|
||||
Me.Cells(rowNum, ERROR_COL).ClearContents
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Sort()
|
||||
Call SortDataRows(3)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Filter()
|
||||
Call ToggleAutoFilter(START_COL, END_COL)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Fit()
|
||||
Call AutoFitColumnWidth(START_COL, END_COL)
|
||||
End Sub
|
||||
|
||||
194
src/sheet/M1.cls
194
src/sheet/M1.cls
@@ -2,29 +2,14 @@
|
||||
' Module Name: Master_Kukan
|
||||
' Module Desc: M1 Kukan master data management (import/export/validate)
|
||||
' Module Methods:
|
||||
' - Import
|
||||
' - Export
|
||||
' - validateButton_Click
|
||||
' - SortData
|
||||
' - ToggleAutoFilter
|
||||
' - CreateEnumDropdown
|
||||
' - Worksheet_Change
|
||||
' - ValidateRow
|
||||
' - FillValidationDropdown
|
||||
' - ValidateAllRows
|
||||
' - Validate
|
||||
' ============================================================
|
||||
' ====== Constants ======
|
||||
Const START_COL As Long = 3 ' C column
|
||||
Const END_COL As Long = 14 ' N column
|
||||
Const ERROR_COL As Long = 15 ' O column
|
||||
Const HEADER_ROW As Long = 5
|
||||
|
||||
Function HEADERS() As Variant
|
||||
HEADERS = Array("C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N")
|
||||
End Function
|
||||
|
||||
' Create dropdown for L column
|
||||
Private Sub CreateEnumDropdown(ByVal rowNum As Long)
|
||||
If tokubetuList Is Nothing Then Call GetTokubetu
|
||||
Dim tokubetuList As Object: Set tokubetuList = GetTokubetu()
|
||||
' Build dropdown list from tokubetuList
|
||||
Dim dropdownList As String
|
||||
dropdownList = ""
|
||||
@@ -49,7 +34,7 @@ Private Sub CreateEnumDropdown(ByVal rowNum As Long)
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
'
|
||||
Private Sub Worksheet_Change(ByVal Target As Range)
|
||||
' === Column C changes: Create L column dropdown ===
|
||||
If Target.Column = 3 And Target.Row >= 7 Then
|
||||
@@ -66,7 +51,7 @@ Private Sub Worksheet_Change(ByVal Target As Range)
|
||||
|
||||
' === Column D changes: Fill E column ===
|
||||
If Target.Column = 4 And Target.Row >= 7 Then
|
||||
If z1Cache Is Nothing Then Call RefreshZ1Cache
|
||||
Dim z1Cache As Object: Set z1Cache = GetZ1Cache()
|
||||
|
||||
Dim cellD As Range
|
||||
For Each cellD In Target
|
||||
@@ -85,57 +70,23 @@ Private Sub Worksheet_Change(ByVal Target As Range)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Sub Import(wsTarget As Worksheet)
|
||||
' === Step 1: Select CSV file ===
|
||||
Dim filePath As String: filePath = SelectCSVFile()
|
||||
If filePath = "" Then Exit Sub
|
||||
Private Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
|
||||
' === Step 2: Read CSV with Shift-JIS (using common function) ===
|
||||
On Error GoTo ImportError
|
||||
Dim csvData As Variant: csvData = ReadCSVAs2DArrayStrict(filePath, 12, "shift_jis", True)
|
||||
On Error GoTo 0
|
||||
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
|
||||
Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
|
||||
|
||||
If UBound(csvData, 1) < 1 Then
|
||||
MsgBox "No data in CSV.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
' === Step 3:Clear all data rows before import ===
|
||||
Application.EnableEvents = False
|
||||
Call ClearDataRows(wsTarget, START_COL, END_COL, 7)
|
||||
Application.EnableEvents = True
|
||||
Dim startCol As String: startCol = sheetConf("StartCol")
|
||||
Dim endCol As String: endCol = sheetConf("EndCol")
|
||||
Dim errorCol As String: errorCol = sheetConf("ErrorCol")
|
||||
|
||||
' === Step 4: Write CSV data to worksheet ===
|
||||
Dim colLetters As Variant: colLetters = HEADERS()
|
||||
Dim writeRow As Long: writeRow = 7
|
||||
Dim i As Long
|
||||
For i = LBound(csvData, 1) To UBound(csvData, 1)
|
||||
' CSV col 1-12 -> C-N column
|
||||
Dim j As Long
|
||||
For j = 0 To 11
|
||||
wsTarget.Cells(writeRow, Columns(colLetters(j)).Column).Value = CleanCSVField(CStr(csvData(i, j + 1)))
|
||||
Next j
|
||||
writeRow = writeRow + 1
|
||||
Next i
|
||||
|
||||
MsgBox writeRow - 7 & " rows imported.", vbInformation
|
||||
Exit Sub
|
||||
|
||||
ImportError:
|
||||
MsgBox "CSV import failed: " & Err.Description, vbExclamation
|
||||
End Sub
|
||||
|
||||
Private Sub validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
|
||||
Dim clearRange As Range
|
||||
Set clearRange = ws.Range(ws.Cells(rowNum, START_COL), ws.Cells(rowNum, END_COL))
|
||||
Dim clearRange As Range: Set clearRange = ws.Range(ws.Cells(rowNum, startCol), ws.Cells(rowNum, endCol))
|
||||
clearRange.Interior.Color = vbWhite
|
||||
|
||||
' Check column required
|
||||
Dim colLetter As Variant
|
||||
For Each colLetter In Array("C", "D", "E", "F", "G", "I", "L")
|
||||
If Trim(ws.Range(colLetter & rowNum).Value) = "" Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = colLetter & " column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = colLetter & " column is required"
|
||||
ws.Range(colLetter & rowNum).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -145,7 +96,7 @@ Private Sub validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As
|
||||
For Each colLetter In Array("H", "I", "J", "N")
|
||||
Dim val As String: val = Trim(ws.Range(colLetter & rowNum).Value)
|
||||
If val <> "" And Not IsNumeric(val) Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = colLetter & " column must be numeric"
|
||||
ws.Cells(rowNum, errorCol).Value = colLetter & " column must be numeric"
|
||||
ws.Range(colLetter & rowNum).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -157,27 +108,27 @@ Private Sub validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As
|
||||
Set foundCell = ws.Range("C7:C" & lastDataRow).Find(What:=cValue, LookIn:=xlValues, LookAt:=xlWhole, SearchOrder:=xlByRows, SearchDirection:=xlNext)
|
||||
If Not foundCell Is Nothing Then
|
||||
If foundCell.Row <> rowNum Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = "C column value is duplicated"
|
||||
ws.Cells(rowNum, errorCol).Value = "C column value is duplicated"
|
||||
ws.Range("C" & rowNum).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
End If
|
||||
|
||||
' Check D and E column in the cache
|
||||
If z1Cache Is Nothing Then Call RefreshZ1Cache
|
||||
Dim z1Cache As Object: Set z1Cache = GetZ1Cache()
|
||||
|
||||
Dim dValue As String: dValue = Trim(ws.Range("D" & rowNum).Value)
|
||||
Dim eValue As String: eValue = Trim(ws.Range("E" & rowNum).Value)
|
||||
|
||||
If Not z1Cache.Exists(dValue) Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = "D column does not exist."
|
||||
ws.Cells(rowNum, errorCol).Value = "D column does not exist."
|
||||
ws.Range("D" & rowNum).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
Else
|
||||
Dim valueArray As Variant
|
||||
valueArray = z1Cache(dValue)
|
||||
If Not IsArray(valueArray) Or UBound(valueArray) < 0 Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = "Invalid reference data for D column."
|
||||
ws.Cells(rowNum, errorCol).Value = "Invalid reference data for D column."
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
@@ -185,121 +136,22 @@ Private Sub validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As
|
||||
expectedEValue = Trim(CStr(valueArray(0)))
|
||||
|
||||
If eValue <> expectedEValue Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = "E column does not match reference data."
|
||||
ws.Cells(rowNum, errorCol).Value = "E column does not match reference data."
|
||||
ws.Range("E" & rowNum).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
End If
|
||||
|
||||
' Check L column in the tokubetuList
|
||||
If tokubetuList Is Nothing Then Call GetTokubetu
|
||||
|
||||
Dim tokubetuList As Object: Set tokubetuList = GetTokubetu()
|
||||
Dim lValue As String: lValue = Trim(ws.Range("L" & rowNum).Value)
|
||||
If Not tokubetuList.Exists(lValue) Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = "L column does not exist."
|
||||
ws.Cells(rowNum, errorCol).Value = "L column does not exist."
|
||||
ws.Range("L" & rowNum).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
' Validation passed - clear error
|
||||
ws.Cells(rowNum, ERROR_COL).ClearContents
|
||||
ws.Cells(rowNum, errorCol).ClearContents
|
||||
End Sub
|
||||
|
||||
' Validate button
|
||||
Sub validateAll(ws As Worksheet)
|
||||
Dim lastDataRow As Long, r As Long, errorCount As Long
|
||||
lastDataRow = GetLastDataRowInRange(ws, START_COL, END_COL)
|
||||
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data found.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
For r = 7 To lastDataRow
|
||||
Validate r, lastDataRow
|
||||
If Trim(ws.Cells(r, ERROR_COL).Value) <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
' === Refresh M1 cache after validation passes ===
|
||||
If errorCount = 0 Then
|
||||
Call RefreshM1Cache
|
||||
End If
|
||||
|
||||
MsgBox "Validation complete. Errors: " & errorCount, vbInformation
|
||||
End Sub
|
||||
|
||||
Private Sub Export()
|
||||
Dim lastDataRow As Long: lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data rows to output.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
' === Step 1: Validate all rows before export ===
|
||||
Dim ws As Worksheet: Set ws = Me
|
||||
Dim r As Long, errorCount As Long
|
||||
For r = 7 To lastDataRow
|
||||
Call validate(r, lastDataRow)
|
||||
If Trim(ws.Cells(r, ERROR_COL).Value) <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
If errorCount > 0 Then
|
||||
MsgBox "Validation failed. Found " & errorCount & " error(s). Please correct them before exporting.", vbCritical
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
' === Step 2: Select save path ===
|
||||
Dim savePath As String: savePath = GetSaveCSVPath()
|
||||
If savePath = "" Then Exit Sub
|
||||
|
||||
' === Step 3: Count data rows ===
|
||||
Dim rowCount As Long: rowCount = lastDataRow - 6
|
||||
|
||||
' === Step 4: Build array with header and data ===
|
||||
Dim headerArr As Variant
|
||||
Dim colLetters As Variant: colLetters = HEADERS()
|
||||
headerArr = GetCSVHeader(ws, colLetters, HEADER_ROW)
|
||||
|
||||
Dim outputArr As Variant
|
||||
ReDim outputArr(1 To rowCount + 1, 1 To 12)
|
||||
|
||||
' Row 1: header
|
||||
Dim colIdx As Long
|
||||
For colIdx = 0 To 11
|
||||
outputArr(1, colIdx + 1) = headerArr(1, colIdx + 1)
|
||||
Next colIdx
|
||||
|
||||
' Rows 2+: data (C-N columns)
|
||||
Dim dataRow As Long: dataRow = 2
|
||||
For r = 7 To lastDataRow
|
||||
For colIdx = 0 To 11
|
||||
outputArr(dataRow, colIdx + 1) = CleanCSVField(ws.Cells(r, Columns(colLetters(colIdx)).Column).Value)
|
||||
Next colIdx
|
||||
dataRow = dataRow + 1
|
||||
Next r
|
||||
|
||||
On Error GoTo ExportError
|
||||
Call WriteCSVFromArray(savePath, outputArr, "shift_jis", False)
|
||||
On Error GoTo 0
|
||||
|
||||
MsgBox "CSV export completed. Total data rows: " & rowCount, vbInformation
|
||||
Exit Sub
|
||||
|
||||
ExportError:
|
||||
MsgBox "CSV export failed: " & Err.Description, vbExclamation
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Sort()
|
||||
Call SortDataRows(3)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Filter()
|
||||
Call ToggleAutoFilter(START_COL, END_COL)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Fit()
|
||||
Call AutoFitColumnWidth(START_COL, END_COL)
|
||||
End Sub
|
||||
185
src/sheet/M2.cls
185
src/sheet/M2.cls
@@ -2,28 +2,11 @@
|
||||
' Module Name: Master_Kukan_detail
|
||||
' Module Desc: M2 Kukan detail master data management
|
||||
' Module Methods:
|
||||
' - Import
|
||||
' - Export
|
||||
' - validateButton_Click
|
||||
' - SortData
|
||||
' - ToggleAutoFilter
|
||||
' - Worksheet_Change
|
||||
' - ValidateRow
|
||||
' - FillValidationDropdown
|
||||
' - ValidateAllRows
|
||||
' - FillFromM1
|
||||
' - validateButton_Click
|
||||
' - Validate
|
||||
' ============================================================
|
||||
' ====== Constants ======
|
||||
Const START_COL As Long = 3 ' C column
|
||||
Const END_COL As Long = 18 ' R column
|
||||
Const ERROR_COL As Long = 19 ' S column
|
||||
Const HEADER_ROW As Long = 6
|
||||
|
||||
Function HEADERS() As Variant
|
||||
HEADERS = Array("C", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R")
|
||||
End Function
|
||||
|
||||
' ====== Function ======
|
||||
|
||||
Private Sub Worksheet_Change(ByVal Target As Range)
|
||||
' === Fill D, E when C column changes ===
|
||||
If Target.Column = 3 And Target.Row >= 7 Then
|
||||
@@ -38,10 +21,10 @@ Private Sub Worksheet_Change(ByVal Target As Range)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Sub FillFromM1(ByVal rowNum As Long, Optional ByVal setG As Boolean = True)
|
||||
Private Sub FillFromM1(ByVal rowNum As Long, Optional ByVal setG As Boolean = True)
|
||||
Set ws = Me
|
||||
|
||||
If m1Cache Is Nothing Then Call RefreshM1Cache
|
||||
Dim m1Cache As Object: Set m1Cache = GetM1Cache()
|
||||
Dim cValue As String: cValue = Trim(ws.Range("C" & rowNum).Value)
|
||||
|
||||
' Fill D, E, F, G, H columns from M1 cache
|
||||
@@ -72,67 +55,31 @@ Sub FillFromM1(ByVal rowNum As Long, Optional ByVal setG As Boolean = True)
|
||||
ws.Cells(rowNum, 8).Value = Trim(cacheVal(6))
|
||||
End Sub
|
||||
|
||||
Sub ClearRowData(ByVal ws As Worksheet, ByVal rowNum As Long)
|
||||
Private Sub ClearRowData(ByVal ws As Worksheet, ByVal rowNum As Long)
|
||||
' Clear from D column onwards
|
||||
ws.Range(ws.Cells(rowNum, 4), ws.Cells(rowNum, 15)).ClearContents
|
||||
ws.Cells(rowNum, 6).Validation.Delete
|
||||
ws.Cells(rowNum, 19).ClearContents ' Q column error info
|
||||
End Sub
|
||||
|
||||
Private Sub Import()
|
||||
' === Step 1: Select CSV file ===
|
||||
Dim filePath As String: filePath = SelectCSVFile()
|
||||
If filePath = "" Then Exit Sub
|
||||
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
|
||||
' === Step 2: Read CSV with Shift-JIS (using common function) ===
|
||||
On Error GoTo ImportError
|
||||
Dim csvData As Variant: csvData = ReadCSVAs2DArrayStrict(filePath, 11, "shift_jis", True)
|
||||
On Error GoTo 0
|
||||
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
|
||||
Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
|
||||
|
||||
If UBound(csvData, 1) < 1 Then
|
||||
MsgBox "No data in CSV.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
' === Step 3:Clear all data rows before import ===
|
||||
Application.EnableEvents = False
|
||||
Dim wsTarget As Worksheet: Set wsTarget = Me
|
||||
Call ClearDataRows(wsTarget, START_COL, ERROR_COL, 7)
|
||||
Application.EnableEvents = True
|
||||
Dim startCol As String: startCol = sheetConf("StartCol")
|
||||
Dim endCol As String: endCol = sheetConf("EndCol")
|
||||
Dim errorCol As String: errorCol = sheetConf("ErrorCol")
|
||||
|
||||
' === Step 4: Write CSV data to worksheet ===
|
||||
Dim colLetters As Variant: colLetters = HEADERS()
|
||||
Dim writeRow As Long: writeRow = 7
|
||||
Dim i As Long
|
||||
For i = LBound(csvData, 1) To UBound(csvData, 1)
|
||||
' CSV col 1-11 -> C, I-R column
|
||||
Dim j As Long
|
||||
For j = 0 To 10
|
||||
wsTarget.Cells(writeRow, Columns(colLetters(j)).Column).Value = CleanCSVField(CStr(csvData(i, j + 1)))
|
||||
Next j
|
||||
writeRow = writeRow + 1
|
||||
Next i
|
||||
|
||||
MsgBox writeRow - 7 & " rows imported.", vbInformation
|
||||
Exit Sub
|
||||
|
||||
ImportError:
|
||||
MsgBox "CSV import failed: " & Err.Description, vbExclamation
|
||||
End Sub
|
||||
|
||||
Private Sub validate(ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
Set ws = Me
|
||||
|
||||
Dim clearRange As Range
|
||||
Set clearRange = ws.Range(ws.Cells(rowNum, START_COL), ws.Cells(rowNum, END_COL))
|
||||
Dim clearRange As Range: Set clearRange = ws.Range(ws.Cells(rowNum, startCol), ws.Cells(rowNum, endCol))
|
||||
clearRange.Interior.Color = vbWhite
|
||||
|
||||
' Check C column in the cache
|
||||
If m1Cache Is Nothing Then Call RefreshM1Cache
|
||||
Dim m1Cache As Object: Set m1Cache = GetM1Cache()
|
||||
Dim cValue As String: cValue = Trim(ws.Range("C" & rowNum).Value)
|
||||
|
||||
If cValue <> "" AND Not m1Cache.Exists(cValue) Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = "C column does not exist in M1."
|
||||
ws.Cells(rowNum, errorCol).Value = "C column does not exist in M1."
|
||||
ws.Range("C" & rowNum).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -141,7 +88,7 @@ Private Sub validate(ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
Dim colLetter As Variant
|
||||
For Each colLetter In Array("C", "I", "J", "K")
|
||||
If Trim(ws.Range(colLetter & rowNum).Value) = "" Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = colLetter & " column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = colLetter & " column is required"
|
||||
ws.Range(colLetter & rowNum).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -153,7 +100,7 @@ Private Sub validate(ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
For Each col In numericCols
|
||||
Dim val As String: val = Trim(ws.Range(col & rowNum).Value & "")
|
||||
If val <> "" And Not IsNumeric(val) Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = col & " column must be numeric"
|
||||
ws.Cells(rowNum, errorCol).Value = col & " column must be numeric"
|
||||
ws.Range(col & rowNum).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -163,105 +110,9 @@ Private Sub validate(ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
Dim kenshuKbn As Variant: kenshuKbn = Array("1", "2", "3")
|
||||
Dim iValue As String: iValue = Trim(ws.Range("I" & rowNum).Value)
|
||||
If UBound(Filter(kenshuKbn, iValue)) = -1 Then
|
||||
ws.Cells(rowNum, ERROR_COL).Value = "I column (kenshuKbn) must be 1, 2, or 3"
|
||||
ws.Cells(rowNum, errorCol).Value = "I column (kenshuKbn) must be 1, 2, or 3"
|
||||
ws.Range("I" & rowNum).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
' Button macro (Validate selected row)
|
||||
Private Sub validateButton()
|
||||
Dim lastDataRow As Long, r As Long, errorCount As Long
|
||||
lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data found.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
For r = 7 To lastDataRow
|
||||
Validate r, lastDataRow
|
||||
If Trim(Cells(r, ERROR_COL).Value) <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
MsgBox "Validation complete. Errors: " & errorCount, vbInformation
|
||||
End Sub
|
||||
|
||||
Private Sub Export()
|
||||
Dim lastDataRow As Long: lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data rows to output.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
' === Step 1: Validate all rows before export ===
|
||||
Dim ws As Worksheet: Set ws = Me
|
||||
Dim r As Long, errorCount As Long
|
||||
For r = 7 To lastDataRow
|
||||
Call validate(r, lastDataRow)
|
||||
If Trim(ws.Cells(r, ERROR_COL).Value) <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
If errorCount > 0 Then
|
||||
MsgBox "Validation failed. Found " & errorCount & " error(s). Please correct them before exporting.", vbCritical
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
' === Step 2: Select save path ===
|
||||
Dim savePath As String: savePath = GetSaveCSVPath()
|
||||
If savePath = "" Then Exit Sub
|
||||
|
||||
' === Step 3: Count data rows ===
|
||||
Dim rowCount As Long: rowCount = lastDataRow - 6
|
||||
|
||||
' === Step 4: Build array with header and data ===
|
||||
Dim headerArr As Variant
|
||||
Dim colLetters As Variant: colLetters = HEADERS()
|
||||
headerArr = GetCSVHeader(ws, colLetters, HEADER_ROW)
|
||||
|
||||
Dim outputArr As Variant
|
||||
ReDim outputArr(1 To rowCount + 1, 1 To 11)
|
||||
|
||||
' Row 1: header
|
||||
Dim colIdx As Long
|
||||
For colIdx = 0 To 10
|
||||
outputArr(1, colIdx + 1) = headerArr(1, colIdx + 1)
|
||||
Next colIdx
|
||||
|
||||
' Rows 2+: data (C, I-R columns)
|
||||
Dim dataRow As Long: dataRow = 2
|
||||
For r = 7 To lastDataRow
|
||||
For colIdx = 0 To 10
|
||||
outputArr(dataRow, colIdx + 1) = CleanCSVField(ws.Cells(r, Columns(colLetters(colIdx)).Column).Value)
|
||||
Next colIdx
|
||||
dataRow = dataRow + 1
|
||||
Next r
|
||||
|
||||
On Error GoTo ExportError
|
||||
Call WriteCSVFromArray(savePath, outputArr, "shift_jis", False)
|
||||
On Error GoTo 0
|
||||
|
||||
MsgBox "CSV export completed. Total data rows: " & rowCount, vbInformation
|
||||
Exit Sub
|
||||
|
||||
ExportError:
|
||||
MsgBox "CSV export failed: " & Err.Description, vbExclamation
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Sort()
|
||||
Call SortDataRows(3)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Filter()
|
||||
Call ToggleAutoFilter(START_COL, END_COL)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Fit()
|
||||
Call AutoFitColumnWidth(START_COL, END_COL)
|
||||
End Sub
|
||||
@@ -2,59 +2,4 @@
|
||||
' Module Name: Master_address
|
||||
' Module Desc: O1 address master data management
|
||||
' Module Methods:
|
||||
' - Import
|
||||
' - Export
|
||||
' - SortData
|
||||
' - ToggleAutoFilter
|
||||
' ============================================================
|
||||
Private Sub Import()
|
||||
Dim filePath As String
|
||||
Dim lines As Variant
|
||||
Dim i As Long
|
||||
Dim writeRow As Long
|
||||
|
||||
Set ws = Me
|
||||
|
||||
On Error GoTo ErrorHandler
|
||||
|
||||
' Step 1: Select CSV file
|
||||
filePath = SelectCSVFile()
|
||||
If filePath = "" Then Exit Sub
|
||||
|
||||
' Step 2: Read CSV and return 2D array
|
||||
lines = ReadCSVAs2DArrayStrict(filePath, 4, "shift-jis", True)
|
||||
|
||||
' Step 3: Clear data rows
|
||||
Call Generic_ClearDataRows(ws, 7, 3)
|
||||
|
||||
' Step 4: Import data
|
||||
writeRow = 7
|
||||
For i = LBound(lines, 1) To UBound(lines, 1)
|
||||
If Not isRowEmpty Then
|
||||
Dim colOffset As Long
|
||||
For colOffset = 1 To 4
|
||||
ws.Cells(writeRow, 2 + colOffset).Value = CleanCSVField(CStr(lines(i, colOffset)))
|
||||
Next colOffset
|
||||
writeRow = writeRow + 1
|
||||
End If
|
||||
Next i
|
||||
|
||||
MsgBox writeRow - 7 & " rows imported.", vbInformation
|
||||
|
||||
Exit Sub
|
||||
|
||||
ErrorHandler:
|
||||
MsgBox "Import fails:" & vbCrLf & Err.Description, vbCritical
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Sort()
|
||||
Call SortDataRows(3)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Filter()
|
||||
Call ToggleAutoFilter(3, 5)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Fit()
|
||||
Call AutoFitColumnWidth(3, 5)
|
||||
End Sub
|
||||
|
||||
@@ -2,24 +2,5 @@
|
||||
' Module Name: Master_507
|
||||
' Module Desc: O2 master data management (507)
|
||||
' Module Methods:
|
||||
' - Import
|
||||
' - Export
|
||||
' - SortData
|
||||
' - ToggleAutoFilter
|
||||
' ============================================================
|
||||
' ====== (507) =======
|
||||
Private Sub Import()
|
||||
Call Generic_Master_Import(Me, 13)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Sort()
|
||||
Call SortDataRows(3)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Filter()
|
||||
Call ToggleAutoFilter(3, 15)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Fit()
|
||||
Call AutoFitColumnWidth(3, 15)
|
||||
End Sub
|
||||
|
||||
116
src/sheet/Z1.cls
116
src/sheet/Z1.cls
@@ -2,64 +2,31 @@
|
||||
' Module Name: Master_222
|
||||
' Module Desc: Z1 master data management (222)
|
||||
' Module Methods:
|
||||
' - Import
|
||||
' - Export
|
||||
' - SortData
|
||||
' - ToggleAutoFilter
|
||||
' - Validate
|
||||
' ============================================================
|
||||
' ====== (222) =======
|
||||
'
|
||||
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
|
||||
' ====== Constants ======
|
||||
Const START_COL As Long = 3
|
||||
Const END_COL As Long = 9
|
||||
Const ERROR_COL As Long = 2
|
||||
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
|
||||
Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
|
||||
|
||||
' ====== Function ======
|
||||
Private Sub Import()
|
||||
Call Generic_Master_Import(Me, 7)
|
||||
End Sub
|
||||
|
||||
Private Sub Export()
|
||||
Dim lastDataRow As Long: lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data rows to output.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Dim r As Long, errorCount As Long
|
||||
For r = 7 To lastDataRow
|
||||
Validate r
|
||||
If Trim(Cells(r, 2).Value & "") <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
If errorCount > 0 Then
|
||||
MsgBox "Validation failed. Found " & errorCount & " error(s). Please correct them before exporting.", vbCritical
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Call Generic_Master_Export(Me, 7, lastDataRow)
|
||||
End Sub
|
||||
|
||||
Private Sub validate(ByVal rowNum As Long)
|
||||
Set ws = Me
|
||||
Dim cValue As String: cValue = Trim(ws.Cells(rowNum, 3).Value)
|
||||
Dim startCol As String: startCol = sheetConf("StartCol")
|
||||
Dim endCol As String: endCol = sheetConf("EndCol")
|
||||
Dim errorCol As String: errorCol = sheetConf("ErrorCol")
|
||||
|
||||
' clear C~I columns background color
|
||||
Dim clearRange As Range
|
||||
Set clearRange = ws.Range(ws.Cells(rowNum, START_COL), ws.Cells(rowNum, END_COL))
|
||||
Dim clearRange As Range: Set clearRange = ws.Range(ws.Cells(rowNum, startCol), ws.Cells(rowNum, endCol))
|
||||
clearRange.Interior.Color = vbWhite
|
||||
|
||||
Dim cValue As String: cValue = Trim(ws.Cells(rowNum, 3).Value)
|
||||
If cValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "C column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = "C column is required"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If Len(cValue) <> 3 Then
|
||||
ws.Cells(rowNum, 2).Value = "C column must be 3 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "C column must be 3 characters"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -69,7 +36,7 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
For i = 1 To 3
|
||||
ch = Mid(cValue, i, 1)
|
||||
If Not ((ch >= "0" And ch <= "9") Or (ch >= "A" And ch <= "Z") Or (ch >= "a" And ch <= "z")) Then
|
||||
ws.Cells(rowNum, 2).Value = "C column must be alphanumeric"
|
||||
ws.Cells(rowNum, errorCol).Value = "C column must be alphanumeric"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -78,12 +45,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim dValue As String
|
||||
dValue = Trim(ws.Cells(rowNum, 4).Value)
|
||||
If dValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "D column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = "D column is required"
|
||||
ws.Cells(rowNum, 4).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If Len(dValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "D column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "D column must be within 80 characters"
|
||||
ws.Cells(rowNum, 4).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -91,12 +58,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim eValue As String
|
||||
eValue = Trim(ws.Cells(rowNum, 5).Value)
|
||||
If eValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "E column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = "E column is required"
|
||||
ws.Cells(rowNum, 5).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If Len(eValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "E column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "E column must be within 80 characters"
|
||||
ws.Cells(rowNum, 5).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -104,7 +71,7 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim fValue As String
|
||||
fValue = Trim(ws.Cells(rowNum, 6).Value)
|
||||
If fValue <> "" And Len(fValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "F column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "F column must be within 80 characters"
|
||||
ws.Cells(rowNum, 6).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -112,7 +79,7 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim gValue As String
|
||||
gValue = Trim(ws.Cells(rowNum, 7).Value)
|
||||
If gValue <> "" And Len(gValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "G column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "G column must be within 80 characters"
|
||||
ws.Cells(rowNum, 7).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -121,12 +88,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
hValue = Trim(ws.Cells(rowNum, 8).Value)
|
||||
If hValue <> "" Then
|
||||
If Len(hValue) <> 1 Then
|
||||
ws.Cells(rowNum, 2).Value = "H column must be 1 digit"
|
||||
ws.Cells(rowNum, errorCol).Value = "H column must be 1 digit"
|
||||
ws.Cells(rowNum, 8).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If hValue <> "0" And hValue <> "1" Then
|
||||
ws.Cells(rowNum, 2).Value = "H column must be 0 or 1"
|
||||
ws.Cells(rowNum, errorCol).Value = "H column must be 0 or 1"
|
||||
ws.Cells(rowNum, 8).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -135,47 +102,10 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim iValue As String
|
||||
iValue = Trim(ws.Cells(rowNum, 9).Value)
|
||||
If iValue <> "" And Len(iValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "I column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "I column must be within 80 characters"
|
||||
ws.Cells(rowNum, 9).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
ws.Cells(rowNum, 2).ClearContents
|
||||
ws.Cells(rowNum, errorCol).ClearContents
|
||||
End Sub
|
||||
|
||||
Private Sub validateButton()
|
||||
Dim lastDataRow As Long, r As Long, errorCount As Long
|
||||
lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data found.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
errorCount = 0
|
||||
For r = 7 To lastDataRow
|
||||
Validate r
|
||||
If Trim(Cells(r, ERROR_COL).Value) <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
' === Refresh Z1 cache after validation passes ===
|
||||
If errorCount = 0 Then
|
||||
Call RefreshZ1Cache
|
||||
End If
|
||||
|
||||
MsgBox "Validation complete. Errors: " & errorCount, vbInformation
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Sort()
|
||||
Call SortDataRows(3)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Filter()
|
||||
Call ToggleAutoFilter(2, END_COL)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Fit()
|
||||
Call AutoFitColumnWidth(2, END_COL)
|
||||
End Sub
|
||||
112
src/sheet/Z2.cls
112
src/sheet/Z2.cls
@@ -2,64 +2,31 @@
|
||||
' Module Name: Master_223
|
||||
' Module Desc: Z2 master data management (223)
|
||||
' Module Methods:
|
||||
' - Import
|
||||
' - Export
|
||||
' - SortData
|
||||
' - ToggleAutoFilter
|
||||
' - Validate
|
||||
' ============================================================
|
||||
' ====== (223) =======
|
||||
'
|
||||
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
|
||||
' ====== Constants ======
|
||||
Const START_COL As Long = 3
|
||||
Const END_COL As Long = 7
|
||||
Const ERROR_COL As Long = 2
|
||||
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
|
||||
Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
|
||||
|
||||
' ====== Function ======
|
||||
Private Sub Import()
|
||||
Call Generic_Master_Import(Me, 5)
|
||||
End Sub
|
||||
|
||||
Private Sub Export()
|
||||
Dim lastDataRow As Long: lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
Dim startCol As String: startCol = sheetConf("StartCol")
|
||||
Dim endCol As String: endCol = sheetConf("EndCol")
|
||||
Dim errorCol As String: errorCol = sheetConf("ErrorCol")
|
||||
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data rows to output.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Dim r As Long, errorCount As Long
|
||||
For r = 7 To lastDataRow
|
||||
Validate r
|
||||
If Trim(Cells(r, 2).Value & "") <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
If errorCount > 0 Then
|
||||
MsgBox "Validation failed. Found " & errorCount & " error(s). Please correct them before exporting.", vbCritical
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Call Generic_Master_Export(Me, 5, lastDataRow)
|
||||
End Sub
|
||||
|
||||
Private Sub validate(ByVal rowNum As Long)
|
||||
Set ws = Me
|
||||
Dim cValue As String: cValue = Trim(ws.Cells(rowNum, 3).Value)
|
||||
|
||||
' clear C~I columns background color
|
||||
Dim clearRange As Range
|
||||
Set clearRange = ws.Range(ws.Cells(rowNum, START_COL), ws.Cells(rowNum, END_COL))
|
||||
Dim clearRange As Range: Set clearRange = ws.Range(ws.Cells(rowNum, startCol), ws.Cells(rowNum, endCol))
|
||||
clearRange.Interior.Color = vbWhite
|
||||
|
||||
Dim cValue As String: cValue = Trim(ws.Cells(rowNum, 3).Value)
|
||||
If cValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "C column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = "C column is required"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If Len(cValue) <> 3 Then
|
||||
ws.Cells(rowNum, 2).Value = "C column must be 3 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "C column must be 3 characters"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -69,7 +36,7 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
For i = 1 To 3
|
||||
ch = Mid(cValue, i, 1)
|
||||
If Not ((ch >= "0" And ch <= "9") Or (ch >= "A" And ch <= "Z") Or (ch >= "a" And ch <= "z")) Then
|
||||
ws.Cells(rowNum, 2).Value = "C column must be alphanumeric"
|
||||
ws.Cells(rowNum, errorCol).Value = "C column must be alphanumeric"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -78,12 +45,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim dValue As String
|
||||
dValue = Trim(ws.Cells(rowNum, 4).Value)
|
||||
If dValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "D column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = "D column is required"
|
||||
ws.Cells(rowNum, 4).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If Len(dValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "D column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "D column must be within 80 characters"
|
||||
ws.Cells(rowNum, 4).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -91,12 +58,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim eValue As String
|
||||
eValue = Trim(ws.Cells(rowNum, 5).Value)
|
||||
If eValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "E column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = "E column is required"
|
||||
ws.Cells(rowNum, 5).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If Len(eValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "E column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "E column must be within 80 characters"
|
||||
ws.Cells(rowNum, 5).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -104,7 +71,7 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim fValue As String
|
||||
fValue = Trim(ws.Cells(rowNum, 6).Value)
|
||||
If fValue <> "" And Len(fValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "F column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "F column must be within 80 characters"
|
||||
ws.Cells(rowNum, 6).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -113,53 +80,16 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
hValue = Trim(ws.Cells(rowNum, 7).Value)
|
||||
If hValue <> "" Then
|
||||
If Len(hValue) <> 1 Then
|
||||
ws.Cells(rowNum, 2).Value = "G column must be 1 digit"
|
||||
ws.Cells(rowNum, errorCol).Value = "G column must be 1 digit"
|
||||
ws.Cells(rowNum, 7).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If hValue <> "0" And hValue <> "1" Then
|
||||
ws.Cells(rowNum, 2).Value = "G column must be 0 or 1"
|
||||
ws.Cells(rowNum, errorCol).Value = "G column must be 0 or 1"
|
||||
ws.Cells(rowNum, 7).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
End If
|
||||
|
||||
ws.Cells(rowNum, 2).ClearContents
|
||||
ws.Cells(rowNum, errorCol).ClearContents
|
||||
End Sub
|
||||
|
||||
Private Sub validateButton()
|
||||
Dim lastDataRow As Long, r As Long, errorCount As Long
|
||||
lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data found.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
errorCount = 0
|
||||
For r = 7 To lastDataRow
|
||||
Validate r
|
||||
If Trim(Cells(r, ERROR_COL).Value) <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
' === Refresh Z2 cache after validation passes ===
|
||||
If errorCount = 0 Then
|
||||
Call RefreshZ2Cache
|
||||
End If
|
||||
|
||||
MsgBox "Validation complete. Errors: " & errorCount, vbInformation
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Sort()
|
||||
Call SortDataRows(3)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Filter()
|
||||
Call ToggleAutoFilter(2, END_COL)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Fit()
|
||||
Call AutoFitColumnWidth(2, END_COL)
|
||||
End Sub
|
||||
115
src/sheet/Z3.cls
115
src/sheet/Z3.cls
@@ -2,64 +2,30 @@
|
||||
' Module Name: Master_Z3_224
|
||||
' Module Desc: Z3 master data management (224)
|
||||
' Module Methods:
|
||||
' - Z3_Import
|
||||
' - Z3_Export
|
||||
' - Z3_SortDataRowsByC
|
||||
' - Z3_ToggleAutoFilter
|
||||
' - Validate
|
||||
' ============================================================
|
||||
' ====== (224) =======
|
||||
'
|
||||
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
|
||||
Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
|
||||
|
||||
' ====== Constants ======
|
||||
Const START_COL As Long = 3
|
||||
Const END_COL As Long = 8
|
||||
Const ERROR_COL As Long = 2
|
||||
|
||||
' ====== Function ======
|
||||
Private Sub Import()
|
||||
Call Generic_Master_Import(Me, 6)
|
||||
End Sub
|
||||
|
||||
Private Sub Export()
|
||||
Dim lastDataRow As Long: lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
Dim startCol As String: startCol = sheetConf("StartCol")
|
||||
Dim endCol As String: endCol = sheetConf("EndCol")
|
||||
Dim errorCol As String: errorCol = sheetConf("ErrorCol")
|
||||
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data rows to output.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Dim r As Long, errorCount As Long
|
||||
For r = 7 To lastDataRow
|
||||
Validate r
|
||||
If Trim(Cells(r, 2).Value & "") <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
If errorCount > 0 Then
|
||||
MsgBox "Validation failed. Found " & errorCount & " error(s). Please correct them before exporting.", vbCritical
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Call Generic_Master_Export(Me, 6, lastDataRow)
|
||||
End Sub
|
||||
|
||||
Private Sub validate(ByVal rowNum As Long)
|
||||
Set ws = Me
|
||||
Dim cValue As String: cValue = Trim(ws.Cells(rowNum, 3).Value)
|
||||
|
||||
' clear C~I columns background color
|
||||
Dim clearRange As Range
|
||||
Set clearRange = ws.Range(ws.Cells(rowNum, START_COL), ws.Cells(rowNum, END_COL))
|
||||
Dim clearRange As Range: Set clearRange = ws.Range(ws.Cells(rowNum, startCol), ws.Cells(rowNum, endCol))
|
||||
clearRange.Interior.Color = vbWhite
|
||||
|
||||
Dim cValue As String: cValue = Trim(ws.Cells(rowNum, 3).Value)
|
||||
If cValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "C column is required"
|
||||
ws.Cells(rowNum, endCol).Value = "C column is required"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If Len(cValue) <> 3 Then
|
||||
ws.Cells(rowNum, 2).Value = "C column must be 3 characters"
|
||||
ws.Cells(rowNum, endCol).Value = "C column must be 3 characters"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -69,7 +35,7 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
For i = 1 To 3
|
||||
ch = Mid(cValue, i, 1)
|
||||
If Not ((ch >= "0" And ch <= "9") Or (ch >= "A" And ch <= "Z") Or (ch >= "a" And ch <= "z")) Then
|
||||
ws.Cells(rowNum, 2).Value = "C column must be alphanumeric"
|
||||
ws.Cells(rowNum, endCol).Value = "C column must be alphanumeric"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -78,12 +44,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim dValue As String
|
||||
dValue = Trim(ws.Cells(rowNum, 4).Value)
|
||||
If dValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "D column is required"
|
||||
ws.Cells(rowNum, endCol).Value = "D column is required"
|
||||
ws.Cells(rowNum, 4).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If Len(dValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "D column must be within 80 characters"
|
||||
ws.Cells(rowNum, endCol).Value = "D column must be within 80 characters"
|
||||
ws.Cells(rowNum, 4).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -91,12 +57,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim eValue As String
|
||||
eValue = Trim(ws.Cells(rowNum, 5).Value)
|
||||
If eValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "E column is required"
|
||||
ws.Cells(rowNum, endCol).Value = "E column is required"
|
||||
ws.Cells(rowNum, 5).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If Len(eValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "E column must be within 80 characters"
|
||||
ws.Cells(rowNum, endCol).Value = "E column must be within 80 characters"
|
||||
ws.Cells(rowNum, 5).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -104,7 +70,7 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim fValue As String
|
||||
fValue = Trim(ws.Cells(rowNum, 6).Value)
|
||||
If fValue <> "" And Len(fValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "F column must be within 80 characters"
|
||||
ws.Cells(rowNum, endCol).Value = "F column must be within 80 characters"
|
||||
ws.Cells(rowNum, 6).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -113,12 +79,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
hValue = Trim(ws.Cells(rowNum, 7).Value)
|
||||
If hValue <> "" Then
|
||||
If Len(hValue) <> 1 Then
|
||||
ws.Cells(rowNum, 2).Value = "G column must be 1 digit"
|
||||
ws.Cells(rowNum, endCol).Value = "G column must be 1 digit"
|
||||
ws.Cells(rowNum, 7).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If hValue <> "0" And hValue <> "1" Then
|
||||
ws.Cells(rowNum, 2).Value = "G column must be 0 or 1"
|
||||
ws.Cells(rowNum, endCol).Value = "G column must be 0 or 1"
|
||||
ws.Cells(rowNum, 7).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -127,47 +93,10 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim iValue As String
|
||||
iValue = Trim(ws.Cells(rowNum, 8).Value)
|
||||
If iValue <> "" And Len(iValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "H column must be within 80 characters"
|
||||
ws.Cells(rowNum, endCol).Value = "H column must be within 80 characters"
|
||||
ws.Cells(rowNum, 8).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
ws.Cells(rowNum, 2).ClearContents
|
||||
ws.Cells(rowNum, endCol).ClearContents
|
||||
End Sub
|
||||
|
||||
Private Sub validateButton()
|
||||
Dim lastDataRow As Long, r As Long, errorCount As Long
|
||||
lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data found.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
errorCount = 0
|
||||
For r = 7 To lastDataRow
|
||||
Validate r
|
||||
If Trim(Cells(r, ERROR_COL).Value) <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
' === Refresh Z3 cache after validation passes ===
|
||||
If errorCount = 0 Then
|
||||
Call RefreshZ3Cache
|
||||
End If
|
||||
|
||||
MsgBox "Validation complete. Errors: " & errorCount, vbInformation
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Sort()
|
||||
Call SortDataRows(3)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Filter()
|
||||
Call ToggleAutoFilter(2, END_COL)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Fit()
|
||||
Call AutoFitColumnWidth(2, END_COL)
|
||||
End Sub
|
||||
115
src/sheet/Z4.cls
115
src/sheet/Z4.cls
@@ -2,64 +2,30 @@
|
||||
' Module Name: Master_Z4_220
|
||||
' Module Desc: Z4 master data management (220)
|
||||
' Module Methods:
|
||||
' - Z4_Import
|
||||
' - Z4_Export
|
||||
' - Z4_SortDataRowsByC
|
||||
' - Z4_ToggleAutoFilter
|
||||
' - Validate
|
||||
' ============================================================
|
||||
' ====== (220) =======
|
||||
'
|
||||
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)
|
||||
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
|
||||
Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
|
||||
|
||||
' ====== Constants ======
|
||||
Const START_COL As Long = 3
|
||||
Const END_COL As Long = 9
|
||||
Const ERROR_COL As Long = 2
|
||||
|
||||
' ====== Function ======
|
||||
Private Sub Import()
|
||||
Call Generic_Master_Import(Me, 7)
|
||||
End Sub
|
||||
|
||||
Private Sub Export()
|
||||
Dim lastDataRow As Long: lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
Dim startCol As String: startCol = sheetConf("StartCol")
|
||||
Dim endCol As String: endCol = sheetConf("EndCol")
|
||||
Dim errorCol As String: errorCol = sheetConf("ErrorCol")
|
||||
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data rows to output.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Dim r As Long, errorCount As Long
|
||||
For r = 7 To lastDataRow
|
||||
Validate r
|
||||
If Trim(Cells(r, 2).Value & "") <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
If errorCount > 0 Then
|
||||
MsgBox "Validation failed. Found " & errorCount & " error(s). Please correct them before exporting.", vbCritical
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Call Generic_Master_Export(Me, 7, lastDataRow)
|
||||
End Sub
|
||||
|
||||
Private Sub validate(ByVal rowNum As Long)
|
||||
Set ws = Me
|
||||
Dim cValue As String: cValue = Trim(ws.Cells(rowNum, 3).Value)
|
||||
|
||||
' clear C~I columns background color
|
||||
Dim clearRange As Range
|
||||
Set clearRange = ws.Range(ws.Cells(rowNum, START_COL), ws.Cells(rowNum, END_COL))
|
||||
Dim clearRange As Range: Set clearRange = ws.Range(ws.Cells(rowNum, startCol), ws.Cells(rowNum, endCol))
|
||||
clearRange.Interior.Color = vbWhite
|
||||
|
||||
Dim cValue As String: cValue = Trim(ws.Cells(rowNum, 3).Value)
|
||||
If cValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "C column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = "C column is required"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If Len(cValue) <> 3 Then
|
||||
ws.Cells(rowNum, 2).Value = "C column must be 3 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "C column must be 3 characters"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -69,7 +35,7 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
For i = 1 To 3
|
||||
ch = Mid(cValue, i, 1)
|
||||
If Not ((ch >= "0" And ch <= "9") Or (ch >= "A" And ch <= "Z") Or (ch >= "a" And ch <= "z")) Then
|
||||
ws.Cells(rowNum, 2).Value = "C column must be alphanumeric"
|
||||
ws.Cells(rowNum, errorCol).Value = "C column must be alphanumeric"
|
||||
ws.Cells(rowNum, 3).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -78,12 +44,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim dValue As String
|
||||
dValue = Trim(ws.Cells(rowNum, 4).Value)
|
||||
If dValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "D column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = "D column is required"
|
||||
ws.Cells(rowNum, 4).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If Len(dValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "D column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "D column must be within 80 characters"
|
||||
ws.Cells(rowNum, 4).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -91,12 +57,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim eValue As String
|
||||
eValue = Trim(ws.Cells(rowNum, 5).Value)
|
||||
If eValue = "" Then
|
||||
ws.Cells(rowNum, 2).Value = "E column is required"
|
||||
ws.Cells(rowNum, errorCol).Value = "E column is required"
|
||||
ws.Cells(rowNum, 5).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If Len(eValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "E column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "E column must be within 80 characters"
|
||||
ws.Cells(rowNum, 5).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -104,7 +70,7 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim fValue As String
|
||||
fValue = Trim(ws.Cells(rowNum, 6).Value)
|
||||
If fValue <> "" And Len(fValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "F column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "F column must be within 80 characters"
|
||||
ws.Cells(rowNum, 6).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -113,12 +79,12 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
hValue = Trim(ws.Cells(rowNum, 7).Value)
|
||||
If hValue <> "" Then
|
||||
If Len(hValue) <> 1 Then
|
||||
ws.Cells(rowNum, 2).Value = "G column must be 1 digit"
|
||||
ws.Cells(rowNum, errorCol).Value = "G column must be 1 digit"
|
||||
ws.Cells(rowNum, 7).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
If hValue <> "0" And hValue <> "1" Then
|
||||
ws.Cells(rowNum, 2).Value = "G column must be 0 or 1"
|
||||
ws.Cells(rowNum, errorCol).Value = "G column must be 0 or 1"
|
||||
ws.Cells(rowNum, 7).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -127,47 +93,10 @@ Private Sub validate(ByVal rowNum As Long)
|
||||
Dim iValue As String
|
||||
iValue = Trim(ws.Cells(rowNum, 8).Value)
|
||||
If iValue <> "" And Len(iValue) > 80 Then
|
||||
ws.Cells(rowNum, 2).Value = "H column must be within 80 characters"
|
||||
ws.Cells(rowNum, errorCol).Value = "H column must be within 80 characters"
|
||||
ws.Cells(rowNum, 8).Interior.Color = RGB(255, 0, 0)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
ws.Cells(rowNum, 2).ClearContents
|
||||
ws.Cells(rowNum, errorCol).ClearContents
|
||||
End Sub
|
||||
|
||||
Private Sub validateButton()
|
||||
Dim lastDataRow As Long, r As Long, errorCount As Long
|
||||
lastDataRow = GetLastDataRowInRange(Me, START_COL, END_COL)
|
||||
|
||||
If lastDataRow < 7 Then
|
||||
MsgBox "No data found.", vbExclamation
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
errorCount = 0
|
||||
For r = 7 To lastDataRow
|
||||
Validate r
|
||||
If Trim(Cells(r, ERROR_COL).Value) <> "" Then
|
||||
errorCount = errorCount + 1
|
||||
End If
|
||||
Next r
|
||||
|
||||
' === Refresh Z4 cache after validation passes ===
|
||||
If errorCount = 0 Then
|
||||
Call RefreshZ4Cache
|
||||
End If
|
||||
|
||||
MsgBox "Validation complete. Errors: " & errorCount, vbInformation
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Sort()
|
||||
Call SortDataRows(3)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Filter()
|
||||
Call ToggleAutoFilter(2, END_COL)
|
||||
End Sub
|
||||
|
||||
Private Sub Do_Fit()
|
||||
Call AutoFitColumnWidth(2, END_COL)
|
||||
End Sub
|
||||
Reference in New Issue
Block a user