From bf34d5790503da4ab1001f55811f504deccd253b Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Tue, 9 Jul 2024 07:31:46 +0500
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20100?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  2 +-
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  2 +-
 app/build.gradle                              |  4 +-
 .../java/kz/istt/locust/DbOpenHelper.java     | 15 +++++
 .../kz/istt/locust/LocustHealthActivity.java  |  4 +-
 .../res/layout-land/activity_locust_del.xml   |  1 -
 .../layout-land/activity_locust_health.xml    | 11 ----
 .../res/layout-large/activity_locust_del.xml  |  5 --
 .../layout-large/activity_locust_health.xml   | 57 ++-----------------
 .../main/res/layout/activity_locust_del.xml   |  1 -
 .../res/layout/activity_locust_health.xml     |  9 ---
 12 files changed, 26 insertions(+), 87 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb865f6..385bcfd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e582162..08bca8d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -77,7 +77,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 9117ac2..c413f81 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     namespace 'kz.istt.locust'
     compileSdk 33
diff --git a/app/src/main/java/kz/istt/locust/DbOpenHelper.java b/app/src/main/java/kz/istt/locust/DbOpenHelper.java
index 63316fc..02afd86 100644
--- a/app/src/main/java/kz/istt/locust/DbOpenHelper.java
+++ b/app/src/main/java/kz/istt/locust/DbOpenHelper.java
@@ -1145,6 +1145,21 @@ public class DbOpenHelper extends SQLiteOpenHelper
 
 			sql = "ALTER TABLE frmlocustdel ADD locust_purpose_id integer;";
 			db.execSQL(sql);
+			sql = """
+				update main.frmlocustdel set
+					locust_purpose_id =
+						CASE
+							WHEN locust_swarm  THEN 3
+							WHEN locust_kuliguli THEN 2
+							WHEN locust_imago THEN 1
+							WHEN locust_sparse THEN 4
+							ELSE locust_purpose_id
+						END
+				where
+					locust_purpose_id is null;
+			""";
+			db.execSQL(sql);
+
 			sql = "ALTER TABLE frmlocustdel ADD efficacy_impact_id integer;";
 			db.execSQL(sql);
 			sql = "ALTER TABLE frmlocustdel ADD insecticide_diluted_id integer;";
diff --git a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
index c878f57..03c3bb8 100644
--- a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
@@ -297,7 +297,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 
 		guiTableHealth.add(m_Filled, "filled");
 
-
+/*
 		btnInfoSafNonTargetEffectPerson = findViewById(R.id.btnInfoSafNonTargetEffectPerson);
 		btnInfoSafNonTargetEffectPerson.setOnClickListener(
 				new OnClickListener()
@@ -319,7 +319,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 					}
 				}
 		);
-
+*/
 
 		//edtImage1 = (EditText) findViewById(R.id.edtImage1); // Фото
 		//guiTable.add(edtImage1, "image_name1");
diff --git a/app/src/main/res/layout-land/activity_locust_del.xml b/app/src/main/res/layout-land/activity_locust_del.xml
index 0f45a8b..46199f7 100644
--- a/app/src/main/res/layout-land/activity_locust_del.xml
+++ b/app/src/main/res/layout-land/activity_locust_del.xml
@@ -689,7 +689,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView13"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:paddingLeft="10dp"
diff --git a/app/src/main/res/layout-land/activity_locust_health.xml b/app/src/main/res/layout-land/activity_locust_health.xml
index 95f79b3..8221942 100644
--- a/app/src/main/res/layout-land/activity_locust_health.xml
+++ b/app/src/main/res/layout-land/activity_locust_health.xml
@@ -335,7 +335,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView13"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:paddingLeft="10dp"
@@ -522,7 +521,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView13"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:paddingLeft="10dp"
@@ -2061,7 +2059,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btnInfoSafNonTargetEffectPerson"
                         style="@style/Widget.MaterialComponents.Button.Icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -2079,7 +2076,6 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/llEffectiveness"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
@@ -2120,7 +2116,6 @@
                         app:boxBackgroundColor="@color/transparent">
 
                         <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/edtEffMortality"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -2211,7 +2206,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btnInfoSafNonTargetEffectPerson"
                         style="@style/Widget.MaterialComponents.Button.Icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -2229,7 +2223,6 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/llEffectiveness"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
