diff --git a/.VSCodeCounter/2026-04-23_10-41-31/details.md b/.VSCodeCounter/2026-04-23_10-41-31/details.md deleted file mode 100644 index da81289..0000000 --- a/.VSCodeCounter/2026-04-23_10-41-31/details.md +++ /dev/null @@ -1,34 +0,0 @@ -# Details - -Date : 2026-04-23 10:41:31 - -Directory d:\\Project\\upds7\\vba\\src - -Total : 19 files, 3122 codes, 483 comments, 650 blanks, all 4255 lines - -[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md) - -## Files -| filename | language | code | comment | blank | total | -| :--- | :--- | ---: | ---: | ---: | ---: | -| [src/init\_module/Import\_modules.bas](/src/init_module/Import_modules.bas) | Visual Basic for Applications | 156 | 13 | 30 | 199 | -| [src/init\_module/Test\_Cache.bas](/src/init_module/Test_Cache.bas) | Visual Basic for Applications | 161 | 12 | 26 | 199 | -| [src/module/Common\_Button.bas](/src/module/Common_Button.bas) | Visual Basic for Applications | 257 | 29 | 73 | 359 | -| [src/module/Common\_File\_Utils.bas](/src/module/Common_File_Utils.bas) | Visual Basic for Applications | 262 | 43 | 43 | 348 | -| [src/module/Common\_Functions.bas](/src/module/Common_Functions.bas) | Visual Basic for Applications | 371 | 42 | 74 | 487 | -| [src/module/Common\_Global\_Cache.bas](/src/module/Common_Global_Cache.bas) | Visual Basic for Applications | 456 | 51 | 80 | 587 | -| [src/module/Common\_Selector.bas](/src/module/Common_Selector.bas) | Visual Basic for Applications | 122 | 22 | 18 | 162 | -| [src/sheet/C1.cls](/src/sheet/C1.cls) | Visual Basic for Applications | 664 | 83 | 100 | 847 | -| [src/sheet/M1.cls](/src/sheet/M1.cls) | Visual Basic for Applications | 124 | 20 | 24 | 168 | -| [src/sheet/M2.cls](/src/sheet/M2.cls) | Visual Basic for Applications | 294 | 53 | 54 | 401 | -| [src/sheet/O1.cls](/src/sheet/O1.cls) | Visual Basic for Applications | 0 | 5 | 1 | 6 | -| [src/sheet/O2.cls](/src/sheet/O2.cls) | Visual Basic for Applications | 0 | 6 | 1 | 7 | -| [src/sheet/T1.cls](/src/sheet/T1.cls) | Visual Basic for Applications | 28 | 13 | 14 | 55 | -| [src/sheet/T2.cls](/src/sheet/T2.cls) | Visual Basic for Applications | 64 | 19 | 32 | 115 | -| [src/sheet/T3.cls](/src/sheet/T3.cls) | Visual Basic for Applications | 40 | 15 | 20 | 75 | -| [src/sheet/Z1.cls](/src/sheet/Z1.cls) | Visual Basic for Applications | 33 | 15 | 17 | 65 | -| [src/sheet/Z2.cls](/src/sheet/Z2.cls) | Visual Basic for Applications | 28 | 13 | 14 | 55 | -| [src/sheet/Z3.cls](/src/sheet/Z3.cls) | Visual Basic for Applications | 30 | 14 | 14 | 58 | -| [src/sheet/Z4.cls](/src/sheet/Z4.cls) | Visual Basic for Applications | 32 | 15 | 15 | 62 | - -[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md) \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-23_10-41-31/diff-details.md b/.VSCodeCounter/2026-04-23_10-41-31/diff-details.md deleted file mode 100644 index e665461..0000000 --- a/.VSCodeCounter/2026-04-23_10-41-31/diff-details.md +++ /dev/null @@ -1,48 +0,0 @@ -# Diff Details - -Date : 2026-04-23 10:41:31 - -Directory d:\\Project\\upds7\\vba\\src - -Total : 33 files, 995 codes, 235 comments, 213 blanks, all 1443 lines - -[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details - -## Files -| filename | language | code | comment | blank | total | -| :--- | :--- | ---: | ---: | ---: | ---: | -| [src/init\_module/Import\_modules.bas](/src/init_module/Import_modules.bas) | Visual Basic for Applications | 156 | 13 | 30 | 199 | -| [src/init\_module/Test\_Cache.bas](/src/init_module/Test_Cache.bas) | Visual Basic for Applications | 161 | 12 | 26 | 199 | -| [src/module/Common\_Button.bas](/src/module/Common_Button.bas) | Visual Basic for Applications | 257 | 29 | 73 | 359 | -| [src/module/Common\_File\_Utils.bas](/src/module/Common_File_Utils.bas) | Visual Basic for Applications | 262 | 43 | 43 | 348 | -| [src/module/Common\_Functions.bas](/src/module/Common_Functions.bas) | Visual Basic for Applications | 371 | 42 | 74 | 487 | -| [src/module/Common\_Global\_Cache.bas](/src/module/Common_Global_Cache.bas) | Visual Basic for Applications | 456 | 51 | 80 | 587 | -| [src/module/Common\_Selector.bas](/src/module/Common_Selector.bas) | Visual Basic for Applications | 122 | 22 | 18 | 162 | -| [src/module/Generic\_Master\_Common.bas](/src/module/Generic_Master_Common.bas) | Visual Basic for Applications | -58 | -12 | -17 | -87 | -| [src/module/Global\_Cache.bas](/src/module/Global_Cache.bas) | Visual Basic for Applications | -195 | -43 | -69 | -307 | -| [src/module/Module\_Common.bas](/src/module/Module_Common.bas) | Visual Basic for Applications | -171 | -23 | -35 | -229 | -| [src/module/Read\_Common.bas](/src/module/Read_Common.bas) | Visual Basic for Applications | -153 | -17 | -19 | -189 | -| [src/module/Test\_Cache.bas](/src/module/Test_Cache.bas) | Visual Basic for Applications | -159 | -4 | -25 | -188 | -| [src/module/Write\_Common.bas](/src/module/Write_Common.bas) | Visual Basic for Applications | -106 | -11 | -21 | -138 | -| [src/sheet/C1.cls](/src/sheet/C1.cls) | Visual Basic for Applications | 664 | 83 | 100 | 847 | -| [src/sheet/M1.cls](/src/sheet/M1.cls) | Visual Basic for Applications | 124 | 20 | 24 | 168 | -| [src/sheet/M2.cls](/src/sheet/M2.cls) | Visual Basic for Applications | 294 | 53 | 54 | 401 | -| [src/sheet/O1.cls](/src/sheet/O1.cls) | Visual Basic for Applications | 0 | 5 | 1 | 6 | -| [src/sheet/O2.cls](/src/sheet/O2.cls) | Visual Basic for Applications | 0 | 6 | 1 | 7 | -| [src/sheet/T1.cls](/src/sheet/T1.cls) | Visual Basic for Applications | 28 | 13 | 14 | 55 | -| [src/sheet/T2.cls](/src/sheet/T2.cls) | Visual Basic for Applications | 64 | 19 | 32 | 115 | -| [src/sheet/T3.cls](/src/sheet/T3.cls) | Visual Basic for Applications | 40 | 15 | 20 | 75 | -| [src/sheet/Z1.cls](/src/sheet/Z1.cls) | Visual Basic for Applications | 33 | 15 | 17 | 65 | -| [src/sheet/Z2.cls](/src/sheet/Z2.cls) | Visual Basic for Applications | 28 | 13 | 14 | 55 | -| [src/sheet/Z3.cls](/src/sheet/Z3.cls) | Visual Basic for Applications | 30 | 14 | 14 | 58 | -| [src/sheet/Z4.cls](/src/sheet/Z4.cls) | Visual Basic for Applications | 32 | 15 | 15 | 62 | -| [src/thisWorkbook/Master\_M1\_Kukan.bas](/src/thisWorkbook/Master_M1_Kukan.bas) | Visual Basic for Applications | -234 | -25 | -53 | -312 | -| [src/thisWorkbook/Master\_M2\_Kukan\_detail.bas](/src/thisWorkbook/Master_M2_Kukan_detail.bas) | Visual Basic for Applications | -176 | -32 | -45 | -253 | -| [src/thisWorkbook/Master\_O1\_address.bas](/src/thisWorkbook/Master_O1_address.bas) | Visual Basic for Applications | -35 | -4 | -13 | -52 | -| [src/thisWorkbook/Master\_O2\_507.bas](/src/thisWorkbook/Master_O2_507.bas) | Visual Basic for Applications | -12 | -1 | -4 | -17 | -| [src/thisWorkbook/Master\_Z1\_222.bas](/src/thisWorkbook/Master_Z1_222.bas) | Visual Basic for Applications | -140 | -5 | -27 | -172 | -| [src/thisWorkbook/Master\_Z2\_223.bas](/src/thisWorkbook/Master_Z2_223.bas) | Visual Basic for Applications | -126 | -5 | -25 | -156 | -| [src/thisWorkbook/Master\_Z3\_224.bas](/src/thisWorkbook/Master_Z3_224.bas) | Visual Basic for Applications | -133 | -5 | -26 | -164 | -| [src/thisWorkbook/Tukin\_C1.bas](/src/thisWorkbook/Tukin_C1.bas) | Visual Basic for Applications | -429 | -61 | -58 | -548 | - -[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-23_10-41-31/diff.csv b/.VSCodeCounter/2026-04-23_10-41-31/diff.csv deleted file mode 100644 index fffd30c..0000000 --- a/.VSCodeCounter/2026-04-23_10-41-31/diff.csv +++ /dev/null @@ -1,35 +0,0 @@ -"filename", "language", "Visual Basic for Applications", "comment", "blank", "total" -"d:\Project\upds7\vba\src\init_module\Import_modules.bas", "Visual Basic for Applications", 156, 13, 30, 199 -"d:\Project\upds7\vba\src\init_module\Test_Cache.bas", "Visual Basic for Applications", 161, 12, 26, 199 -"d:\Project\upds7\vba\src\module\Common_Button.bas", "Visual Basic for Applications", 257, 29, 73, 359 -"d:\Project\upds7\vba\src\module\Common_File_Utils.bas", "Visual Basic for Applications", 262, 43, 43, 348 -"d:\Project\upds7\vba\src\module\Common_Functions.bas", "Visual Basic for Applications", 371, 42, 74, 487 -"d:\Project\upds7\vba\src\module\Common_Global_Cache.bas", "Visual Basic for Applications", 456, 51, 80, 587 -"d:\Project\upds7\vba\src\module\Common_Selector.bas", "Visual Basic for Applications", 122, 22, 18, 162 -"d:\Project\upds7\vba\src\module\Generic_Master_Common.bas", "Visual Basic for Applications", -58, -12, -17, -87 -"d:\Project\upds7\vba\src\module\Global_Cache.bas", "Visual Basic for Applications", -195, -43, -69, -307 -"d:\Project\upds7\vba\src\module\Module_Common.bas", "Visual Basic for Applications", -171, -23, -35, -229 -"d:\Project\upds7\vba\src\module\Read_Common.bas", "Visual Basic for Applications", -153, -17, -19, -189 -"d:\Project\upds7\vba\src\module\Test_Cache.bas", "Visual Basic for Applications", -159, -4, -25, -188 -"d:\Project\upds7\vba\src\module\Write_Common.bas", "Visual Basic for Applications", -106, -11, -21, -138 -"d:\Project\upds7\vba\src\sheet\C1.cls", "Visual Basic for Applications", 664, 83, 100, 847 -"d:\Project\upds7\vba\src\sheet\M1.cls", "Visual Basic for Applications", 124, 20, 24, 168 -"d:\Project\upds7\vba\src\sheet\M2.cls", "Visual Basic for Applications", 294, 53, 54, 401 -"d:\Project\upds7\vba\src\sheet\O1.cls", "Visual Basic for Applications", 0, 5, 1, 6 -"d:\Project\upds7\vba\src\sheet\O2.cls", "Visual Basic for Applications", 0, 6, 1, 7 -"d:\Project\upds7\vba\src\sheet\T1.cls", "Visual Basic for Applications", 28, 13, 14, 55 -"d:\Project\upds7\vba\src\sheet\T2.cls", "Visual Basic for Applications", 64, 19, 32, 115 -"d:\Project\upds7\vba\src\sheet\T3.cls", "Visual Basic for Applications", 40, 15, 20, 75 -"d:\Project\upds7\vba\src\sheet\Z1.cls", "Visual Basic for Applications", 33, 15, 17, 65 -"d:\Project\upds7\vba\src\sheet\Z2.cls", "Visual Basic for Applications", 28, 13, 14, 55 -"d:\Project\upds7\vba\src\sheet\Z3.cls", "Visual Basic for Applications", 30, 14, 14, 58 -"d:\Project\upds7\vba\src\sheet\Z4.cls", "Visual Basic for Applications", 32, 15, 15, 62 -"d:\Project\upds7\vba\src\thisWorkbook\Master_M1_Kukan.bas", "Visual Basic for Applications", -234, -25, -53, -312 -"d:\Project\upds7\vba\src\thisWorkbook\Master_M2_Kukan_detail.bas", "Visual Basic for Applications", -176, -32, -45, -253 -"d:\Project\upds7\vba\src\thisWorkbook\Master_O1_address.bas", "Visual Basic for Applications", -35, -4, -13, -52 -"d:\Project\upds7\vba\src\thisWorkbook\Master_O2_507.bas", "Visual Basic for Applications", -12, -1, -4, -17 -"d:\Project\upds7\vba\src\thisWorkbook\Master_Z1_222.bas", "Visual Basic for Applications", -140, -5, -27, -172 -"d:\Project\upds7\vba\src\thisWorkbook\Master_Z2_223.bas", "Visual Basic for Applications", -126, -5, -25, -156 -"d:\Project\upds7\vba\src\thisWorkbook\Master_Z3_224.bas", "Visual Basic for Applications", -133, -5, -26, -164 -"d:\Project\upds7\vba\src\thisWorkbook\Tukin_C1.bas", "Visual Basic for Applications", -429, -61, -58, -548 -"Total", "-", 995, 235, 213, 1443 \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-23_10-41-31/diff.md b/.VSCodeCounter/2026-04-23_10-41-31/diff.md deleted file mode 100644 index 570fd3b..0000000 --- a/.VSCodeCounter/2026-04-23_10-41-31/diff.md +++ /dev/null @@ -1,25 +0,0 @@ -# Diff Summary - -Date : 2026-04-23 10:41:31 - -Directory d:\\Project\\upds7\\vba\\src - -Total : 33 files, 995 codes, 235 comments, 213 blanks, all 1443 lines - -[Summary](results.md) / [Details](details.md) / Diff Summary / [Diff Details](diff-details.md) - -## Languages -| language | files | code | comment | blank | total | -| :--- | ---: | ---: | ---: | ---: | ---: | -| Visual Basic for Applications | 33 | 995 | 235 | 213 | 1,443 | - -## Directories -| path | files | code | comment | blank | total | -| :--- | ---: | ---: | ---: | ---: | ---: | -| . | 33 | 995 | 235 | 213 | 1,443 | -| init_module | 2 | 317 | 25 | 56 | 398 | -| module | 11 | 626 | 77 | 102 | 805 | -| sheet | 12 | 1,337 | 271 | 306 | 1,914 | -| thisWorkbook | 8 | -1,285 | -138 | -251 | -1,674 | - -[Summary](results.md) / [Details](details.md) / Diff Summary / [Diff Details](diff-details.md) \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-23_10-41-31/diff.txt b/.VSCodeCounter/2026-04-23_10-41-31/diff.txt deleted file mode 100644 index 7efabc0..0000000 --- a/.VSCodeCounter/2026-04-23_10-41-31/diff.txt +++ /dev/null @@ -1,61 +0,0 @@ -Date : 2026-04-23 10:41:31 -Directory : d:\Project\upds7\vba\src -Total : 33 files, 995 codes, 235 comments, 213 blanks, all 1443 lines - -Languages -+-------------------------------+------------+------------+------------+------------+------------+ -| language | files | code | comment | blank | total | -+-------------------------------+------------+------------+------------+------------+------------+ -| Visual Basic for Applications | 33 | 995 | 235 | 213 | 1,443 | -+-------------------------------+------------+------------+------------+------------+------------+ - -Directories -+------------------------------------------------------------------+------------+------------+------------+------------+------------+ -| path | files | code | comment | blank | total | -+------------------------------------------------------------------+------------+------------+------------+------------+------------+ -| . | 33 | 995 | 235 | 213 | 1,443 | -| init_module | 2 | 317 | 25 | 56 | 398 | -| module | 11 | 626 | 77 | 102 | 805 | -| sheet | 12 | 1,337 | 271 | 306 | 1,914 | -| thisWorkbook | 8 | -1,285 | -138 | -251 | -1,674 | -+------------------------------------------------------------------+------------+------------+------------+------------+------------+ - -Files -+------------------------------------------------------------------+-------------------------------+------------+------------+------------+------------+ -| filename | language | code | comment | blank | total | -+------------------------------------------------------------------+-------------------------------+------------+------------+------------+------------+ -| d:\Project\upds7\vba\src\init_module\Import_modules.bas | Visual Basic for Applications | 156 | 13 | 30 | 199 | -| d:\Project\upds7\vba\src\init_module\Test_Cache.bas | Visual Basic for Applications | 161 | 12 | 26 | 199 | -| d:\Project\upds7\vba\src\module\Common_Button.bas | Visual Basic for Applications | 257 | 29 | 73 | 359 | -| d:\Project\upds7\vba\src\module\Common_File_Utils.bas | Visual Basic for Applications | 262 | 43 | 43 | 348 | -| d:\Project\upds7\vba\src\module\Common_Functions.bas | Visual Basic for Applications | 371 | 42 | 74 | 487 | -| d:\Project\upds7\vba\src\module\Common_Global_Cache.bas | Visual Basic for Applications | 456 | 51 | 80 | 587 | -| d:\Project\upds7\vba\src\module\Common_Selector.bas | Visual Basic for Applications | 122 | 22 | 18 | 162 | -| d:\Project\upds7\vba\src\module\Generic_Master_Common.bas | Visual Basic for Applications | -58 | -12 | -17 | -87 | -| d:\Project\upds7\vba\src\module\Global_Cache.bas | Visual Basic for Applications | -195 | -43 | -69 | -307 | -| d:\Project\upds7\vba\src\module\Module_Common.bas | Visual Basic for Applications | -171 | -23 | -35 | -229 | -| d:\Project\upds7\vba\src\module\Read_Common.bas | Visual Basic for Applications | -153 | -17 | -19 | -189 | -| d:\Project\upds7\vba\src\module\Test_Cache.bas | Visual Basic for Applications | -159 | -4 | -25 | -188 | -| d:\Project\upds7\vba\src\module\Write_Common.bas | Visual Basic for Applications | -106 | -11 | -21 | -138 | -| d:\Project\upds7\vba\src\sheet\C1.cls | Visual Basic for Applications | 664 | 83 | 100 | 847 | -| d:\Project\upds7\vba\src\sheet\M1.cls | Visual Basic for Applications | 124 | 20 | 24 | 168 | -| d:\Project\upds7\vba\src\sheet\M2.cls | Visual Basic for Applications | 294 | 53 | 54 | 401 | -| d:\Project\upds7\vba\src\sheet\O1.cls | Visual Basic for Applications | 0 | 5 | 1 | 6 | -| d:\Project\upds7\vba\src\sheet\O2.cls | Visual Basic for Applications | 0 | 6 | 1 | 7 | -| d:\Project\upds7\vba\src\sheet\T1.cls | Visual Basic for Applications | 28 | 13 | 14 | 55 | -| d:\Project\upds7\vba\src\sheet\T2.cls | Visual Basic for Applications | 64 | 19 | 32 | 115 | -| d:\Project\upds7\vba\src\sheet\T3.cls | Visual Basic for Applications | 40 | 15 | 20 | 75 | -| d:\Project\upds7\vba\src\sheet\Z1.cls | Visual Basic for Applications | 33 | 15 | 17 | 65 | -| d:\Project\upds7\vba\src\sheet\Z2.cls | Visual Basic for Applications | 28 | 13 | 14 | 55 | -| d:\Project\upds7\vba\src\sheet\Z3.cls | Visual Basic for Applications | 30 | 14 | 14 | 58 | -| d:\Project\upds7\vba\src\sheet\Z4.cls | Visual Basic for Applications | 32 | 15 | 15 | 62 | -| d:\Project\upds7\vba\src\thisWorkbook\Master_M1_Kukan.bas | Visual Basic for Applications | -234 | -25 | -53 | -312 | -| d:\Project\upds7\vba\src\thisWorkbook\Master_M2_Kukan_detail.bas | Visual Basic for Applications | -176 | -32 | -45 | -253 | -| d:\Project\upds7\vba\src\thisWorkbook\Master_O1_address.bas | Visual Basic for Applications | -35 | -4 | -13 | -52 | -| d:\Project\upds7\vba\src\thisWorkbook\Master_O2_507.bas | Visual Basic for Applications | -12 | -1 | -4 | -17 | -| d:\Project\upds7\vba\src\thisWorkbook\Master_Z1_222.bas | Visual Basic for Applications | -140 | -5 | -27 | -172 | -| d:\Project\upds7\vba\src\thisWorkbook\Master_Z2_223.bas | Visual Basic for Applications | -126 | -5 | -25 | -156 | -| d:\Project\upds7\vba\src\thisWorkbook\Master_Z3_224.bas | Visual Basic for Applications | -133 | -5 | -26 | -164 | -| d:\Project\upds7\vba\src\thisWorkbook\Tukin_C1.bas | Visual Basic for Applications | -429 | -61 | -58 | -548 | -| Total | | 995 | 235 | 213 | 1,443 | -+------------------------------------------------------------------+-------------------------------+------------+------------+------------+------------+ \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-23_10-41-31/results.csv b/.VSCodeCounter/2026-04-23_10-41-31/results.csv deleted file mode 100644 index dedf570..0000000 --- a/.VSCodeCounter/2026-04-23_10-41-31/results.csv +++ /dev/null @@ -1,21 +0,0 @@ -"filename", "language", "Visual Basic for Applications", "comment", "blank", "total" -"d:\Project\upds7\vba\src\init_module\Import_modules.bas", "Visual Basic for Applications", 156, 13, 30, 199 -"d:\Project\upds7\vba\src\init_module\Test_Cache.bas", "Visual Basic for Applications", 161, 12, 26, 199 -"d:\Project\upds7\vba\src\module\Common_Button.bas", "Visual Basic for Applications", 257, 29, 73, 359 -"d:\Project\upds7\vba\src\module\Common_File_Utils.bas", "Visual Basic for Applications", 262, 43, 43, 348 -"d:\Project\upds7\vba\src\module\Common_Functions.bas", "Visual Basic for Applications", 371, 42, 74, 487 -"d:\Project\upds7\vba\src\module\Common_Global_Cache.bas", "Visual Basic for Applications", 456, 51, 80, 587 -"d:\Project\upds7\vba\src\module\Common_Selector.bas", "Visual Basic for Applications", 122, 22, 18, 162 -"d:\Project\upds7\vba\src\sheet\C1.cls", "Visual Basic for Applications", 664, 83, 100, 847 -"d:\Project\upds7\vba\src\sheet\M1.cls", "Visual Basic for Applications", 124, 20, 24, 168 -"d:\Project\upds7\vba\src\sheet\M2.cls", "Visual Basic for Applications", 294, 53, 54, 401 -"d:\Project\upds7\vba\src\sheet\O1.cls", "Visual Basic for Applications", 0, 5, 1, 6 -"d:\Project\upds7\vba\src\sheet\O2.cls", "Visual Basic for Applications", 0, 6, 1, 7 -"d:\Project\upds7\vba\src\sheet\T1.cls", "Visual Basic for Applications", 28, 13, 14, 55 -"d:\Project\upds7\vba\src\sheet\T2.cls", "Visual Basic for Applications", 64, 19, 32, 115 -"d:\Project\upds7\vba\src\sheet\T3.cls", "Visual Basic for Applications", 40, 15, 20, 75 -"d:\Project\upds7\vba\src\sheet\Z1.cls", "Visual Basic for Applications", 33, 15, 17, 65 -"d:\Project\upds7\vba\src\sheet\Z2.cls", "Visual Basic for Applications", 28, 13, 14, 55 -"d:\Project\upds7\vba\src\sheet\Z3.cls", "Visual Basic for Applications", 30, 14, 14, 58 -"d:\Project\upds7\vba\src\sheet\Z4.cls", "Visual Basic for Applications", 32, 15, 15, 62 -"Total", "-", 3122, 483, 650, 4255 \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-23_10-41-31/results.json b/.VSCodeCounter/2026-04-23_10-41-31/results.json deleted file mode 100644 index 72089cd..0000000 --- a/.VSCodeCounter/2026-04-23_10-41-31/results.json +++ /dev/null @@ -1 +0,0 @@ -{"file:///d%3A/Project/upds7/vba/src/sheet/Z4.cls":{"language":"Visual Basic for Applications","code":32,"comment":15,"blank":15},"file:///d%3A/Project/upds7/vba/src/sheet/Z2.cls":{"language":"Visual Basic for Applications","code":28,"comment":13,"blank":14},"file:///d%3A/Project/upds7/vba/src/sheet/Z3.cls":{"language":"Visual Basic for Applications","code":30,"comment":14,"blank":14},"file:///d%3A/Project/upds7/vba/src/sheet/Z1.cls":{"language":"Visual Basic for Applications","code":33,"comment":15,"blank":17},"file:///d%3A/Project/upds7/vba/src/sheet/T3.cls":{"language":"Visual Basic for Applications","code":40,"comment":15,"blank":20},"file:///d%3A/Project/upds7/vba/src/sheet/T1.cls":{"language":"Visual Basic for Applications","code":28,"comment":13,"blank":14},"file:///d%3A/Project/upds7/vba/src/sheet/T2.cls":{"language":"Visual Basic for Applications","code":64,"comment":19,"blank":32},"file:///d%3A/Project/upds7/vba/src/sheet/O2.cls":{"language":"Visual Basic for Applications","code":0,"comment":6,"blank":1},"file:///d%3A/Project/upds7/vba/src/sheet/M1.cls":{"language":"Visual Basic for Applications","code":124,"comment":20,"blank":24},"file:///d%3A/Project/upds7/vba/src/sheet/O1.cls":{"language":"Visual Basic for Applications","code":0,"comment":5,"blank":1},"file:///d%3A/Project/upds7/vba/src/sheet/C1.cls":{"language":"Visual Basic for Applications","code":664,"comment":83,"blank":100},"file:///d%3A/Project/upds7/vba/src/module/Common_Functions.bas":{"language":"Visual Basic for Applications","code":371,"comment":42,"blank":74},"file:///d%3A/Project/upds7/vba/src/sheet/M2.cls":{"language":"Visual Basic for Applications","code":294,"comment":53,"blank":54},"file:///d%3A/Project/upds7/vba/src/module/Common_File_Utils.bas":{"language":"Visual Basic for Applications","code":262,"comment":43,"blank":43},"file:///d%3A/Project/upds7/vba/src/module/Common_Button.bas":{"language":"Visual Basic for Applications","code":257,"comment":29,"blank":73},"file:///d%3A/Project/upds7/vba/src/init_module/Import_modules.bas":{"language":"Visual Basic for Applications","code":156,"comment":13,"blank":30},"file:///d%3A/Project/upds7/vba/src/init_module/Test_Cache.bas":{"language":"Visual Basic for Applications","code":161,"comment":12,"blank":26},"file:///d%3A/Project/upds7/vba/src/module/Common_Global_Cache.bas":{"language":"Visual Basic for Applications","code":456,"comment":51,"blank":80},"file:///d%3A/Project/upds7/vba/src/module/Common_Selector.bas":{"language":"Visual Basic for Applications","code":122,"comment":22,"blank":18}} \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-23_10-41-31/results.md b/.VSCodeCounter/2026-04-23_10-41-31/results.md deleted file mode 100644 index 83afde3..0000000 --- a/.VSCodeCounter/2026-04-23_10-41-31/results.md +++ /dev/null @@ -1,24 +0,0 @@ -# Summary - -Date : 2026-04-23 10:41:31 - -Directory d:\\Project\\upds7\\vba\\src - -Total : 19 files, 3122 codes, 483 comments, 650 blanks, all 4255 lines - -Summary / [Details](details.md) / [Diff Summary](diff.md) / [Diff Details](diff-details.md) - -## Languages -| language | files | code | comment | blank | total | -| :--- | ---: | ---: | ---: | ---: | ---: | -| Visual Basic for Applications | 19 | 3,122 | 483 | 650 | 4,255 | - -## Directories -| path | files | code | comment | blank | total | -| :--- | ---: | ---: | ---: | ---: | ---: | -| . | 19 | 3,122 | 483 | 650 | 4,255 | -| init_module | 2 | 317 | 25 | 56 | 398 | -| module | 5 | 1,468 | 187 | 288 | 1,943 | -| sheet | 12 | 1,337 | 271 | 306 | 1,914 | - -Summary / [Details](details.md) / [Diff Summary](diff.md) / [Diff Details](diff-details.md) \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-23_10-41-31/results.txt b/.VSCodeCounter/2026-04-23_10-41-31/results.txt deleted file mode 100644 index 6342628..0000000 --- a/.VSCodeCounter/2026-04-23_10-41-31/results.txt +++ /dev/null @@ -1,46 +0,0 @@ -Date : 2026-04-23 10:41:31 -Directory : d:\Project\upds7\vba\src -Total : 19 files, 3122 codes, 483 comments, 650 blanks, all 4255 lines - -Languages -+-------------------------------+------------+------------+------------+------------+------------+ -| language | files | code | comment | blank | total | -+-------------------------------+------------+------------+------------+------------+------------+ -| Visual Basic for Applications | 19 | 3,122 | 483 | 650 | 4,255 | -+-------------------------------+------------+------------+------------+------------+------------+ - -Directories -+---------------------------------------------------------+------------+------------+------------+------------+------------+ -| path | files | code | comment | blank | total | -+---------------------------------------------------------+------------+------------+------------+------------+------------+ -| . | 19 | 3,122 | 483 | 650 | 4,255 | -| init_module | 2 | 317 | 25 | 56 | 398 | -| module | 5 | 1,468 | 187 | 288 | 1,943 | -| sheet | 12 | 1,337 | 271 | 306 | 1,914 | -+---------------------------------------------------------+------------+------------+------------+------------+------------+ - -Files -+---------------------------------------------------------+-------------------------------+------------+------------+------------+------------+ -| filename | language | code | comment | blank | total | -+---------------------------------------------------------+-------------------------------+------------+------------+------------+------------+ -| d:\Project\upds7\vba\src\init_module\Import_modules.bas | Visual Basic for Applications | 156 | 13 | 30 | 199 | -| d:\Project\upds7\vba\src\init_module\Test_Cache.bas | Visual Basic for Applications | 161 | 12 | 26 | 199 | -| d:\Project\upds7\vba\src\module\Common_Button.bas | Visual Basic for Applications | 257 | 29 | 73 | 359 | -| d:\Project\upds7\vba\src\module\Common_File_Utils.bas | Visual Basic for Applications | 262 | 43 | 43 | 348 | -| d:\Project\upds7\vba\src\module\Common_Functions.bas | Visual Basic for Applications | 371 | 42 | 74 | 487 | -| d:\Project\upds7\vba\src\module\Common_Global_Cache.bas | Visual Basic for Applications | 456 | 51 | 80 | 587 | -| d:\Project\upds7\vba\src\module\Common_Selector.bas | Visual Basic for Applications | 122 | 22 | 18 | 162 | -| d:\Project\upds7\vba\src\sheet\C1.cls | Visual Basic for Applications | 664 | 83 | 100 | 847 | -| d:\Project\upds7\vba\src\sheet\M1.cls | Visual Basic for Applications | 124 | 20 | 24 | 168 | -| d:\Project\upds7\vba\src\sheet\M2.cls | Visual Basic for Applications | 294 | 53 | 54 | 401 | -| d:\Project\upds7\vba\src\sheet\O1.cls | Visual Basic for Applications | 0 | 5 | 1 | 6 | -| d:\Project\upds7\vba\src\sheet\O2.cls | Visual Basic for Applications | 0 | 6 | 1 | 7 | -| d:\Project\upds7\vba\src\sheet\T1.cls | Visual Basic for Applications | 28 | 13 | 14 | 55 | -| d:\Project\upds7\vba\src\sheet\T2.cls | Visual Basic for Applications | 64 | 19 | 32 | 115 | -| d:\Project\upds7\vba\src\sheet\T3.cls | Visual Basic for Applications | 40 | 15 | 20 | 75 | -| d:\Project\upds7\vba\src\sheet\Z1.cls | Visual Basic for Applications | 33 | 15 | 17 | 65 | -| d:\Project\upds7\vba\src\sheet\Z2.cls | Visual Basic for Applications | 28 | 13 | 14 | 55 | -| d:\Project\upds7\vba\src\sheet\Z3.cls | Visual Basic for Applications | 30 | 14 | 14 | 58 | -| d:\Project\upds7\vba\src\sheet\Z4.cls | Visual Basic for Applications | 32 | 15 | 15 | 62 | -| Total | | 3,122 | 483 | 650 | 4,255 | -+---------------------------------------------------------+-------------------------------+------------+------------+------------+------------+ \ No newline at end of file diff --git a/README.md b/README.md index cfe13ae..6b70860 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ vba/ ├── Z1.cls (64 lines) - Master_222: 交通機関マスタ ├── Z2.cls (54 lines) - Master_223: 決定事項マスタ ├── Z3.cls (57 lines) - Master_224: 手当月額決定区分マスタ - └── Z4.cls (61 lines) - Master_225 + └── O3.cls (61 lines) - Master_225 ``` ## Sheet Class Prefix diff --git a/src/sh/tuk/module/Common_Button.bas b/src/sh/tuk/module/Common_Button.bas index a1b34a5..aa94e96 100644 --- a/src/sh/tuk/module/Common_Button.bas +++ b/src/sh/tuk/module/Common_Button.bas @@ -49,7 +49,7 @@ Sub RefreshCache_Button() Dim activeSheetName As String: activeSheetName = ActiveSheet.CodeName Debug.Print "1. Validate Z1~Z4, T1~T3, O1~O3 master data" - Dim cacheSheets As Variant: cacheSheets = Array("Z1", "Z2", "Z3", "T1", "T2", "T3", "O1", "O2", CACHE_O3) + Dim cacheSheets As Variant: cacheSheets = Array(CACHE_Z1, CACHE_Z2, CACHE_Z3, CACHE_Z4, CACHE_T1, CACHE_T2, CACHE_T3, CACHE_O1, CACHE_O2, CACHE_O3) Dim sheetName As Variant Dim ws As Worksheet For Each sheetName In cacheSheets @@ -325,7 +325,7 @@ Private Sub Do_Filter(ws As Excel.Worksheet) Exit Sub End If - Dim startCol As Long: startCol = ws.Range(sheetConf("StartCol") & "1").Column + Dim startCol As Long: startCol = ws.Range(sheetConf("ErrorCol") & "1").Column Dim endCol As Long: endCol = ws.Range(sheetConf("EndCol") & "1").Column Dim filterRow As Long: filterRow = sheetConf("FilterRow") diff --git a/src/sh/tuk/module/Common_Global_Cache.bas b/src/sh/tuk/module/Common_Global_Cache.bas index 796fdfa..c5c3478 100644 --- a/src/sh/tuk/module/Common_Global_Cache.bas +++ b/src/sh/tuk/module/Common_Global_Cache.bas @@ -8,7 +8,17 @@ Option Explicit ' - RefreshM2Cache ' - RefreshO1Cache ' ============================================================ -Public Const CACHE_O3 As String = CACHE_O3 +Public Const CACHE_Z1 As String = "Z1" +Public Const CACHE_Z2 As String = "Z2" +Public Const CACHE_Z3 As String = "Z3" +Public Const CACHE_Z4 As String = "Z4" +Public Const CACHE_T1 As String = "T1" +Public Const CACHE_T2 As String = "T2" +Public Const CACHE_T3 As String = "T3" +Public Const CACHE_O1 As String = "O1" +Public Const CACHE_O2 As String = "O2" +Public Const CACHE_O3 As String = "O3" + Private sheetConfDict As Object @@ -53,7 +63,7 @@ Public Sub RefreshCache(ByVal cacheName As String) Set loadedData = LookupM1KukanCache() ElseIf cacheName = "M2" Then Set loadedData = LookupM2Cache() - ElseIf cacheName = "O1" Then + ElseIf cacheName = CACHE_O1 Then Set loadedData = LookupO1Cache() ElseIf Contains(sheetConfDict("Enum"), cacheName) Then Set loadedData = LoadLookup("Enum", cacheName) @@ -217,11 +227,11 @@ Private Function LookupO1Cache() As Object Dim ws As Worksheet On Error Resume Next - Set ws = ThisWorkbook.Worksheets("O1") + Set ws = ThisWorkbook.Worksheets(CACHE_O1) On Error GoTo ErrHandler ' ws exists, continue - Dim sheetConf As Object: Set sheetConf = sheetConfDict("O1") + Dim sheetConf As Object: Set sheetConf = sheetConfDict(CACHE_O1) Dim startRow As Long: startRow = sheetConf("StartRow") Dim lastRow As Long: lastRow = GetLastDataRowInRange(ws) If lastRow < startRow Then @@ -345,7 +355,7 @@ Private Sub RefreshSheetDict() sheetConf("FilterRow") = 6 sheetConf("KeyCol") = 3 sheetConf("ValueCols") = Array(4) - Set sheetConfDict("Z1") = sheetConf + Set sheetConfDict(CACHE_Z1) = sheetConf Debug.Print "RefreshSheetDict Z1 ok." ' Z2 @@ -363,7 +373,7 @@ Private Sub RefreshSheetDict() sheetConf("FilterRow") = 6 sheetConf("KeyCol") = 3 sheetConf("ValueCols") = Array(4) - Set sheetConfDict("Z2") = sheetConf + Set sheetConfDict(CACHE_Z2) = sheetConf Debug.Print "RefreshSheetDict Z2 ok." ' Z3 @@ -381,9 +391,27 @@ Private Sub RefreshSheetDict() sheetConf("FilterRow") = 6 sheetConf("KeyCol") = 3 sheetConf("ValueCols") = Array(4) - Set sheetConfDict("Z3") = sheetConf + Set sheetConfDict(CACHE_Z3) = sheetConf Debug.Print "RefreshSheetDict Z3 ok." + ' Z4 + Set sheetConf = CreateObject("Scripting.Dictionary") + sheetConf("StartCol") = "C" + sheetConf("EndCol") = "H" + sheetConf("ErrorCol") = "B" + sheetConf("StartRow") = 7 + sheetConf("HeaderRow") = 5 + sheetConf("CSV_Encoding") = "utf-8" + sheetConf("HasHeader") = False + sheetConf("ExpectedColumnCount") = 6 + sheetConf("HeaderColumns") = Array("C", "D", "E", "F", "G", "H") + sheetConf("AlwaysQuote") = True + sheetConf("FilterRow") = 6 + sheetConf("KeyCol") = 3 + sheetConf("ValueCols") = Array(4) + Set sheetConfDict("Z4") = sheetConf + Debug.Print "RefreshSheetDict Z4 ok." + ' T1 Set sheetConf = CreateObject("Scripting.Dictionary") sheetConf("StartCol") = "C" @@ -399,7 +427,7 @@ Private Sub RefreshSheetDict() sheetConf("FilterRow") = 6 sheetConf("KeyCol") = 3 sheetConf("ValueCols") = Array(4) - Set sheetConfDict("T1") = sheetConf + Set sheetConfDict(CACHE_T1) = sheetConf Debug.Print "RefreshSheetDict T1 ok." ' T2 @@ -417,7 +445,7 @@ Private Sub RefreshSheetDict() sheetConf("FilterRow") = 6 sheetConf("KeyCol") = 3 sheetConf("ValueCols") = Array(4, 8, 9, 10, 11, 12, 13) - Set sheetConfDict("T2") = sheetConf + Set sheetConfDict(CACHE_T2) = sheetConf Debug.Print "RefreshSheetDict T2 ok." ' T3 @@ -435,7 +463,7 @@ Private Sub RefreshSheetDict() sheetConf("FilterRow") = 6 sheetConf("KeyCol") = 3 sheetConf("ValueCols") = Array(4, 8, 9) - Set sheetConfDict("T3") = sheetConf + Set sheetConfDict(CACHE_T3) = sheetConf Debug.Print "RefreshSheetDict T3 ok." ' O1 @@ -451,7 +479,7 @@ Private Sub RefreshSheetDict() sheetConf("HeaderColumns") = Array("C", "D", "E", "F") sheetConf("AlwaysQuote") = True sheetConf("FilterRow") = 5 - Set sheetConfDict("O1") = sheetConf + Set sheetConfDict(CACHE_O1) = sheetConf Debug.Print "RefreshSheetDict O1 ok." ' O2 @@ -469,7 +497,7 @@ Private Sub RefreshSheetDict() sheetConf("FilterRow") = 5 sheetConf("KeyCol") = 3 sheetConf("ValueCols") = Array(4) - Set sheetConfDict("O2") = sheetConf + Set sheetConfDict(CACHE_O2) = sheetConf Debug.Print "RefreshSheetDict O2 ok." ' O3 @@ -568,7 +596,7 @@ End Function Public Sub RefreshMasterCache() ' Fixed cache names Dim fixedCaches As Variant - fixedCaches = Array("Z1", "Z2", "Z3", "T1", "T2", "T3", "O1", "O2", CACHE_O3, _ + fixedCaches = Array(CACHE_Z1, CACHE_Z2, CACHE_Z3, CACHE_T1, CACHE_T2, CACHE_T3, CACHE_O1, CACHE_O2, CACHE_O3, _ "tokubetuList", "kenshuList", "renrakuList", "oufukuList", "koutaiList", "higaitouList", "errorList") ' Refresh fixed caches @@ -604,15 +632,16 @@ Public Sub WriteCachesSheet(ByVal cacheName As String) ' Map cacheName to column letter Dim colLetter As String Select Case cacheName - Case "Z1": colLetter = "A" - Case "Z2": colLetter = "B" - Case "Z3": colLetter = "C" - Case CACHE_O3: colLetter = "D" - Case "T1": colLetter = "E" - Case "T2": colLetter = "F" - Case "T3": colLetter = "G" - Case "O2": colLetter = "H" - Case "M1": colLetter = "I" + Case CACHE_Z1: colLetter = "A" + Case CACHE_Z2: colLetter = "B" + Case CACHE_Z3: colLetter = "C" + Case CACHE_Z4: colLetter = "D" + Case CACHE_T1: colLetter = "E" + Case CACHE_T2: colLetter = "F" + Case CACHE_T3: colLetter = "G" + Case CACHE_O2: colLetter = "H" + Case CACHE_O3: colLetter = "I" + Case "M1": colLetter = "M" Case Else: Exit Sub End Select diff --git a/src/sh/tuk/module/Common_Selector.bas b/src/sh/tuk/module/Common_Selector.bas index cb35919..bad050c 100644 --- a/src/sh/tuk/module/Common_Selector.bas +++ b/src/sh/tuk/module/Common_Selector.bas @@ -19,7 +19,7 @@ Option Explicit ' ============================================================ ' Create Transport (T) dropdown from Z1 cache Public Function BuildTransportList() - Dim z1Cache As Object: Set z1Cache = GetCache("Z1") + Dim z1Cache As Object: Set z1Cache = GetCache(CACHE_Z1) Dim dropdownList As String Dim key As Variant @@ -92,7 +92,7 @@ End Function ' Create Kettei (AU) dropdown Public Function BuildKetteiList() - Dim z2Cache As Object: Set z2Cache = GetCache("Z2") + Dim z2Cache As Object: Set z2Cache = GetCache(CACHE_Z2) Dim dropdownList As String Dim key As Variant @@ -128,7 +128,7 @@ End Function ' Create Kanshoku (BC) dropdown Public Function BuildKanshokuList() - Dim o2Cache As Object: Set o2Cache = GetCache("O2") + Dim o2Cache As Object: Set o2Cache = GetCache(CACHE_O2) Dim dropdownList As String Dim key As Variant diff --git a/src/sh/tuk/sheet/C1.cls b/src/sh/tuk/sheet/C1.cls index f5e97b8..b287e73 100644 --- a/src/sh/tuk/sheet/C1.cls +++ b/src/sh/tuk/sheet/C1.cls @@ -109,7 +109,7 @@ Private Sub Worksheet_Change(ByVal Target As Range) ' Check if cache is loaded Application.EnableEvents = False On Error GoTo Finally - Dim testCache As Object: Set testCache = GetCache("Z1") + Dim testCache As Object: Set testCache = GetCache(CACHE_Z1) ' === Column C changes === If Target.Column = 3 Then @@ -272,7 +272,7 @@ Private Sub Worksheet_BeforeRightClick(ByVal Target As Range, Cancel As Boolean) End Sub Private Sub Refresh(ws As Worksheet, ByVal startRow As Long, ByVal lastDataRow As Long) - Dim z1Cache As Object: Set z1Cache = GetCache("Z1") + Dim z1Cache As Object: Set z1Cache = GetCache(CACHE_Z1) Application.EnableEvents = False On Error GoTo ErrorHandler @@ -336,13 +336,13 @@ Private Sub RebuildDropdowns(ByVal rowNum As Long) End With Next i - Call BuildDropdownFromCacheNamedRange(Me, MMONTH_AMOUNT_KBN_COL, rowNum, "Z3") + Call BuildDropdownFromCacheNamedRange(Me, MMONTH_AMOUNT_KBN_COL, rowNum, CACHE_Z3) End Sub Private Sub ReFillFromDropdowns(ByVal rowNum As Long) - Dim z3Cache As Object: Set z3Cache = GetCache("Z3") + Dim z3Cache As Object: Set z3Cache = GetCache(CACHE_Z3) Dim valueStrMonthAmountKbn As String: valueStrMonthAmountKbn = Trim(Me.Cells(rowNum, MMONTH_AMOUNT_KBN_COL).Value) Dim monthAmountKbn As String: monthAmountKbn = GetCode(valueStrMonthAmountKbn) If z3Cache.Exists(monthAmountKbn) Then @@ -430,7 +430,7 @@ End Sub ' when cshainno does not exist in o1, clear dropdownList and value ' when cshainno exist in o1, create dropdownList and value Private Sub BuildAddress1Dropdown(ByVal rowNum As Long, ByVal cshainno As String) - Dim o1Cache As Object: Set o1Cache = GetCache("O1") + Dim o1Cache As Object: Set o1Cache = GetCache(CACHE_O1) ' Build dropdown list from O1 cache: get all E values for the C Dim dropdownList As String If o1Cache.Exists(cshainno) Then @@ -460,7 +460,7 @@ Private Sub BuildAddress1Dropdown(ByVal rowNum As Long, ByVal cshainno As String End Sub Private Sub ReFillAddress1(ByVal rowNum As Long, ByVal cshainno As String) - Dim o1Cache As Object: Set o1Cache = GetCache("O1") + Dim o1Cache As Object: Set o1Cache = GetCache(CACHE_O1) If Not o1Cache.Exists(cshainno) Then Me.Cells(rowNum, ADDRESS1_COL).Value = "" Exit Sub @@ -487,7 +487,7 @@ End Sub Private Sub BuildAddress2Dropdown(ByVal rowNum As Long, ByVal cshainno As String) ' Clear address2 contents ' obtain cshainno, address1, o1Cache - Dim o1Cache As Object: Set o1Cache = GetCache("O1") + Dim o1Cache As Object: Set o1Cache = GetCache(CACHE_O1) Dim address1 As String: address1 = Trim(Me.Cells(rowNum, ADDRESS1_COL).Value) If cshainno = "" OR address1 = "" Then Exit Sub @@ -534,7 +534,7 @@ Private Sub ReFillAddress2(ByVal rowNum As Long, ByVal cshainno As String) Exit Sub End If - Dim o1Cache As Object: Set o1Cache = GetCache("O1") + Dim o1Cache As Object: Set o1Cache = GetCache(CACHE_O1) If Not o1Cache.Exists(cshainno) Then Me.Cells(rowNum, ADDRESS2_COL).Value = "" Exit Sub @@ -825,7 +825,7 @@ Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As End If ' I column [address1 J column address2] - Dim o1Cache As Object: Set o1Cache = GetCache("O1") + Dim o1Cache As Object: Set o1Cache = GetCache(CACHE_O1) Dim ColI As String: ColI = "I" Dim ColJ As String: ColJ = "J" Dim address1 As String: address1 = Trim(Me.Cells(rowNum, ColI).Value) diff --git a/src/sh/tuk/sheet/M1.cls b/src/sh/tuk/sheet/M1.cls index 7214296..b2ca542 100644 --- a/src/sh/tuk/sheet/M1.cls +++ b/src/sh/tuk/sheet/M1.cls @@ -30,7 +30,7 @@ Private Sub Worksheet_Change(ByVal Target As Range) ' === Column D changes: Fill E column === If Target.Column = 4 And Target.Row >= 7 Then - Dim z1Cache As Object: Set z1Cache = GetCache("Z1") + Dim z1Cache As Object: Set z1Cache = GetCache(CACHE_Z1) Dim cellD As Range For Each cellD In Target @@ -109,7 +109,7 @@ Private Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As End If ' Check D and E column in the cache - Dim z1Cache As Object: Set z1Cache = GetCache("Z1") + Dim z1Cache As Object: Set z1Cache = GetCache(CACHE_Z1) Dim dValue As String: dValue = Trim(ws.Range("D" & rowNum).Value) Dim eValue As String: eValue = Trim(ws.Range("E" & rowNum).Value) @@ -157,7 +157,7 @@ End Sub ' obtain z1 master data, and update column E Private Sub Refresh(ws As Worksheet, ByVal startRow As Long, ByVal lastDataRow As Long) - Dim z1Cache As Object: Set z1Cache = GetCache("Z1") + Dim z1Cache As Object: Set z1Cache = GetCache(CACHE_Z1) Application.EnableEvents = False On Error GoTo ErrorHandler diff --git a/src/sh/tuk/sheet/M2.cls b/src/sh/tuk/sheet/M2.cls index f4b7798..17beaf4 100644 --- a/src/sh/tuk/sheet/M2.cls +++ b/src/sh/tuk/sheet/M2.cls @@ -164,7 +164,7 @@ Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Dim equaledCols As Variant Dim emptyCols As Variant If kenshuKbn = "1" Then - Set cache = GetCache("T1") + Set cache = GetCache(CACHE_T1) ' must input equaledCols = Array("K") requiredCols = Array("N") @@ -172,7 +172,7 @@ Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As End If If kenshuKbn = "2" Then - Set cache = GetCache("T2") + Set cache = GetCache(CACHE_T2) ' must input equaledCols = Array("K", "L", "M", "N", "O", "P", "Q") requiredCols = Array("N", "O", "P", "Q") @@ -180,7 +180,7 @@ Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As End If If kenshuKbn = "3" Then - Set cache = GetCache("T3") + Set cache = GetCache(CACHE_T3) ' must input equaledCols = Array("K", "L", "M") requiredCols = Array() @@ -320,11 +320,11 @@ Private Sub FillKFromJ(ByVal ws As Worksheet, ByVal rowNum As Long) Dim cache As Object Select Case kenshu Case "1" - Set cache = GetCache("T1") + Set cache = GetCache(CACHE_T1) Case "2" - Set cache = GetCache("T2") + Set cache = GetCache(CACHE_T2) Case "3" - Set cache = GetCache("T3") + Set cache = GetCache(CACHE_T3) Case Else Exit Sub End Select diff --git a/src/sh/tuk/sheet/O3.cls b/src/sh/tuk/sheet/O3.cls index 5151d79..b665449 100644 --- a/src/sh/tuk/sheet/O3.cls +++ b/src/sh/tuk/sheet/O3.cls @@ -1,6 +1,6 @@ ' ============================================================ -' Module Name: Master_Z4_220 -' Module Desc: Z4 master data management (220) +' Module Name: Master_O3_220 +' Module Desc: O3 master data management (220) ' Module Methods: ' - Worksheet_Change ' - Validate diff --git a/src/sh/tuk/sheet/Z4.cls b/src/sh/tuk/sheet/Z4.cls new file mode 100644 index 0000000..388e928 --- /dev/null +++ b/src/sh/tuk/sheet/Z4.cls @@ -0,0 +1,86 @@ +' ============================================================ +' Module Name: Master_Z4_221 +' Module Desc: Z4 master data management (221) +' Module Methods: +' - Worksheet_Change +' - Validate +' ============================================================ + +' ============================================================ +' Event Handlers +' ============================================================ +Private Sub Worksheet_Change(ByVal Target As Range) + Dim HasHeaderEdit As Boolean: HasHeaderEdit = CheckHeaderEdit(Me, Target) + If HasHeaderEdit = True Then Exit Sub + +End Sub + +' Prevent insert/delete row in header area +Private Sub Worksheet_BeforeRightClick(ByVal Target As Range, Cancel As Boolean) + Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig() + Dim sheetConf As Object: Set sheetConf = sheetConfDict(Me.CodeName) + Dim filterRow As Long: filterRow = sheetConf("FilterRow") + + If Target.Row < filterRow + 1 Then + Cancel = True + MsgBox "Cannot insert or delete row in header area.", vbExclamation + End If +End Sub + +' +Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long) + On Error GoTo ErrHandler + + 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") + + ' clear C~I columns background color + Dim clearRange As Range: Set clearRange = ws.Range(ws.Cells(rowNum, startCol), ws.Cells(rowNum, endCol)) + clearRange.Interior.Color = vbWhite + + ' C column check + checkResult = CheckRequired(ws, rowNum, 3, errorCol) + If checkResult = False Then Exit Sub + + checkResult = CheckChar(ws, rowNum, 3, 2, errorCol) + If checkResult = False Then Exit Sub + + checkResult = CheckAlphanumeric(ws, rowNum, 3, 2, errorCol) + If checkResult = False Then Exit Sub + + checkResult = CheckDuplicate(ws, rowNum, 3, errorCol) + If checkResult = False Then Exit Sub + + ' D column check + checkResult = CheckRequired(ws, rowNum, 4, errorCol) + If checkResult = False Then Exit Sub + + checkResult = CheckVarcharOver(ws, rowNum, 4, 80, errorCol) + If checkResult = False Then Exit Sub + + ' E column check + checkResult = CheckVarcharOver(ws, rowNum, 5, 80, errorCol) + If checkResult = False Then Exit Sub + + ' F column check + checkResult = CheckVarcharOver(ws, rowNum, 6, 80, errorCol) + If checkResult = False Then Exit Sub + + ' G column check + checkResult = CheckVarcharOver(ws, rowNum, 7, 80, errorCol) + If checkResult = False Then Exit Sub + + ' H column check + checkResult = Check01(ws, rowNum, 8, errorCol) + If checkResult = False Then Exit Sub + + ws.Cells(rowNum, errorCol).ClearContents + Exit Sub + +ErrHandler: + lastErrorMsg = Err.Description +End Sub diff --git a/通勤手当テンプレート20260525.xlsm b/通勤手当テンプレート20260525.xlsm index caa0d0d..43d5752 100644 Binary files a/通勤手当テンプレート20260525.xlsm and b/通勤手当テンプレート20260525.xlsm differ