handled uzbekistan goods case

USDepartmentofLabor · Sep 12, 2018 · 0e28598 · 0e28598
1 parent 0f0bc0b
commit 0e28598
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/39683.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/39683.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Child Labor/.DS_Store b/Child Labor/.DS_Store
diff --git a/Child Labor/CountryController.swift b/Child Labor/CountryController.swift
@@ -123,11 +123,17 @@ class CountryController: UITableViewController, UICollectionViewDataSource, UICo
                         // Add the exploitation type to an array
                         if childLaborStatusForGood == "Yes" && forcedLaborStatusForGood == "No" {
                             exploitations.add(0)
-                        } else if childLaborStatusForGood == "No" && forcedLaborStatusForGood == "Yes" {
+                        }
+                        else if childLaborStatusForGood == "No" && forcedLaborStatusForGood == "Yes" && forcedChildLaborStatusForGood == "Yes" {
+                            exploitations.add(3)
+                        }
+                        else if childLaborStatusForGood == "No" && forcedLaborStatusForGood == "Yes" {
                             exploitations.add(1)
                         } else if childLaborStatusForGood == "Yes" && forcedLaborStatusForGood == "Yes" && forcedChildLaborStatusForGood == "No" {
                             exploitations.add(2)
-                        } else {
+                        }
+
+                        else {
                             exploitations.add(3)
                         }
                     }

diff --git a/Child Labor/GoodController.swift b/Child Labor/GoodController.swift
@@ -59,7 +59,11 @@ class GoodController: UITableViewController {
                     // Add the exploitation type to an array
                     if country["Child_Labor"].element?.text == "Yes" && country["Forced_Labor"].element?.text == "No" {
                         exploitations.add(0)
-                    } else if country["Child_Labor"].element?.text == "No" && country["Forced_Labor"].element?.text == "Yes" {
+                    }
+                    else if country["Child_Labor"].element?.text == "No" && country["Forced_Labor"].element?.text == "Yes" && country["Forced_Child_Labor"].element?.text == "Yes" {
+                        exploitations.add(3)
+                    }
+                    else if country["Child_Labor"].element?.text == "No" && country["Forced_Labor"].element?.text == "Yes" {
                         exploitations.add(1)
                     } else if country["Child_Labor"].element?.text == "Yes" && country["Forced_Labor"].element?.text == "Yes" && country["Forced_Child_Labor"].element?.text == "No" {
                         exploitations.add(2)