Skip to content

Commit

Permalink
Merge pull request #166 from Zolon-DOL/master
Browse files Browse the repository at this point in the history 
2023 Changes - Sprint 6
  • Loading branch information
@pbhatt17
pbhatt17 authored Aug 11, 2023
2 parents 8340394 + 49d401a commit d8520e8
Show file tree
Hide file tree
Showing 12 changed files with 4,896 additions and 5,100 deletions.
40 changes: 20 additions & 20 deletions Child Labor.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

Binary file modified Child Labor/BackgroundNew.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 4 additions & 10 deletions Child Labor/CountryController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ class CountryController: UITableViewController, UICollectionViewDataSource, UICo

override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
// If this is a TVPRA-only country, or one of British Indian Ocean Territories, Heard and McDonald Islands, or Pitcairn Island, it has no indicator or PDF buttons, so return 0 for both sections
if ["China", "Iran", "Malaysia", "Turkey", "North Korea", "Taiwan", "Tajikistan", "Turkmenistan", "Vietnam", "British Indian Ocean Territories", "Heard and McDonald Islands", "Pitcairn Islands", "Russia", "Sudan", "Venezuela"].contains(self.countryName) {
if ["China", "Iran", "Malaysia", "Turkey (Türkiye)", "North Korea", "Taiwan", "Tajikistan", "Turkmenistan", "Vietnam", "British Indian Ocean Territories", "Heard and McDonald Islands", "Pitcairn Islands", "Russia", "Sudan", "Venezuela"].contains(self.countryName) {
return 0

// Otherwise
Expand Down Expand Up @@ -377,24 +377,18 @@ class CountryController: UITableViewController, UICollectionViewDataSource, UICo

if (indexPath.row == 1) {
if (countryName=="Somalia") {


performSegue(withIdentifier: "presentSomalia", sender: self)
performSegue(withIdentifier: "presentStats", sender: self)

}

else
if (countryName=="Pakistan") {


performSegue(withIdentifier: "presentPakistan", sender: self)
performSegue(withIdentifier: "presentStats", sender: self)

}

else if (countryName=="Tanzania") {


performSegue(withIdentifier: "presentTanzania", sender: self)
performSegue(withIdentifier: "presentStats", sender: self)

}

Expand Down
2 changes: 1 addition & 1 deletion Child Labor/GoodsTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ class GoodsTableViewController: UITableViewController, UISearchBarDelegate, UITe
{
goodsCount.text = "1 result found for search " + searchBarFilter.text!
}
if(getGoodsCount() == 169)
if(getGoodsCount() == 170)
{
goodsCount.text = ""
}
Expand Down
16 changes: 8 additions & 8 deletions Child Labor/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@
<rect key="frame" x="0.0" y="239" width="320" height="280"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundNew.png" translatesAutoresizingMaskIntoConstraints="NO" id="Ejl-hO-RVy">
<rect key="frame" x="0.0" y="0.0" width="320" height="280"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="329"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l3Q-78-HdS">
<rect key="frame" x="284" y="244" width="26" height="26"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l3Q-78-HdS">
<rect key="frame" x="284" y="259" width="26" height="26"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<segue destination="3s6-C9-493" kind="presentation" id="omh-cQ-qP8"/>
</connections>
Expand All @@ -265,7 +265,7 @@
<constraint firstItem="Ejl-hO-RVy" firstAttribute="top" secondItem="Zar-Fb-UJ0" secondAttribute="top" id="1La-co-9dG"/>
<constraint firstAttribute="trailing" secondItem="l3Q-78-HdS" secondAttribute="trailing" constant="10" id="HHg-Sz-shN"/>
<constraint firstItem="Ejl-hO-RVy" firstAttribute="top" secondItem="Zar-Fb-UJ0" secondAttribute="top" id="KrQ-NB-F5K"/>
<constraint firstAttribute="bottom" secondItem="Ejl-hO-RVy" secondAttribute="bottom" id="a5f-IJ-OHg"/>
<constraint firstAttribute="bottom" secondItem="Ejl-hO-RVy" secondAttribute="bottom" constant="-49" id="a5f-IJ-OHg"/>
<constraint firstAttribute="trailing" secondItem="Ejl-hO-RVy" secondAttribute="trailing" id="fXK-7n-XKV"/>
<constraint firstAttribute="bottom" secondItem="l3Q-78-HdS" secondAttribute="bottom" constant="10" id="rVn-cU-kvK"/>
<constraint firstItem="Ejl-hO-RVy" firstAttribute="top" secondItem="Zar-Fb-UJ0" secondAttribute="top" id="y5m-0u-2yA"/>
Expand Down Expand Up @@ -2935,7 +2935,7 @@ Standards </string>
<rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No. Conducted at Worksites" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Xr-CQ-bWI">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="No. Conducted at Worksites" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Xr-CQ-bWI">
<rect key="frame" x="26" y="19" width="178" height="42"/>
<accessibility key="accessibilityConfiguration" label="Number Conducted at Worksite"/>
<constraints>
Expand All @@ -2945,7 +2945,7 @@ Standards </string>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unavailable" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OEr-PU-Jsv">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Unavailable" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OEr-PU-Jsv">
<rect key="frame" x="209" y="29.5" width="88" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.43137254899999999" green="0.43137254899999999" blue="0.43137254899999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
Expand Down Expand Up @@ -5973,7 +5973,7 @@ Standards </string>
</inferredMetricsTieBreakers>
<resources>
<image name="Afghanistan.png" width="56.829429626464844" height="27.69230842590332"/>
<image name="BackgroundNew.png" width="1914" height="2609"/>
<image name="BackgroundNew.png" width="1914" height="2871"/>
<image name="Brazil-map.png" width="453.60000610351562" height="452.16000366210938"/>
<image name="child-labor.png" width="60" height="50"/>
<image name="derived_labor.png" width="71" height="43"/>
Expand Down
Binary file added Child Labor/Saint Helena Ascension and Tristan da Cunha.pdf
View file
Binary file not shown.
Binary file added Child Labor/Saint_Helena_Ascension_and_Tristan_da_Cunha.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 Child Labor/Turkey-map.png → Child Labor/Turkey (Türkiye)-map.png
View file
File renamed without changes
Binary file added Child Labor/Turkey_(Türkiye).pdf
View file
Binary file not shown.
Binary file added Child Labor/Turkey_(Türkiye).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d8520e8

Please sign in to comment.