通勤認定エクセルツール対応19
This commit is contained in:
@@ -196,7 +196,18 @@ Public Sub Validation_Button()
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
Do_Fit_Internal ws
|
Do_Fit_Internal ws
|
||||||
|
|
||||||
|
' Clear previous error marks before validation
|
||||||
|
Dim lastRow As Long: lastRow = GetLastDataRowInRange(ws)
|
||||||
|
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
|
||||||
|
Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
|
||||||
|
Dim errCol As Long: errCol = ColNum(CStr(sheetConf("ErrorCol")))
|
||||||
|
Dim endCol As Long: endCol = ColNum(CStr(sheetConf("EndCol")))
|
||||||
|
ws.Range(ws.Cells(lastRow + 1, errCol), ws.Cells(1048576, errCol)).ClearContents
|
||||||
|
ws.Range(ws.Cells(lastRow + 1, errCol), ws.Cells(1048576, endCol)).Interior.Color = RGB(255, 255, 255)
|
||||||
|
|
||||||
Application.EnableEvents = True
|
Application.EnableEvents = True
|
||||||
|
Do_Fit_Internal ws
|
||||||
Exit Sub
|
Exit Sub
|
||||||
|
|
||||||
ErrorHandler:
|
ErrorHandler:
|
||||||
|
|||||||
@@ -300,10 +300,10 @@ Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As
|
|||||||
.AddDate "BF"
|
.AddDate "BF"
|
||||||
|
|
||||||
' Number columns (numeric check only, no digit limit)
|
' Number columns (numeric check only, no digit limit)
|
||||||
.AddNumber "L", 2
|
.AddNumber "L", 2, 0
|
||||||
.AddNumber "P", 4, 1
|
.AddNumber "P", 4, 1
|
||||||
.AddNumber "Q", 6
|
.AddNumber "Q", 6, 0
|
||||||
.AddNumber "R", 6
|
.AddNumber "R", 6, 0
|
||||||
|
|
||||||
' G column o3Cache
|
' G column o3Cache
|
||||||
.AddCodeSelect "G", CACHE_O3
|
.AddCodeSelect "G", CACHE_O3
|
||||||
|
|||||||
@@ -142,9 +142,9 @@ Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As
|
|||||||
.AddCodeSelect "K", "renrakuList"
|
.AddCodeSelect "K", "renrakuList"
|
||||||
.AddCodeSelect "L", "tokubetuList"
|
.AddCodeSelect "L", "tokubetuList"
|
||||||
.AddNumber "H", 6, 1
|
.AddNumber "H", 6, 1
|
||||||
.AddNumber "I", 5
|
.AddNumber "I", 5, 0
|
||||||
.AddNumber "J", 6
|
.AddNumber "J", 6, 0
|
||||||
.AddNumber "N"
|
.AddNumber "N", 7, 0
|
||||||
|
|
||||||
End With
|
End With
|
||||||
|
|
||||||
|
|||||||
@@ -118,9 +118,9 @@ Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As
|
|||||||
.AddRequired "K"
|
.AddRequired "K"
|
||||||
.AddRequired "L"
|
.AddRequired "L"
|
||||||
.AddRequired "M"
|
.AddRequired "M"
|
||||||
.AddNumber "L"
|
.AddNumber "L", 10, 3
|
||||||
.AddNumber "M"
|
.AddNumber "M", 7, 0
|
||||||
.AddNumber "N"
|
.AddNumber "N", 3, 0
|
||||||
.AddNumber "O"
|
.AddNumber "O"
|
||||||
.AddNumber "P"
|
.AddNumber "P"
|
||||||
.AddNumber "Q"
|
.AddNumber "Q"
|
||||||
|
|||||||
@@ -71,6 +71,8 @@ Public Function ValidateRow(ws As Worksheet, rowNum As Long, Optional lastDataRo
|
|||||||
If Left(intPart, 1) = "-" Then intPart = Mid(intPart, 2)
|
If Left(intPart, 1) = "-" Then intPart = Mid(intPart, 2)
|
||||||
If Len(intPart) = 0 Then
|
If Len(intPart) = 0 Then
|
||||||
result.SetFail ERR_NUMDIGITS, ColIndex, rowNum, "Number(" & NumberDigits & ", " & NumberDec & ")"
|
result.SetFail ERR_NUMDIGITS, ColIndex, rowNum, "Number(" & NumberDigits & ", " & NumberDec & ")"
|
||||||
|
ElseIf NumberDec = 0 And dotPos > 0 Then
|
||||||
|
result.SetFail ERR_NUMDIGITS, ColIndex, rowNum, "Number(" & NumberDigits & ", " & NumberDec & ")"
|
||||||
ElseIf Len(intPart) > NumberDigits - NumberDec Then
|
ElseIf Len(intPart) > NumberDigits - NumberDec Then
|
||||||
result.SetFail ERR_NUMDIGITS, ColIndex, rowNum, "Number(" & NumberDigits & ", " & NumberDec & ")"
|
result.SetFail ERR_NUMDIGITS, ColIndex, rowNum, "Number(" & NumberDigits & ", " & NumberDec & ")"
|
||||||
ElseIf NumberDec > 0 And Len(decPart) > NumberDec Then
|
ElseIf NumberDec > 0 And Len(decPart) > NumberDec Then
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user