Skip to content

Commit 8705b84

Browse files
authored
Merge pull request #130 from Zolon-DOL/master
Sprint changes 2023
2 parents 0ae7ad7 + a2a1fd7 commit 8705b84

File tree

8 files changed

+451
-272
lines changed

8 files changed

+451
-272
lines changed

app/src/main/assets/countries_2021.xml

Lines changed: 372 additions & 191 deletions
Large diffs are not rendered by default.

app/src/main/assets/goods_2021.xml

Lines changed: 57 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Goods>
22
<Good>
3-
<Good_Name>Acai</Good_Name>
3+
<Good_Name>Açaí Berries</Good_Name>
44
<Good_Sector>Agriculture</Good_Sector>
55
<Countries>
66
<Country>
@@ -173,7 +173,7 @@
173173
</Countries>
174174
</Good>
175175
<Good>
176-
<Good_Name>Bidis </Good_Name>
176+
<Good_Name>Bidis (hand-rolled cigarettes)</Good_Name>
177177
<Good_Sector>Manufacturing</Good_Sector>
178178
<Countries>
179179
<Country>
@@ -339,6 +339,13 @@
339339
<Forced_Labor>Yes</Forced_Labor>
340340
<Forced_Child_Labor>Yes</Forced_Child_Labor>
341341
</Country>
342+
<Country>
343+
<Country_Name>Colombia</Country_Name>
344+
<Country_Region>Latin America and the Caribbean</Country_Region>
345+
<Child_Labor>Yes</Child_Labor>
346+
<Forced_Labor>No</Forced_Labor>
347+
<Forced_Child_Labor>No</Forced_Child_Labor>
348+
</Country>
342349
<Country>
343350
<Country_Name>Ecuador</Country_Name>
344351
<Country_Region>Latin America and the Caribbean</Country_Region>
@@ -425,19 +432,6 @@
425432
</Country>
426433
</Countries>
427434
</Good>
428-
<Good>
429-
<Good_Name>Bricks </Good_Name>
430-
<Good_Sector>Manufacturing</Good_Sector>
431-
<Countries>
432-
<Country>
433-
<Country_Name>Colombia</Country_Name>
434-
<Country_Region>Latin America and the Caribbean</Country_Region>
435-
<Child_Labor>Yes</Child_Labor>
436-
<Forced_Labor>No</Forced_Labor>
437-
<Forced_Child_Labor>No</Forced_Child_Labor>
438-
</Country>
439-
</Countries>
440-
</Good>
441435
<Good>
442436
<Good_Name>Broccoli</Good_Name>
443437
<Good_Sector>Agriculture</Good_Sector>
@@ -830,7 +824,7 @@
830824
</Countries>
831825
</Good>
832826
<Good>
833-
<Good_Name>Cobalt ore </Good_Name>
827+
<Good_Name>Cobalt ore (heterogenite)</Good_Name>
834828
<Good_Sector>Mining</Good_Sector>
835829
<Countries>
836830
<Country>
@@ -843,7 +837,7 @@
843837
</Countries>
844838
</Good>
845839
<Good>
846-
<Good_Name>Coca </Good_Name>
840+
<Good_Name>Coca (stimulant plant)</Good_Name>
847841
<Good_Sector>Agriculture</Good_Sector>
848842
<Countries>
849843
<Country>
@@ -1228,7 +1222,7 @@
12281222
</Countries>
12291223
</Good>
12301224
<Good>
1231-
<Good_Name>Cottonseed </Good_Name>
1225+
<Good_Name>Cottonseed (hybrid)</Good_Name>
12321226
<Good_Sector>Agriculture</Good_Sector>
12331227
<Countries>
12341228
<Country>
@@ -1611,7 +1605,7 @@
16111605
</Countries>
16121606
</Good>
16131607
<Good>
1614-
<Good_Name>Fluorspar </Good_Name>
1608+
<Good_Name>Fluorspar (mineral)</Good_Name>
16151609
<Good_Sector>Mining</Good_Sector>
16161610
<Countries>
16171611
<Country>
@@ -1679,7 +1673,7 @@
16791673
</Countries>
16801674
</Good>
16811675
<Good>
1682-
<Good_Name>Fruit </Good_Name>
1676+
<Good_Name>Fruit (Pome and Stone)</Good_Name>
16831677
<Good_Sector>Agriculture</Good_Sector>
16841678
<Countries>
16851679
<Country>
@@ -2157,7 +2151,7 @@
21572151
</Countries>
21582152
</Good>
21592153
<Good>
2160-
<Good_Name>Gravel </Good_Name>
2154+
<Good_Name>Gravel (crushed stones)</Good_Name>
21612155
<Good_Sector>Mining</Good_Sector>
21622156
<Countries>
21632157
<Country>
@@ -2184,7 +2178,7 @@
21842178
</Countries>
21852179
</Good>
21862180
<Good>
2187-
<Good_Name>Gypsum </Good_Name>
2181+
<Good_Name>Gypsum (mineral)</Good_Name>
21882182
<Good_Sector>Mining</Good_Sector>
21892183
<Countries>
21902184
<Country>
@@ -2257,7 +2251,7 @@
22572251
</Countries>
22582252
</Good>
22592253
<Good>
2260-
<Good_Name>Incense </Good_Name>
2254+
<Good_Name>Incense (agarbatti)</Good_Name>
22612255
<Good_Sector>Manufacturing</Good_Sector>
22622256
<Countries>
22632257
<Country>
@@ -2269,19 +2263,6 @@
22692263
</Country>
22702264
</Countries>
22712265
</Good>
2272-
<Good>
2273-
<Good_Name>Ingots</Good_Name>
2274-
<Good_Sector>Manufacturing</Good_Sector>
2275-
<Countries>
2276-
<Country>
2277-
<Country_Name>China</Country_Name>
2278-
<Country_Region>Indo-Pacific</Country_Region>
2279-
<Child_Labor>No</Child_Labor>
2280-
<Forced_Labor>No</Forced_Labor>
2281-
<Forced_Child_Labor>No</Forced_Child_Labor>
2282-
</Country>
2283-
</Countries>
2284-
</Good>
22852266
<Good>
22862267
<Good_Name>Iron</Good_Name>
22872268
<Good_Sector>Mining</Good_Sector>
@@ -2309,7 +2290,7 @@
23092290
</Countries>
23102291
</Good>
23112292
<Good>
2312-
<Good_Name>Jute </Good_Name>
2293+
<Good_Name>Jute (textiles)</Good_Name>
23132294
<Good_Sector>Manufacturing</Good_Sector>
23142295
<Countries>
23152296
<Country>
@@ -2322,7 +2303,7 @@
23222303
</Countries>
23232304
</Good>
23242305
<Good>
2325-
<Good_Name>Khat </Good_Name>
2306+
<Good_Name>Khat (stimulant plant)</Good_Name>
23262307
<Good_Sector>Agriculture</Good_Sector>
23272308
<Countries>
23282309
<Country>
@@ -2335,7 +2316,7 @@
23352316
</Countries>
23362317
</Good>
23372318
<Good>
2338-
<Good_Name>Khat/Miraa </Good_Name>
2319+
<Good_Name>Khat/Miraa (stimulant plant)</Good_Name>
23392320
<Good_Sector>Agriculture</Good_Sector>
23402321
<Countries>
23412322
<Country>
@@ -2408,7 +2389,7 @@
24082389
</Countries>
24092390
</Good>
24102391
<Good>
2411-
<Good_Name>Lithium</Good_Name>
2392+
<Good_Name>Lithium-Ion Batteries</Good_Name>
24122393
<Good_Sector>Manufacturing</Good_Sector>
24132394
<Countries>
24142395
<Country>
@@ -2581,7 +2562,7 @@
25812562
</Countries>
25822563
</Good>
25832564
<Good>
2584-
<Good_Name>Nile Perch </Good_Name>
2565+
<Good_Name>Nile Perch (fish)</Good_Name>
25852566
<Good_Sector>Agriculture</Good_Sector>
25862567
<Countries>
25872568
<Country>
@@ -2732,6 +2713,32 @@
27322713
</Country>
27332714
</Countries>
27342715
</Good>
2716+
<Good>
2717+
<Good_Name>Photovoltaic Ingots</Good_Name>
2718+
<Good_Sector>Manufacturing</Good_Sector>
2719+
<Countries>
2720+
<Country>
2721+
<Country_Name>China</Country_Name>
2722+
<Country_Region>Indo-Pacific</Country_Region>
2723+
<Child_Labor>No</Child_Labor>
2724+
<Forced_Labor>No</Forced_Labor>
2725+
<Forced_Child_Labor>No</Forced_Child_Labor>
2726+
</Country>
2727+
</Countries>
2728+
</Good>
2729+
<Good>
2730+
<Good_Name>Photovoltaic Wafers</Good_Name>
2731+
<Good_Sector>Manufacturing</Good_Sector>
2732+
<Countries>
2733+
<Country>
2734+
<Country_Name>China</Country_Name>
2735+
<Country_Region>Indo-Pacific</Country_Region>
2736+
<Child_Labor>No</Child_Labor>
2737+
<Forced_Labor>No</Forced_Labor>
2738+
<Forced_Child_Labor>No</Forced_Child_Labor>
2739+
</Country>
2740+
</Countries>
2741+
</Good>
27352742
<Good>
27362743
<Good_Name>Pineapples</Good_Name>
27372744
<Good_Sector>Agriculture</Good_Sector>
@@ -2881,7 +2888,7 @@
28812888
</Countries>
28822889
</Good>
28832890
<Good>
2884-
<Good_Name>Pulses </Good_Name>
2891+
<Good_Name>Pulses (legumes)</Good_Name>
28852892
<Good_Sector>Agriculture</Good_Sector>
28862893
<Countries>
28872894
<Country>
@@ -3675,7 +3682,7 @@
36753682
</Countries>
36763683
</Good>
36773684
<Good>
3678-
<Good_Name>Tantalum ore </Good_Name>
3685+
<Good_Name>Tantalum ore (coltan)</Good_Name>
36793686
<Good_Sector>Mining</Good_Sector>
36803687
<Countries>
36813688
<Country>
@@ -3688,7 +3695,7 @@
36883695
</Countries>
36893696
</Good>
36903697
<Good>
3691-
<Good_Name>Tanzanite </Good_Name>
3698+
<Good_Name>Tanzanite (gems)</Good_Name>
36923699
<Good_Sector>Mining</Good_Sector>
36933700
<Countries>
36943701
<Country>
@@ -3851,7 +3858,7 @@
38513858
</Countries>
38523859
</Good>
38533860
<Good>
3854-
<Good_Name>Tilapia </Good_Name>
3861+
<Good_Name>Tilapia (fish)</Good_Name>
38553862
<Good_Sector>Agriculture</Good_Sector>
38563863
<Countries>
38573864
<Country>
@@ -3932,7 +3939,7 @@
39323939
</Countries>
39333940
</Good>
39343941
<Good>
3935-
<Good_Name>Tin ore </Good_Name>
3942+
<Good_Name>Tin ore (cassiterite)</Good_Name>
39363943
<Good_Sector>Mining</Good_Sector>
39373944
<Countries>
39383945
<Country>
@@ -4130,7 +4137,7 @@
41304137
</Countries>
41314138
</Good>
41324139
<Good>
4133-
<Good_Name>Trona </Good_Name>
4140+
<Good_Name>Trona (mineral)</Good_Name>
41344141
<Good_Sector>Mining</Good_Sector>
41354142
<Countries>
41364143
<Country>
@@ -4143,7 +4150,7 @@
41434150
</Countries>
41444151
</Good>
41454152
<Good>
4146-
<Good_Name>Tungsten ore </Good_Name>
4153+
<Good_Name>Tungsten ore (wolframite)</Good_Name>
41474154
<Good_Sector>Mining</Good_Sector>
41484155
<Countries>
41494156
<Country>
@@ -4175,19 +4182,6 @@
41754182
</Country>
41764183
</Countries>
41774184
</Good>
4178-
<Good>
4179-
<Good_Name>Wafers</Good_Name>
4180-
<Good_Sector>Manufacturing</Good_Sector>
4181-
<Countries>
4182-
<Country>
4183-
<Country_Name>China</Country_Name>
4184-
<Country_Region>Indo-Pacific</Country_Region>
4185-
<Child_Labor>No</Child_Labor>
4186-
<Forced_Labor>No</Forced_Labor>
4187-
<Forced_Child_Labor>No</Forced_Child_Labor>
4188-
</Country>
4189-
</Countries>
4190-
</Good>
41914185
<Good>
41924186
<Good_Name>Wheat</Good_Name>
41934187
<Good_Sector>Agriculture</Good_Sector>
@@ -4202,7 +4196,7 @@
42024196
</Countries>
42034197
</Good>
42044198
<Good>
4205-
<Good_Name>Yerba Mate </Good_Name>
4199+
<Good_Name>Yerba Mate (stimulant plant)</Good_Name>
42064200
<Good_Sector>Agriculture</Good_Sector>
42074201
<Countries>
42084202
<Country>
@@ -4234,5 +4228,4 @@
42344228
</Country>
42354229
</Countries>
42364230
</Good>
4237-
</Goods>
4238-
4231+
</Goods>

