From 471a996b089bc0fe1f2af5e0e85b1be9f3e4d5dd Mon Sep 17 00:00:00 2001 From: Chetan Kale Date: Mon, 1 May 2023 21:46:04 +0530 Subject: [PATCH 1/3] grey issue has been fixed. --- Child Labor/countries_2016.xml | 2 +- charts/AssesmentLevelParser.swift | 5 +++++ charts/AssesmentsPageViewController.swift | 7 +++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Child Labor/countries_2016.xml b/Child Labor/countries_2016.xml index f94a324..c4e77e6 100644 --- a/Child Labor/countries_2016.xml +++ b/Child Labor/countries_2016.xml @@ -33942,7 +33942,7 @@ addressing-labor-exploitation-fishing-asean Yes Yes Yes - NO + No Unknown Unknown Unknown diff --git a/charts/AssesmentLevelParser.swift b/charts/AssesmentLevelParser.swift index cfb34bd..c236be6 100644 --- a/charts/AssesmentLevelParser.swift +++ b/charts/AssesmentLevelParser.swift @@ -64,6 +64,11 @@ class AssesmentLevelParser { if let countryRegion = country["Region"].element?.text, !countryRegion.isEmpty { if var enforcements = country["Enforcements"]["Labor_Inspectors_Intl_Standards"].element?.text, !enforcements.isEmpty { + + if var enforcement = country["Enforcements"]["Labor_Inspectors_Intl_Standards"]["Territory"]["Enforcement"].element?.text { + enforcements = enforcement + } + if var currentSector = self.goodsSectors[countryRegion] as? Dictionary { if var advancementInfo = currentSector[enforcements] as? Int { advancementInfo += 1 diff --git a/charts/AssesmentsPageViewController.swift b/charts/AssesmentsPageViewController.swift index c5de237..fe3a53b 100644 --- a/charts/AssesmentsPageViewController.swift +++ b/charts/AssesmentsPageViewController.swift @@ -133,8 +133,11 @@ class AssesmentsPageViewController: UIPageViewController { if let regionAssesmentsDict = assesmentData[key] as? [String : Any] { var chartSegments = [Segment]() for assesmentKey in regionAssesmentsDict.keys { - let assesmentSegment = Segment.init(color: colorCodes[assesmentKey] ?? .gray, value: CGFloat(regionAssesmentsDict[assesmentKey] as! Int), title : assesmentKey, isFloatType: false) - chartSegments.append(assesmentSegment) + if !assesmentKey.contains("\n") { + let assesmentSegment = Segment.init(color: colorCodes[assesmentKey] ?? .gray, value: CGFloat(regionAssesmentsDict[assesmentKey] as! Int), title : assesmentKey, isFloatType: false) + chartSegments.append(assesmentSegment) + } + } let chartDetails = AssesmentPageDetails(name: key, mainTitle: "Advancement Level for \(key)", index: index, chartData: chartSegments) advancementsArr.append(chartDetails) From 11f17edd55b8d906d4bcb5663ffb0b3dfbbbef71 Mon Sep 17 00:00:00 2001 From: Chetan Kale Date: Thu, 4 May 2023 20:06:29 +0530 Subject: [PATCH 2/3] title has been updated. --- charts/AssesmentsPageViewController.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/AssesmentsPageViewController.swift b/charts/AssesmentsPageViewController.swift index fe3a53b..fb27c33 100644 --- a/charts/AssesmentsPageViewController.swift +++ b/charts/AssesmentsPageViewController.swift @@ -139,8 +139,14 @@ class AssesmentsPageViewController: UIPageViewController { } } - let chartDetails = AssesmentPageDetails(name: key, mainTitle: "Advancement Level for \(key)", index: index, chartData: chartSegments) - advancementsArr.append(chartDetails) + if screenType == .assesmentLevelByRegion { + let chartDetails = AssesmentPageDetails(name: key, mainTitle: "Advancement Level for \(key)", index: index, chartData: chartSegments) + advancementsArr.append(chartDetails) + } else if screenType == .newDVASCountries { + let chartDetails = AssesmentPageDetails(name: key, mainTitle: "Assessment Level for \(key)", index: index, chartData: chartSegments) + advancementsArr.append(chartDetails) + } + } } From 0e6ec0f55d9309025f1279b7c724be41703e028a Mon Sep 17 00:00:00 2001 From: Chetan Kale Date: Wed, 10 May 2023 20:36:33 +0530 Subject: [PATCH 3/3] Applied logic as per has multiple teritory. --- charts/AssesmentLevelParser.swift | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/charts/AssesmentLevelParser.swift b/charts/AssesmentLevelParser.swift index c236be6..857be53 100644 --- a/charts/AssesmentLevelParser.swift +++ b/charts/AssesmentLevelParser.swift @@ -62,23 +62,25 @@ class AssesmentLevelParser { for country in goodsXML[kCountries][kCountry].all { if let countryRegion = country["Region"].element?.text, !countryRegion.isEmpty { - - if var enforcements = country["Enforcements"]["Labor_Inspectors_Intl_Standards"].element?.text, !enforcements.isEmpty { - - if var enforcement = country["Enforcements"]["Labor_Inspectors_Intl_Standards"]["Territory"]["Enforcement"].element?.text { - enforcements = enforcement + var enforcementss = "" + if var enforcement = country["Enforcements"]["Labor_Inspectors_Intl_Standards"]["Territory"]["Enforcement"].element?.text { + enforcementss = enforcement + } else { + if var enforcements = country["Enforcements"]["Labor_Inspectors_Intl_Standards"].element?.text, !enforcements.isEmpty { + enforcementss = enforcements } - + } + if enforcementss.count > 0 { if var currentSector = self.goodsSectors[countryRegion] as? Dictionary { - if var advancementInfo = currentSector[enforcements] as? Int { + if var advancementInfo = currentSector[enforcementss] as? Int { advancementInfo += 1 - currentSector[enforcements] = advancementInfo + currentSector[enforcementss] = advancementInfo } else { - currentSector[enforcements] = 1 + currentSector[enforcementss] = 1 } self.goodsSectors[countryRegion] = currentSector } else { - self.goodsSectors[countryRegion] = [enforcements : 1] + self.goodsSectors[countryRegion] = [enforcementss : 1] } } }