moneymanagerex · georgeef · Nov 3, 2024 · Nov 3, 2024
diff --git a/MMEX.xcodeproj/project.pbxproj b/MMEX.xcodeproj/project.pbxproj
@@ -18,11 +18,11 @@
 		920824042CA4ADC100388AB2 /* ScheduledSplitData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920824032CA4ADC100388AB2 /* ScheduledSplitData.swift */; };
 		920824062CA4AE0A00388AB2 /* TransactionSplitRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920824052CA4AE0A00388AB2 /* TransactionSplitRepository.swift */; };
 		920824082CA4B05700388AB2 /* ScheduledSplitRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920824072CA4B05700388AB2 /* ScheduledSplitRepository.swift */; };
-		9208240A2CA4C2AD00388AB2 /* BudgetYearData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920824092CA4C2AD00388AB2 /* BudgetYearData.swift */; };
-		9208240C2CA4C31B00388AB2 /* BudgetTableData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9208240B2CA4C31B00388AB2 /* BudgetTableData.swift */; };
+		9208240A2CA4C2AD00388AB2 /* YearData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920824092CA4C2AD00388AB2 /* YearData.swift */; };
+		9208240C2CA4C31B00388AB2 /* BudgetData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9208240B2CA4C31B00388AB2 /* BudgetData.swift */; };
 		9208240E2CA4C4FA00388AB2 /* ReportData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9208240D2CA4C4FA00388AB2 /* ReportData.swift */; };
-		920824102CA4C5CD00388AB2 /* BudgetYearRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9208240F2CA4C5CD00388AB2 /* BudgetYearRepository.swift */; };
-		920824122CA4C6A400388AB2 /* BudgetTableRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920824112CA4C6A400388AB2 /* BudgetTableRepository.swift */; };
+		920824102CA4C5CD00388AB2 /* YearRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9208240F2CA4C5CD00388AB2 /* YearRepository.swift */; };
+		920824122CA4C6A400388AB2 /* BudgetRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920824112CA4C6A400388AB2 /* BudgetRepository.swift */; };
 		920824162CA4C95F00388AB2 /* ReportRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920824152CA4C95F00388AB2 /* ReportRepository.swift */; };
 		920824182CA4CF4300388AB2 /* AttachmentData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920824172CA4CF4300388AB2 /* AttachmentData.swift */; };
 		9208241A2CA4D35700388AB2 /* AttachmentRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920824192CA4D35700388AB2 /* AttachmentRepository.swift */; };
@@ -95,6 +95,7 @@
 		925EABB62CD6E6EF003CEAB3 /* InfotableList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 925EABB52CD6E6EF003CEAB3 /* InfotableList.swift */; };
 		925EABB82CD6FAC7003CEAB3 /* TransactionList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 925EABB72CD6FAC7003CEAB3 /* TransactionList.swift */; };
 		925EABBA2CD6FBF7003CEAB3 /* ScheduledList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 925EABB92CD6FBF7003CEAB3 /* ScheduledList.swift */; };
+		925EABBC2CD78A65003CEAB3 /* JournalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 925EABBB2CD78A65003CEAB3 /* JournalData.swift */; };
 		929EF65F2C9FF2DE0051A3E6 /* AssetData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 929EF65E2C9FF2DE0051A3E6 /* AssetData.swift */; };
 		929EF6612C9FF2FD0051A3E6 /* StockData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 929EF6602C9FF2FD0051A3E6 /* StockData.swift */; };
 		929EF6632C9FF3ED0051A3E6 /* AssetRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 929EF6622C9FF3ED0051A3E6 /* AssetRepository.swift */; };
