From f1900a6684189134fda586c852953f115c40b745 Mon Sep 17 00:00:00 2001
From: Mumthasir mohammed <unknown>
Date: Fri, 6 Oct 2023 12:24:21 +0530
Subject: [PATCH] Fix #45: User request screen issue fix

---
 .../Classes/PrivacyDashboard.storyboard       | 38 ++++++-------------
 .../OrganisationWebService.swift              | 13 ++-----
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/PrivacyDashboardiOS/Classes/PrivacyDashboard.storyboard b/PrivacyDashboardiOS/Classes/PrivacyDashboard.storyboard
index 67d1c9c..febf1b8 100644
--- a/PrivacyDashboardiOS/Classes/PrivacyDashboard.storyboard
+++ b/PrivacyDashboardiOS/Classes/PrivacyDashboard.storyboard
@@ -65,7 +65,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vGv-pI-uwc">
-                                                    <rect key="frame" x="15" y="111.66666666666666" width="74" height="74"/>
+                                                    <rect key="frame" x="15" y="111.66666666666669" width="74" height="74"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="74" id="A1r-by-PrG"/>
@@ -73,7 +73,7 @@
                                                     </constraints>
                                                 </button>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_igrant_tick" translatesAutoresizingMaskIntoConstraints="NO" id="lXW-18-pqy">
-                                                    <rect key="frame" x="19" y="115.66666666666666" width="66" height="66"/>
+                                                    <rect key="frame" x="19" y="115.66666666666669" width="66" height="66"/>
                                                     <color key="backgroundColor" red="0.87429744009999999" green="0.87842917440000001" blue="0.88245391849999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="66" id="2bB-Kc-ixk"/>
@@ -581,34 +581,34 @@
                                                     <outlet property="titleLbl" destination="kRm-cn-3Nr" id="5L8-g2-JZI"/>
                                                 </connections>
                                             </tableViewCell>
-                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ConsentHeaderTableViewCell" rowHeight="65" id="rbk-Ie-Hy0" customClass="BBConsentAttributesHeaderCell" customModule="PrivacyDashboardiOS" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="164" width="393" height="65"/>
+                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ConsentHeaderTableViewCell" id="rbk-Ie-Hy0" customClass="BBConsentAttributesHeaderCell" customModule="PrivacyDashboardiOS" customModuleProvider="target">
+                                                <rect key="frame" x="0.0" y="164" width="393" height="44"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="rbk-Ie-Hy0" id="VZd-Vm-qGg">
-                                                    <rect key="frame" x="0.0" y="0.0" width="393" height="65"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="393" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Kh-5O-InD">
-                                                            <rect key="frame" x="0.0" y="0.0" width="393" height="65"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="393" height="44"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MY DATA CONSENTS" textAlignment="natural" lineBreakMode="tailTruncation" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="XJS-Bh-nOO">
-                                                                    <rect key="frame" x="15" y="22.666666666666671" width="180" height="20"/>
+                                                                    <rect key="frame" x="15" y="12" width="180" height="20"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="180" id="grQ-c9-d9s"/>
                                                                         <constraint firstAttribute="height" constant="20" id="p4M-Vl-Vst"/>
                                                                     </constraints>
                                                                     <fontDescription key="fontDescription" name="OpenSans-Semibold" family="Open Sans" pointSize="15"/>
-                                                                    <nil key="textColor"/>
+                                                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                     <nil key="highlightedColor"/>
                                                                     <userDefinedRuntimeAttributes>
                                                                         <userDefinedRuntimeAttribute type="string" keyPath="localizableString" value="MY DATA CONSENTS"/>
                                                                     </userDefinedRuntimeAttributes>
                                                                 </label>
                                                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gry-9H-jPm">
-                                                                    <rect key="frame" x="215" y="20" width="150" height="25"/>
+                                                                    <rect key="frame" x="253" y="9.6666666666666643" width="120" height="25"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="25" id="LJi-FK-FC2"/>
-                                                                        <constraint firstAttribute="width" constant="150" id="YpW-ge-dLa"/>
+                                                                        <constraint firstAttribute="width" constant="120" id="YpW-ge-dLa"/>
                                                                     </constraints>
                                                                     <fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="12"/>
                                                                     <state key="normal" title="Read policy">
@@ -624,33 +624,19 @@
                                                             </subviews>
                                                             <color key="backgroundColor" systemColor="systemGroupedBackgroundColor"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="70" id="5Ba-DV-dff"/>
-                                                                <constraint firstItem="Gry-9H-jPm" firstAttribute="top" secondItem="7Kh-5O-InD" secondAttribute="top" constant="20" id="8aZ-fE-p76"/>
                                                                 <constraint firstItem="XJS-Bh-nOO" firstAttribute="leading" secondItem="7Kh-5O-InD" secondAttribute="leading" constant="15" id="RQh-hh-Zvr"/>