app/src/main/assets/www/aboutthisapp.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2>What is this app? </h2>
2121

2222
<li>See what governments, businesses, and consumers can do end child labor;</li>
2323
<li>Browse USDOL’s projects to combat child labor and forced labor;</li>
24-
<li>New this year, explore visualizations of USDOL’s child labor and forced labor data!</li>
24+
<li>Explore visualizations of USDOL’s child labor and forced labor data!</li>
2525
</ol>
2626

2727

@@ -35,7 +35,7 @@ <h2>How can I use this app?</h2>
3535

3636
<h2>What’s new in the app?</h2>
3737

38-
<p>Sweat &amp; Toil is now in its eighth year, and contains the latest information from the 2021 reporting period. It also includes updated data for the <i><a href="https://www.dol.gov/agencies/ilab/reports/child-labor/list-of-goods/">List of Goods Produced by Child Labor or Forced Labor</a></i> and <i><a href="https://www.dol.gov/agencies/ilab/reports/child-labor/list-of-products">List of Products Produced by Forced or Indentured Child Labor</a>.</i>
38+
<p>Sweat &amp; Toil is now in its ninth year, and contains the latest information from the 2022 reporting period. It also includes updated data for the <i><a href="https://www.dol.gov/agencies/ilab/reports/child-labor/list-of-goods/">List of Goods Produced by Child Labor or Forced Labor</a></i> and <i><a href="https://www.dol.gov/agencies/ilab/reports/child-labor/list-of-products">List of Products Produced by Forced or Indentured Child Labor</a>.</i>
3939
</p>
4040
<p>Sweat &amp; Toil also includes updated information related to ILAB’s projects in each country. The app now also contains new visualizations of ILAB’s global child labor and forced labor data.
4141
</p>