@@ -174,11 +175,11 @@
 		920824032CA4ADC100388AB2 /* ScheduledSplitData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduledSplitData.swift; sourceTree = "<group>"; };
 		920824052CA4AE0A00388AB2 /* TransactionSplitRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionSplitRepository.swift; sourceTree = "<group>"; };
 		920824072CA4B05700388AB2 /* ScheduledSplitRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduledSplitRepository.swift; sourceTree = "<group>"; };
-		920824092CA4C2AD00388AB2 /* BudgetYearData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BudgetYearData.swift; sourceTree = "<group>"; };
-		9208240B2CA4C31B00388AB2 /* BudgetTableData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BudgetTableData.swift; sourceTree = "<group>"; };
+		920824092CA4C2AD00388AB2 /* YearData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YearData.swift; sourceTree = "<group>"; };
+		9208240B2CA4C31B00388AB2 /* BudgetData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BudgetData.swift; sourceTree = "<group>"; };
 		9208240D2CA4C4FA00388AB2 /* ReportData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReportData.swift; sourceTree = "<group>"; };
-		9208240F2CA4C5CD00388AB2 /* BudgetYearRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BudgetYearRepository.swift; sourceTree = "<group>"; };
-		920824112CA4C6A400388AB2 /* BudgetTableRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BudgetTableRepository.swift; sourceTree = "<group>"; };
+		9208240F2CA4C5CD00388AB2 /* YearRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YearRepository.swift; sourceTree = "<group>"; };
+		920824112CA4C6A400388AB2 /* BudgetRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BudgetRepository.swift; sourceTree = "<group>"; };
 		920824152CA4C95F00388AB2 /* ReportRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReportRepository.swift; sourceTree = "<group>"; };
 		920824172CA4CF4300388AB2 /* AttachmentData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentData.swift; sourceTree = "<group>"; };
 		920824192CA4D35700388AB2 /* AttachmentRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentRepository.swift; sourceTree = "<group>"; };
@@ -251,6 +252,7 @@
 		925EABB52CD6E6EF003CEAB3 /* InfotableList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InfotableList.swift; sourceTree = "<group>"; };
 		925EABB72CD6FAC7003CEAB3 /* TransactionList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionList.swift; sourceTree = "<group>"; };
 		925EABB92CD6FBF7003CEAB3 /* ScheduledList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduledList.swift; sourceTree = "<group>"; };
+		925EABBB2CD78A65003CEAB3 /* JournalData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JournalData.swift; sourceTree = "<group>"; };
 		929EF65E2C9FF2DE0051A3E6 /* AssetData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssetData.swift; sourceTree = "<group>"; };
 		929EF6602C9FF2FD0051A3E6 /* StockData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StockData.swift; sourceTree = "<group>"; };
 		929EF6622C9FF3ED0051A3E6 /* AssetRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssetRepository.swift; sourceTree = "<group>"; };
@@ -617,8 +619,8 @@
 				9208242B2CA615B400388AB2 /* FieldRepository.swift */,
 				9208242D2CA617FB00388AB2 /* FieldContentRepository.swift */,
 				920824192CA4D35700388AB2 /* AttachmentRepository.swift */,
-				9208240F2CA4C5CD00388AB2 /* BudgetYearRepository.swift */,
-				920824112CA4C6A400388AB2 /* BudgetTableRepository.swift */,
+				9208240F2CA4C5CD00388AB2 /* YearRepository.swift */,
+				920824112CA4C6A400388AB2 /* BudgetRepository.swift */,
 				920824152CA4C95F00388AB2 /* ReportRepository.swift */,
 			);
 			path = Repository;
@@ -701,9 +703,10 @@
 				920824272CA60E8400388AB2 /* FieldData.swift */,
 				920824292CA60FD900388AB2 /* FieldContentData.swift */,
 				920824172CA4CF4300388AB2 /* AttachmentData.swift */,
-				920824092CA4C2AD00388AB2 /* BudgetYearData.swift */,
-				9208240B2CA4C31B00388AB2 /* BudgetTableData.swift */,
+				920824092CA4C2AD00388AB2 /* YearData.swift */,
+				9208240B2CA4C31B00388AB2 /* BudgetData.swift */,
 				9208240D2CA4C4FA00388AB2 /* ReportData.swift */,
