Skip to content

Commit

Permalink
Implement 9/20 Feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
aquilent-trumainejohnson committed Sep 21, 2016
1 parent 55f6b8b commit 9e9fe71
Show file tree
Hide file tree
Showing 27 changed files with 50 additions and 45 deletions.
16 changes: 0 additions & 16 deletions Child Labor.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 835A6C961B604D1800F26D3F /* [email protected] */; };
8364BBA91B3CC67C008C547A /* SWXMLHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8364BBA81B3CC67C008C547A /* SWXMLHash.swift */; };
836633B41B2F0734007C127E /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 836633B21B2F0734007C127E /* [email protected] */; };
Expand Down Expand Up @@ -1018,9 +1014,6 @@
380048741D8B991C00E64714 /* Fact Sheet-Regional-2016-lo.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Fact Sheet-Regional-2016-lo.pdf"; sourceTree = "<group>"; };
380048751D8B991C00E64714 /* Fact Sheet-Reports-lo.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Fact Sheet-Reports-lo.pdf"; sourceTree = "<group>"; };
380048761D8B991C00E64714 /* FAQs- Combo.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "FAQs- Combo.pdf"; sourceTree = "<group>"; };
380048771D8B991C00E64714 /* FAQs-EO.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "FAQs-EO.pdf"; sourceTree = "<group>"; };
380048781D8B991C00E64714 /* FAQs-TDA.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "FAQs-TDA.pdf"; sourceTree = "<group>"; };
380048801D8B993D00E64714 /* FAQs-TVPRA.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "FAQs-TVPRA.pdf"; sourceTree = "<group>"; };
380048811D8B993D00E64714 /* ToolkitForResponsibleBusinesses-lo.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "ToolkitForResponsibleBusinesses-lo.pdf"; sourceTree = "<group>"; };
38BC75311CE99C9200C53216 /* EnforcementTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnforcementTableViewController.swift; sourceTree = "<group>"; };
38BC75351CEECBBD00C53216 /* CoordTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoordTableViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1677,7 +1670,6 @@
8356181C1BD7DE79007BCF75 /* Yemen.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Yemen.pdf; sourceTree = "<group>"; };
8356181D1BD7DE79007BCF75 /* Zambia.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Zambia.pdf; sourceTree = "<group>"; };
8356181E1BD7DE79007BCF75 /* Zimbabwe.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Zimbabwe.pdf; sourceTree = "<group>"; };
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 = "<group>"; };
835A6C961B604D1800F26D3F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
835E54961B51665D00EE7B26 /* GAITracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GAITracker.h; sourceTree = "<group>"; };
835E54971B51665D00EE7B26 /* GAIDictionaryBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GAIDictionaryBuilder.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3078,18 +3070,14 @@
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 */,
380048731D8B991C00E64714 /* Fact Sheet-Programming-2016-lo.pdf */,
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 /* [email protected] */,
Expand Down Expand Up @@ -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 /* [email protected] in Resources */,
8310FE6F1ABB11310025F7AE /* Afghanistan.png in Resources */,
83AD13CD1B669137004B92D3 /* [email protected] in Resources */,
Expand Down Expand Up @@ -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 /* [email protected] in Resources */,
8310FF401ABB11310025F7AE /* Uganda.png in Resources */,
8335AF6B1B667963000748F0 /* icons_Shellfish.png in Resources */,
Expand Down Expand Up @@ -3784,7 +3770,6 @@
8303DF751B41F21A00E4FD42 /* Cabo Verde-map.png in Resources */,
83AD13821B669137004B92D3 /* [email protected] in Resources */,
8356185E1BD7DE79007BCF75 /* Kenya.pdf in Resources */,
3800487F1D8B991C00E64714 /* FAQs-TDA.pdf in Resources */,
83AD13C91B669137004B92D3 /* [email protected] in Resources */,
835618401BD7DE79007BCF75 /* Cook Islands.pdf in Resources */,
8310FF481ABB11310025F7AE /* Vatican_City.png in Resources */,
Expand Down Expand Up @@ -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)[email protected] in Resources */,
Expand Down
Binary file not shown.
18 changes: 3 additions & 15 deletions Child Labor/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@
</label>
</subviews>
</tableViewCellContentView>
<connections>
<segue destination="BPw-8l-f6p" kind="show" identifier="presentReportIntroduction" id="pMt-qz-cXq"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="Gut-zs-cUE" style="IBUITableViewCellStyleDefault" id="VCF-ik-Ers">
<rect key="frame" x="0.0" y="251" width="600" height="44"/>
Expand Down Expand Up @@ -235,9 +232,6 @@
</label>
</subviews>
</tableViewCellContentView>
<connections>
<segue destination="BPw-8l-f6p" kind="show" identifier="presentTDAFactSheet" id="QP8-2n-cyd"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="cmG-P8-mgc" style="IBUITableViewCellStyleDefault" id="dsr-rS-JKk">
<rect key="frame" x="0.0" y="599" width="600" height="44"/>
Expand All @@ -255,9 +249,6 @@
</label>
</subviews>
</tableViewCellContentView>
<connections>
<segue destination="BPw-8l-f6p" kind="show" identifier="presentTVPRAFactSheet" id="kah-zz-ypK"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="vdX-uJ-gKP" style="IBUITableViewCellStyleDefault" id="6C6-hc-1ym">
<rect key="frame" x="0.0" y="643" width="600" height="44"/>
Expand All @@ -275,9 +266,6 @@
</label>
</subviews>
</tableViewCellContentView>
<connections>
<segue destination="BPw-8l-f6p" kind="show" identifier="presentEOFactSheet" id="B5t-Za-0lP"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="pcf-fn-6ah" style="IBUITableViewCellStyleDefault" id="oGx-aN-svd">
<rect key="frame" x="0.0" y="687" width="600" height="44"/>
Expand Down Expand Up @@ -4434,9 +4422,9 @@
<image name="man.png" width="12" height="12"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="Qkd-VV-gmI"/>
<segue reference="iR0-4H-bt0"/>
<segue reference="UrS-Cc-ziQ"/>
<segue reference="XHW-m8-7YS"/>
<segue reference="yAD-Cl-esb"/>
<segue reference="iR0-4H-bt0"/>
<segue reference="Qkd-VV-gmI"/>
</inferredMetricsTieBreakers>
</document>
Binary file modified Child Labor/Cocos (Keeling) Islands.pdf
Binary file not shown.
Binary file modified Child Labor/Costa Rica.pdf
Binary file not shown.
Binary file modified Child Labor/Cote d'Ivoire.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion Child Labor/EnforceTableViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion Child Labor/EnforcementMultiTableViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Binary file modified Child Labor/Ethiopia.pdf
Binary file not shown.
Binary file removed Child Labor/FAQs-EO.pdf
Binary file not shown.
Binary file removed Child Labor/FAQs-TDA.pdf
Binary file not shown.
Binary file removed Child Labor/FAQs-TVPRA.pdf
Binary file not shown.
Binary file modified Child Labor/Ghana.pdf
Binary file not shown.
Binary file modified Child Labor/Guyana.pdf
Binary file not shown.
Empty file modified Child Labor/Indonesia.pdf
100644 → 100755
Empty file.
Binary file modified Child Labor/Moldova, Republic of.pdf
Binary file not shown.
Binary file modified Child Labor/Montserrat.pdf
Binary file not shown.
35 changes: 34 additions & 1 deletion Child Labor/MoreInfoController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Binary file modified Child Labor/Morocco.pdf
Binary file not shown.
Binary file modified Child Labor/Saint Helena, Ascensión, and Tristán da Cunha.pdf
Binary file not shown.
Binary file modified Child Labor/Saint Lucia.pdf
Binary file not shown.
Binary file modified Child Labor/Uzbekistan.pdf
Binary file not shown.
Binary file modified Child Labor/Western Sahara.pdf
Binary file not shown.
Binary file modified Child Labor/Yemen.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion Child Labor/aboutthisapp.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>What is this app?</h2>
<li>Check countries’ efforts to eliminate child labor;</li>
<li>Find child labor data;</li>
<li>Browse goods produced with child labor or forced labor;</li>
<li>Review laws ratifications, and enforcement efforts; and</li>
<li>Review laws, ratifications, and enforcement efforts; and</li>
<li>See what governments, businesses, and consumers can to do end child labor.</li>
</ol>

