From bb99f1644e4a9c7b62e19607e49cfc56187abc24 Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Thu, 15 Aug 2024 17:10:05 +0500
Subject: [PATCH] =?UTF-8?q?+=D0=BF=D0=BE=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kz/istt/locust/LocustHealthActivity.java  | 25 +++++++++++++++++++
 .../layout-land/activity_locust_health.xml    |  1 +
 .../layout-large/activity_locust_health.xml   | 11 +++-----
 .../res/layout/activity_locust_health.xml     |  1 +
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
index 71fb70e..efa5829 100644
--- a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
@@ -1082,6 +1082,22 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 		((selectDB)spiSprObservation).addField(getString(R.string.Yes), "1");
 		((selectDB)spiSprObservation).addField(getString(R.string.No), "0");
 
+		// Чтоб при изменении значения скрывались соответствующие поля
+		((selectDB)spiSprObservation).setOnChangeValueListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				LinearLayout llSprDescription = findViewById(R.id.llSprDescription);
+				if(((selectDB)spiSprObservation).getValue() != null && ((selectDB)spiSprObservation).getValue().equals("1")) {
+					llSprDescription.setVisibility(View.VISIBLE);
+				}else{
+					edtSprDescription.setText("");
+					llSprDescription.setVisibility(View.GONE);
+				}
+			}
+		});
+
 		//H Замечания относительно наблюдаемой практики опрыскивания
 		edtSprDescription = (EditText) findViewById(R.id.edtSprDescription);
 		guiTableHealth.add(edtSprDescription, "spr_description");
@@ -3107,6 +3123,15 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 		//boolean f;
 		//int c;
 
+		//Если проводилось наблюдение за опрыскиванием: соблюдалась ли надлежащая практика применения инсектицидов?
+		LinearLayout llSprDescription = findViewById(R.id.llSprDescription);
+		if(((selectDB)spiSprObservation).getValue() != null && ((selectDB)spiSprObservation).getValue().equals("1")) {
+			llSprDescription.setVisibility(View.VISIBLE);
+		}else{
+			edtSprDescription.setText("");
+			llSprDescription.setVisibility(View.GONE);
+		}
+
 		//Имеются ли в непосредственной близости от обработок жилые дома или жилье (в радиусе 2 км вокруг обрабатываемого участка)
 		LinearLayout llRiskHouseDistance = findViewById(R.id.llRiskHouseDistance);
 		LinearLayout llRiskHouseBufferZones  = findViewById(R.id.llRiskHouseBufferZones);
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 3aed2c8..5f66989 100644
--- a/app/src/main/res/layout-land/activity_locust_health.xml
+++ b/app/src/main/res/layout-land/activity_locust_health.xml
@@ -2105,6 +2105,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llSprDescription"
                 android:baselineAligned="false"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
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 74d33a5..3c9660f 100644
--- a/app/src/main/res/layout-large/activity_locust_health.xml
+++ b/app/src/main/res/layout-large/activity_locust_health.xml
@@ -2044,22 +2044,19 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llSprDescription"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:orientation="vertical">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Remarks_about_the_observed_spray_application_practice"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <EditText
                     android:id="@+id/edtSprDescription"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:importantForAutofill="no"
diff --git a/app/src/main/res/layout/activity_locust_health.xml b/app/src/main/res/layout/activity_locust_health.xml
index cb56389..000af2f 100644
--- a/app/src/main/res/layout/activity_locust_health.xml
+++ b/app/src/main/res/layout/activity_locust_health.xml
@@ -2182,6 +2182,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llSprDescription"
                 android:baselineAligned="false"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"