+				925EABBB2CD78A65003CEAB3 /* JournalData.swift */,
 			);
 			path = Data;
 			sourceTree = "<group>";
@@ -892,7 +895,7 @@
 				924353492CCD36890052E4BC /* CurrencyList.swift in Sources */,
 				924352FA2CB355CF0052E4BC /* SettingsThemeView.swift in Sources */,
 				925EABAC2CCF826F003CEAB3 /* CategoryValidation.swift in Sources */,
-				9208240A2CA4C2AD00388AB2 /* BudgetYearData.swift in Sources */,
+				9208240A2CA4C2AD00388AB2 /* YearData.swift in Sources */,
 				924353392CCD2F310052E4BC /* CurrencySearch.swift in Sources */,
 				9243533B2CCD2F610052E4BC /* AccountSearch.swift in Sources */,
 				A3363EEB2C93BF62004696C7 /* CurrencyRepository.swift in Sources */,
@@ -904,14 +907,15 @@
 				9208242E2CA617FB00388AB2 /* FieldContentRepository.swift in Sources */,
 				9208241E2CA4E1C500388AB2 /* TransactionLinkRepository.swift in Sources */,
 				9208241A2CA4D35700388AB2 /* AttachmentRepository.swift in Sources */,
+				925EABBC2CD78A65003CEAB3 /* JournalData.swift in Sources */,
 				925EABA82CCF81FF003CEAB3 /* AssetValidation.swift in Sources */,
 				925EAB932CCD7386003CEAB3 /* RepositoryCreateView.swift in Sources */,
 				A37E7D882C9AC2E600B4ECFC /* VersionInfoView.swift in Sources */,
 				920823F62CA498A200388AB2 /* CurrencyHistoryData.swift in Sources */,
 				9208242A2CA60FD900388AB2 /* FieldContentData.swift in Sources */,
 				A3462F662C94854800F79145 /* ExportableEntity.swift in Sources */,
 				A3462F6A2C948CDB00F79145 /* ExportableEntityDocument.swift in Sources */,
-				920824122CA4C6A400388AB2 /* BudgetTableRepository.swift in Sources */,
+				920824122CA4C6A400388AB2 /* BudgetRepository.swift in Sources */,
 				A3C142982C8FE62200D3CEC0 /* TransactionListView.swift in Sources */,
 				9243533D2CCD2F990052E4BC /* AssetSearch.swift in Sources */,
 				A33742882CA8E55400698466 /* IncomeExpenseView.swift in Sources */,
@@ -930,7 +934,7 @@
 				920824022CA4AD0C00388AB2 /* TransactionSplitData.swift in Sources */,
 				924353172CC51F8E0052E4BC /* StockReload.swift in Sources */,
 				A3363EE32C9323A5004696C7 /* CategoryEditView.swift in Sources */,
-				920824102CA4C5CD00388AB2 /* BudgetYearRepository.swift in Sources */,
+				920824102CA4C5CD00388AB2 /* YearRepository.swift in Sources */,
 				925EABB62CD6E6EF003CEAB3 /* InfotableList.swift in Sources */,
 				920824202CA4E5C200388AB2 /* TagLinkData.swift in Sources */,
 				A3C142652C8ED8EA00D3CEC0 /* AccountEditView.swift in Sources */,
@@ -942,7 +946,7 @@
 				9243531D2CC5201C0052E4BC /* ManageList.swift in Sources */,
 				A3C142A22C90267F00D3CEC0 /* CategoryRepository.swift in Sources */,
 				A37E7D862C9AC2D000B4ECFC /* AboutView.swift in Sources */,
-				9208240C2CA4C31B00388AB2 /* BudgetTableData.swift in Sources */,
+				9208240C2CA4C31B00388AB2 /* BudgetData.swift in Sources */,
 				924353472CCD353A0052E4BC /* ListProtocol.swift in Sources */,
 				A3363EE92C9326A1004696C7 /* CategoryListView.swift in Sources */,
 				A3C142A02C9025D600D3CEC0 /* CategoryData.swift in Sources */,