app/src/main/assets/www/methodology.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2><a href="https://www.dol.gov/agencies/ilab/resources/reports/child-labor/fin
2121

2222
<h2><a href="https://www.dol.gov/agencies/ilab/reports/child-labor/list-of-goods/">List of Goods Produced by Child Labor or Forced Labor</a></h2>
2323

24-
<p>The <em>List of Goods Produced by Child Labor or Forced Labor,</em> mandated by the Trafficking Victims Protection Reauthorization Act (TVPRA) of 2005, focuses on both children under 18 and adults, and includes 158 goods and 77 source countries and areas that ILAB has reason to believe are produced by child labor or forced labor in violation of international standards. ILAB’s mandate also requires the TVPRA List to include, to the extent practicable, goods that are produced with inputs that are produced with forced labor or child labor. To this end, the 2022 edition of the <em>List of Goods</em> includes ten goods from supply chain tracing that are produced in two countries. <em>The List of Goods </em>is intended to raise public awareness about child labor and forced labor around the world and to promote efforts to address them. A starting point for action, the <em>List of Goods </em>creates opportunities for ILAB to engage and assist foreign governments. It is also a valuable resource for researchers, advocacy organizations, and companies wishing to carry out risk assessments and engage in due diligence on labor rights in their supply chains.</p>
24+
<p>The <em>List of Goods Produced by Child Labor or Forced Labor,</em> mandated by the Trafficking Victims Protection Reauthorization Act (TVPRA) of 2005, focuses on both children under 18 and adults, and includes 159 goods and 77 source countries and areas that ILAB has reason to believe are produced by child labor or forced labor in violation of international standards. ILAB’s mandate also requires the TVPRA List to include, to the extent practicable, goods that are produced with inputs that are produced with forced labor or child labor. To this end, the 2022 edition of the <em>List of Goods</em> includes ten goods from supply chain tracing that are produced in two countries. <em>The List of Goods </em>is intended to raise public awareness about child labor and forced labor around the world and to promote efforts to address them. A starting point for action, the <em>List of Goods </em>creates opportunities for ILAB to engage and assist foreign governments. It is also a valuable resource for researchers, advocacy organizations, and companies wishing to carry out risk assessments and engage in due diligence on labor rights in their supply chains.</p>
2525