Expand Down
12 changes: 6 additions & 6 deletions Child Labor/countries_2015.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6470,7 +6470,7 @@
</Good>
<Good>
<Good_Name>Electronics</Good_Name>
<Child_Labor>No</Child_Labor>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>Yes</Forced_Child_Labor>
</Good>
Expand Down Expand Up @@ -9824,7 +9824,7 @@
<Good_Name>Textiles (hand-woven)</Good_Name>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
<Forced_Child_Labor>Yes</Forced_Child_Labor>
</Good>
</Goods>
<Country_Statistics>
Expand Down Expand Up @@ -14394,7 +14394,7 @@ In 2015, Haiti made a moderate advancement in efforts to eliminate the worst for
<Good>
<Good_Name>Cotton</Good_Name>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>No</Forced_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Good>
</Goods>
Expand Down Expand Up @@ -22674,9 +22674,9 @@ The Government raised the minimum age for employment in domestic work to 18 and
</Minimum_Compulsory_Military>
<Minumum_Voluntary_Military>
<Standard>Yes</Standard>
<Age>16</Age>
<Age></Age>
<Calculated_Age>No</Calculated_Age>
<Conforms_To_Intl_Standard>No</Conforms_To_Intl_Standard>
<Conforms_To_Intl_Standard>Yes</Conforms_To_Intl_Standard>
</Minumum_Voluntary_Military>
<Types_Hazardous_Work>
<Standard>Yes</Standard>
Expand Down Expand Up @@ -25790,7 +25790,7 @@ The Government raised the minimum age for employment in domestic work to 18 and
<Good_Name>Cotton</Good_Name>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
<Forced_Child_Labor>Yes</Forced_Child_Labor>
</Good>
</Goods>
<Country_Statistics>
Expand Down
8 changes: 4 additions & 4 deletions Child Labor/goods_2015.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@
<Country_Name>Kazakhstan</Country_Name>
<Country_Region>Asia &amp; the Pacific</Country_Region>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>No</Forced_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
<Country>
Expand Down Expand Up @@ -1044,7 +1044,7 @@
<Country_Region>Asia &amp; the Pacific</Country_Region>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
<Forced_Child_Labor>Yes</Forced_Child_Labor>
</Country>
<Country>
<Country_Name>Turkey</Country_Name>
Expand Down Expand Up @@ -1196,7 +1196,7 @@
<Country>
<Country_Name>China</Country_Name>
<Country_Region>Asia &amp; the Pacific</Country_Region>
<Child_Labor>No</Child_Labor>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>Yes</Forced_Child_Labor>
</Country>
Expand Down Expand Up @@ -3145,7 +3145,7 @@
<Country_Region>Sub-Saharan Africa</Country_Region>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
<Forced_Child_Labor>Yes</Forced_Child_Labor>
</Country>
</Countries>
</Good>
Expand Down

0 comments on commit 9e9fe71

Please sign in to comment.