diff --git a/MMEX/Data/AccountData.swift b/MMEX/Data/AccountData.swift
@@ -1,5 +1,5 @@
 //
-//  Account.swift
+//  AccountData.swift
 //  MMEX
 //
 //  Created by Lisheng Guan on 2024/9/5.

diff --git a/MMEX/Data/AssetData.swift b/MMEX/Data/AssetData.swift
@@ -1,5 +1,5 @@
 //
-//  Asset.swift
+//  AssetData.swift
 //  MMEX
 //
 //  Created 2024-09-22 by George Ef ([email protected])

diff --git a/MMEX/Data/AttachmentData.swift b/MMEX/Data/AttachmentData.swift
@@ -1,5 +1,5 @@
 //
-//  Attachment.swift
+//  AttachmentData.swift
 //  MMEX
 //
 //  Created 2024-09-26 by George Ef ([email protected])

diff --git a/MMEX/Data/BudgetTableData.swift → MMEX/Data/BudgetData.swift b/MMEX/Data/BudgetTableData.swift → MMEX/Data/BudgetData.swift
@@ -1,8 +1,8 @@
 //
-//  BudgetTable.swift
+//  BudgetData.swift
 //  MMEX
 //
-//  Created 2024-09-26 by George Ef ([email protected])
+//  2024-09-26: Created by George Ef ([email protected])
 //
 
 import Foundation
@@ -21,7 +21,7 @@ enum BudgetPeriod: String, EnumCollateNoCase {
     static let defaultValue = Self.none
 }
 
-struct BudgetTableData: ExportableEntity {
+struct BudgetData: ExportableEntity {
     var id      : DataId       = .void
     var yearId  : DataId       = .void
     var categId : DataId       = .void
@@ -31,15 +31,15 @@ struct BudgetTableData: ExportableEntity {
     var active  : Bool         = false
 }
 
-extension BudgetTableData: DataProtocol {
-    static let dataName = ("Budget Table", "Budget Tables")
+extension BudgetData: DataProtocol {
+    static let dataName = ("Budget", "Budget")
 
     func shortDesc() -> String {
         "#\(self.id.value)"
     }
 }
 
-extension BudgetTableData {
-    static let sampleData: [BudgetTableData] = [
+extension BudgetData {
+    static let sampleData: [BudgetData] = [
     ]
 }
diff --git a/MMEX/Data/CategoryData.swift b/MMEX/Data/CategoryData.swift
@@ -1,5 +1,5 @@
 //
-//  Category.swift
+//  CategoryData.swift
 //  MMEX
 //
 //  Created by Lisheng Guan on 2024/9/10.

diff --git a/MMEX/Data/CurrencyData.swift b/MMEX/Data/CurrencyData.swift
@@ -1,5 +1,5 @@
 //
-//  Currency.swift
+//  CurrencyData.swift
 //  MMEX
 //
 //  Created by Lisheng Guan on 2024/9/6.

diff --git a/MMEX/Data/CurrencyHistoryData.swift b/MMEX/Data/CurrencyHistoryData.swift
@@ -1,5 +1,5 @@
 //
-//  CurrencyHistory.swift
+//  CurrencyHistoryData.swift
 //  MMEX
 //
 //  Created 2024-09-25 by George Ef ([email protected])

diff --git a/MMEX/Data/FieldData.swift b/MMEX/Data/FieldData.swift
@@ -1,5 +1,5 @@
 //
-//  Field.swift
+//  FieldData.swift
 //  MMEX
 //
 //  Created 2024-09-26 by George Ef ([email protected])

diff --git a/MMEX/Data/InfotableData.swift b/MMEX/Data/InfotableData.swift
@@ -1,5 +1,5 @@
 //
-//  Infotable.swift
+//  InfotableData.swift
 //  MMEX
 //
 //  Created by Lisheng Guan on 2024/9/18.