diff --git a/Child Labor/EnforceTableViewController.swift b/Child Labor/EnforceTableViewController.swift index de36f5f..36456d1 100755 --- a/Child Labor/EnforceTableViewController.swift +++ b/Child Labor/EnforceTableViewController.swift @@ -84,8 +84,8 @@ class EnforceTableViewController: UITableViewController { setEnforcement(self.laborInspectorsLabel, text: enforcements["Labor_Inspectors"].element?.text) setEnforcement(self.laborAccessPenaltiesLabel, text: enforcements["Authorized_Access_Penalties"].element?.text) - setEnforcement(self.laborInspectionsLabel, text: enforcements["Labor_Inspections"].element?.text) - setEnforcement(self.laborWorksiteInspectionsLabel, text: enforcements["Labor_Worksite_Inspections"].element?.text) + //setEnforcement(self.laborInspectionsLabel, text: enforcements["Labor_Inspections"].element?.text) + setEnforcement(self.laborWorksiteInspectionsLabel, text: enforcements["Labor_Inspections"].element?.text) setEnforcement(self.laborViolationsLabel, text: enforcements["Labor_Violations"].element?.text) setEnforcement(self.laborPenaltiesImposedLabel, text: enforcements["Labor_Penalties_Imposed"].element?.text) @@ -96,22 +96,22 @@ class EnforceTableViewController: UITableViewController { 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.laborRefresherCoursesLabel, text: enforcements["Labor_Refresher_Courses"].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) setEnforcement(self.laborInspectorsMeetILORec, text: enforcements["Labor_Inspectors_Intl_Standards"].element?.text) tempState = 1 setEnforcement(self.criminalInvestigationsLabel, text: enforcements["Criminal_Investigations"].element?.text) - setEnforcement(self.criminalViolationsLabel, text: enforcements["Criminal_Violations"].element?.text) + //setEnforcement(self.criminalViolationsLabel, text: enforcements["Criminal_Violations"].element?.text) setEnforcement(self.criminalProsecutionsLabel, text: enforcements["Criminal_Prosecutions"].element?.text) setEnforcement(self.criminalConvictionsLabel, text: enforcements["Criminal_Convictions"].element?.text) setEnforcement(self.imposedPenaltiesForViolationsRelatedToTheWFCLLabel, text: enforcements["Criminal_Penalties_for_WFCL"].element?.text) setEnforcement(self.criminalReferralMechanismLabel, text: enforcements["Criminal_Referral_Mechanism"].element?.text) setEnforcement(self.criminalEmployeeTrainingLabel, text: enforcements["Criminal_New_Employee_Training"].element?.text) - setEnforcement(self.criminalNewLawsTrainingLabel, text: enforcements["Criminal_New_Law_Training"].element?.text) - setEnforcement(self.criminalRefresherCoursesLabel, text: enforcements["Criminal_Refresher_Courses"].element?.text) +// setEnforcement(self.criminalNewLawsTrainingLabel, text: enforcements["Criminal_New_Law_Training"].element?.text) +// setEnforcement(self.criminalRefresherCoursesLabel, text: enforcements["Criminal_Refresher_Courses"].element?.text) } } @@ -173,9 +173,9 @@ class EnforceTableViewController: UITableViewController { case 0: return 4 case 1: - return 3 + return 1 case 2: - return 2 + return 1 case 3: return 3 case 4: @@ -191,7 +191,7 @@ class EnforceTableViewController: UITableViewController { else { switch section { case 7: - return 3 + return 2 case 8: return 6 default: diff --git a/Child Labor/GoodController.swift b/Child Labor/GoodController.swift index c7b6447..8873e67 100755 --- a/Child Labor/GoodController.swift +++ b/Child Labor/GoodController.swift @@ -39,7 +39,9 @@ class GoodController: UITableViewController { // Do any additional setup after loading the view. self.title = goodName goodTitle.text = goodName - goodImage.image = UIImage(named:"icons_" + goodName.replacingOccurrences(of: "/", with: "_").replacingOccurrences(of: " ", with: "_"))! + if let image = UIImage(named:"icons_" + goodName.replacingOccurrences(of: "/", with: "_").replacingOccurrences(of: " ", with: "_")) { + goodImage.image = image + } let urlPathGoods = Bundle.main.path(forResource: "goods_2016", ofType: "xml") var contentsGoods: NSString? diff --git a/Child Labor/Main.storyboard b/Child Labor/Main.storyboard index e97e8e1..7de255d 100644 --- a/Child Labor/Main.storyboard +++ b/Child Labor/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -247,13 +247,13 @@ - + - +