-                                                                <constraint firstItem="Gry-9H-jPm" firstAttribute="leading" secondItem="XJS-Bh-nOO" secondAttribute="trailing" constant="20" id="UHi-UI-qhd"/>
+                                                                <constraint firstAttribute="trailing" secondItem="Gry-9H-jPm" secondAttribute="trailing" constant="20" id="k2j-mF-31U"/>
+                                                                <constraint firstItem="XJS-Bh-nOO" firstAttribute="centerY" secondItem="7Kh-5O-InD" secondAttribute="centerY" id="l3I-T8-z5t"/>
                                                                 <constraint firstItem="Gry-9H-jPm" firstAttribute="centerY" secondItem="XJS-Bh-nOO" secondAttribute="centerY" id="zh4-dD-GBu"/>
                                                             </constraints>
                                                         </view>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="btX-K8-7LO">
-                                                            <rect key="frame" x="10" y="0.0" width="383" height="0.66666666666666663"/>
-                                                            <color key="backgroundColor" systemColor="separatorColor"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="height" constant="0.5" id="0SP-yM-0Xn"/>
-                                                                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="0.5" id="iCZ-4e-Vu5"/>
-                                                            </constraints>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
                                                     </subviews>
                                                     <color key="backgroundColor" systemColor="systemGroupedBackgroundColor"/>
                                                     <constraints>
-                                                        <constraint firstItem="btX-K8-7LO" firstAttribute="top" secondItem="VZd-Vm-qGg" secondAttribute="top" id="FM6-Y6-NQV"/>
                                                         <constraint firstItem="7Kh-5O-InD" firstAttribute="top" secondItem="VZd-Vm-qGg" secondAttribute="top" id="SCN-qB-LFd"/>
                                                         <constraint firstAttribute="bottom" secondItem="7Kh-5O-InD" secondAttribute="bottom" id="bwJ-5E-aHO"/>
                                                         <constraint firstItem="7Kh-5O-InD" firstAttribute="leading" secondItem="VZd-Vm-qGg" secondAttribute="leading" id="msN-ZQ-0PJ"/>
                                                         <constraint firstAttribute="trailing" secondItem="7Kh-5O-InD" secondAttribute="trailing" id="mwt-Jf-OtB"/>
-                                                        <constraint firstAttribute="trailing" secondItem="btX-K8-7LO" secondAttribute="trailing" id="nES-3k-2IQ"/>
-                                                        <constraint firstItem="btX-K8-7LO" firstAttribute="leading" secondItem="VZd-Vm-qGg" secondAttribute="leading" constant="10" id="uYy-or-cbu"/>
                                                     </constraints>
                                                 </tableViewCellContentView>
                                                 <connections>
diff --git a/PrivacyDashboardiOS/Classes/WebService/Application API/OrganisationApi/OrganisationWebService.swift b/PrivacyDashboardiOS/Classes/WebService/Application API/OrganisationApi/OrganisationWebService.swift
index 0266854..82e4b06 100644
--- a/PrivacyDashboardiOS/Classes/WebService/Application API/OrganisationApi/OrganisationWebService.swift	
+++ b/PrivacyDashboardiOS/Classes/WebService/Application API/OrganisationApi/OrganisationWebService.swift	
@@ -32,7 +32,6 @@ class OrganisationWebService: BBConsentBaseWebService {
     }
     
     func organisationDetails(orgId : String){
-        let userID = BBConsentPrivacyDashboardiOS.shared.userId ?? ""
         self.url = baseUrl + "GetUserOrgsAndConsents" + "?orgID=" + orgId
         getServiceCall()
     }
@@ -103,15 +102,12 @@ class OrganisationWebService: BBConsentBaseWebService {
     }
 
     func requestDownloadData(orgId: String) {
-        let userID = BBConsentPrivacyDashboardiOS.shared.userId ?? ""
-//        self.url = baseUrl + "user/organizations/" + orgId + "/data-download"
-        self.url = baseUrl + "users/" + userID + "/organizations/" + orgId + "/data-download"
+        self.url = baseUrl + "user/organizations/" + orgId + "/data-download"
         postServiceCall()
     }
     
     func requestForgetMe(orgId: String) {
-        let userID = BBConsentPrivacyDashboardiOS.shared.userId ?? ""
-        self.url = baseUrl + "users/" + userID + "/organizations/" + orgId + "/data-delete"
+        self.url = baseUrl + "user/organizations/" + orgId + "/data-delete"
         postServiceCall()
     }
     
@@ -132,11 +128,10 @@ class OrganisationWebService: BBConsentBaseWebService {
     }
     
     func cancelRequest(orgId: String, requestID: String, type: RequestType) {
-        let userID = BBConsentPrivacyDashboardiOS.shared.userId ?? ""
         if type == RequestType.DownloadData {
-             self.url = baseUrl + "users/" + userID + "/organizations/" + orgId + "/data-download/" + requestID + "/cancel"
+            self.url = baseUrl + "user/organizations/" + orgId + "/data-download/" + requestID + "/cancel"
         } else {
-            self.url = baseUrl + "users/" + userID + "/organizations/" + orgId + "/data-delete/" + requestID + "/cancel"
+            self.url = baseUrl + "user/organizations/" + orgId + "/data-delete/" + requestID + "/cancel"
         }
        postServiceCall()
     }