diff --git a/.VSCodeCounter/2026-04-16_18-53-36/details.md b/.VSCodeCounter/2026-04-16_18-53-36/details.md new file mode 100644 index 0000000..041c8e7 --- /dev/null +++ b/.VSCodeCounter/2026-04-16_18-53-36/details.md @@ -0,0 +1,29 @@ +# Details + +Date : 2026-04-16 18:53:36 + +Directory d:\\Project\\upds7\\vba\\src + +Total : 14 files, 2127 codes, 248 comments, 437 blanks, all 2812 lines + +[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md) + +## Files +| filename | language | code | comment | blank | total | +| :--- | :--- | ---: | ---: | ---: | ---: | +| [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/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 / [Diff Summary](diff.md) / [Diff Details](diff-details.md) \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-16_18-53-36/diff-details.md b/.VSCodeCounter/2026-04-16_18-53-36/diff-details.md new file mode 100644 index 0000000..b547934 --- /dev/null +++ b/.VSCodeCounter/2026-04-16_18-53-36/diff-details.md @@ -0,0 +1,27 @@ +# Diff Details + +Date : 2026-04-16 18:53:36 + +Directory d:\\Project\\upds7\\vba\\src + +Total : 12 files, -6366 codes, 0 comments, -42 blanks, all -6408 lines + +[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details + +## Files +| filename | language | code | comment | blank | total | +| :--- | :--- | ---: | ---: | ---: | ---: | +| [README.md](/README.md) | Markdown | -20 | 0 | -1 | -21 | +| [src/data/222交通機関名区分.csv](/src/data/222%E4%BA%A4%E9%80%9A%E6%A9%9F%E9%96%A2%E5%90%8D%E5%8C%BA%E5%88%86.csv) | CSV | -3 | 0 | 0 | -3 | +| [src/data/223通勤\_決定事項区分.csv](/src/data/223%E9%80%9A%E5%8B%A4_%E6%B1%BA%E5%AE%9A%E4%BA%8B%E9%A0%85%E5%8C%BA%E5%88%86.csv) | CSV | -3 | 0 | -1 | -4 | +| [src/data/224通勤\_手当月額の決定区分.csv](/src/data/224%E9%80%9A%E5%8B%A4_%E6%89%8B%E5%BD%93%E6%9C%88%E9%A1%8D%E3%81%AE%E6%B1%BA%E5%AE%9A%E5%8C%BA%E5%88%86.csv) | CSV | -12 | 0 | -1 | -13 | +| [src/data/507発信者.csv](/src/data/507%E7%99%BA%E4%BF%A1%E8%80%85.csv) | CSV | -2 | 0 | -1 | -3 | +| [src/data/区間.csv](/src/data/%E5%8C%BA%E9%96%93.csv) | CSV | -75 | 0 | 0 | -75 | +| [src/data/区間詳細.csv](/src/data/%E5%8C%BA%E9%96%93%E8%A9%B3%E7%B4%B0.csv) | CSV | -20 | 0 | 0 | -20 | +| [src/module/Test\_Cache.bas](/src/module/Test_Cache.bas) | Visual Basic for Applications | 10 | 0 | 0 | 10 | +| [src/thisWorkbook/Tukin\_C1.bas](/src/thisWorkbook/Tukin_C1.bas) | Visual Basic for Applications | 7 | 0 | 0 | 7 | +| [~$通勤手当テンプレート\_案.xlsm](/~$%E9%80%9A%E5%8B%A4%E6%89%8B%E5%BD%93%E3%83%86%E3%83%B3%E3%83%97%E3%83%AC%E3%83%BC%E3%83%88_%E6%A1%88.xlsm) | Excel | -1 | 0 | 0 | -1 | +| [通勤手当テンプレート\_案.xlsm](/%E9%80%9A%E5%8B%A4%E6%89%8B%E5%BD%93%E3%83%86%E3%83%B3%E3%83%97%E3%83%AC%E3%83%BC%E3%83%88_%E6%A1%88.xlsm) | Excel | -2,349 | 0 | -20 | -2,369 | +| [通勤手当テンプレート\_案.xlsx](/%E9%80%9A%E5%8B%A4%E6%89%8B%E5%BD%93%E3%83%86%E3%83%B3%E3%83%97%E3%83%AC%E3%83%BC%E3%83%88_%E6%A1%88.xlsx) | Excel | -3,898 | 0 | -18 | -3,916 | + +[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-16_18-53-36/diff.csv b/.VSCodeCounter/2026-04-16_18-53-36/diff.csv new file mode 100644 index 0000000..9dd3055 --- /dev/null +++ b/.VSCodeCounter/2026-04-16_18-53-36/diff.csv @@ -0,0 +1,14 @@ +"filename", "language", "Visual Basic for Applications", "Markdown", "Excel", "CSV", "comment", "blank", "total" +"d:\Project\upds7\vba\README.md", "Markdown", 0, -20, 0, 0, 0, -1, -21 +"d:\Project\upds7\vba\src\data\222交通機関名区分.csv", "CSV", 0, 0, 0, -3, 0, 0, -3 +"d:\Project\upds7\vba\src\data\223通勤_決定事項区分.csv", "CSV", 0, 0, 0, -3, 0, -1, -4 +"d:\Project\upds7\vba\src\data\224通勤_手当月額の決定区分.csv", "CSV", 0, 0, 0, -12, 0, -1, -13 +"d:\Project\upds7\vba\src\data\507発信者.csv", "CSV", 0, 0, 0, -2, 0, -1, -3 +"d:\Project\upds7\vba\src\data\区間.csv", "CSV", 0, 0, 0, -75, 0, 0, -75 +"d:\Project\upds7\vba\src\data\区間詳細.csv", "CSV", 0, 0, 0, -20, 0, 0, -20 +"d:\Project\upds7\vba\src\module\Test_Cache.bas", "Visual Basic for Applications", 10, 0, 0, 0, 0, 0, 10 +"d:\Project\upds7\vba\src\thisWorkbook\Tukin_C1.bas", "Visual Basic for Applications", 7, 0, 0, 0, 0, 0, 7 +"d:\Project\upds7\vba\~$通勤手当テンプレート_案.xlsm", "Excel", 0, 0, -1, 0, 0, 0, -1 +"d:\Project\upds7\vba\通勤手当テンプレート_案.xlsm", "Excel", 0, 0, -2349, 0, 0, -20, -2369 +"d:\Project\upds7\vba\通勤手当テンプレート_案.xlsx", "Excel", 0, 0, -3898, 0, 0, -18, -3916 +"Total", "-", 17, -20, -6248, -115, 0, -42, -6408 \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-16_18-53-36/diff.md b/.VSCodeCounter/2026-04-16_18-53-36/diff.md new file mode 100644 index 0000000..33c17f1 --- /dev/null +++ b/.VSCodeCounter/2026-04-16_18-53-36/diff.md @@ -0,0 +1,28 @@ +# Diff Summary + +Date : 2026-04-16 18:53:36 + +Directory d:\\Project\\upds7\\vba\\src + +Total : 12 files, -6366 codes, 0 comments, -42 blanks, all -6408 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 | 2 | 17 | 0 | 0 | 17 | +| Markdown | 1 | -20 | 0 | -1 | -21 | +| CSV | 6 | -115 | 0 | -3 | -118 | +| Excel | 3 | -6,248 | 0 | -38 | -6,286 | + +## Directories +| path | files | code | comment | blank | total | +| :--- | ---: | ---: | ---: | ---: | ---: | +| . | 12 | -6,366 | 0 | -42 | -6,408 | +| .. | 4 | -6,268 | 0 | -39 | -6,307 | +| data | 6 | -115 | 0 | -3 | -118 | +| module | 1 | 10 | 0 | 0 | 10 | +| thisWorkbook | 1 | 7 | 0 | 0 | 7 | + +[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-16_18-53-36/diff.txt b/.VSCodeCounter/2026-04-16_18-53-36/diff.txt new file mode 100644 index 0000000..8902025 --- /dev/null +++ b/.VSCodeCounter/2026-04-16_18-53-36/diff.txt @@ -0,0 +1,43 @@ +Date : 2026-04-16 18:53:36 +Directory : d:\Project\upds7\vba\src +Total : 12 files, -6366 codes, 0 comments, -42 blanks, all -6408 lines + +Languages ++-------------------------------+------------+------------+------------+------------+------------+ +| language | files | code | comment | blank | total | ++-------------------------------+------------+------------+------------+------------+------------+ +| Visual Basic for Applications | 2 | 17 | 0 | 0 | 17 | +| Markdown | 1 | -20 | 0 | -1 | -21 | +| CSV | 6 | -115 | 0 | -3 | -118 | +| Excel | 3 | -6,248 | 0 | -38 | -6,286 | ++-------------------------------+------------+------------+------------+------------+------------+ + +Directories ++----------------------------------------------------+------------+------------+------------+------------+------------+ +| path | files | code | comment | blank | total | ++----------------------------------------------------+------------+------------+------------+------------+------------+ +| . | 12 | -6,366 | 0 | -42 | -6,408 | +| .. | 4 | -6,268 | 0 | -39 | -6,307 | +| data | 6 | -115 | 0 | -3 | -118 | +| module | 1 | 10 | 0 | 0 | 10 | +| thisWorkbook | 1 | 7 | 0 | 0 | 7 | ++----------------------------------------------------+------------+------------+------------+------------+------------+ + +Files ++----------------------------------------------------+-------------------------------+------------+------------+------------+------------+ +| filename | language | code | comment | blank | total | ++----------------------------------------------------+-------------------------------+------------+------------+------------+------------+ +| d:\Project\upds7\vba\README.md | Markdown | -20 | 0 | -1 | -21 | +| d:\Project\upds7\vba\src\data\222交通機関名区分.csv | CSV | -3 | 0 | 0 | -3 | +| d:\Project\upds7\vba\src\data\223通勤_決定事項区分.csv | CSV | -3 | 0 | -1 | -4 | +| d:\Project\upds7\vba\src\data\224通勤_手当月額の決定区分.csv | CSV | -12 | 0 | -1 | -13 | +| d:\Project\upds7\vba\src\data\507発信者.csv | CSV | -2 | 0 | -1 | -3 | +| d:\Project\upds7\vba\src\data\区間.csv | CSV | -75 | 0 | 0 | -75 | +| d:\Project\upds7\vba\src\data\区間詳細.csv | CSV | -20 | 0 | 0 | -20 | +| d:\Project\upds7\vba\src\module\Test_Cache.bas | Visual Basic for Applications | 10 | 0 | 0 | 10 | +| d:\Project\upds7\vba\src\thisWorkbook\Tukin_C1.bas | Visual Basic for Applications | 7 | 0 | 0 | 7 | +| d:\Project\upds7\vba\~$通勤手当テンプレート_案.xlsm | Excel | -1 | 0 | 0 | -1 | +| d:\Project\upds7\vba\通勤手当テンプレート_案.xlsm | Excel | -2,349 | 0 | -20 | -2,369 | +| d:\Project\upds7\vba\通勤手当テンプレート_案.xlsx | Excel | -3,898 | 0 | -18 | -3,916 | +| Total | | -6,366 | 0 | -42 | -6,408 | ++----------------------------------------------------+-------------------------------+------------+------------+------------+------------+ \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-16_18-53-36/results.csv b/.VSCodeCounter/2026-04-16_18-53-36/results.csv new file mode 100644 index 0000000..0513082 --- /dev/null +++ b/.VSCodeCounter/2026-04-16_18-53-36/results.csv @@ -0,0 +1,16 @@ +"filename", "language", "Visual Basic for Applications", "comment", "blank", "total" +"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\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", "-", 2127, 248, 437, 2812 \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-16_18-53-36/results.json b/.VSCodeCounter/2026-04-16_18-53-36/results.json new file mode 100644 index 0000000..e6fbb54 --- /dev/null +++ b/.VSCodeCounter/2026-04-16_18-53-36/results.json @@ -0,0 +1 @@ +{"file:///d%3A/Project/upds7/vba/src/thisWorkbook/Master_M2_Kukan_detail.bas":{"language":"Visual Basic for Applications","code":176,"comment":32,"blank":45},"file:///d%3A/Project/upds7/vba/src/thisWorkbook/Master_O2_507.bas":{"language":"Visual Basic for Applications","code":12,"comment":1,"blank":4},"file:///d%3A/Project/upds7/vba/src/thisWorkbook/Master_O1_address.bas":{"language":"Visual Basic for Applications","code":35,"comment":4,"blank":13},"file:///d%3A/Project/upds7/vba/src/thisWorkbook/Master_Z1_222.bas":{"language":"Visual Basic for Applications","code":140,"comment":5,"blank":27},"file:///d%3A/Project/upds7/vba/src/thisWorkbook/Master_M1_Kukan.bas":{"language":"Visual Basic for Applications","code":234,"comment":25,"blank":53},"file:///d%3A/Project/upds7/vba/src/module/Global_Cache.bas":{"language":"Visual Basic for Applications","code":195,"comment":43,"blank":69},"file:///d%3A/Project/upds7/vba/src/thisWorkbook/Tukin_C1.bas":{"language":"Visual Basic for Applications","code":429,"comment":61,"blank":58},"file:///d%3A/Project/upds7/vba/src/module/Module_Common.bas":{"language":"Visual Basic for Applications","code":171,"comment":23,"blank":35},"file:///d%3A/Project/upds7/vba/src/thisWorkbook/Master_Z2_223.bas":{"language":"Visual Basic for Applications","code":126,"comment":5,"blank":25},"file:///d%3A/Project/upds7/vba/src/module/Generic_Master_Common.bas":{"language":"Visual Basic for Applications","code":58,"comment":12,"blank":17},"file:///d%3A/Project/upds7/vba/src/thisWorkbook/Master_Z3_224.bas":{"language":"Visual Basic for Applications","code":133,"comment":5,"blank":26},"file:///d%3A/Project/upds7/vba/src/module/Read_Common.bas":{"language":"Visual Basic for Applications","code":153,"comment":17,"blank":19},"file:///d%3A/Project/upds7/vba/src/module/Test_Cache.bas":{"language":"Visual Basic for Applications","code":159,"comment":4,"blank":25},"file:///d%3A/Project/upds7/vba/src/module/Write_Common.bas":{"language":"Visual Basic for Applications","code":106,"comment":11,"blank":21}} \ No newline at end of file diff --git a/.VSCodeCounter/2026-04-16_18-53-36/results.md b/.VSCodeCounter/2026-04-16_18-53-36/results.md new file mode 100644 index 0000000..b5c8f95 --- /dev/null +++ b/.VSCodeCounter/2026-04-16_18-53-36/results.md @@ -0,0 +1,23 @@ +# Summary + +Date : 2026-04-16 18:53:36 + +Directory d:\\Project\\upds7\\vba\\src + +Total : 14 files, 2127 codes, 248 comments, 437 blanks, all 2812 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 | 14 | 2,127 | 248 | 437 | 2,812 | + +## Directories +| path | files | code | comment | blank | total | +| :--- | ---: | ---: | ---: | ---: | ---: | +| . | 14 | 2,127 | 248 | 437 | 2,812 | +| module | 6 | 842 | 110 | 186 | 1,138 | +| thisWorkbook | 8 | 1,285 | 138 | 251 | 1,674 | + +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-16_18-53-36/results.txt b/.VSCodeCounter/2026-04-16_18-53-36/results.txt new file mode 100644 index 0000000..2dfa53a --- /dev/null +++ b/.VSCodeCounter/2026-04-16_18-53-36/results.txt @@ -0,0 +1,40 @@ +Date : 2026-04-16 18:53:36 +Directory : d:\Project\upds7\vba\src +Total : 14 files, 2127 codes, 248 comments, 437 blanks, all 2812 lines + +Languages ++-------------------------------+------------+------------+------------+------------+------------+ +| language | files | code | comment | blank | total | ++-------------------------------+------------+------------+------------+------------+------------+ +| Visual Basic for Applications | 14 | 2,127 | 248 | 437 | 2,812 | ++-------------------------------+------------+------------+------------+------------+------------+ + +Directories ++------------------------------------------------------------------+------------+------------+------------+------------+------------+ +| path | files | code | comment | blank | total | ++------------------------------------------------------------------+------------+------------+------------+------------+------------+ +| . | 14 | 2,127 | 248 | 437 | 2,812 | +| module | 6 | 842 | 110 | 186 | 1,138 | +| thisWorkbook | 8 | 1,285 | 138 | 251 | 1,674 | ++------------------------------------------------------------------+------------+------------+------------+------------+------------+ + +Files ++------------------------------------------------------------------+-------------------------------+------------+------------+------------+------------+ +| filename | language | code | comment | blank | total | ++------------------------------------------------------------------+-------------------------------+------------+------------+------------+------------+ +| 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\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 | | 2,127 | 248 | 437 | 2,812 | ++------------------------------------------------------------------+-------------------------------+------------+------------+------------+------------+ \ No newline at end of file diff --git a/src/data/222交通機関名区分.csv b/data/222交通機関名区分.csv similarity index 100% rename from src/data/222交通機関名区分.csv rename to data/222交通機関名区分.csv diff --git a/src/data/223通勤_決定事項区分.csv b/data/223通勤_決定事項区分.csv similarity index 100% rename from src/data/223通勤_決定事項区分.csv rename to data/223通勤_決定事項区分.csv diff --git a/src/data/224通勤_手当月額の決定区分.csv b/data/224通勤_手当月額の決定区分.csv similarity index 100% rename from src/data/224通勤_手当月額の決定区分.csv rename to data/224通勤_手当月額の決定区分.csv diff --git a/src/data/507発信者.csv b/data/507発信者.csv similarity index 100% rename from src/data/507発信者.csv rename to data/507発信者.csv diff --git a/src/data/区間.csv b/data/区間.csv similarity index 100% rename from src/data/区間.csv rename to data/区間.csv diff --git a/src/data/区間詳細.csv b/data/区間詳細.csv similarity index 100% rename from src/data/区間詳細.csv rename to data/区間詳細.csv diff --git a/src/module/Test_Cache.bas b/src/module/Test_Cache.bas index e4e12ed..cc24928 100644 --- a/src/module/Test_Cache.bas +++ b/src/module/Test_Cache.bas @@ -4,191 +4,184 @@ ' ============================================================ Sub Test_PrintAllCaches() - ' Refresh all caches first Call RefreshM1Cache Call RefreshM1KukanDCache Call RefreshM2Cache Call RefreshZ1Cache Call RefreshO1Cache - ' Get or create Test_Cache sheet - Dim wb As Workbook - Set wb = ThisWorkbook - Dim ws As Worksheet On Error Resume Next - Set ws = wb.Worksheets("Test_Cache") - On Error GoTo 0 - + Set ws = ThisWorkbook.Worksheets("Test_Cache") If ws Is Nothing Then - Set ws = wb.Worksheets.Add + Set ws = ThisWorkbook.Worksheets.Add ws.Name = "Test_Cache" End If + On Error GoTo 0 - ws.Cells.Clear + ws.Cells.ClearContents - Dim row As Long - row = 1 + Dim r As Long + r = 1 + ws.Cells(r, 1).Value = "M1 Cache" + r = r + 1 + Call PrintM1CacheToSheet(ws, r) - ' Print M1 Cache - ws.Cells(row, 1).Value = "=== M1 Cache ===" - row = row + 1 - Call PrintM1CacheToSheet(ws, row) + r = r + 1 + ws.Cells(r, 1).Value = "M1_KukanD Cache" + r = r + 1 + Call PrintM1KukanDCacheToSheet(ws, r) - ' Print M1_KukanD Cache - row = row + 1 - ws.Cells(row, 1).Value = "=== M1_KukanD Cache ===" - row = row + 1 - Call PrintM1KukanDCacheToSheet(ws, row) + r = r + 1 + ws.Cells(r, 1).Value = "M2 Cache" + r = r + 1 + Call PrintM2CacheToSheet(ws, r) - ' Print M2 Cache - row = row + 1 - ws.Cells(row, 1).Value = "=== M2 Cache ===" - row = row + 1 - Call PrintM2CacheToSheet(ws, row) + r = r + 1 + ws.Cells(r, 1).Value = "Z1 Cache" + r = r + 1 + Call PrintZ1CacheToSheet(ws, r) - ' Print Z1 Cache - row = row + 1 - ws.Cells(row, 1).Value = "=== Z1 Cache ===" - row = row + 1 - Call PrintZ1CacheToSheet(ws, row) - - ' Print O1 Cache - row = row + 1 - ws.Cells(row, 1).Value = "=== O1 Cache ===" - row = row + 1 - Call PrintO1CacheToSheet(ws, row) + r = r + 1 + ws.Cells(r, 1).Value = "O1 Cache" + r = r + 1 + Call PrintO1CacheToSheet(ws, r) ws.Columns.AutoFit End Sub -Private Sub PrintM1CacheToSheet(ws As Worksheet, ByRef row As Long) +Private Sub PrintM1CacheToSheet(ws As Worksheet, ByRef r As Long) If m1Cache Is Nothing Then - ws.Cells(row, 1).Value = "m1Cache is Nothing" - row = row + 1 + ws.Cells(r, 1).Value = "Nothing" + r = r + 1 Exit Sub End If - ws.Cells(row, 1).Value = "Count: " & m1Cache.Count - row = row + 1 + ws.Cells(r, 1).Value = "Count: " & m1Cache.Count + r = r + 1 - Dim key As Variant - For Each key In m1Cache.Keys - Dim vals As Variant - vals = m1Cache(key) - ws.Cells(row, 1).Value = key - ws.Cells(row, 2).Value = vals(1) & ": " & vals(2) - ws.Cells(row, 3).Value = vals(3) - ws.Cells(row, 4).Value = vals(4) - ws.Cells(row, 5).Value = vals(5) - row = row + 1 - Next key + Dim k As Variant + For Each k In m1Cache.Keys + Dim v As Variant + v = m1Cache(k) + ws.Cells(r, 1).Value = k + ws.Cells(r, 2).Value = v(1) + ws.Cells(r, 3).Value = v(2) + ws.Cells(r, 4).Value = v(3) + r = r + 1 + Next k End Sub -Private Sub PrintM1KukanDCacheToSheet(ws As Worksheet, ByRef row As Long) +Private Sub PrintM1KukanDCacheToSheet(ws As Worksheet, ByRef r As Long) If m1KukanDCache Is Nothing Then - ws.Cells(row, 1).Value = "m1KukanDCache is Nothing" - row = row + 1 + ws.Cells(r, 1).Value = "Nothing" + r = r + 1 Exit Sub End If - ws.Cells(row, 1).Value = "Count: " & m1KukanDCache.Count - row = row + 1 + ws.Cells(r, 1).Value = "Count: " & m1KukanDCache.Count + r = r + 1 - Dim dKey As Variant - For Each dKey In m1KukanDCache.Keys - ws.Cells(row, 1).Value = "D: " & dKey - row = row + 1 - - Dim innerDict As Object - Set innerDict = m1KukanDCache(dKey) - Dim fKey As Variant - For Each fKey In innerDict.Keys - ws.Cells(row, 2).Value = "F: " & fKey - row = row + 1 - + Dim d As Variant + For Each d In m1KukanDCache.Keys + ws.Cells(r, 1).Value = d + r = r + 1 + Dim inner As Object + Set inner = m1KukanDCache(d) + Dim f As Variant + For Each f In inner.Keys + ws.Cells(r, 2).Value = f + r = r + 1 Dim arr As Object - Set arr = innerDict(fKey) - Dim gKey As Variant - For Each gKey In arr.Keys - ws.Cells(row, 3).Value = "G: " & gKey - row = row + 1 - Next gKey - Next fKey - Next dKey + Set arr = inner(f) + Dim g As Variant + For Each g In arr.Keys + ws.Cells(r, 3).Value = g + r = r + 1 + Next g + Next f + Next d End Sub -Private Sub PrintM2CacheToSheet(ws As Worksheet, ByRef row As Long) +Private Sub PrintM2CacheToSheet(ws As Worksheet, ByRef r As Long) If m2Cache Is Nothing Then - ws.Cells(row, 1).Value = "m2Cache is Nothing" - row = row + 1 + ws.Cells(r, 1).Value = "Nothing" + r = r + 1 Exit Sub End If - ws.Cells(row, 1).Value = "Count: " & m2Cache.Count - row = row + 1 + ws.Cells(r, 1).Value = "Count: " & m2Cache.Count + r = r + 1 - Dim kukanKey As Variant - For Each kukanKey In m2Cache.Keys - ws.Cells(row, 1).Value = "KukanCode: " & kukanKey - row = row + 1 - - Dim innerDict As Object - Set innerDict = m2Cache(kukanKey) - Dim kanshuKey As Variant - For Each kanshuKey In innerDict.Keys - ws.Cells(row, 2).Value = "Kanshu: " & kanshuKey - row = row + 1 - - Dim innermostDict As Object - Set innermostDict = innerDict(kanshuKey) - Dim codeKey As Variant - For Each codeKey In innermostDict.Keys - ws.Cells(row, 3).Value = "Code: " & codeKey - ws.Cells(row, 4).Value = innermostDict(codeKey) - row = row + 1 - Next codeKey - Next kanshuKey - Next kukanKey + Dim k As Variant + For Each k In m2Cache.Keys + ws.Cells(r, 1).Value = k + r = r + 1 + Dim inner As Object + Set inner = m2Cache(k) + Dim kanshu As Variant + For Each kanshu In inner.Keys + ws.Cells(r, 2).Value = kanshu + r = r + 1 + Dim innermost As Object + Set innermost = inner(kanshu) + Dim c As Variant + For Each c In innermost.Keys + ws.Cells(r, 3).Value = c + ws.Cells(r, 4).Value = innermost(c) + r = r + 1 + Next c + Next kanshu + Next k End Sub -Private Sub PrintZ1CacheToSheet(ws As Worksheet, ByRef row As Long) +Private Sub PrintZ1CacheToSheet(ws As Worksheet, ByRef r As Long) If z1Cache Is Nothing Then - ws.Cells(row, 1).Value = "z1Cache is Nothing" - row = row + 1 + ws.Cells(r, 1).Value = "Nothing" + r = r + 1 Exit Sub End If - ws.Cells(row, 1).Value = "Count: " & z1Cache.Count - row = row + 1 + ws.Cells(r, 1).Value = "Count: " & z1Cache.Count + r = r + 1 - Dim key As Variant - For Each key In z1Cache.Keys - Dim vals As Variant - vals = z1Cache(key) - ws.Cells(row, 1).Value = key - ws.Cells(row, 2).Value = vals(0) - row = row + 1 - Next key + Dim k As Variant + For Each k In z1Cache.Keys + Dim v As Variant + v = z1Cache(k) + ws.Cells(r, 1).Value = k + ws.Cells(r, 2).Value = v(0) + r = r + 1 + Next k End Sub -Private Sub PrintO1CacheToSheet(ws As Worksheet, ByRef row As Long) +Private Sub PrintO1CacheToSheet(ws As Worksheet, ByRef r As Long) If o1Cache Is Nothing Then - ws.Cells(row, 1).Value = "o1Cache is Nothing" - row = row + 1 + ws.Cells(r, 1).Value = "Nothing" + r = r + 1 Exit Sub End If - ws.Cells(row, 1).Value = "Count: " & o1Cache.Count - row = row + 1 + ws.Cells(r, 1).Value = "Count: " & o1Cache.Count + r = r + 1 - Dim key As Variant - For Each key In o1Cache.Keys - Dim vals As Variant - vals = o1Cache(key) - ws.Cells(row, 1).Value = key - ws.Cells(row, 2).Value = vals(0) - ws.Cells(row, 3).Value = vals(1) - row = row + 1 - Next key + Dim c As Variant + For Each c In o1Cache.Keys + ws.Cells(r, 1).Value = c + r = r + 1 + Dim inner As Object + Set inner = o1Cache(c) + Dim e As Variant + For Each e In inner.Keys + ws.Cells(r, 2).Value = e + r = r + 1 + Dim arr As Object + Set arr = inner(e) + Dim f As Variant + For Each f In arr.Keys + ws.Cells(r, 3).Value = f + r = r + 1 + Next f + Next e + Next c End Sub diff --git a/src/thisWorkbook/Tukin_C1.bas b/src/thisWorkbook/Tukin_C1.bas index d0d8ec4..0a826e9 100644 --- a/src/thisWorkbook/Tukin_C1.bas +++ b/src/thisWorkbook/Tukin_C1.bas @@ -320,29 +320,36 @@ End Sub Private Sub FillAddressFromO1(ByVal rowNum As Long) If o1Cache Is Nothing Then Call RefreshO1Cache - Dim empNo As String: empNo = Trim(Me.Cells(rowNum, 3).Value) + Dim empNo As String + empNo = Trim(Me.Cells(rowNum, 3).Value) If empNo = "" Then Exit Sub - ' Build dropdown list from O1 cache + ' Build dropdown list from O1 cache: get all E values for the C Dim dropdownList As String - Dim key As Variant - For Each key In o1Cache.Keys - If dropdownList = "" Then - dropdownList = key - Else - dropdownList = dropdownList & "," & key - End If - Next key + If o1Cache.Exists(empNo) Then + Dim innerDict As Object + Set innerDict = o1Cache(empNo) + Dim eKey As Variant + For Each eKey In innerDict.Keys + If dropdownList = "" Then + dropdownList = eKey + Else + dropdownList = dropdownList & "," & eKey + End If + Next eKey + End If ' Create dropdown for I column (住所) - With Me.Range("I" & rowNum).Validation - .Delete - .Add Type:=xlValidateList, Formula1:=dropdownList - .IgnoreBlank = True - .InCellDropdown = True - .InputTitle = "" - .InputMessage = "" - End With + If dropdownList <> "" Then + With Me.Range("I" & rowNum).Validation + .Delete + .Add Type:=xlValidateList, Formula1:=dropdownList + .IgnoreBlank = True + .InCellDropdown = True + .InputTitle = "" + .InputMessage = "" + End With + End If End Sub ' Create transport (T) dropdown from Z1 cache diff --git a/通勤手当テンプレート_案.xlsm b/通勤手当テンプレート_案.xlsm index 9bd14c9..8ef126d 100644 Binary files a/通勤手当テンプレート_案.xlsm and b/通勤手当テンプレート_案.xlsm differ