Merge pull request #131 from Zolon-DOL/master

Sprint 5 changes
USDepartmentofLabor · Jul 14, 2023 · fd066d0 · fd066d0
2 parents 8705b84 + 0a90937
commit fd066d0
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 29 deletions.
diff --git a/app/src/main/assets/countries_2021.xml b/app/src/main/assets/countries_2021.xml
@@ -33325,4 +33325,5 @@
             <Coordination>Yes</Coordination>
         </Mechanisms>
     </Country>
-</Countries>
+</Countries>
+
diff --git a/app/src/main/assets/www/methodology.html b/app/src/main/assets/www/methodology.html
@@ -1,27 +1,27 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <meta charset="utf-8"/>
-        <title>Methodology</title>
-        
-        <style>
+<head>
+    <meta charset="utf-8"/>
+    <title>Methodology</title>
+
+    <style>
             body { font-family: "Helvetica Neue"; margin: 20px; }
             </style>
-    </head>
-    <body>
-        <h1>Methodology</h1>
+</head>
+<body>
+<h1>Methodology</h1>
 <p>The U.S. Department of Labor&rsquo;s (USDOL) Bureau of International Labor Affairs (ILAB) has been working to combat child labor, forced labor, and human trafficking since 1993. We carry out research, policy engagement, and technical cooperation to advance the elimination of these human rights abuses. ILAB produces reports on the incidence and nature of child labor and forced labor and efforts underway to address these problems. We assist in the development and implementation of U.S. government policy and also engage strategically with governments, business, labor, and civil society groups to implement models that work to reduce exploitative labor practices.</p>
 
 <p>Data and research in this app is taken from three flagship reports that ILAB publishes on international child labor and forced labor. These reports are the <em><a href="https://www.dol.gov/agencies/ilab/resources/reports/child-labor/findings/">Findings on the Worst Forms of Child Labor</a></em>; the <em><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></em>; and the <em><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></em>. Each of these reports has a distinct mandate and focus, but taken collectively, they document the current situation of child labor, forced labor, and forced child labor around the world and serve as valuable resources for research, advocacy, government action, and corporate responsibility.</p>
 
 <h2><a href="https://www.dol.gov/agencies/ilab/resources/reports/child-labor/findings/">Findings on the Worst Forms of Child Labor</a></h2>
 
-<p>USDOL&rsquo;s <em>Findings on the Worst Forms of Child Labor</em>, mandated by the Trade and Development Act of 2000 (TDA), focuses on the efforts of 135 U.S. trade beneficiary countries and territories to eliminate the worst forms of child labor through laws and regulations, enforcement, coordination, policies, and social programs.</p>
+<p>USDOL&rsquo;s <em>Findings on the Worst Forms of Child Labor</em>, mandated by the Trade and Development Act of 2000 (TDA), focuses on the efforts of 131 U.S. trade beneficiary countries and territories to eliminate the worst forms of child labor through laws and regulations, enforcement, coordination, policies, and social programs.</p>
 <p>Information was gathered for this report through desk research, U.S. embassy reporting, and limited field work. Information was also received from some foreign governments and collected from U.S. government-funded technical assistance and field research projects. ILAB did not use information that is unavailable to the public, such as government-classified information. ILAB used the criteria of nature, date, and source of information, as well as extent of corroboration, to determine what should be included. Each country in the report receives an assessment to indicate clearly the Secretary of Labor&rsquo;s findings on each country&rsquo;s level of advancement in efforts to eliminate the worst forms of child labor during the reporting period. Countries can receive one of five possible assessments: <em>Significant Advancement, Moderate Advancement, Minimal Advancement, No Advancement,</em> or <em>No Assessment</em>. In preparing the assessments, ILAB evaluated country efforts against criteria laid out in the TDA Conference Committee report. For more information, see the report Introduction.</p>
 
 <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>
 
-<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>
+<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 10 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>
 
 <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>
 

diff --git a/app/src/main/java/gov/dol/childlabor/FactsheetActivity.java b/app/src/main/java/gov/dol/childlabor/FactsheetActivity.java
@@ -59,7 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
             case "EO FAQs":
                 filename = "FAQs-EO.pdf";
                 break;
-            case "NEW: Comply Chain app":
+            case "Comply Chain":
                 intent = new Intent(getApplicationContext(), ToolKitActivity.class);
                 intent.putExtra("title", "Comply Chain app");
                 startActivity(intent);

diff --git a/app/src/main/java/gov/dol/childlabor/MenuMain.java b/app/src/main/java/gov/dol/childlabor/MenuMain.java
@@ -44,7 +44,10 @@ public void onClick(View v) {
 
         ComplyChain.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(), ToolKitActivity.class);
