diff --git a/Child Labor/EnforceTableViewController.swift b/Child Labor/EnforceTableViewController.swift index 36456d1..dccb6d7 100755 --- a/Child Labor/EnforceTableViewController.swift +++ b/Child Labor/EnforceTableViewController.swift @@ -95,7 +95,7 @@ class EnforceTableViewController: UITableViewController { setEnforcement(self.laborUnannouncedPremittedLabel, text: enforcements["Labor_Unannounced_Inspections_Premitted"].element?.text) setEnforcement(self.laborUnannouncedConductedLabel, text: enforcements["Labor_Unannounced_Inspections_Conducted"].element?.text) setEnforcement(self.laborEmployeeTrainingLabel, text: enforcements["Labor_New_Employee_Training"].element?.text) - setEnforcement(self.laborLawTrainingLabel, text: enforcements["Labor_New_Law_Training"].element?.text) + // setEnforcement(self.laborLawTrainingLabel, text: enforcements["Labor_New_Law_Training"].element?.text) // setEnforcement(self.laborRefresherCoursesLabel, text: enforcements["Labor_Refresher_Courses"].element?.text) setEnforcement(self.laborComplaintMechanismLabel, text: enforcements["Labor_Complaint_Mechanism"].element?.text) setEnforcement(self.laborReferralMechanismLabel, text: enforcements["Labor_Referral_Mechanism"].element?.text) @@ -163,7 +163,7 @@ class EnforceTableViewController: UITableViewController { override func numberOfSections(in tableView: UITableView) -> Int { // #warning Incomplete implementation, return the number of sections - return 9 + return 8 } override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { @@ -171,29 +171,29 @@ class EnforceTableViewController: UITableViewController { if state == 0 { switch section { case 0: - return 4 + return 5 +// case 1: +// return 0//1 case 1: return 1 case 2: - return 1 - case 3: return 3 + case 3: + return 2 case 4: return 2 case 5: return 2 - case 6: - return 2 default: return 0 } } else { switch section { + case 6: + return 1 case 7: - return 2 - case 8: - return 6 + return 5 default: return 0 } @@ -206,11 +206,14 @@ class EnforceTableViewController: UITableViewController { } override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { - if (state == 0 && section <= 6) { + if (state == 0 && section <= 5) { + if section == 0 { + return 0 + } return UITableViewAutomaticDimension; } - if (state == 1 && section >= 7) { + if (state == 1 && section >= 6) { return UITableViewAutomaticDimension; } @@ -218,14 +221,14 @@ class EnforceTableViewController: UITableViewController { } override func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat { - if (state == 0 && section <= 6) { - return UITableViewAutomaticDimension; + if (state == 0 && section <= 5) { + return UITableViewAutomaticDimension; } - if (state == 1 && section > 6) { + if (state == 1 && section > 5) { return UITableViewAutomaticDimension; } @@ -233,11 +236,11 @@ class EnforceTableViewController: UITableViewController { } override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { - if (state == 0 && section <= 6) { + if (state == 0 && section <= 5) { return super.tableView(tableView, titleForHeaderInSection: section) } - if (state == 1 && section > 6) { + if (state == 1 && section > 5) { return super.tableView(tableView, titleForHeaderInSection: section) } @@ -245,7 +248,7 @@ class EnforceTableViewController: UITableViewController { } override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? { - if (state == 0 && section <= 6) { + if (state == 0 && section <= 5) { if (section == 6 && self.hasLaborFooter) { // return "*The government does not publish this information"; return " "; @@ -253,8 +256,8 @@ class EnforceTableViewController: UITableViewController { return super.tableView(tableView, titleForFooterInSection: section) } - if (state == 1 && section > 6) { - if (section == 8 && self.hasCriminalFooter) { + if (state == 1 && section > 5) { + if (section == 7 && self.hasCriminalFooter) { // return "*The government does not publish this information"; return " "; } diff --git a/Child Labor/Main.storyboard b/Child Labor/Main.storyboard index 7de255d..a82be2b 100644 --- a/Child Labor/Main.storyboard +++ b/Child Labor/Main.storyboard @@ -2224,7 +2224,7 @@ and School - + @@ -2893,86 +2893,20 @@ Standards - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - + + + + + + + @@ -2995,7 +2929,7 @@ Standards - + @@ -3034,13 +2968,13 @@ Standards - + - - + - - + - - + @@ -4253,7 +4153,7 @@ Standards - + diff --git a/Child Labor/MoreInfoController.swift b/Child Labor/MoreInfoController.swift index 3561993..21a0dcb 100755 --- a/Child Labor/MoreInfoController.swift +++ b/Child Labor/MoreInfoController.swift @@ -80,12 +80,12 @@ class MoreInfoController: UITableViewController { } if (indexPath.section == 1) { if (indexPath.row == 0) { - cell?.textLabel?.text = "Comply Chain App" + cell?.textLabel?.text = "Comply Chain" } } if (indexPath.section == 2) { if (indexPath.row == 0) { - cell?.textLabel?.text = "NEW: Better Trade Tool" + cell?.textLabel?.text = "Better Trade Tool" } } /*Old code below not using now after adding the new better trade tool link @@ -122,7 +122,9 @@ class MoreInfoController: UITableViewController { } if (indexPath.section == 1){ if (indexPath.row == 0) { - performSegue(withIdentifier: "presentSimilarApps", sender: self) + //performSegue(withIdentifier: "presentSimilarApps", sender: self) + guard let url = URL(string: "https://www.dol.gov/ilab/complychain/") else { return } + UIApplication.shared.openURL(url) } } if (indexPath.section == 2){ diff --git a/Child Labor/methodology.html b/Child Labor/methodology.html index 1159be4..2ca97f4 100755 --- a/Child Labor/methodology.html +++ b/Child Labor/methodology.html @@ -16,12 +16,12 @@

Methodology

Findings on the Worst Forms of Child Labor

-

USDOL’s Findings on the Worst Forms of Child Labor, mandated by the Trade and Development Act of 2000 (TDA), focuses on the efforts of 135 U.S. trade beneficiary countries and territories to eliminate the worst forms of child labor through laws and regulations, enforcement, coordination, policies, and social programs.

+

USDOL’s Findings on the Worst Forms of Child Labor, mandated by the Trade and Development Act of 2000 (TDA), focuses on the efforts of 131 U.S. trade beneficiary countries and territories to eliminate the worst forms of child labor through laws and regulations, enforcement, coordination, policies, and social programs.

Information was gathered for this report through desk research, U.S. embassy reporting, and limited field work. Information was also received from some foreign governments and collected from U.S. government-funded technical assistance and field research projects. ILAB did not use information that is unavailable to the public, such as government-classified information. ILAB used the criteria of nature, date, and source of information, as well as extent of corroboration, to determine what should be included. Each country in the report receives an assessment to indicate clearly the Secretary of Labor’s findings on each country’s level of advancement in efforts to eliminate the worst forms of child labor during the reporting period. Countries can receive one of five possible assessments: Significant Advancement, Moderate Advancement, Minimal Advancement, No Advancement, or No Assessment. In preparing the assessments, ILAB evaluated country efforts against criteria laid out in the TDA Conference Committee report. For more information, see the report Introduction.

List of Goods Produced by Child Labor or Forced Labor

-

The List of Goods Produced by Child Labor or Forced Labor, mandated by the Trafficking Victims Protection Reauthorization Act (TVPRA) of 2005, focuses on both children under 18 and adults, and includes 159 goods and 77 source countries and areas that ILAB has reason to believe are produced by child labor or forced labor in violation of international standards. ILAB’s mandate also requires the TVPRA List to include, to the extent practicable, goods that are produced with inputs that are produced with forced labor or child labor. To this end, the 2022 edition of the List of Goods includes ten goods from supply chain tracing that are produced in two countries. The List of Goods is intended to raise public awareness about child labor and forced labor around the world and to promote efforts to address them. A starting point for action, the List of Goods creates opportunities for ILAB to engage and assist foreign governments. It is also a valuable resource for researchers, advocacy organizations, and companies wishing to carry out risk assessments and engage in due diligence on labor rights in their supply chains.

+

The List of Goods Produced by Child Labor or Forced Labor, mandated by the Trafficking Victims Protection Reauthorization Act (TVPRA) of 2005, focuses on both children under 18 and adults, and includes 159 goods and 77 source countries and areas that ILAB has reason to believe are produced by child labor or forced labor in violation of international standards. ILAB’s mandate also requires the TVPRA List to include, to the extent practicable, goods that are produced with inputs that are produced with forced labor or child labor. To this end, the 2022 edition of the List of Goods includes 10 goods from supply chain tracing that are produced in two countries. The List of Goods is intended to raise public awareness about child labor and forced labor around the world and to promote efforts to address them. A starting point for action, the List of Goods creates opportunities for ILAB to engage and assist foreign governments. It is also a valuable resource for researchers, advocacy organizations, and companies wishing to carry out risk assessments and engage in due diligence on labor rights in their supply chains.

ILAB used similar data collection methods to prepare the List of Goods as the Findings on the Worst Forms of Child Labor. ILAB used the following five criteria to determine whether there was “reason to believe” a particular good was being produced using child or forced labor in violation of international standards: nature, date, and source of information; extent of corroboration; and significant incidence of child labor or forced labor. For each good that was reviewed, ILAB evaluated each data source against each of the five criteria. In addition, for goods produced with inputs produced with child labor or forced labor, ILAB also analyzed evidence on production processes and supply chains. ILAB researchers applied the criteria consistently across goods and countries so that ultimate findings of “reason to believe” are consistent worldwide.

diff --git a/charts/AssesmentsPageViewController.swift b/charts/AssesmentsPageViewController.swift index fb27c33..64fdee5 100644 --- a/charts/AssesmentsPageViewController.swift +++ b/charts/AssesmentsPageViewController.swift @@ -90,7 +90,7 @@ class AssesmentsPageViewController: UIPageViewController { if screenType == .assesmentLevelByRegion { self.title = "Assesment Level By Region" } else if screenType == .newDVASCountries { - self.title = "Labor Inspector Meet ILO by Region" + self.title = "ILO Rec for Labor Inspectors Met" } // Navigation bar color @@ -143,7 +143,7 @@ class AssesmentsPageViewController: UIPageViewController { 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) + let chartDetails = AssesmentPageDetails(name: key, mainTitle: "ILO Rec for Labor Inspectors Met - \(key)", index: index, chartData: chartSegments) advancementsArr.append(chartDetails) } diff --git a/charts/DataVisualizationTableViewController.swift b/charts/DataVisualizationTableViewController.swift index 36fb1da..3146df0 100644 --- a/charts/DataVisualizationTableViewController.swift +++ b/charts/DataVisualizationTableViewController.swift @@ -7,7 +7,7 @@ enum ChartTypes: String, CaseIterable { case goodsBySector = "Goods By Sector" //case goodsByRegion = "Goods By Region" case assesmentLevelByRegion = "Assesment Level By Region" - case newDVAsCountries = "Labor Inspector Meet ILO by Region" + case newDVAsCountries = "ILO Rec for Labor Inspectors Met" } class DataVisualizationTableViewController: UITableViewController {