@@ -2267,7 +2260,6 @@
                         app:boxBackgroundColor="@color/transparent">
 
                         <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/edtEffMortality2"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -2930,7 +2922,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btnInfoSafNonTargetEffectPerson"
                         style="@style/Widget.MaterialComponents.Button.Icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -3339,7 +3330,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btnInfoSafNonTargetEffectPerson"
                         style="@style/Widget.MaterialComponents.Button.Icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -3853,7 +3843,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btnInfoSafNonTargetEffectPerson"
                         style="@style/Widget.MaterialComponents.Button.Icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-large/activity_locust_del.xml b/app/src/main/res/layout-large/activity_locust_del.xml
index a551e05..e58a87b 100644
--- a/app/src/main/res/layout-large/activity_locust_del.xml
+++ b/app/src/main/res/layout-large/activity_locust_del.xml
@@ -634,7 +634,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView13"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:paddingLeft="10dp"
@@ -878,7 +877,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvInsFormulation"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Formulation"
@@ -1704,7 +1702,6 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
-                    android:id="@+id/tvEffMethod"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Type_of_assessed_biological_impact"
@@ -1778,7 +1775,6 @@
                     android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
-                        android:id="@+id/tvEffMethod"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/Method_of_biological_efficiency_estimation"
@@ -2172,7 +2168,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView43"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/If_Yes_type_of_organisms_and_effects_description"
diff --git a/app/src/main/res/layout-large/activity_locust_health.xml b/app/src/main/res/layout-large/activity_locust_health.xml
index 91e35c8..9476b35 100644
--- a/app/src/main/res/layout-large/activity_locust_health.xml
+++ b/app/src/main/res/layout-large/activity_locust_health.xml
@@ -173,7 +173,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvDate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Date"
@@ -377,7 +376,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvDate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Date_of_monitoring"
@@ -472,7 +470,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvVegHeight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Number_of_agents_in_control_team"
@@ -499,7 +496,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvVegHeight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Number_of_agents_previously_trained_in_insecticide_handling_and_application"
@@ -571,7 +567,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvVegHeight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Height_cm"
@@ -803,7 +798,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvInsFormulation"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Formulation"
@@ -843,7 +837,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvInsFormulation"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Commercial_product_diluted"
@@ -859,13 +852,12 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvVegHeight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Working_fluid_dilution_ratio"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
                 <EditText
-                    android:id="@+id/edtBrigadeCount"
+                    android:id="@+id/edtInsProportion"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -1341,7 +1333,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvVegHeight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/If_Yes_which_part_of_the_sprayer_shows_leakage"
@@ -1402,7 +1393,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvSprBarrierSpace"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Type_of_treatment"
@@ -1478,7 +1468,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvSprSpeed"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Area_treated_ha"
@@ -1520,7 +1509,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSprSpeed"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Actual_volume_application_rate_L_ha"
@@ -1562,7 +1550,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvVegHeight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Remarks_about_the_observed_spray_application_practice"
@@ -1609,7 +1596,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvSprBarrierSpace"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Flow_rate_of_sprayer_verified_during_this_monitoring_visit"
@@ -1626,7 +1612,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSprSpeed"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Calibration_time_min"
@@ -1665,7 +1650,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSprSpeed"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Flow_rate_L_min"
@@ -1691,7 +1675,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvSprBarrierSpace"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Droplet_deposition_verified_during_this_monitoring_visit"
@@ -1802,7 +1785,6 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/llEffectiveness"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
@@ -1854,7 +1836,6 @@
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
                     <EditText
-                        android:id="@+id/edtEffMortality"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -1947,7 +1928,6 @@
                         android:text="@string/Biological_efficiency_of_treatment"
                         android:textAppearance="?android:attr/textAppearanceSmall"/>
                     <EditText
-                        android:id="@+id/edtEffMortality2"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -2135,7 +2115,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvDescription"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Remarks_with_respect_to_type_and_state_of_protective_clothing"
@@ -2181,7 +2160,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvEffTime"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Number_of_operators_with_a_Pesticide_Use_Passport"
@@ -2266,7 +2244,6 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
-                    android:id="@+id/tvDescription"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/If_yes_describe_what_happened_description"
@@ -2418,7 +2395,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Accidental_contamination_observed_or_reported"
@@ -2441,7 +2417,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView43"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/If_yes_where_and_what_type_of_contamination"
@@ -2488,7 +2463,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView43"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/If_yes_where_and_what_type_of_effect"
@@ -2500,7 +2474,7 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <EditText
-                    android:id="@+id/edtSafNonTargetEffect2"
+                    android:id="@+id/edtSafNonTargetEffect"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:importantForAutofill="no"
@@ -2543,7 +2517,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/If_yes_describe_follow_up_actions"
+                    android:text="@string/If_yes_where_and_what_type_of_effect"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
             </LinearLayout>
 
