From df1ce4fd3a6c617c4afee08ea8ac81a54cedbd76 Mon Sep 17 00:00:00 2001
From: dankito <git@dankito.net>
Date: Tue, 22 Sep 2020 04:03:44 +0200
Subject: [PATCH] Committing changes to Core Data now as Xcode didn't save them
 before

---
 .../BankingiOSApp.xcdatamodel/contents                    | 5 +++--
 .../ui/dialogs/AccountTransactionsDialog.swift            | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents b/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents
index ec59f0e1..d626e986 100644
--- a/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents
+++ b/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents
@@ -47,8 +47,9 @@
         <attribute name="iban" optional="YES" attributeType="String"/>
         <attribute name="identifier" attributeType="String"/>
         <attribute name="isAccountTypeSupported" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
-        <attribute name="lastRetrievedTransactionsTimestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="productName" optional="YES" attributeType="String"/>
+        <attribute name="retrievedTransactionsFromOn" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="retrievedTransactionsUpTo" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="subAccountNumber" optional="YES" attributeType="String"/>
         <attribute name="supportsInstantPaymentMoneyTransfer" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="supportsRetrievingAccountTransactions" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
@@ -90,7 +91,7 @@
     </entity>
     <elements>
         <element name="PersistedAccountTransaction" positionX="-36" positionY="45" width="128" height="553"/>
-        <element name="PersistedBankAccount" positionX="-54" positionY="63" width="128" height="358"/>
+        <element name="PersistedBankAccount" positionX="-54" positionY="63" width="128" height="373"/>
         <element name="PersistedCustomer" positionX="-63" positionY="-18" width="128" height="283"/>
         <element name="PersistedTanMedium" positionX="-45" positionY="144" width="128" height="28"/>
         <element name="PersistedTanMethod" positionX="-54" positionY="135" width="128" height="118"/>
diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift b/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift
index 2f59cb3d..259ad119 100644
--- a/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift
+++ b/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift
@@ -261,6 +261,14 @@ struct AccountTransactionsDialog: View {
         }
     }
     
+    private func mapDate(_ date: CommonDate?) -> String {
+        if let date = date?.date {
+            return Self.RetrievedTransactionsPeriodDateFormat.string(from: date)
+        }
+        
+        return ""
+    }
+    
     private func filterTransactions(_ query: String) {
         self.filteredTransactions = presenter.searchSelectedAccountTransactions(query: query).sorted { $0.valueDate.date > $1.valueDate.date }