Skip to content

Commit df0cb86

Browse files
pbhatt17pbhatt17
authored
Merge pull request #133 from Zolon-DOL/master
Sprint 7 Changes
2 parents 60b79ff + 9dfc71d commit df0cb86

File tree

8 files changed

+1830
-916
lines changed

8 files changed

+1830
-916
lines changed

‎app/src/main/assets/countries_2021.xml‎

Lines changed: 1775 additions & 880 deletions
Large diffs are not rendered by default.

‎app/src/main/assets/goods_2021.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@
931931
<Derived_Country>No</Derived_Country>
932932
</Country>
933933
<Country>
934-
<Country_Name>Turkey</Country_Name>
934+
<Country_Name>Turkey (Türkiye)</Country_Name>
935935
<Country_Region>Middle East and North Africa</Country_Region>
936936
<Child_Labor>Yes</Child_Labor>
937937
<Forced_Labor>No</Forced_Labor>
@@ -1495,7 +1495,7 @@
14951495
<Derived_Country>No</Derived_Country>
14961496
</Country>
14971497
<Country>
1498-
<Country_Name>Turkey</Country_Name>
1498+
<Country_Name>Turkey (Türkiye)</Country_Name>
14991499
<Country_Region>Middle East and North Africa</Country_Region>
15001500
<Child_Labor>Yes</Child_Labor>
15011501
<Forced_Labor>No</Forced_Labor>
@@ -1588,7 +1588,7 @@
15881588
<Good_Sector>Agriculture</Good_Sector>
15891589
<Countries>
15901590
<Country>
1591-
<Country_Name>Turkey</Country_Name>
1591+
<Country_Name>Turkey (Türkiye)</Country_Name>
15921592
<Country_Region>Middle East and North Africa</Country_Region>
15931593
<Child_Labor>Yes</Child_Labor>
15941594
<Forced_Labor>No</Forced_Labor>
@@ -2044,7 +2044,7 @@
20442044
<Derived_Country>No</Derived_Country>
20452045
</Country>
20462046
<Country>
2047-
<Country_Name>Turkey</Country_Name>
2047+
<Country_Name>Turkey (Türkiye)</Country_Name>
20482048
<Country_Region>Middle East and North Africa</Country_Region>
20492049
<Child_Labor>Yes</Child_Labor>
20502050
<Forced_Labor>No</Forced_Labor>
@@ -2107,7 +2107,7 @@
21072107
<Derived_Country>No</Derived_Country>
21082108
</Country>
21092109
<Country>
2110-
<Country_Name>Turkey</Country_Name>
2110+
<Country_Name>Turkey (Türkiye)</Country_Name>
21112111
<Country_Region>Middle East and North Africa</Country_Region>
21122112
<Child_Labor>Yes</Child_Labor>
21132113
<Forced_Labor>No</Forced_Labor>
@@ -2251,7 +2251,7 @@
22512251
<Derived_Country>No</Derived_Country>
22522252
</Country>
22532253
<Country>
2254-
<Country_Name>Turkey</Country_Name>
2254+
<Country_Name>Turkey (Türkiye)</Country_Name>
22552255
<Country_Region>Middle East and North Africa</Country_Region>
22562256
<Child_Labor>Yes</Child_Labor>
22572257
<Forced_Labor>No</Forced_Labor>
@@ -2752,7 +2752,7 @@
27522752
<Good_Sector>Agriculture</Good_Sector>
27532753
<Countries>
27542754
<Country>
2755-
<Country_Name>Turkey</Country_Name>
2755+
<Country_Name>Turkey (Türkiye)</Country_Name>
27562756
<Country_Region>Middle East and North Africa</Country_Region>
27572757
<Child_Labor>Yes</Child_Labor>
27582758
<Forced_Labor>No</Forced_Labor>
@@ -3313,7 +3313,7 @@
33133313
<Derived_Country>No</Derived_Country>
33143314
</Country>
33153315
<Country>
3316-
<Country_Name>Turkey</Country_Name>
3316+
<Country_Name>Turkey (Türkiye)</Country_Name>
33173317
<Country_Region>Middle East and North Africa</Country_Region>
33183318
<Child_Labor>Yes</Child_Labor>
33193319
<Forced_Labor>No</Forced_Labor>
@@ -3568,7 +3568,7 @@
35683568
<Good_Sector>Agriculture</Good_Sector>
35693569
<Countries>
35703570
<Country>
3571-
<Country_Name>Turkey</Country_Name>
3571+
<Country_Name>Turkey (Türkiye)</Country_Name>
35723572
<Country_Region>Middle East and North Africa</Country_Region>
35733573
<Child_Labor>Yes</Child_Labor>
35743574
<Forced_Labor>No</Forced_Labor>
@@ -4309,7 +4309,7 @@
43094309
<Good_Sector>Agriculture</Good_Sector>
43104310
<Countries>
43114311
<Country>
4312-
<Country_Name>Turkey</Country_Name>
4312+
<Country_Name>Turkey (Türkiye)</Country_Name>
43134313
<Country_Region>Middle East and North Africa</Country_Region>
43144314
<Child_Labor>Yes</Child_Labor>
43154315
<Forced_Labor>No</Forced_Labor>