@@ -2566,7 +2540,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView43"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/If_reported_by_another_person_by_whom"
@@ -2578,7 +2551,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <EditText
-                    android:id="@+id/btnInfoSafNonTargetEffectPerson"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:importantForAutofill="no"
@@ -2597,7 +2569,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <dbfields.TextViewHTML
-                    android:id="@+id/tvSafIncident"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="3"
@@ -2623,7 +2594,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafIncidentEffect"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/If_Yes_type_of_incident_and_reported_by_whom_description"
@@ -2652,7 +2622,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <dbfields.TextViewHTML
-                    android:id="@+id/tvSafIncident"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="3"
@@ -2677,7 +2646,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafIncidentEffect"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/If_yes_describe_follow_up_actions"
@@ -2848,7 +2816,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Any_dwellings_or_housing_nearby_the_treatment"
@@ -2871,7 +2838,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafIncidentEffect"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Distance_from_the_closest_edge_of_the_treated_area_m_to_the_nearest_housing"
@@ -2899,7 +2865,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Were_buffer_zones_respected"
@@ -2915,7 +2880,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Was_exposure_of_the_dwellings_housing_probable"
@@ -2930,7 +2894,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Were_inhabitants_informed_about_the_insecticide_application"
@@ -2957,7 +2920,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Any_surface_waters_nearby_the_treatment"
@@ -2980,7 +2942,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafIncidentEffect"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Distance_from_the_closest_edge_of_the_treated_area_m_to_the_nearest_surface_water"
@@ -3008,7 +2969,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Were_buffer_zones_respected"
@@ -3023,20 +2983,16 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/spiRiskWaterImpact"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Was_exposure_of_the_surface_water_probable"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
                 <dbfields.SpinnerDB
-                    android:id="@+id/spiRiskApiaryInformed"
+                    android:id="@+id/spiRiskWaterImpact"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
-
-
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
@@ -3047,7 +3003,6 @@
                     android:contentDescription="@null"
                     android:layout_gravity="center_vertical"/>
                 <TextView
-                    android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Any_apiculture_nearby_the_treatment"
@@ -3070,7 +3025,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafIncidentEffect"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Distance_from_the_closest_edge_of_the_treated_area_m_to_the_apiary"
@@ -3097,7 +3051,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Were_beekeepers_informed_about_the_insecticide_application"
@@ -3114,7 +3067,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafIncidentEffect"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Which_measures_were_taken_to_reduce_the_risks_for_honeybees"
@@ -3142,7 +3094,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Was_exposure_of_honeybees_probable"
diff --git a/app/src/main/res/layout/activity_locust_del.xml b/app/src/main/res/layout/activity_locust_del.xml
index aa89078..0e92aa9 100644
--- a/app/src/main/res/layout/activity_locust_del.xml
+++ b/app/src/main/res/layout/activity_locust_del.xml
@@ -766,7 +766,6 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView13"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:paddingLeft="10dp"
diff --git a/app/src/main/res/layout/activity_locust_health.xml b/app/src/main/res/layout/activity_locust_health.xml
index e80c2da..ccbf38f 100644
--- a/app/src/main/res/layout/activity_locust_health.xml
+++ b/app/src/main/res/layout/activity_locust_health.xml
@@ -2241,7 +2241,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btnInfoSafNonTargetEffectPerson"
                         style="@style/Widget.MaterialComponents.Button.Icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -2259,7 +2258,6 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/llEffectiveness"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
@@ -2300,7 +2298,6 @@
                         app:boxBackgroundColor="@color/transparent">
 
                         <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/edtEffMortality"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -2391,7 +2388,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btnInfoSafNonTargetEffectPerson"
                         style="@style/Widget.MaterialComponents.Button.Icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -2409,7 +2405,6 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/llEffectiveness"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
@@ -2447,7 +2442,6 @@
                         app:boxBackgroundColor="@color/transparent">
 
                         <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/edtEffMortality"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -3111,7 +3105,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btnInfoSafNonTargetEffectPerson"
                         style="@style/Widget.MaterialComponents.Button.Icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -3520,7 +3513,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btnInfoSafNonTargetEffectPerson"
                         style="@style/Widget.MaterialComponents.Button.Icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -4034,7 +4026,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/btnInfoSafNonTargetEffectPerson"
                         style="@style/Widget.MaterialComponents.Button.Icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"