diff --git a/PrivacyDashboardiOS/Classes/Model/Organisation/DAPolicy.swift b/PrivacyDashboardiOS/Classes/Model/Organisation/DAPolicy.swift
index 43a4831..eb3893d 100644
--- a/PrivacyDashboardiOS/Classes/Model/Organisation/DAPolicy.swift
+++ b/PrivacyDashboardiOS/Classes/Model/Organisation/DAPolicy.swift
@@ -17,7 +17,7 @@ class DAPolicy: Codable {
var id, controllerID, lawfulBasis, version: String?
var methodOfUse, dpiaDate: String?
var active: Bool?
- var dpiaSummaryURL: String?
+ var dpiaSummaryUrl: String?
var controllerURL: String?
enum CodingKeys: String, CodingKey {
@@ -26,11 +26,11 @@ class DAPolicy: Codable {
case controllerName, signature, id
case controllerID
case lawfulBasis, version, methodOfUse, dpiaDate, active
- case dpiaSummaryURL
+ case dpiaSummaryUrl
case controllerURL
}
- init(forgettable: Bool?, policy: Policy?, purpose: String?, lifecycle: String?, purposeDescription: String?, dataAttributes: [DataAttributeInPolicy]?, compatibleWithVersionID: String?, controllerName: String?, signature: Signature?, id: String?, controllerID: String?, lawfulBasis: String?, version: String?, methodOfUse: String?, dpiaDate: String?, active: Bool?, dpiaSummaryURL: String?, controllerURL: String?) {
+ init(forgettable: Bool?, policy: Policy?, purpose: String?, lifecycle: String?, purposeDescription: String?, dataAttributes: [DataAttributeInPolicy]?, compatibleWithVersionID: String?, controllerName: String?, signature: Signature?, id: String?, controllerID: String?, lawfulBasis: String?, version: String?, methodOfUse: String?, dpiaDate: String?, active: Bool?, dpiaSummaryUrl: String?, controllerURL: String?) {
self.forgettable = forgettable
self.policy = policy
self.purpose = purpose
@@ -47,7 +47,7 @@ class DAPolicy: Codable {
self.methodOfUse = methodOfUse
self.dpiaDate = dpiaDate
self.active = active
- self.dpiaSummaryURL = dpiaSummaryURL
+ self.dpiaSummaryUrl = dpiaSummaryUrl
self.controllerURL = controllerURL
}
}
diff --git a/PrivacyDashboardiOS/Classes/PrivacyDashboard.storyboard b/PrivacyDashboardiOS/Classes/PrivacyDashboard.storyboard
index 66e9211..bb062a9 100644
--- a/PrivacyDashboardiOS/Classes/PrivacyDashboard.storyboard
+++ b/PrivacyDashboardiOS/Classes/PrivacyDashboard.storyboard
@@ -1448,27 +1448,32 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -1480,7 +1485,7 @@
-
+
@@ -1493,7 +1498,7 @@
-
+
diff --git a/PrivacyDashboardiOS/Classes/ViewControllers/DataSharingViewController/BBConsentDataAgreementVC.swift b/PrivacyDashboardiOS/Classes/ViewControllers/DataSharingViewController/BBConsentDataAgreementVC.swift
index a9769bd..835bc88 100644
--- a/PrivacyDashboardiOS/Classes/ViewControllers/DataSharingViewController/BBConsentDataAgreementVC.swift
+++ b/PrivacyDashboardiOS/Classes/ViewControllers/DataSharingViewController/BBConsentDataAgreementVC.swift
@@ -10,7 +10,7 @@ import Foundation
// MARK: Custom cell
class DACell: UITableViewCell {
@IBOutlet weak var titleLabel: UILabel!
- @IBOutlet weak var descLabel: UILabel!
+ @IBOutlet weak var descLabel: UITextView!
}
class BBConsentDataAgreementVC: UITableViewController {
@@ -59,15 +59,15 @@ class BBConsentDataAgreementVC: UITableViewController {
} else {
purposeSectionDic = ["Purpose": instance?.purpose ?? "", "Purpose Description": instance?.purposeDescription ?? "", "Lawful basis of processing": instance?.lawfulBasis ?? ""]
- policySectionDict = ["Policy URL": instance?.policy?.url ?? "", "Jurisdiction": instance?.policy?.jurisdiction ?? "", "Third party data sharing": instance?.policy?.thirdPartyDataSharing ?? "", "Industry scope": instance?.policy?.industrySector ?? "", "Geographic restriction": instance?.policy?.geographicRestriction ?? "", "Retention period": instance?.policy?.dataRetentionPeriodDays ?? "", "Storage Location": instance?.policy?.storageLocation ?? ""]
- DPIASectionDic = ["DPIA Date":instance?.dpiaDate ?? "", "DPIA Summary": instance?.dpiaSummaryURL ?? ""]
+ policySectionDict = ["Policy URL": instance?.policy?.url ?? "", "Jurisdiction": instance?.policy?.jurisdiction ?? "", "Third party data sharing": instance?.policy?.thirdPartyDataSharing ?? 0, "Industry scope": instance?.policy?.industrySector ?? "", "Geographic restriction": instance?.policy?.geographicRestriction ?? "", "Retention period": instance?.policy?.dataRetentionPeriodDays ?? 0, "Storage Location": instance?.policy?.storageLocation ?? ""]
+ DPIASectionDic = ["DPIA Date":instance?.dpiaDate ?? "", "DPIA Summary": instance?.dpiaSummaryUrl ?? ""]
dataAgreementDic = [purposeSectionDic, policySectionDict, DPIASectionDic]
}
}
// MARK: TableView delegates & datasources
override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
- return 55
+ return 65
}
override func numberOfSections(in tableView: UITableView) -> Int {
@@ -126,7 +126,8 @@ class BBConsentDataAgreementVC: UITableViewController {
let keys = item.map({ $0.key })
let values = item.map({ $0.value })
cell.titleLabel.text = keys[indexPath.row]
- cell.descLabel.text = values[indexPath.row] as? String
+ let val = "\(values[indexPath.row])"
+ cell.descLabel.text = val
return cell
}
}