‎app/src/main/java/gov/dol/childlabor/CountryViewActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ else if(good.hasChildLabor()) {
119119
}
120120

121121
//Added new Item in Coutry Page for ILAB Projects
122-
String[] items = {"Suggested Actions", "Statistics", "International Conventions", "Legal Standards", "Enforcement", "Coordinating Mechanisms", "Report PDF", "Country Webpage","ILAB Projects"};
122+
String[] items = {"Suggested Actions", "Statistics", "International Conventions", "Legal Standards", "Enforcement", "Coordinating Mechanisms", "Country Webpage","ILAB Projects"};
123123
ArrayAdapter<String> itemsAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, items);
124124

125125
ListView listView = (ListView) findViewById(R.id.actionListView);
@@ -152,9 +152,9 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
152152
case "Coordinating Mechanisms":
153153
intent = new Intent(getApplicationContext(), MechanismActivity.class);
154154
break;
155-
case "Report PDF":
156-
intent = new Intent(getApplicationContext(), FullReportActivity.class);
157-
break;
155+
// case "Report PDF":
156+
// intent = new Intent(getApplicationContext(), FullReportActivity.class);
157+
// break;
158158
case "Country Webpage":
159159
intent = new Intent(Intent.ACTION_VIEW, Uri.parse(urlname));
160160
startActivity(intent);

‎app/src/main/java/gov/dol/childlabor/StatisticsActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class StatisticsActivity extends AppCompatActivity {
2525
protected void onCreate(Bundle savedInstanceState) {
2626
super.onCreate(savedInstanceState);
2727
Country country = (Country) getIntent().getSerializableExtra("country");
28-
String[] MultiText = {};//{"Somalia", "Pakistan","Tanzania"};
28+
String[] MultiText = {"Somalia"};//{"Somalia", "Pakistan","Tanzania"};
2929
// String[] MultiText = {"Pakistan","Tanzania"};
3030

3131

‎app/src/main/java/gov/dol/childlabor/TabbedCountryListSpinnerActivity.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,13 @@ public boolean onQueryTextChange(String query) {
287287
ListView listView = (ListView) getView().findViewById(R.id.listView);
288288
listView.setAdapter(itemsAdapter);
289289
}else{
290+
searchQuery = query;
290291
if( !searchQuery.trim().equals("")) {
291292
searchView.setQuery(searchQuery, false);
293+
} else {
294+
CountryListAdapter itemsAdapter = new CountryListAdapter(getActivity(), getCountriesBySearch(""), 1);
295+
ListView list = (ListView) getView().findViewById(R.id.listView);
296+
list.setAdapter(itemsAdapter);
292297
}
293298
}
294299
return false;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ private void setMultipleTerritoryValues(View rootView, Hashtable<String, Country
177177
// displayTerritories((LinearLayout) rootView.findViewById(R.id.laborDedicatedInspectorsLinearLayout), enforcements.get("Dedicated_Labor_Inspectors"));
178178
displayTerritories((LinearLayout) rootView.findViewById(R.id.laborAssessPenaltiesLinearLayout), enforcements.get("Authorized_Access_Penalties"));
179179
displayTerritories((LinearLayout) rootView.findViewById(R.id.laborInitialTrainingLinearLayout), enforcements.get("Labor_New_Employee_Training"));
180-
displayTerritories((LinearLayout) rootView.findViewById(R.id.laborNewLawsLinearLayout), enforcements.get("Labor_New_Law_Training"));
181-
displayTerritories((LinearLayout) rootView.findViewById(R.id.laborRefresherCoursesLinearLayout), enforcements.get("Labor_Refresher_Courses"));
180+
// displayTerritories((LinearLayout) rootView.findViewById(R.id.laborNewLawsLinearLayout), enforcements.get("Labor_New_Law_Training"));
181+
// displayTerritories((LinearLayout) rootView.findViewById(R.id.laborRefresherCoursesLinearLayout), enforcements.get("Labor_Refresher_Courses"));
182182
displayTerritories((LinearLayout) rootView.findViewById(R.id.laborInspectionsLinearLayout), enforcements.get("Labor_Inspections"));
183183
displayTerritories((LinearLayout) rootView.findViewById(R.id.laborWorksiteInspectionsLinearLayout), enforcements.get("Labor_Inspections"));
184184
displayTerritories((LinearLayout) rootView.findViewById(R.id.laborInspectorsMeetILOLinearLayout), enforcements.get("Labor_Inspectors_Intl_Standards"));
@@ -195,10 +195,10 @@ private void setMultipleTerritoryValues(View rootView, Hashtable<String, Country
195195
}
196196
else {
197197
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalInitialTrainingLinearLayout), enforcements.get("Criminal_New_Employee_Training"));
198-
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalNewLawTrainingLinearLayout), enforcements.get("Criminal_New_Law_Training"));
198+
//displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalNewLawTrainingLinearLayout), enforcements.get("Criminal_New_Law_Training"));
199199
// displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalRefresherCoursesLinearLayout), enforcements.get("Criminal_Refresher_Courses"));
200200
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalInvestigationsLinearLayout), enforcements.get("Criminal_Investigations"));
201-
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalViolationsFoundLinearLayout), enforcements.get("Criminal_Violations"));
201+
//displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalViolationsFoundLinearLayout), enforcements.get("Criminal_Violations"));
202202
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalProsecutionsInitiatedLinearLayout), enforcements.get("Criminal_Prosecutions"));
203203
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalConvictionsLinearLayout), enforcements.get("Criminal_Convictions"));
204204
displayTerritories((LinearLayout) rootView.findViewById(R.id.criminalReferralMechanismLinearLayout), enforcements.get("Criminal_Referral_Mechanism"));