+//                Intent intent = new Intent(getApplicationContext(), ToolKitActivity.class);
+//                startActivity(intent);
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse("https://www.dol.gov/ilab/complychain/"));//"market://details?id=gov.dol.complychain"));
                 startActivity(intent);
             }
         });

diff --git a/app/src/main/java/gov/dol/childlabor/TabbedEnforcementActivity.java b/app/src/main/java/gov/dol/childlabor/TabbedEnforcementActivity.java
@@ -3,6 +3,7 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.Html;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -143,7 +144,7 @@ private void setSingleTerritoryValues(View rootView, Hashtable<String, Country.E
                 //displayEnforcement((TextView) rootView.findViewById(R.id.laborNewLawsTextView), enforcements.get("Labor_New_Law_Training"));
                 //displayEnforcement((TextView) rootView.findViewById(R.id.laborRefresherCoursesTextView), enforcements.get("Labor_Refresher_Courses"));
                 //displayEnforcement((TextView) rootView.findViewById(R.id.laborInspectionsTextView), enforcements.get("Labor_Inspections"));
-                //displayEnforcement((TextView) rootView.findViewById(R.id.laborWorksiteInspectionsTextView), enforcements.get("Labor_Worksite_Inspections"));
+                displayEnforcement((TextView) rootView.findViewById(R.id.laborWorksiteInspectionsTextView), enforcements.get("Labor_Inspections"));
                 displayEnforcement((TextView) rootView.findViewById(R.id.laborInspectorsMeetILOTextView), enforcements.get("Labor_Inspectors_Intl_Standards"));
                 // displayEnforcement((TextView) rootView.findViewById(R.id.laborDeskReviewsTextView), enforcements.get("Labor_Desk_Review_Inspections"));
                 displayEnforcement((TextView) rootView.findViewById(R.id.laborViolationsFoundTextView), enforcements.get("Labor_Violations"));
@@ -157,7 +158,7 @@ private void setSingleTerritoryValues(View rootView, Hashtable<String, Country.E
                 displayEnforcement((TextView) rootView.findViewById(R.id.laborReferralMechanismTextView), enforcements.get("Labor_Referral_Mechanism"));
             }
             else {
-                //displayEnforcement((TextView) rootView.findViewById(R.id.criminalInitialTrainingTextView), enforcements.get("Criminal_New_Employee_Training"));
+                displayEnforcement((TextView) rootView.findViewById(R.id.criminalInitialTrainingTextView), enforcements.get("Criminal_New_Employee_Training"));
                 //displayEnforcement((TextView) rootView.findViewById(R.id.criminalNewLawTrainingTextView), enforcements.get("Criminal_New_Law_Training"));
                 //displayEnforcement((TextView) rootView.findViewById(R.id.criminalRefresherCoursesTextView), enforcements.get("Criminal_Refresher_Courses"));
                 displayEnforcement((TextView) rootView.findViewById(R.id.criminalInvestigationsTextView), enforcements.get("Criminal_Investigations"));
@@ -179,7 +180,7 @@ private void setMultipleTerritoryValues(View rootView, Hashtable<String, Country
                 displayTerritories((LinearLayout) rootView.findViewById(R.id.laborNewLawsLinearLayout), enforcements.get("Labor_New_Law_Training"));
                 displayTerritories((LinearLayout) rootView.findViewById(R.id.laborRefresherCoursesLinearLayout), enforcements.get("Labor_Refresher_Courses"));
                 displayTerritories((LinearLayout) rootView.findViewById(R.id.laborInspectionsLinearLayout), enforcements.get("Labor_Inspections"));
-                displayTerritories((LinearLayout) rootView.findViewById(R.id.laborWorksiteInspectionsLinearLayout), enforcements.get("Labor_Worksite_Inspections"));
+                displayTerritories((LinearLayout) rootView.findViewById(R.id.laborWorksiteInspectionsLinearLayout), enforcements.get("Labor_Inspections"));
                 displayTerritories((LinearLayout) rootView.findViewById(R.id.laborInspectorsMeetILOLinearLayout), enforcements.get("Labor_Inspectors_Intl_Standards"));
                 //displayTerritories((LinearLayout) rootView.findViewById(R.id.laborDeskReviewsLinearLayout), enforcements.get("Labor_Desk_Review_Inspections"));
                 displayTerritories((LinearLayout) rootView.findViewById(R.id.laborViolationsFoundLinearLayout), enforcements.get("Labor_Violations"));
@@ -207,7 +208,12 @@ private void setMultipleTerritoryValues(View rootView, Hashtable<String, Country
 
 
         private void displayEnforcement(TextView view, Country.Enforcement enforcement) {
-            displayValue(view, enforcement.type, enforcement.value);
+            if (enforcement != null) {
+                displayValue(view, enforcement.type, enforcement.value);
+            }
+
+
+
         }
 
         private void displayTerritories(LinearLayout layout, Country.TerritoryEnforcement enforcement) {

diff --git a/app/src/main/java/gov/dol/childlabor/charts/AssessmentFragment.java b/app/src/main/java/gov/dol/childlabor/charts/AssessmentFragment.java
@@ -54,8 +54,8 @@ public static AssessmentFragment getInstance(Map<String, Integer> stringIntegerM
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View rootView =  inflater.inflate(R.layout.activity_assessment_levels,container,false);
-        if (getActivity().getTitle().equals("Labor Inspector Meet ILO")) {
-            ((TextView)rootView.findViewById(R.id.text)).setText(getActivity().getTitle() + " "+getArguments().getString("TITLE"));
+        if (getActivity().getTitle().equals("ILO Rec for Labor Inspectors Met")) {
+            ((TextView)rootView.findViewById(R.id.text)).setText(getActivity().getTitle() + "-"+getArguments().getString("TITLE"));
         } else {
             ((TextView)rootView.findViewById(R.id.text)).setText("Advancement Level for "+getArguments().getString("TITLE"));
         }

diff --git a/app/src/main/java/gov/dol/childlabor/charts/AssessmentLevelsChart.java b/app/src/main/java/gov/dol/childlabor/charts/AssessmentLevelsChart.java
@@ -44,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
         isLaborInspectorMeetILOByRegion = getIntent().getBooleanExtra("LABOR_INSPECTOR_MEET_ILO_BY_REGION",false);
 
         if (isLaborInspectorMeetILOByRegion) {
-            setTitle("Labor Inspector Meet ILO");
+            setTitle("ILO Rec for Labor Inspectors Met");
         } else {
             setTitle("Assessment Levels By Region");
         }

diff --git a/app/src/main/res/layout/activity_charts_list.xml b/app/src/main/res/layout/activity_charts_list.xml
@@ -80,7 +80,7 @@
                 android:id="@+id/laborInspectorILO"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Labor Inspector Meet ILO by Region"
+                android:text="ILO Rec for Labor Inspectors Met"
                 android:drawableRight="@drawable/ic_baseline_keyboard_arrow_right_24"
                 app:drawableEndCompat="@drawable/ic_baseline_keyboard_arrow_right_24" />
 

diff --git a/app/src/main/res/layout/content_menu_page.xml b/app/src/main/res/layout/content_menu_page.xml
@@ -170,7 +170,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="Comply Chain app"
             android:paddingBottom="10dp"
-            android:text="Comply Chain app"
+            android:text="Comply Chain"
             android:textColor="#3d3d3d"
             android:textSize="16sp"
              />
@@ -185,9 +185,9 @@
             android:clickable="true"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:contentDescription="New: Better Trade Tool"
+            android:contentDescription="Better Trade Tool"
             android:paddingBottom="10dp"
-            android:text="NEW: Better Trade Tool"
+            android:text="Better Trade Tool"
             android:textColor="#3d3d3d"
             android:textSize="16sp"
             />

diff --git a/app/src/main/res/layout/fragment_tabbed_enforcement_criminal.xml b/app/src/main/res/layout/fragment_tabbed_enforcement_criminal.xml
@@ -63,7 +63,8 @@
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             android:paddingLeft="20dp"
-            android:paddingRight="20dp">
+            android:paddingRight="20dp"
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="0dp"
@@ -163,7 +164,8 @@
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             android:paddingLeft="20dp"
-            android:paddingRight="20dp">
+            android:paddingRight="20dp"
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="0dp"

diff --git a/app/src/main/res/layout/fragment_tabbed_enforcement_labor.xml b/app/src/main/res/layout/fragment_tabbed_enforcement_labor.xml
@@ -175,7 +175,8 @@
             android:textAllCaps="true"
             android:text="Training for Labor Inspectors:"
             android:background="#dadada"
-            android:contentDescription="Training for Labor Inspectors, heading" />
+            android:contentDescription="Training for Labor Inspectors, heading"
+            android:visibility="gone"/>
 
         <LinearLayout
             android:orientation="horizontal"
@@ -184,7 +185,8 @@
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             android:paddingLeft="20dp"
-            android:paddingRight="20dp">
+            android:paddingRight="20dp"
+            android:visibility="visible">
 
             <TextView
                 android:layout_width="0dp"
@@ -345,7 +347,8 @@
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             android:paddingLeft="20dp"
-            android:paddingRight="20dp">
+            android:paddingRight="20dp"
+            android:visibility="gone">
 
         </LinearLayout>