edit test cache

src/data/222交通機関名区分.csv

@@ -1,3 +0,0 @@
-"001","JR 東北線","JR 東北線","","JR 東北線","0",""
-"002","ＪＲ","ＪＲ","","ＪＲ","",""
-"003","山交バス","山交バス","","山交バス","",""

src/data/223通勤_決定事項区分.csv

@@ -1,3 +0,0 @@
-"1","法第１２条第１項 該当","法第１２条第１項 該当","",""
-"2","法第１２条第１項 該当（規則第５条）","法第１２条第１項 該当（規則第５条）","",""
-"3","法第１２条第１項 非該当","法第１２条第１項 非該当","",""

src/data/224通勤_手当月額の決定区分.csv

@@ -1,12 +0,0 @@
-"10","法第１２条第２項第１号","法第１２条第２項第１号","","",""
-"20","法第１２条第２項第２号","法第１２条第２項第２号","","",""
-"30","法第１２条第２項第３号","法第１２条第２項第３号","","",""
-"31","法第１２条第２項第３号。","法第１２条第２項第３号　規則第８条の２第１号","","","規則第８条の２第１号"
-"32","法第１２条第２項第３号","法第１２条第２項第３号　規則第８条の２第２号","","","規則第８条の２第２号"
-"33","法第１２条第２項第３号","法第１２条第２項第３号　規則第８条の２第３号","","","規則第８条の２第３号"
-"40","法第１２条第３項","法第１２条第３項","","",""
-"41","法第１２条第３項第３号","法第１２条第３項第３号　規則第８条の３第１号","","","規則第８条の３第１号"
-"42","法第１２条第３項第３号","法第１２条第３項第３号　規則第８条の３第２号","","",""
-"50","法第１２条第４項","法第１２条第４項","","",""
-"60","法第１２条第５項","法第１２条第５項","","",""
-"90","非該当","非該当","","",""

src/data/507発信者.csv

@@ -1,2 +0,0 @@
-"001","○○大学総長","○○大学総長","","","○○大学総長","○　○　○　○","000000","943901","","","","1"
-"002","○○大学医療技術短期大学部学長","○○大学医療技術短期大学部学長","","","○○大学医療技術短期大学部学長","○　○　○　○","607300","607300","","","","1"

src/data/区間.csv