‎app/src/main/res/layout/fragment_tabbed_enforcement_criminal_multi.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@
6767
android:paddingTop="10dp"
6868
android:paddingBottom="10dp"
6969
android:paddingLeft="20dp"
70-
android:paddingRight="20dp">
70+
android:paddingRight="20dp"
71+
android:visibility="gone">
7172

7273
<TextView
7374
android:layout_width="0dp"
@@ -174,7 +175,8 @@
174175
android:paddingTop="10dp"
175176
android:paddingBottom="10dp"
176177
android:paddingLeft="20dp"
177-
android:paddingRight="20dp">
178+
android:paddingRight="20dp"
179+
android:visibility="gone">
178180

179181
<TextView
180182
android:layout_width="0dp"

‎app/src/main/res/layout/fragment_tabbed_enforcement_labor_multi.xml‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@
193193

194194
</LinearLayout>
195195

196+
196197
<LinearLayout
197198
android:id="@+id/laborAssessPenaltiesLinearLayout"
198199
android:orientation="vertical"
@@ -201,17 +202,10 @@
201202

202203

203204
</LinearLayout>
204-
205-
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
205+
<View
206206
android:layout_width="match_parent"
207-
android:layout_height="wrap_content"
208-
android:padding="20dp"
209-
android:textAppearance="?android:attr/textAppearanceMedium"
210-
android:textStyle="bold"
211-
android:textAllCaps="true"
212-
android:text="Training for labor inspectors:"
213-
android:background="#dadada"
214-
android:contentDescription="Training for labor inspectors, heading" />
207+
android:layout_height="1dp"
208+
android:background="#dadada" />
215209

216210
<LinearLayout
217211
android:orientation="horizontal"
@@ -240,6 +234,19 @@
240234

241235

242236
</LinearLayout>
237+
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
238+
android:layout_width="match_parent"
239+
android:layout_height="wrap_content"
240+
android:padding="20dp"
241+
android:textAppearance="?android:attr/textAppearanceMedium"
242+
android:textStyle="bold"
243+
android:textAllCaps="true"
244+
android:text="Training for labor inspectors:"
245+
android:background="#dadada"
246+
android:visibility="gone"
247+
android:contentDescription="Training for labor inspectors, heading" />
248+
249+
243250

244251
<View
245252
android:layout_width="match_parent"
@@ -253,7 +260,8 @@
253260
android:paddingTop="10dp"
254261
android:paddingBottom="10dp"
255262
android:paddingLeft="20dp"
256-
android:paddingRight="20dp">
263+
android:paddingRight="20dp"
264+
android:visibility="gone">
257265

258266
<TextView
259267
android:layout_width="0dp"
@@ -286,7 +294,8 @@
286294
android:paddingTop="10dp"
287295
android:paddingBottom="10dp"
288296
android:paddingLeft="20dp"
289-
android:paddingRight="20dp">
297+
android:paddingRight="20dp"
298+
android:visibility="gone">
290299

291300
<TextView
292301
android:layout_width="0dp"
@@ -342,15 +351,17 @@
342351
android:id="@+id/laborInspectionsLinearLayout"
343352
android:orientation="vertical"
344353
android:layout_width="match_parent"
345-
android:layout_height="wrap_content">
354+
android:layout_height="wrap_content"
355+
android:visibility="gone">
346356

347357

348358
</LinearLayout>
349359

350360
<View
351361
android:layout_width="match_parent"
352362
android:layout_height="1dp"
353-
android:background="#dadada" />
363+
android:background="#dadada"
364+
android:visibility="gone"/>
354365

355366
<LinearLayout
356367
android:orientation="horizontal"
@@ -359,7 +370,8 @@
359370
android:paddingTop="10dp"
360371
android:paddingBottom="10dp"
361372
android:paddingLeft="20dp"
362-
android:paddingRight="20dp">
373+
android:paddingRight="20dp"
374+
android:visibility="gone">
363375

364376
<TextView
365377
android:layout_width="0dp"

0 commit comments

Comments
 (0)