Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add #176: Styling + value missing issue in DA details screen #182

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Add #176: Styling + value missing issue in DA details screen #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions PrivacyDashboardiOS/Classes/Model/Organisation/DAPolicy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand All @@ -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
}
}
Expand Down
45 changes: 25 additions & 20 deletions PrivacyDashboardiOS/Classes/PrivacyDashboard.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,27 +1448,32 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8bM-zK-W6i">
<rect key="frame" x="10" y="-9" width="333" height="86"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q1S-T9-FRM">
<rect key="frame" x="0.0" y="20" width="325" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q7t-7N-CO4">
<rect key="frame" x="20" y="58" width="305" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="wVu-hw-nd8">
<rect key="frame" x="0.0" y="20" width="333" height="56"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q1S-T9-FRM">
<rect key="frame" x="0.0" y="0.0" width="333" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" text="Text" textAlignment="right" translatesAutoresizingMaskIntoConstraints="NO" id="W9K-UG-bk2">
<rect key="frame" x="0.0" y="18" width="333" height="38"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
<dataDetectorType key="dataDetectorTypes" link="YES"/>
</textView>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Q1S-T9-FRM" firstAttribute="leading" secondItem="8bM-zK-W6i" secondAttribute="leading" id="7bm-aT-GAd"/>
<constraint firstAttribute="trailing" secondItem="Q1S-T9-FRM" secondAttribute="trailing" constant="8" id="Pwj-x6-Php"/>
<constraint firstAttribute="trailing" secondItem="q7t-7N-CO4" secondAttribute="trailing" constant="8" id="SCc-2Z-wzJ"/>
<constraint firstAttribute="bottom" secondItem="q7t-7N-CO4" secondAttribute="bottom" constant="10" id="eoh-lr-6nr"/>
<constraint firstItem="q7t-7N-CO4" firstAttribute="leading" secondItem="8bM-zK-W6i" secondAttribute="leading" constant="20" symbolic="YES" id="gLi-gI-Rsj"/>
<constraint firstItem="Q1S-T9-FRM" firstAttribute="top" secondItem="8bM-zK-W6i" secondAttribute="top" constant="20" symbolic="YES" id="wbg-oh-uNl"/>
<constraint firstAttribute="trailing" secondItem="wVu-hw-nd8" secondAttribute="trailing" id="9Wa-i6-Bec"/>
<constraint firstItem="wVu-hw-nd8" firstAttribute="top" secondItem="8bM-zK-W6i" secondAttribute="top" constant="20" id="Z61-E1-UTp"/>
<constraint firstAttribute="bottom" secondItem="wVu-hw-nd8" secondAttribute="bottom" constant="10" id="nvW-u3-5jS"/>
<constraint firstItem="wVu-hw-nd8" firstAttribute="leading" secondItem="8bM-zK-W6i" secondAttribute="leading" id="zfs-29-vKX"/>
</constraints>
</view>
</subviews>
Expand All @@ -1480,7 +1485,7 @@
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="descLabel" destination="q7t-7N-CO4" id="9fM-EZ-9II"/>
<outlet property="descLabel" destination="W9K-UG-bk2" id="fw0-EA-aHV"/>
<outlet property="titleLabel" destination="Q1S-T9-FRM" id="vb4-Ra-r4R"/>
</connections>
</tableViewCell>
Expand All @@ -1493,7 +1498,7 @@
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="A0H-Ic-NE7" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="3742.7480916030531" y="722.53521126760563"/>
<point key="canvasLocation" x="3814.5038167938928" y="626.76056338028172"/>
</scene>
</scenes>
<resources>
Expand Down
11 changes: 6 additions & 5 deletions ...boardiOS/Classes/ViewControllers/DataSharingViewController/BBConsentDataAgreementVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
}
Loading