@@ -1,75 +0,0 @@
-利用区間コード,交通機関区分,交通機関名称,利用区間発名,利用区間着名,距離等,運賃,現金の場合の1箇月運賃,連絡,特別料金区分,特別料金の券種,特別料金の負担額
-00001,002,ＪＲ,芦川,甲府,22,2233,,,普通,,
-00002,002,ＪＲ,井土ヶ谷,甲府,,0,,,普通,,
-00003,002,ＪＲ,稲田堤,甲府,,0,,,普通,,
-00004,002,ＪＲ,猿橋,甲府,,0,,,普通,,
-00005,002,ＪＲ,塩崎,甲府,,0,,,普通,,
-00006,002,ＪＲ,塩山,甲府,,0,,,普通,,
-00007,002,ＪＲ,岡谷,甲府,,0,,,普通,,
-00008,002,ＪＲ,下部温泉,常永,,0,,,普通,,
-00009,002,ＪＲ,我孫子,甲府,,0,,,普通,,
-00010,002,ＪＲ,茅野,甲府,,0,,,普通,,
-00011,002,ＪＲ,久那土,小井川,,0,,,普通,,
-00012,002,ＪＲ,狭間,甲府,,0,,,普通,,
-00013,002,ＪＲ,金手,甲府,,0,,,普通,,
-00014,002,ＪＲ,穴山,甲府,,0,,,普通,,
-00015,002,ＪＲ,御茶ノ水,甲府,,0,,,普通,,
-00016,002,ＪＲ,御嶽山・目黒,永田町,,0,,,普通,,
-00017,002,ＪＲ,広丘,甲府,,0,,,普通,,
-00018,002,ＪＲ,甲斐岩間,甲府,,0,,,普通,,
-00019,002,ＪＲ,甲斐上野,甲府,,0,,,普通,,
-00020,002,ＪＲ,甲斐大和,甲府,,0,,,普通,,
-00021,002,ＪＲ,甲府,常永,,0,,,普通,,
-00022,002,ＪＲ,高尾,甲府,,0,,,普通,,
-00023,002,ＪＲ,国分寺,甲府,,0,,,普通,,
-00024,002,ＪＲ,国母,常永,,0,,,普通,,
-00025,002,ＪＲ,国母,甲府,,0,,,普通,,
-00026,002,ＪＲ,笹子,甲府,,0,,,普通,,
-00027,002,ＪＲ,三鷹,塩山,,0,,,普通,,
-00028,002,ＪＲ,山梨市,甲府,,0,,,普通,,
-00029,002,ＪＲ,市川本町,常永,,0,,,普通,,
-00030,002,ＪＲ,指扇,甲府,,0,,,普通,,
-00031,002,ＪＲ,若葉台,甲府,,0,,,普通,,
-00032,002,ＪＲ,酒折,甲府,,0,,,普通,,
-00033,002,ＪＲ,春日居町,甲府,,0,,,普通,,
-00034,002,ＪＲ,初狩,甲府,,0,,,普通,,
-00035,002,ＪＲ,小井川,甲府,,0,,,普通,,
-00036,002,ＪＲ,小淵沢,甲府,,0,,,普通,,
-00037,002,ＪＲ,松本,甲府,,0,,,普通,,
-00038,002,ＪＲ,常永,甲府,,0,,,普通,,
-00039,002,ＪＲ,新座,甲府,,0,,,普通,,
-00040,002,ＪＲ,新三郷,甲府,,0,,,普通,,
-00041,002,ＪＲ,新宿,常永,,0,,,普通,,
-00042,002,ＪＲ,新府,甲府,,0,,,普通,,
-00043,002,ＪＲ,聖蹟桜ヶ丘,甲府,,0,,,普通,,
-00044,002,ＪＲ,西荻窪,甲府,,0,,,普通,,
-00045,002,ＪＲ,西八王子,甲府,,0,,,普通,,
-00046,002,ＪＲ,石和温泉,甲府,,0,,,普通,,
-00047,002,ＪＲ,代々木,甲府,,0,,,普通,,
-00048,002,ＪＲ,代田橋,甲府,,0,,,普通,,
-00049,002,ＪＲ,大月,甲府,,0,,,普通,,
-00050,002,ＪＲ,池袋,甲府,,0,,,普通,,
-00051,002,ＪＲ,潮見～東京,新宿～甲府,,0,,,普通,,
-00052,002,ＪＲ,長後,甲府,,0,,,普通,,
-00053,002,ＪＲ,長坂,甲府,,0,,,普通,,
-00054,002,ＪＲ,東花輪,甲府,,0,,,普通,,
-00055,002,ＪＲ,東山梨,甲府,,0,,,普通,,
-00056,002,ＪＲ,東山梨→甲府,甲府→常永,,0,,,普通,,
-00057,002,ＪＲ,東所沢,甲府,,0,,,普通,,
-00058,002,ＪＲ,東船橋,甲府,,0,,,普通,,
-00059,002,ＪＲ,東飯能,甲府,,0,,,普通,,
-00060,002,ＪＲ,南甲府,甲府,,0,,,普通,,
-00061,002,ＪＲ,韮崎,甲府,,0,,,普通,,
-00062,002,ＪＲ,柏の葉キャンパス,甲府,,0,,,普通,,
-00063,002,ＪＲ,八王子,甲府,,0,,,普通,,
-00064,002,ＪＲ,豊田,甲府,,0,,,普通,,
-00065,002,ＪＲ,矢川,甲府,,0,,,普通,,
-00066,002,ＪＲ,立川,甲府,,0,,,普通,,
-00067,002,ＪＲ,竜王,甲府,,0,,,普通,,
-00068,002,ＪＲ,飯田橋,甲府,,0,,,普通,,
-00069,003,山交バス,甲府駅北口,山梨大学,,0,,,普通,,
-00070,002,ＪＲ,白金高輪駅,虎ノ門駅,20,2000,,,普通,,
-00071,003,山交バス,新貢川橋南,山梨大学,30,3000,,,普通,,
-00072,002,ＪＲ,芦川,甲府,1,2,3,,普通,,
-00073,001,交通用具,smart,smart,2222,222,2222,,普通,,
-00074,002,ＪＲ,甲府,甲府,22,2222,2222,,普通,,

src/data/区間詳細.csv

@@ -1,20 +0,0 @@
-利用区間コード,券種,コード,名称,1箇月運賃/販売額,定期額/券１(額)/利用額,定期支給期間/券１(枚)/特別料金,特別料金/券２(額),券２(枚),端数(額),特別料金
-00001,1,003,６箇月定期,7920,47520,6,,,,
-00001,2,001,テスト,15000,0,0,0,0,0,
-00001,3,001,プリペイドカード,20000,20000,,,,,
-00002,1,003,６箇月定期,1451.833,8711,6,,,,
-00002,2,001,テスト,15000,0,0,0,0,0,
-00002,3,002,0002テスト,45000,60000,,,,,
-00003,2,002,テスト2,500,500,10,500,10,0,
-00004,3,003,0004テスト,5000,5000,,,,,
-00005,1,003,６箇月定期,4753.333,28520,6,,,,
-00006,1,001,１箇月定期,7920,7920,1,,,,
-00006,1,003,６箇月定期,7920,47520,6,,,,
-00021,1,001,１箇月定期,6260,6260,1,,,,
-00038,1,001,１箇月定期,6260,6260,1,,,,
-00056,1,003,６箇月定期,10030,10030,1,,,,
-00067,1,003,６箇月定期,4486.666,26920,6,,,,
-00068,1,003,６箇月定期,52800,316800,6,,,,
-00069,1,006,６箇月,7181.666,43090,6,,,,
-00070,1,003,６箇月定期,6426.666,38560,6,,,,
-00071,1,003,６箇月定期,6879,6879,1,,,,

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

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