diff --git a/Child Labor.xcodeproj/project.pbxproj b/Child Labor.xcodeproj/project.pbxproj index a42eb58..82bfcd4 100644 --- a/Child Labor.xcodeproj/project.pbxproj +++ b/Child Labor.xcodeproj/project.pbxproj @@ -12,9 +12,6 @@ 3800487B1D8B991C00E64714 /* Fact Sheet-Regional-2016-lo.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 380048741D8B991C00E64714 /* Fact Sheet-Regional-2016-lo.pdf */; }; 3800487C1D8B991C00E64714 /* Fact Sheet-Reports-lo.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 380048751D8B991C00E64714 /* Fact Sheet-Reports-lo.pdf */; }; 3800487D1D8B991C00E64714 /* FAQs- Combo.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 380048761D8B991C00E64714 /* FAQs- Combo.pdf */; }; - 3800487E1D8B991C00E64714 /* FAQs-EO.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 380048771D8B991C00E64714 /* FAQs-EO.pdf */; }; - 3800487F1D8B991C00E64714 /* FAQs-TDA.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 380048781D8B991C00E64714 /* FAQs-TDA.pdf */; }; - 380048821D8B993D00E64714 /* FAQs-TVPRA.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 380048801D8B993D00E64714 /* FAQs-TVPRA.pdf */; }; 380048831D8B993D00E64714 /* ToolkitForResponsibleBusinesses-lo.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 380048811D8B993D00E64714 /* ToolkitForResponsibleBusinesses-lo.pdf */; }; 38BC75321CE99C9200C53216 /* EnforcementTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38BC75311CE99C9200C53216 /* EnforcementTableViewController.swift */; }; 38BC75361CEECBBD00C53216 /* CoordTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38BC75351CEECBBD00C53216 /* CoordTableViewController.swift */; }; @@ -671,7 +668,6 @@ 835618A51BD7DE79007BCF75 /* Yemen.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 8356181C1BD7DE79007BCF75 /* Yemen.pdf */; }; 835618A61BD7DE79007BCF75 /* Zambia.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 8356181D1BD7DE79007BCF75 /* Zambia.pdf */; }; 835618A71BD7DE79007BCF75 /* Zimbabwe.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 8356181E1BD7DE79007BCF75 /* Zimbabwe.pdf */; }; - 835618AC1BD7E145007BCF75 /* 2014 Findings on the Worst Forms of Child Labor_app.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835618A81BD7E145007BCF75 /* 2014 Findings on the Worst Forms of Child Labor_app.pdf */; }; 835A6C971B604D1800F26D3F /* Launch@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 835A6C961B604D1800F26D3F /* Launch@2x.png */; }; 8364BBA91B3CC67C008C547A /* SWXMLHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8364BBA81B3CC67C008C547A /* SWXMLHash.swift */; }; 836633B41B2F0734007C127E /* ilab@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 836633B21B2F0734007C127E /* ilab@3x.png */; }; @@ -1018,9 +1014,6 @@ 380048741D8B991C00E64714 /* Fact Sheet-Regional-2016-lo.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Fact Sheet-Regional-2016-lo.pdf"; sourceTree = ""; }; 380048751D8B991C00E64714 /* Fact Sheet-Reports-lo.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Fact Sheet-Reports-lo.pdf"; sourceTree = ""; }; 380048761D8B991C00E64714 /* FAQs- Combo.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "FAQs- Combo.pdf"; sourceTree = ""; }; - 380048771D8B991C00E64714 /* FAQs-EO.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "FAQs-EO.pdf"; sourceTree = ""; }; - 380048781D8B991C00E64714 /* FAQs-TDA.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "FAQs-TDA.pdf"; sourceTree = ""; }; - 380048801D8B993D00E64714 /* FAQs-TVPRA.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "FAQs-TVPRA.pdf"; sourceTree = ""; }; 380048811D8B993D00E64714 /* ToolkitForResponsibleBusinesses-lo.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "ToolkitForResponsibleBusinesses-lo.pdf"; sourceTree = ""; }; 38BC75311CE99C9200C53216 /* EnforcementTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnforcementTableViewController.swift; sourceTree = ""; }; 38BC75351CEECBBD00C53216 /* CoordTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoordTableViewController.swift; sourceTree = ""; }; @@ -1677,7 +1670,6 @@ 8356181C1BD7DE79007BCF75 /* Yemen.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Yemen.pdf; sourceTree = ""; }; 8356181D1BD7DE79007BCF75 /* Zambia.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Zambia.pdf; sourceTree = ""; }; 8356181E1BD7DE79007BCF75 /* Zimbabwe.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Zimbabwe.pdf; sourceTree = ""; }; - 835618A81BD7E145007BCF75 /* 2014 Findings on the Worst Forms of Child Labor_app.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "2014 Findings on the Worst Forms of Child Labor_app.pdf"; sourceTree = ""; }; 835A6C961B604D1800F26D3F /* Launch@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Launch@2x.png"; sourceTree = ""; }; 835E54961B51665D00EE7B26 /* GAITracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GAITracker.h; sourceTree = ""; }; 835E54971B51665D00EE7B26 /* GAIDictionaryBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GAIDictionaryBuilder.h; sourceTree = ""; }; @@ -3078,7 +3070,6 @@ 8303DEE31B41F20300E4FD42 /* Maps */, 83B05CD31B9F1DE400A0F53A /* countries_for_app.xml */, 83B05CD41B9F1DE400A0F53A /* complete_goods_by_good.xml */, - 380048801D8B993D00E64714 /* FAQs-TVPRA.pdf */, 380048811D8B993D00E64714 /* ToolkitForResponsibleBusinesses-lo.pdf */, 38CA953D1D4BAF2400319316 /* goods_2015.xml */, 380048721D8B991C00E64714 /* Fact Sheet-OFCT-2016-lo.pdf */, @@ -3086,10 +3077,7 @@ 380048741D8B991C00E64714 /* Fact Sheet-Regional-2016-lo.pdf */, 380048751D8B991C00E64714 /* Fact Sheet-Reports-lo.pdf */, 380048761D8B991C00E64714 /* FAQs- Combo.pdf */, - 380048771D8B991C00E64714 /* FAQs-EO.pdf */, - 380048781D8B991C00E64714 /* FAQs-TDA.pdf */, 38CA953B1D4BAEF200319316 /* countries_2015.xml */, - 835618A81BD7E145007BCF75 /* 2014 Findings on the Worst Forms of Child Labor_app.pdf */, 83A3B11A1B6BCB8E002380E6 /* aboutthisapp.html */, 83A3B1191B6BCB8E002380E6 /* methodology.html */, 835A6C961B604D1800F26D3F /* Launch@2x.png */, @@ -3503,7 +3491,6 @@ 8356182F1BD7DE79007BCF75 /* Botswana.pdf in Resources */, 8335AF1A1B667963000748F0 /* icons_Bananas.png in Resources */, 8310FE771ABB11310025F7AE /* Argentina.png in Resources */, - 380048821D8B993D00E64714 /* FAQs-TVPRA.pdf in Resources */, 83AD12C91B668E71004B92D3 /* icons_Thread_Yarn-33@3x.png in Resources */, 8310FE6F1ABB11310025F7AE /* Afghanistan.png in Resources */, 83AD13CD1B669137004B92D3 /* icons_Silk_Thread-33@2x.png in Resources */, @@ -3670,7 +3657,6 @@ 8303DFB41B41F21A00E4FD42 /* Panama-map.png in Resources */, 8303DFA01B41F21A00E4FD42 /* Liberia-map.png in Resources */, 8303DF761B41F21A00E4FD42 /* Central African Republic-map.png in Resources */, - 3800487E1D8B991C00E64714 /* FAQs-EO.pdf in Resources */, 83AD128E1B668E71004B92D3 /* icons_Hazelnuts-33@3x.png in Resources */, 8310FF401ABB11310025F7AE /* Uganda.png in Resources */, 8335AF6B1B667963000748F0 /* icons_Shellfish.png in Resources */, @@ -3784,7 +3770,6 @@ 8303DF751B41F21A00E4FD42 /* Cabo Verde-map.png in Resources */, 83AD13821B669137004B92D3 /* icons_Coffee-33@2x.png in Resources */, 8356185E1BD7DE79007BCF75 /* Kenya.pdf in Resources */, - 3800487F1D8B991C00E64714 /* FAQs-TDA.pdf in Resources */, 83AD13C91B669137004B92D3 /* icons_Sesame-33@2x.png in Resources */, 835618401BD7DE79007BCF75 /* Cook Islands.pdf in Resources */, 8310FF481ABB11310025F7AE /* Vatican_City.png in Resources */, @@ -3886,7 +3871,6 @@ 8310FF4B1ABB11310025F7AE /* Wallis_and_Futuna.png in Resources */, 8335AF1F1B667963000748F0 /* icons_Brazil_Nuts_Chestnuts.png in Resources */, 835618A31BD7DE79007BCF75 /* West Bank & Gaza Strip.pdf in Resources */, - 835618AC1BD7E145007BCF75 /* 2014 Findings on the Worst Forms of Child Labor_app.pdf in Resources */, 8310FECA1ABB11310025F7AE /* Indonesia.png in Resources */, 835618891BD7DE79007BCF75 /* Seychelles.pdf in Resources */, 83AD12671B668E71004B92D3 /* icons_Coca_(stimulant_plant)-33@3x.png in Resources */, diff --git a/Child Labor/2014 Findings on the Worst Forms of Child Labor_app.pdf b/Child Labor/2014 Findings on the Worst Forms of Child Labor_app.pdf deleted file mode 100755 index 0f14dd4..0000000 Binary files a/Child Labor/2014 Findings on the Worst Forms of Child Labor_app.pdf and /dev/null differ diff --git a/Child Labor/Base.lproj/Main.storyboard b/Child Labor/Base.lproj/Main.storyboard index 5e0fa27..def02fd 100644 --- a/Child Labor/Base.lproj/Main.storyboard +++ b/Child Labor/Base.lproj/Main.storyboard @@ -93,9 +93,6 @@ - - - @@ -235,9 +232,6 @@ - - - @@ -255,9 +249,6 @@ - - - @@ -275,9 +266,6 @@ - - - @@ -4434,9 +4422,9 @@ - - - + + + diff --git a/Child Labor/Cocos (Keeling) Islands.pdf b/Child Labor/Cocos (Keeling) Islands.pdf index e7356e1..19aefb0 100755 Binary files a/Child Labor/Cocos (Keeling) Islands.pdf and b/Child Labor/Cocos (Keeling) Islands.pdf differ diff --git a/Child Labor/Costa Rica.pdf b/Child Labor/Costa Rica.pdf index 6653380..341aaf7 100755 Binary files a/Child Labor/Costa Rica.pdf and b/Child Labor/Costa Rica.pdf differ diff --git a/Child Labor/Cote d'Ivoire.pdf b/Child Labor/Cote d'Ivoire.pdf index 84000de..73e4bb7 100755 Binary files a/Child Labor/Cote d'Ivoire.pdf and b/Child Labor/Cote d'Ivoire.pdf differ diff --git a/Child Labor/EnforceTableViewController.swift b/Child Labor/EnforceTableViewController.swift index 8a399fe..f19cf3c 100644 --- a/Child Labor/EnforceTableViewController.swift +++ b/Child Labor/EnforceTableViewController.swift @@ -111,7 +111,7 @@ class EnforceTableViewController: UITableViewController { } let text = self.laborDedicatedInspectorsLabel.text - if !(text!.hasPrefix("N/A") == false && text!.hasPrefix("Unavailable") == false) { + if !(text!.hasPrefix("N/A") == false && text!.hasPrefix("Unavailable") == false && text! != "0") { self.laborDedicatedInspectorsCell.hidden = true } diff --git a/Child Labor/EnforcementMultiTableViewController.swift b/Child Labor/EnforcementMultiTableViewController.swift index 2edda11..e513d96 100644 --- a/Child Labor/EnforcementMultiTableViewController.swift +++ b/Child Labor/EnforcementMultiTableViewController.swift @@ -57,7 +57,7 @@ class EnforcementMultiTableViewController: UITableViewController { for territory in enforcements["Dedicated_Labor_Inspectors"]["Territory"] { let text = territory["Enforcement"].element?.text - if (text!.hasPrefix("N/A") == false && text!.hasPrefix("Unavailable") == false) { + if (text!.hasPrefix("N/A") == false && text!.hasPrefix("Unavailable") == false && text! != "0") { showDedicatedInspectors = true } } diff --git a/Child Labor/Ethiopia.pdf b/Child Labor/Ethiopia.pdf index 8165995..d2d462d 100755 Binary files a/Child Labor/Ethiopia.pdf and b/Child Labor/Ethiopia.pdf differ diff --git a/Child Labor/FAQs-EO.pdf b/Child Labor/FAQs-EO.pdf deleted file mode 100755 index 8bb66da..0000000 Binary files a/Child Labor/FAQs-EO.pdf and /dev/null differ diff --git a/Child Labor/FAQs-TDA.pdf b/Child Labor/FAQs-TDA.pdf deleted file mode 100755 index b41ec56..0000000 Binary files a/Child Labor/FAQs-TDA.pdf and /dev/null differ diff --git a/Child Labor/FAQs-TVPRA.pdf b/Child Labor/FAQs-TVPRA.pdf deleted file mode 100755 index e646359..0000000 Binary files a/Child Labor/FAQs-TVPRA.pdf and /dev/null differ diff --git a/Child Labor/Ghana.pdf b/Child Labor/Ghana.pdf index 0351b59..d78b0eb 100755 Binary files a/Child Labor/Ghana.pdf and b/Child Labor/Ghana.pdf differ diff --git a/Child Labor/Guyana.pdf b/Child Labor/Guyana.pdf index 1e6e9c7..8cd8dd8 100755 Binary files a/Child Labor/Guyana.pdf and b/Child Labor/Guyana.pdf differ diff --git a/Child Labor/Indonesia.pdf b/Child Labor/Indonesia.pdf old mode 100644 new mode 100755 diff --git a/Child Labor/Moldova, Republic of.pdf b/Child Labor/Moldova, Republic of.pdf index 7ed80cf..8495a98 100755 Binary files a/Child Labor/Moldova, Republic of.pdf and b/Child Labor/Moldova, Republic of.pdf differ diff --git a/Child Labor/Montserrat.pdf b/Child Labor/Montserrat.pdf index c1fe5db..8f0c792 100755 Binary files a/Child Labor/Montserrat.pdf and b/Child Labor/Montserrat.pdf differ diff --git a/Child Labor/MoreInfoController.swift b/Child Labor/MoreInfoController.swift index 4e516d7..0d2177d 100644 --- a/Child Labor/MoreInfoController.swift +++ b/Child Labor/MoreInfoController.swift @@ -49,11 +49,44 @@ class MoreInfoController: UITableViewController { case 2: return 4 case 3: - return 3 + return 4 default: return 1 } } + + override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) { + if (indexPath.section == 1) { + switch indexPath.row { + case 0: + UIApplication.sharedApplication().openURL(NSURL(string: "https://www.dol.gov/sites/default/files/documents/ilab/reports/child-labor/findings/2015TDAMagazine.pdf")!) + break + case 1: + UIApplication.sharedApplication().openURL(NSURL(string: "https://www.dol.gov/sites/default/files/documents/ilab/reports/child-labor/findings/TVPRA_Report2016.pdf")!) + break + case 2: + UIApplication.sharedApplication().openURL(NSURL(string: "https://www.dol.gov/sites/default/files/documents/ilab/reports/child-labor/findings/EO_Report_2014.pdf")!) + default: + break + } + } + else if (indexPath.section == 3) { + switch indexPath.row { + case 0: + UIApplication.sharedApplication().openURL(NSURL(string: "https://www.dol.gov/sites/default/files/documents/ilab/reports/child-labor/findings/TDA2015_FAQs.pdf")!) + break + case 1: + UIApplication.sharedApplication().openURL(NSURL(string: "https://www.dol.gov/sites/default/files/documents/ilab/reports/child-labor/findings/TVPRA_FAQs2016.pdf")!) + break + case 2: + UIApplication.sharedApplication().openURL(NSURL(string: "https://www.dol.gov/sites/default/files/documents/ilab/reports/child-labor/findings/EOFAQS_2016.pdf")!) + break + default: + break + + } + } + } /* override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell { diff --git a/Child Labor/Morocco.pdf b/Child Labor/Morocco.pdf index 87282a6..cfdadcf 100755 Binary files a/Child Labor/Morocco.pdf and b/Child Labor/Morocco.pdf differ diff --git "a/Child Labor/Saint Helena, Ascensi\303\263n, and Trist\303\241n da Cunha.pdf" "b/Child Labor/Saint Helena, Ascensi\303\263n, and Trist\303\241n da Cunha.pdf" index 400b27d..d1bf294 100755 Binary files "a/Child Labor/Saint Helena, Ascensi\303\263n, and Trist\303\241n da Cunha.pdf" and "b/Child Labor/Saint Helena, Ascensi\303\263n, and Trist\303\241n da Cunha.pdf" differ diff --git a/Child Labor/Saint Lucia.pdf b/Child Labor/Saint Lucia.pdf index 0e6ceb1..985c628 100755 Binary files a/Child Labor/Saint Lucia.pdf and b/Child Labor/Saint Lucia.pdf differ diff --git a/Child Labor/Uzbekistan.pdf b/Child Labor/Uzbekistan.pdf index 334d05c..6b8cc14 100755 Binary files a/Child Labor/Uzbekistan.pdf and b/Child Labor/Uzbekistan.pdf differ diff --git a/Child Labor/Western Sahara.pdf b/Child Labor/Western Sahara.pdf index 6e35a65..f111ee1 100755 Binary files a/Child Labor/Western Sahara.pdf and b/Child Labor/Western Sahara.pdf differ diff --git a/Child Labor/Yemen.pdf b/Child Labor/Yemen.pdf index 8548d95..3c8d26a 100755 Binary files a/Child Labor/Yemen.pdf and b/Child Labor/Yemen.pdf differ diff --git a/Child Labor/aboutthisapp.html b/Child Labor/aboutthisapp.html index 8760b90..e195c58 100644 --- a/Child Labor/aboutthisapp.html +++ b/Child Labor/aboutthisapp.html @@ -17,7 +17,7 @@

What is this app?

  • Check countries’ efforts to eliminate child labor;
  • Find child labor data;
  • Browse goods produced with child labor or forced labor;
    • -
  • Review laws ratifications, and enforcement efforts; and
    • +
  • Review laws, ratifications, and enforcement efforts; and
  • See what governments, businesses, and consumers can to do end child labor.
    • diff --git a/Child Labor/countries_2015.xml b/Child Labor/countries_2015.xml index 1eb01ca..d66751d 100644 --- a/Child Labor/countries_2015.xml +++ b/Child Labor/countries_2015.xml @@ -6470,7 +6470,7 @@ Electronics - No + Yes Yes Yes @@ -9824,7 +9824,7 @@ Textiles (hand-woven) Yes Yes - No + Yes @@ -14394,7 +14394,7 @@ In 2015, Haiti made a moderate advancement in efforts to eliminate the worst for Cotton Yes - No + Yes No @@ -22674,9 +22674,9 @@ The Government raised the minimum age for employment in domestic work to 18 and Yes - 16 + No - No + Yes Yes @@ -25790,7 +25790,7 @@ The Government raised the minimum age for employment in domestic work to 18 and Cotton Yes Yes - No + Yes diff --git a/Child Labor/goods_2015.xml b/Child Labor/goods_2015.xml index 416cc97..af7c85e 100755 --- a/Child Labor/goods_2015.xml +++ b/Child Labor/goods_2015.xml @@ -1008,7 +1008,7 @@ Kazakhstan Asia & the Pacific Yes - No + Yes No @@ -1044,7 +1044,7 @@ Asia & the Pacific Yes Yes - No + Yes Turkey @@ -1196,7 +1196,7 @@ China Asia & the Pacific - No + Yes Yes Yes @@ -3145,7 +3145,7 @@ Sub-Saharan Africa Yes Yes - No + Yes