2626
<p>ILAB used similar data collection methods to prepare the <em>List of Goods</em> as the <em>Findings on the Worst Forms of Child Labor</em>. ILAB used the following five criteria to determine whether there was &ldquo;reason to believe&rdquo; a particular good was being produced using child or forced labor in violation of international standards: nature, date, and source of information; extent of corroboration; and significant incidence of child labor or forced labor. For each good that was reviewed, ILAB evaluated each data source against each of the five criteria. In addition, for goods produced with inputs produced with child labor or forced labor, ILAB also analyzed evidence on production processes and supply chains. ILAB researchers applied the criteria consistently across goods and countries so that ultimate findings of &ldquo;reason to believe&rdquo; are consistent worldwide.</p>
2727

app/src/main/java/gov/dol/childlabor/TabbedEnforcementActivity.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ private void setSingleTerritoryValues(View rootView, Hashtable<String, Country.E
140140
// displayEnforcement((TextView) rootView.findViewById(R.id.laborDedicatedInspectorsTextView), enforcements.get("Dedicated_Labor_Inspectors"));
141141
displayEnforcement((TextView) rootView.findViewById(R.id.laborAssessPenaltiesTextView), enforcements.get("Authorized_Access_Penalties"));
142142
displayEnforcement((TextView) rootView.findViewById(R.id.laborInitialTrainingTextView), enforcements.get("Labor_New_Employee_Training"));
143-
displayEnforcement((TextView) rootView.findViewById(R.id.laborNewLawsTextView), enforcements.get("Labor_New_Law_Training"));
144-
displayEnforcement((TextView) rootView.findViewById(R.id.laborRefresherCoursesTextView), enforcements.get("Labor_Refresher_Courses"));
145-
displayEnforcement((TextView) rootView.findViewById(R.id.laborInspectionsTextView), enforcements.get("Labor_Inspections"));
146-
displayEnforcement((TextView) rootView.findViewById(R.id.laborWorksiteInspectionsTextView), enforcements.get("Labor_Worksite_Inspections"));
143+
//displayEnforcement((TextView) rootView.findViewById(R.id.laborNewLawsTextView), enforcements.get("Labor_New_Law_Training"));
144+
//displayEnforcement((TextView) rootView.findViewById(R.id.laborRefresherCoursesTextView), enforcements.get("Labor_Refresher_Courses"));
145+
//displayEnforcement((TextView) rootView.findViewById(R.id.laborInspectionsTextView), enforcements.get("Labor_Inspections"));
146+
//displayEnforcement((TextView) rootView.findViewById(R.id.laborWorksiteInspectionsTextView), enforcements.get("Labor_Worksite_Inspections"));
147147
displayEnforcement((TextView) rootView.findViewById(R.id.laborInspectorsMeetILOTextView), enforcements.get("Labor_Inspectors_Intl_Standards"));
148148
// displayEnforcement((TextView) rootView.findViewById(R.id.laborDeskReviewsTextView), enforcements.get("Labor_Desk_Review_Inspections"));
149149
displayEnforcement((TextView) rootView.findViewById(R.id.laborViolationsFoundTextView), enforcements.get("Labor_Violations"));
@@ -157,11 +157,11 @@ private void setSingleTerritoryValues(View rootView, Hashtable<String, Country.E
157157
displayEnforcement((TextView) rootView.findViewById(R.id.laborReferralMechanismTextView), enforcements.get("Labor_Referral_Mechanism"));
158158
}
159159
else {
160-
displayEnforcement((TextView) rootView.findViewById(R.id.criminalInitialTrainingTextView), enforcements.get("Criminal_New_Employee_Training"));
161-
displayEnforcement((TextView) rootView.findViewById(R.id.criminalNewLawTrainingTextView), enforcements.get("Criminal_New_Law_Training"));
162-
displayEnforcement((TextView) rootView.findViewById(R.id.criminalRefresherCoursesTextView), enforcements.get("Criminal_Refresher_Courses"));
160+
//displayEnforcement((TextView) rootView.findViewById(R.id.criminalInitialTrainingTextView), enforcements.get("Criminal_New_Employee_Training"));
161+
//displayEnforcement((TextView) rootView.findViewById(R.id.criminalNewLawTrainingTextView), enforcements.get("Criminal_New_Law_Training"));
162+
//displayEnforcement((TextView) rootView.findViewById(R.id.criminalRefresherCoursesTextView), enforcements.get("Criminal_Refresher_Courses"));
163163
displayEnforcement((TextView) rootView.findViewById(R.id.criminalInvestigationsTextView), enforcements.get("Criminal_Investigations"));
164-
displayEnforcement((TextView) rootView.findViewById(R.id.criminalViolationsFoundTextView), enforcements.get("Criminal_Violations"));
164+
//displayEnforcement((TextView) rootView.findViewById(R.id.criminalViolationsFoundTextView), enforcements.get("Criminal_Violations"));
165165
displayEnforcement((TextView) rootView.findViewById(R.id.criminalProsecutionsInitiatedTextView), enforcements.get("Criminal_Prosecutions"));
166166
displayEnforcement((TextView) rootView.findViewById(R.id.criminalConvictionsTextView), enforcements.get("Criminal_Convictions"));
167167
displayEnforcement((TextView) rootView.findViewById(R.id.criminalReferralMechanismTextView), enforcements.get("Criminal_Referral_Mechanism"));
@@ -195,7 +195,7 @@ private void setMultipleTerritoryValues(View rootView, Hashtable<String, Country
195195
else {
196196
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalInitialTrainingLinearLayout), enforcements.get("Criminal_New_Employee_Training"));
197197
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalNewLawTrainingLinearLayout), enforcements.get("Criminal_New_Law_Training"));
198-
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalRefresherCoursesLinearLayout), enforcements.get("Criminal_Refresher_Courses"));
198+
// displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalRefresherCoursesLinearLayout), enforcements.get("Criminal_Refresher_Courses"));
199199
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalInvestigationsLinearLayout), enforcements.get("Criminal_Investigations"));
200200
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalViolationsFoundLinearLayout), enforcements.get("Criminal_Violations"));
201201
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalProsecutionsInitiatedLinearLayout), enforcements.get("Criminal_Prosecutions"));

app/src/main/res/layout/fragment_tabbed_enforcement_criminal.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@
9292
android:paddingTop="10dp"
9393
android:paddingBottom="10dp"
9494
android:paddingLeft="20dp"
95-
android:paddingRight="20dp">
95+
android:paddingRight="20dp"
96+
android:visibility="gone">
9697

9798
<TextView
9899
android:layout_width="0dp"

0 commit comments

Comments
 (0)