From 2c29159b51a0ac7de861c80691b54271a8afe44c Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Mon, 17 Jun 2024 07:25:05 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D1=82=D0=B8=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D1=84=D0=BE=D1=80=D0=BC=D1=83?=
 =?UTF-8?q?=20=D0=B7=D0=B4=D0=BE=D1=80=D0=BE=D0=B2=D1=8C=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |    2 +-
 .idea/gradle.xml                              |    3 +-
 .idea/misc.xml                                |   10 +-
 app/src/main/AndroidManifest.xml              |   30 +-
 .../java/kz/istt/locust/DbOpenHelper.java     |  120 +-
 .../kz/istt/locust/LocustHealthActivity.java  | 3523 +++++++++--------
 .../java/kz/istt/locust/MainActivity.java     |    2 +-
 .../java/kz/istt/locust/SetupActivity.java    |   24 +
 .../main/java/kz/istt/locust/XMLTools.java    |    2 +-
 .../layout-land/activity_locust_health.xml    | 3199 +++++++++++----
 .../main/res/layout-large/activity_locust.xml |  840 ++--
 .../res/layout-large/activity_locust_del.xml  |  827 ++--
 .../layout-large/activity_locust_health.xml   | 2966 +++++++++-----
 .../res/layout/activity_locust_health.xml     |   28 +-
 app/src/main/res/layout/activity_setup.xml    |   25 +
 app/src/main/res/values-az/strings.xml        |    1 +
 app/src/main/res/values-hy/strings.xml        |    1 +
 app/src/main/res/values-ka/strings.xml        |    1 +
 app/src/main/res/values-kg/strings.xml        |    1 +
 app/src/main/res/values-kk/strings.xml        |    1 +
 app/src/main/res/values-ps/strings.xml        |    1 +
 app/src/main/res/values-ru/strings.xml        |   11 +-
 app/src/main/res/values-tg/strings.xml        |    1 +
 app/src/main/res/values-tk/strings.xml        |    1 +
 app/src/main/res/values-uz/strings.xml        |    1 +
 app/src/main/res/values/strings.xml           |   11 +
 26 files changed, 7035 insertions(+), 4597 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 5b230c0..385bcfd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,9 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8c8437c..08bca8d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -33,7 +33,7 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="15">
+        <list size="17">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
@@ -49,12 +49,14 @@
           <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
           <item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
           <item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
+          <item index="15" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
+          <item index="16" class="java.lang.String" itemvalue="jakarta.annotation.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="14">
+        <list size="16">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@@ -69,11 +71,13 @@
           <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
           <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
           <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="14" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
+          <item index="15" class="java.lang.String" itemvalue="jakarta.annotation.Nonnull" />
         </list>
       </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/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33bf1a5..5427c19 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -51,7 +51,7 @@
 
         <activity
             android:name=".MapsActivity"
-            android:label="@string/title_activity_maps"></activity>
+            android:label="@string/title_activity_maps"/>
         <activity android:name=".SplashScreen"
             android:exported="true">
             <intent-filter android:label="ASDC">
@@ -62,15 +62,15 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"></activity>
+            android:label="@string/app_name"/>
         <activity
             android:name=".SetupActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/title_activity_setup"></activity>
+            android:label="@string/title_activity_setup"/>
         <activity
             android:name=".ScanActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/Authorize_the_tablet_by_QR_code"></activity>
+            android:label="@string/Authorize_the_tablet_by_QR_code"/>
         <activity
             android:name=".LocustActivity"
             android:configChanges="screenSize"
@@ -78,22 +78,24 @@
         <activity
             android:name=".LocustListActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/title_activity_locust_list"></activity>
+            android:label="@string/title_activity_locust_list"/>
         <activity
             android:name=".LocustDelListActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/title_activity_locust_del_list"></activity>
+            android:label="@string/title_activity_locust_del_list"/>
+        <activity
+            android:name=".LocustHealthListActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/title_activity_locust_health_list"/>
+        <activity
+            android:name=".LocustHealthActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/title_activity_locust_health"/>
         <activity
             android:name=".LocustDelActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/title_activity_locust_del"></activity>
-        <!--
-activity
-            android:name="kz.istt.locust.ImagePickActivity"
-            android:label="@string/title_activity_image_pick"
-            android:configChanges="orientation|screenSize">
-        </activity
-        -->
+            android:label="@string/title_activity_locust_del"/>
+
         <!--
 activity
             android:name="kz.istt.locust.GeoMapActivity"
diff --git a/app/src/main/java/kz/istt/locust/DbOpenHelper.java b/app/src/main/java/kz/istt/locust/DbOpenHelper.java
index c460b37..e6878aa 100644
--- a/app/src/main/java/kz/istt/locust/DbOpenHelper.java
+++ b/app/src/main/java/kz/istt/locust/DbOpenHelper.java
@@ -40,40 +40,10 @@ public class DbOpenHelper extends SQLiteOpenHelper
 	{
 		super(context, DB_NAME, null, DB_VERSION);
 		_context = context;
-/*
-		SQLiteDatabase db = this.getWritableDatabase();
-		db.execSQL("DROP TABLE IF EXISTS frmlocust");
-		db.execSQL("DROP TABLE IF EXISTS frmlocust_locations");
-		db.execSQL("DROP TABLE IF EXISTS frmlocustdel");
-		db.execSQL("DROP TABLE IF EXISTS frmlocustdel_locations");
-		db.execSQL("DROP TABLE IF EXISTS CountriesRegions");
-		db.execSQL("DROP TABLE IF EXISTS CountriesRegionsPoints");
-		db.execSQL("DROP TABLE IF EXISTS Countries");
-		db.execSQL("DROP TABLE IF EXISTS LocustsTypes"); //Табличка видов саранчи
-		db.execSQL("DROP TABLE IF EXISTS _languages");
-		db.execSQL("DROP TABLE IF EXISTS _translations");
-		db.execSQL("DROP TABLE IF EXISTS _user");
-		db.execSQL("DROP TABLE IF EXISTS Borns"); //Справочник отрождение "Начало", "Массовое".
-		db.execSQL("DROP TABLE IF EXISTS list_density"); //Справочник плотност: «низкая», «средняя» и «высокая».
-		db.execSQL("DROP TABLE IF EXISTS list_phase");
-		db.execSQL("DROP TABLE IF EXISTS list_mortality"); //Метод подсчёта смертности
-		db.execSQL("DROP TABLE IF EXISTS list_directions"); //Стороны света направления
-		db.execSQL("DROP TABLE IF EXISTS list_damage"); //Справочник повреждений растительного покрова
-		db.execSQL("DROP TABLE IF EXISTS list_greenery");
-		db.execSQL("DROP TABLE IF EXISTS list_biotope");
-		db.execSQL("DROP TABLE IF EXISTS list_cover");
-		db.execSQL("DROP TABLE IF EXISTS list_age");
-		db.execSQL("DROP TABLE IF EXISTS list_actions");
-		db.execSQL("DROP TABLE IF EXISTS list_paintings");
-		db.execSQL("DROP TABLE IF EXISTS list_behaviors"); //
-		db.execSQL("DROP TABLE IF EXISTS list_breeding"); //«Одиночные, разреженные, группы»
-		db.execSQL("DROP TABLE IF EXISTS list_capacities"); //«Полнообъемное», «Малообъемное», «Ультрамалообъемное».
-		db.execSQL("DROP TABLE IF EXISTS list_markings");
-		db.execSQL("DROP TABLE IF EXISTS sprayers"); //Опрыскиватели: "Трактор", "Самолёт" итд.
-		db.execSQL("DROP TABLE IF EXISTS sprayers_types"); //Виды опрыскивания: "Авиа", "Наземное", "Ручное".
-		db.execSQL("DROP TABLE IF EXISTS Fledgling");
-		onCreate(db);
-/**/
+
+
+		//dropAllTables(this.getWritableDatabase());
+		//onCreate(db);
 	}
 
 	/** Содание новой базы если её нет
@@ -732,8 +702,6 @@ public class DbOpenHelper extends SQLiteOpenHelper
 
 				"frmlocustdel_uid text NOT NULL," + //На основе какой формы заполняется анкета
 
-
-
 				"filled boolean," + //Заполнена ли анкета (спец поле а не проверка на NULL потому что обязательность полей можно выставлять галочкой в интерфейсе)
 				"device_id text, " + //Идентификатор устройства
 
@@ -1370,46 +1338,54 @@ public class DbOpenHelper extends SQLiteOpenHelper
 
 		if(oldVersion < newVersion) //Это условие выполняется: если совсем старые версии и не знаю что поменялось...
 		{
-			//db.execSQL("DROP TABLE IF EXISTS android_metadata");
-
-			db.execSQL("DROP TABLE IF EXISTS frmlocust");
-			db.execSQL("DROP TABLE IF EXISTS frmlocust_locations");
-			db.execSQL("DROP TABLE IF EXISTS frmlocustdel");
-			db.execSQL("DROP TABLE IF EXISTS frmlocustdel_locations");
-			db.execSQL("DROP TABLE IF EXISTS CountriesRegions");
-			db.execSQL("DROP TABLE IF EXISTS CountriesRegionsPoints");
-			db.execSQL("DROP TABLE IF EXISTS Countries");
-			db.execSQL("DROP TABLE IF EXISTS LocustsTypes"); //Табличка видов саранчи
-			db.execSQL("DROP TABLE IF EXISTS _languages");
-			db.execSQL("DROP TABLE IF EXISTS _translations");
-			db.execSQL("DROP TABLE IF EXISTS _user");
-			db.execSQL("DROP TABLE IF EXISTS Borns"); //Справочник отрождение "Начало", "Массовое".
-			db.execSQL("DROP TABLE IF EXISTS list_density"); //Справочник плотност: «низкая», «средняя» и «высокая».
-			db.execSQL("DROP TABLE IF EXISTS list_phase");
-			db.execSQL("DROP TABLE IF EXISTS list_mortality"); //Метод подсчёта смертности
-			db.execSQL("DROP TABLE IF EXISTS list_directions"); //Стороны света направления
-			db.execSQL("DROP TABLE IF EXISTS list_damage"); //Справочник повреждений растительного покрова
-			db.execSQL("DROP TABLE IF EXISTS list_greenery");
-			db.execSQL("DROP TABLE IF EXISTS list_biotope");
-			db.execSQL("DROP TABLE IF EXISTS list_cover");
-			db.execSQL("DROP TABLE IF EXISTS list_age");
-			db.execSQL("DROP TABLE IF EXISTS list_actions");
-			db.execSQL("DROP TABLE IF EXISTS list_paintings");
-			db.execSQL("DROP TABLE IF EXISTS list_behaviors"); //
-			db.execSQL("DROP TABLE IF EXISTS list_breeding"); //«Одиночные, разреженные, группы»
-			db.execSQL("DROP TABLE IF EXISTS list_capacities"); //«Полнообъемное», «Малообъемное», «Ультрамалообъемное».
-			db.execSQL("DROP TABLE IF EXISTS list_markings");
-			db.execSQL("DROP TABLE IF EXISTS list_purpose");
-			db.execSQL("DROP TABLE IF EXISTS list_impact");
-			db.execSQL("DROP TABLE IF EXISTS list_diluted");
-			db.execSQL("DROP TABLE IF EXISTS sprayers"); //Опрыскиватели: "Трактор", "Самолёт" итд.
-			db.execSQL("DROP TABLE IF EXISTS sprayers_types"); //Виды опрыскивания: "Авиа", "Наземное", "Ручное".
-			db.execSQL("DROP TABLE IF EXISTS Fledgling");
-
+			dropAllTables(db);
 			onCreate(db);
 		}
 	}
 
+	public boolean dropAllTables(SQLiteDatabase db){
+
+		//db.execSQL("DROP TABLE IF EXISTS android_metadata");
+		db.execSQL("DROP TABLE IF EXISTS frmlocust");
+		db.execSQL("DROP TABLE IF EXISTS frmlocust_locations");
+		db.execSQL("DROP TABLE IF EXISTS frmlocustdel");
+		db.execSQL("DROP TABLE IF EXISTS frmlocustdel_locations");
+		db.execSQL("DROP TABLE IF EXISTS frmlocusthealth");
+		db.execSQL("DROP TABLE IF EXISTS frmlocusthealth_locations");
+
+		db.execSQL("DROP TABLE IF EXISTS CountriesRegions");
+		db.execSQL("DROP TABLE IF EXISTS CountriesRegionsPoints");
+		db.execSQL("DROP TABLE IF EXISTS Countries");
+		db.execSQL("DROP TABLE IF EXISTS LocustsTypes"); //Табличка видов саранчи
+		db.execSQL("DROP TABLE IF EXISTS _languages");
+		db.execSQL("DROP TABLE IF EXISTS _translations");
+		db.execSQL("DROP TABLE IF EXISTS _user");
+		db.execSQL("DROP TABLE IF EXISTS Borns"); //Справочник отрождение "Начало", "Массовое".
+		db.execSQL("DROP TABLE IF EXISTS list_density"); //Справочник плотност: «низкая», «средняя» и «высокая».
+		db.execSQL("DROP TABLE IF EXISTS list_phase");
+		db.execSQL("DROP TABLE IF EXISTS list_mortality"); //Метод подсчёта смертности
+		db.execSQL("DROP TABLE IF EXISTS list_directions"); //Стороны света направления
+		db.execSQL("DROP TABLE IF EXISTS list_damage"); //Справочник повреждений растительного покрова
+		db.execSQL("DROP TABLE IF EXISTS list_greenery");
+		db.execSQL("DROP TABLE IF EXISTS list_biotope");
+		db.execSQL("DROP TABLE IF EXISTS list_cover");
+		db.execSQL("DROP TABLE IF EXISTS list_age");
+		db.execSQL("DROP TABLE IF EXISTS list_actions");
+		db.execSQL("DROP TABLE IF EXISTS list_paintings");
+		db.execSQL("DROP TABLE IF EXISTS list_behaviors"); //
+		db.execSQL("DROP TABLE IF EXISTS list_breeding"); //«Одиночные, разреженные, группы»
+		db.execSQL("DROP TABLE IF EXISTS list_capacities"); //«Полнообъемное», «Малообъемное», «Ультрамалообъемное».
+		db.execSQL("DROP TABLE IF EXISTS list_markings");
+		db.execSQL("DROP TABLE IF EXISTS list_purpose");
+		db.execSQL("DROP TABLE IF EXISTS list_impact");
+		db.execSQL("DROP TABLE IF EXISTS list_diluted");
+		db.execSQL("DROP TABLE IF EXISTS sprayers"); //Опрыскиватели: "Трактор", "Самолёт" итд.
+		db.execSQL("DROP TABLE IF EXISTS sprayers_types"); //Виды опрыскивания: "Авиа", "Наземное", "Ручное".
+		db.execSQL("DROP TABLE IF EXISTS Fledgling");
+
+		return true;
+	}
+
 	//Функция по изменению типа столбца
 	public boolean changeTableFieldType()
 	{
diff --git a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
index 7e2000c..c878f57 100644
--- a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
@@ -236,8 +236,10 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 	public View btnDelImage3					= null;
 
 	private Uri mImageUri						= null;
-	private DBGUITable		guiTable			= null;
+	private DBGUITable		guiTableDel			= null;
+	private DBGUITable		guiTableHealth		= null;
 
+	public View btnInfoSafNonTargetEffectPerson	= null;
 
 	private boolean isInRange(double a, double b, double c)
 	{
@@ -260,7 +262,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_locust_del);
+		setContentView(R.layout.activity_locust_health);
 
 		//Загрузка сохранёного языка
 		Tools.loadLocale(this);
@@ -271,8 +273,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 		Intent intent = getIntent();
 		uid = intent.getStringExtra("uid"); // Параметр для Активити
 
-		guiTable = new DBGUITable(this, "frmlocustdel");
-		guiTable.add(uid, "uid");
+		guiTableHealth = new DBGUITable(this, "frmlocusthealth");
+		guiTableHealth.add(uid, "uid");
 
 		Integer user_id = null;
 		/*DbOpenHelper dboh = new DbOpenHelper(this);
@@ -284,1324 +286,1353 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 		}
 		cursor.close();
 		dboh.close();*/
-		guiTable.add(user_id, "user_id"); //Пользователя больше нет!!!
+		guiTableHealth.add(user_id, "user_id"); //Пользователя больше нет!!!
 		String device_id= Secure.getString(getContentResolver(), Secure.ANDROID_ID);
-		guiTable.add(device_id, "device_id"); //Идентификатор устройства
+		guiTableHealth.add(device_id, "device_id"); //Идентификатор устройства
 
 		List<String> list;
 		ArrayAdapter<String> dataAdapter;
 
 		scrollView1 = (ScrollView) findViewById(R.id.scrollView1);
 
-		guiTable.add(m_Filled, "filled");
+		guiTableHealth.add(m_Filled, "filled");
 
-		edtImage1 = (EditText) findViewById(R.id.edtImage1); // Фото
-		guiTable.add(edtImage1, "image_name1");
-		edtImage2 = (EditText) findViewById(R.id.edtImage2); // Фото
-		guiTable.add(edtImage2, "image_name2");
-		edtImage3 = (EditText) findViewById(R.id.edtImage3); // Фото
-		guiTable.add(edtImage3, "image_name3");
 
-		spiCountry = findViewById(R.id.spiCountry); // страна
-		guiTable.add(spiCountry, "country_id");
-		((selectDB)spiCountry).addField("", "");
+		btnInfoSafNonTargetEffectPerson = findViewById(R.id.btnInfoSafNonTargetEffectPerson);
+		btnInfoSafNonTargetEffectPerson.setOnClickListener(
+				new OnClickListener()
+				{
+					@Override
+					public void onClick(View v)
+					{
+						AlertDialog.Builder builder = new AlertDialog.Builder(LocustHealthActivity.this);
+						builder.setTitle(getString(R.string.Help))
+								.setMessage("This is your help text. You can customize this as needed.")
+								.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+									@Override
+									public void onClick(DialogInterface dialog, int id) {
+										dialog.dismiss();
+									}
+								});
+						AlertDialog dialog = builder.create();
+						dialog.show();
+					}
+				}
+		);
+
+
+		//edtImage1 = (EditText) findViewById(R.id.edtImage1); // Фото
+		//guiTable.add(edtImage1, "image_name1");
+		//edtImage2 = (EditText) findViewById(R.id.edtImage2); // Фото
+		//guiTable.add(edtImage2, "image_name2");
+		//edtImage3 = (EditText) findViewById(R.id.edtImage3); // Фото
+		//guiTable.add(edtImage3, "image_name3");
+
+		//spiCountry = findViewById(R.id.spiCountry); // страна
+		//guiTable.add(spiCountry, "country_id");
+		//((selectDB)spiCountry).addField("", "");
 		// Выбираем страны и заполняем поля
-		dboh = new DbOpenHelper(this);
-		cursor = dboh.getReadableDatabase().rawQuery("select id, name from countries where del=0 order by name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiCountry).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
+		//dboh = new DbOpenHelper(this);
+		//cursor = dboh.getReadableDatabase().rawQuery("select id, name from countries where del=0 order by name", null);
+		//if (cursor.moveToFirst())
+		//{
+		//	do
+		//	{
+		//		((selectDB)spiCountry).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+		//	} while (cursor.moveToNext());
+		//}
+		//cursor.close();
+		//dboh.close();
 
 		// Чтоб при изменении страны обновлялся список регионов
-		((selectDB)spiCountry).setOnChangeValueListener(new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				((selectDB)spiRegion).clearFields();
-				((selectDB)spiRegion).addField("", "");
-
-				if(((selectDB)spiCountry).getValue() != null && ((selectDB)spiCountry).getValue() != "")
-				{
-					DbOpenHelper dboh = new DbOpenHelper(LocustHealthActivity.this);
-					Cursor cursor = dboh.getReadableDatabase().rawQuery(
-							"select id, name from countriesregions where del=0 and country_id=" + ((selectDB)spiCountry).getValue() + " order by name", null);
-					if (cursor.moveToFirst())
-					{
-						do
-						{
-							((selectDB)spiRegion).addField(cursor.getString(cursor.getColumnIndex("name")),
-									cursor.getString(cursor.getColumnIndex("id")));
-						} while (cursor.moveToNext());
-					}
-					cursor.close();
-					dboh.close();
-				}
-			}
-		});
-
-		spiRegion = findViewById(R.id.spiRegion); // Регион
-		guiTable.add(spiRegion, "region_id");
-
-		edtArea = (EditText) findViewById(R.id.edtArea); // Район
-		guiTable.add(edtArea, "area");
-		edtDistrict = (EditText) findViewById(R.id.edtDistrict);
-		guiTable.add(edtDistrict, "district");
-
-		edtVillage = (EditText) findViewById(R.id.edtVillage); // Название местности либо урочища
-		guiTable.add(edtVillage, "village");
-		edtTerrain = (EditText) findViewById(R.id.edtTerrain); // Название местности либо урочища
-		guiTable.add(edtTerrain, "terrain");
-
-		edtObserver = (EditText) findViewById(R.id.edtObserver);
-		guiTable.add(edtObserver, "observer");
-		edtDate = (EditText) findViewById(R.id.edtDate); // Должна быть уникальной
-		guiTable.add(edtDate, "date");
-
-		View btnGetDate = (View) findViewById(R.id.btnGetDate);
-        OnClickListener clk0 = new OnClickListener() {
-            public void onClick(View v)
-            {
-                DatePickerDialog.OnDateSetListener myDateListener = new DatePickerDialog.OnDateSetListener() {
-                    @Override
-                    public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth)
-                    {
-
-                        //SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
-                        //format.setTimeZone(TimeZone.getTimeZone("UTC"));
-                        //LocustDelActivity.this.edtDate.setText(format.format(curDateTime));
-
-                        //Теперь выбираем время
-                    	OnTimeSetListener myDateListener = new OnTimeSetListener() {
-                    		@Override
-                    	    public void onTimeSet(TimePicker view, int hourOfDay, int minute)
-                            {
-                    			long val = Long.parseLong(((fieldDB) LocustHealthActivity.this.edtDate).getValue());
-                    			val += (hourOfDay*60+minute)*60;
-								((fieldDB) LocustHealthActivity.this.edtDate).setValue(String.valueOf(val));
-                            }
-                        };
-
-                        if(((fieldDB) LocustHealthActivity.this.edtDate).getValue()!=null && !((fieldDB) LocustHealthActivity.this.edtDate).getValue().equals(""))
-                        {
-                            Date time = new Date(Long.parseLong(((fieldDB) LocustHealthActivity.this.edtDate).getValue())*1000);
-                            Calendar myCal = new GregorianCalendar();
-                            myCal.setTime(time);
-                            int hour = myCal.get(Calendar.HOUR_OF_DAY);
-                            int minute = myCal.get(Calendar.MINUTE);
-                            TimePickerDialog tpd = new TimePickerDialog(LocustHealthActivity.this, R.style.AlertDialogTheme, myDateListener, hour, minute, true);
-                            tpd.show();
-                        }else
-                        {
-                            final Calendar myCal = Calendar.getInstance();
-                            int hour = myCal.get(Calendar.HOUR_OF_DAY);
-                            int minute = myCal.get(Calendar.MINUTE);
-                            TimePickerDialog tpd = new TimePickerDialog(LocustHealthActivity.this, R.style.AlertDialogTheme, myDateListener, hour, minute, true);
-                            tpd.show();
-                        }
-
-                        Date date = new Date(year-1900, monthOfYear, dayOfMonth);
-						((fieldDB) LocustHealthActivity.this.edtDate).setValue(String.valueOf(date.getTime()/1000));
-
-
-                    }
-                };
-
-                if(!LocustHealthActivity.this.edtDate.getText().toString().equals(""))
-                {
-                    Date date=null;
-                    SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
-                    //format.setTimeZone(TimeZone.getTimeZone("UTC"));
-                    try {
-                        date = format.parse(LocustHealthActivity.this.edtDate.getText().toString());
-                    } catch (ParseException e) {
-                        e.printStackTrace();
-                    }
-                    if(date!=null)
-                    {
-                        Calendar myCal = new GregorianCalendar();
-                        myCal.setTime(date);
-                        int day = myCal.get(Calendar.DAY_OF_MONTH);
-                        int month = myCal.get(Calendar.MONTH);
-                        int year = myCal.get(Calendar.YEAR);
-                        DatePickerDialog dpd = new DatePickerDialog(LocustHealthActivity.this, R.style.AlertDialogTheme, myDateListener, year, month, day);
-                        dpd.show();
-                    }
-                }else
-                {
-                    final Calendar c = Calendar.getInstance();
-                    int year = c.get(Calendar.YEAR);
-                    int month = c.get(Calendar.MONTH);
-                    int day = c.get(Calendar.DAY_OF_MONTH);
-
-                    DatePickerDialog dpd = new DatePickerDialog(LocustHealthActivity.this, R.style.AlertDialogTheme, myDateListener, year, month, day);
-                    dpd.show();
-                }
-            }
-        };
-        btnGetDate.setOnClickListener(clk0);
-
-		edtTimeZone = (EditText) findViewById(R.id.edtTimeZone);
-		guiTable.add(edtTimeZone,"timezone");
-
-		edtLatCenter = (EditText) findViewById(R.id.edtLatCenter); // Широта
-		guiTable.add(edtLatCenter, "lat_center");
-		edtLonCenter = (EditText) findViewById(R.id.edtLonCenter); // Долгота
-		guiTable.add(edtLonCenter, "lon_center");
-
-		ArrayList<LatLon> latlon = new ArrayList<LatLon>();
-		if(latlon.size()==0){
-			latlon.add(new LatLon(0, 0));
-		}
-		latlonList = findViewById(R.id.latlonList);
-		LatLonAdapter adapter = new LatLonAdapter(this, R.layout.list_lat_lon, latlon, this, latlonList);
-		latlonList.setAdapter(adapter);
-		adapter.clc=new OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				Tools.setListViewHeightBasedOnItems(LocustHealthActivity.this.latlonList);
-			}
-		};
-
-		edtInfestedArea = (EditText) findViewById(R.id.edtInfestedArea); // заселенная площадь(га)
-		guiTable.add(edtInfestedArea, "infested_area");
-		edtTreatedArea = (EditText) findViewById(R.id.edtTreatedArea); // обработанная площадь(га)
-		guiTable.add(edtTreatedArea, "treated_area");
-
-		spiVegType = findViewById(R.id.spiVegType); // Тип(Дикая, Культурная)
-		guiTable.add(spiVegType, "vegetation_type_id");
-		((selectDB)spiVegType).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_vegetation d where d.del=0 order by d.sort, d.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiVegType).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		edtVegHeight = (EditText) findViewById(R.id.edtVegHeight); // Высота (м)
-		guiTable.add(edtVegHeight, "vegetation_height");
-
-		spiVegCover = findViewById(R.id.spiVegCover); // Густота растительного покрова(%)
-		guiTable.add(spiVegCover, "vegetation_cover_id");
-		((selectDB)spiVegCover).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_cover d where d.del=0 order by d.sort, d.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiVegCover).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		edtVegCrop = (EditText) findViewById(R.id.edtVegCrop); // Перечисление культур
-		guiTable.add(edtVegCrop, "vegetation_crop");
-
-		spiVegDamage = findViewById(R.id.spiVegDamage); // Повреждения растительного покрова(%)
-		guiTable.add(spiVegDamage, "vegetation_damage");
-		((selectDB)spiVegDamage).addField("", "");
-		// Выбираем страны и заполняем поля
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_damage d where d.del=0 order by d.sort, d.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiVegDamage).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		edtVegDamageArea = (EditText) findViewById(R.id.edtVegDamageArea); // Площядь повреждения
-		guiTable.add(edtVegDamageArea, "vegetation_damage_area");
-
-		edtInsName = (EditText) findViewById(R.id.edtInsName); // коммерческое название
-		guiTable.add(edtInsName, "insecticide_name");
-		edtInsActiveSubstance = (EditText) findViewById(R.id.edtInsActiveSubstance); // Наименование активного вещества отравы
-		guiTable.add(edtInsActiveSubstance, "insecticide_active_substance");
-		edtInsConcentration = (EditText) findViewById(R.id.edtInsConcentration); // концентрация(г д.в./л или%)
-		guiTable.add(edtInsConcentration, "insecticide_concentration");
-		//edtInsConcentration.setFilters(new InputFilter[] { new InputFilterMinMax("0", "100") }); потому что текст
-
-		spiInsFormulation = findViewById(R.id.spiInsFormulation); // формуляция(УМО, КЭ, др.)
-		guiTable.add(spiInsFormulation, "insecticide_formulation_id");
-		((selectDB)spiInsFormulation).addField("", "");
-		// Выбираем страны и заполняем поля
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_formulation d where d.del=0 order by d.sort, d.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiInsFormulation).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		edtInsDose = (EditText) findViewById(R.id.edtInsDose); // норма расхода(л/га)
-		guiTable.add(edtInsDose, "insecticide_dose");
-		edtInsRate = (EditText) findViewById(R.id.edtInsRate); // расход рабочей жидкости(л/га)
-		guiTable.add(edtInsRate, "insecticide_rate");
-		edtInsUsedVolume = (EditText) findViewById(R.id.edtInsUsedVolume); // Общий объем использованной рабочей жидкости (л)
-		guiTable.add(edtInsUsedVolume, "insecticide_used_volume");
-
-		spiWeaTimeStart = findViewById(R.id.spiWeaTimeStart); // время начала
-		guiTable.add(spiWeaTimeStart, "weather_time_start");
-		((selectDB)spiWeaTimeStart).addField("", "");
-		for (int i = 0; i < 24; i++) {
-			((selectDB) spiWeaTimeStart).addField(String.valueOf(i), String.valueOf(i)+".0");
-		}
-		spiWeaTimeEnd = findViewById(R.id.spiWeaTimeEnd); // время окончания
-		guiTable.add(spiWeaTimeEnd, "weather_time_end");
-		((selectDB)spiWeaTimeEnd).addField("", "");
-		for (int i = 0; i < 24; i++) {
-			((selectDB) spiWeaTimeEnd).addField(String.valueOf(i), String.valueOf(i)+".0");
-		}
-		edtWeaTemperatureStart = (EditText) findViewById(R.id.edtWeaTemperatureStart); // Температура нач.(°C)
-		guiTable.add(edtWeaTemperatureStart, "weather_temperature_start");
-		edtWeaTemperatureEnd = (EditText) findViewById(R.id.edtWeaTemperatureEnd); // Температура кон.(°C)
-		guiTable.add(edtWeaTemperatureEnd, "weather_temperature_end");
-
-		edtWeaWindSpeedStart = (EditText) findViewById(R.id.edtWeaWindSpeedStart); // скорость ветра нач. (м/с)
-		guiTable.add(edtWeaWindSpeedStart, "weather_wind_speed_start");
-		edtWeaWindSpeedEnd = (EditText) findViewById(R.id.edtWeaWindSpeedEnd); // скорость ветра кон. (м/с)
-		guiTable.add(edtWeaWindSpeedEnd, "weather_wind_speed_end");
-
-		spiWindDirectionStart = findViewById(R.id.spiWindDirectionStart); // направление ветра нач.
-		guiTable.add(spiWindDirectionStart, "weather_direction_start");
-		((selectDB)spiWindDirectionStart).addField("", "");
-		dboh = new DbOpenHelper(this);
-
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name, degree from list_directions d where d.del=0 order by d.degree", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiWindDirectionStart).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		spiWindDirectionEnd = findViewById(R.id.spiWindDirectionEnd); // направление ветра кон.
-		guiTable.add(spiWindDirectionEnd, "weather_direction_end");
-		((selectDB)spiWindDirectionEnd).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name, degree from list_directions d where d.del=0 order by d.degree", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiWindDirectionEnd).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		spiSprayDirectionStart = findViewById(R.id.spiSprayDirectionStart); // направление опрыскивания нач.
-		guiTable.add(spiSprayDirectionStart, "weather_spray_direction_start");
-		((selectDB)spiSprayDirectionStart).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name, d.degree from list_directions d where d.del=0 and d.degree>=0 order by d.degree",
-						null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiSprayDirectionStart).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		spiSprayDirectionEnd = findViewById(R.id.spiSprayDirectionEnd); // направление опрыскивания кон.
-		guiTable.add(spiSprayDirectionEnd, "weather_spray_direction_end");
-		((selectDB)spiSprayDirectionEnd).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name, degree from list_directions d where d.del=0 and d.degree>=0 order by d.degree",
-						null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiSprayDirectionEnd).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		// locuststypes
-		/*spiLocSpecies = findViewById(R.id.spiLocSpeciese);
-		guiTable.add(spiLocSpecies, "locust_type_id");
-		((selectDB)spiLocSpecies).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select lt.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = lt.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),lt.name) name from LocustsTypes lt where lt.del=0 order by lt.sort,lt.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiLocSpecies).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();*/
-
-		spiLocHoppers = findViewById(R.id.spiLocHoppers); // Стадии личинок
-		guiTable.add(spiLocHoppers, "locust_hoppers_id");
-		((selectDB)spiLocHoppers).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select lt.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = lt.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),lt.name) name from list_age lt where lt.del=0 order by lt.sort,lt.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiLocHoppers).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		/*
-		 * list = new ArrayList<String>(); list.add(""); list.add(getString(R.string.Younger)); // Младшие list.add(getString(R.string.Middle)); // Средние list.add(getString(R.string.Senior)); // Старшие list.add(getString(R.string.Adult)); // Имаго
-		 *
-		 * dataAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, list); dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spiLocHoppers.setAdapter(dataAdapter);
-		 */
-
-//		spiImago = findViewById(R.id.spiImago); // Стаи (да, нет)
-//		guiTable.add(spiImago, "locust_imago");
-//		((selectDB)spiImago).addField("", "");
-//		((selectDB)spiImago).addField(getString(R.string.Have), "1");
-//		((selectDB)spiImago).addField(getString(R.string.No), "0");
-
-		edtLocDensity = (EditText) findViewById(R.id.edtLocDensity); // плотность на м2
-		guiTable.add(edtLocDensity, "locust_density");
-
-//		spiKuliguli = findViewById(R.id.spiKuliguli); // Кулиги (да, нет)
-//		guiTable.add(spiKuliguli, "locust_kuliguli");
-//		((selectDB)spiKuliguli).addField("", "");
-//		((selectDB)spiKuliguli).addField(getString(R.string.Have), "1");
-//		((selectDB)spiKuliguli).addField(getString(R.string.No), "0");
-
-//		spiSwarm = findViewById(R.id.spiSwarm); // Стаи (да, нет)
-//		guiTable.add(spiSwarm, "locust_swarm");
-//		((selectDB)spiSwarm).addField("", "");
-//		((selectDB)spiSwarm).addField(getString(R.string.Have), "1");
-//		((selectDB)spiSwarm).addField(getString(R.string.No), "0");
-
-//		spiSparse = findViewById(R.id.spiSparse); // Разреженные (да, нет)
-//		guiTable.add(spiSparse, "locust_sparse");
-//		((selectDB)spiSparse).addField("", "");
-//		((selectDB)spiSparse).addField(getString(R.string.Have), "1");
-//		((selectDB)spiSparse).addField(getString(R.string.No), "0");
-
-		spiMainPurpose = findViewById(R.id.spiMainPurpose);
-		guiTable.add(spiMainPurpose, "main_purpose");
-//TODO добавить выборку из справочника!
-
-		spiLocustPhaseId = findViewById(R.id.spiLocustPhaseId);
-		guiTable.add(spiLocustPhaseId, "locust_phase_id");
-		((selectDB)spiLocustPhaseId).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_phase d where d.del=0 order by d.sort,d.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiLocustPhaseId).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		spiSprPlatform = findViewById(R.id.spiSprPlatform); // Вид опрыскивания
-		guiTable.add(spiSprPlatform, "spray_platform");
-		((selectDB)spiSprPlatform).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from sprayers_types d where d.del=0 order by d.sort,d.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiSprPlatform).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		spiSprPlatformA = findViewById(R.id.spiSprPlatformA); // «Авиа» - выпадающий список:«Самолет», «Вертолет», «Дельтаплан».
-		guiTable.add(spiSprPlatformA, "spray_platform_a");
-		((selectDB)spiSprPlatformA).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from sprayers d where d.del=0 and d.sprayer_type_id=1 order by d.sort,d.name",
-						null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiSprPlatformA).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		spiSprPlatformG = findViewById(R.id.spiSprPlatformG); // «Наземное» - выпадающий список:«Трактор», «Машина», «Аэроз.генераторG».
-		guiTable.add(spiSprPlatformG, "spray_platform_g");
-		((selectDB)spiSprPlatformG).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from sprayers d where d.del=0 and d.sprayer_type_id=3 order by d.sort,d.name",
-						null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiSprPlatformG).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		spiSprPlatformH = findViewById(R.id.spiSprPlatformH); // «Ручное» - выпадающий список:«Ранцевый», «Моторный», «Батарейный».
-		guiTable.add(spiSprPlatformH, "spray_platform_h");
-		((selectDB)spiSprPlatformH).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from sprayers d where d.del=0 and d.sprayer_type_id=5 order by d.sort,d.name",
-						null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiSprPlatformH).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		/*
-		 * spiSprOperator = findViewById(R.id.spiSprOperator); // Оператор (пилот, водитель, др...) guiTable.add(spiSprOperator,"spray_operatortype_id"); spiSprOperator.addField(this, "", ""); dboh = new DbOpenHelper(this); cursor =
-		 * dboh.getReadableDatabase().rawQuery("select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"+Tools.getLang()+"' LIMIT 1),d.name) name from list_operatorstypes d where d.del=0 order by d.sort,d.name", null); if (cursor.moveToFirst()) { do { spiSprOperator.addField(this, cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id"))); } while
-		 * (cursor.moveToNext()); } cursor.close(); dboh.close();
-		 */
-
-		// edtSprOperatorName = (EditText) findViewById(R.id.edtSprOperatorName); // Имя оператора
-		// guiTable.add(edtSprOperatorName,"spray_operator_name");
-		edtSprManufacturer = (EditText) findViewById(R.id.edtSprManufacturer); // Марка опрыскивателя/модель
-		guiTable.add(edtSprManufacturer, "spray_manufacturer_name");
-		//edtSprModel = (EditText) findViewById(R.id.edtSprModel); // Модель опрыскивателя
-		//guiTable.add(edtSprModel, "spray_model_name");
-
-		// edtDateCalibration = (DateInput) findViewById(R.id.edtDateCalibration); // Дата последней калибровки
-		// guiTable.add(edtDateCalibration,"spray_date_calibration");
-		// edtDateCalibration.setVisibleDMY("my"); //Кроме дня
-
-		edtSprHeight = (EditText) findViewById(R.id.edtSprHeight); // Высота над поверхностью почвы (м)
-		guiTable.add(edtSprHeight, "spray_height");
-		// edtSprWidth = (EditText) findViewById(R.id.edtSprWidth); // Ширина захвата (м)
-		// guiTable.add(edtSprWidth,"spray_width");
-		// edtSprSpacing = (EditText) findViewById(R.id.edtSprSpacing); // Расстояние между проходами опрыскивателя (м)
-		// guiTable.add(edtSprSpacing,"spray_spacing");
-		spiSprBarrier = findViewById(R.id.spiSprBarrier); // Барьеры (да, нет)
-		guiTable.add(spiSprBarrier, "spray_barrier");
-		((selectDB)spiSprBarrier).addField("", "");
-		((selectDB)spiSprBarrier).addField(getString(R.string.Barriers), "1");
-		((selectDB)spiSprBarrier).addField(getString(R.string.Continuous), "0");
-		//edtSprBarrierWidth = (EditText) findViewById(R.id.edtSprBarrierWidth); // ширина (м)
-		//guiTable.add(edtSprBarrierWidth, "spray_barrier_width");
-		edtSprBarrierSpace = (EditText) findViewById(R.id.edtSprBarrierSpace); // промежуток (м)
-		guiTable.add(edtSprBarrierSpace, "spray_barrier_space");
-
-		edtSprSpeed = (EditText) findViewById(R.id.edtSprSpeed); // Скорость движения (км/ч)
-		guiTable.add(edtSprSpeed, "spray_speed");
-
-		spiSprMarking = findViewById(R.id.spiSprMarking); // Наземная маркировка(Сиг-нальщики, GPS, Машина, Нет)
-		guiTable.add(spiSprMarking, "spray_marking_id");
-		((selectDB)spiSprMarking).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_markings d where d.del=0 order by d.sort,d.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiSprMarking).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		cbEffectiveness = (CheckBox) findViewById(R.id.cbEffectiveness);
-		guiTable.add(cbEffectiveness, "efficiency");
-
-		OnClickListener oclCbBoxEggs = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				CheckBox cbx=(CheckBox)v;
-				if(!cbx.isChecked()) {
-					AlertDialog.Builder adb = new AlertDialog.Builder(LocustHealthActivity.this, R.style.AlertDialogTheme);
-					adb.setTitle(getString(R.string.Warning));
-					adb.setMessage(LocustHealthActivity.this.getResources().getString(R.string.Cancel_filling_section));
-					adb.setPositiveButton(LocustHealthActivity.this.getResources().getString(R.string.Yes), new DialogInterface.OnClickListener() {
-						@Override
-						public void onClick(DialogInterface dialog, int id) {
-							updateAlpha();
-						}
-					});
-					adb.setNegativeButton(LocustHealthActivity.this.getResources().getString(R.string.No), new DialogInterface.OnClickListener() {
-						public void onClick(DialogInterface dialog, int id) {
-							cbx.setChecked(true);
-						}
-					});
-					AlertDialog ad = adb.show();
-					ad.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(Color.BLACK);
-					ad.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(Color.BLACK);
-
-
-				}else{
-					updateAlpha();
-				}
-
-			}
-		};
-		cbEffectiveness.setOnClickListener(oclCbBoxEggs);
-
-
-		edtEffMortality = (EditText) findViewById(R.id.edtEffMortality); // смертность саранчи(%)
-		guiTable.add(edtEffMortality, "efficacy_mortality");
-		//edtEffMortality.setFilters(new InputFilter[] { new InputFilterMinMax("0", "100") });
-
-		edtEffTime = (EditText) findViewById(R.id.edtEffTime); // Прошло времени после обработки
-		guiTable.add(edtEffTime, "efficacy_passed_time");
-
-		spiEffMethod = findViewById(R.id.spiEffMethod); // метод подсчета смертности "Визуальный", "Учётная рамка".
-		guiTable.add(spiEffMethod, "efficacy_mortality_method");
-		((selectDB)spiEffMethod).addField("", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_mortality d where d.del=0 order by d.sort,d.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				((selectDB)spiEffMethod).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		OnCheckedChangeListener cclsl = new OnCheckedChangeListener()
-		{
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
-			{
-				String val = "";
-				if (LocustHealthActivity.this.cbSafClothingGoggles.isChecked())
-					val += '1';
-				if (LocustHealthActivity.this.cbSafClothingMasks.isChecked())
-					val += '2';
-				if (LocustHealthActivity.this.cbSafClothingGloves.isChecked())
-					val += '3';
-				if (LocustHealthActivity.this.cbSafClothingOveralls.isChecked())
-					val += '4';
-				if (LocustHealthActivity.this.cbSafClothingCaps.isChecked())
-					val += '5';
-				if (LocustHealthActivity.this.cbSafClothingBoots.isChecked())
-					val += '6';
-
-				if (LocustHealthActivity.this.cbSafClothingAbsent.isChecked())
-				{
-					val = "7";
-					LocustHealthActivity.this.cbSafClothingGoggles.setEnabled(false);
-					LocustHealthActivity.this.cbSafClothingMasks.setEnabled(false);
-					LocustHealthActivity.this.cbSafClothingGloves.setEnabled(false);
-					LocustHealthActivity.this.cbSafClothingOveralls.setEnabled(false);
-					LocustHealthActivity.this.cbSafClothingCaps.setEnabled(false);
-					LocustHealthActivity.this.cbSafClothingBoots.setEnabled(false);
-				} else
-				{
-					LocustHealthActivity.this.cbSafClothingGoggles.setEnabled(true);
-					LocustHealthActivity.this.cbSafClothingMasks.setEnabled(true);
-					LocustHealthActivity.this.cbSafClothingGloves.setEnabled(true);
-					LocustHealthActivity.this.cbSafClothingOveralls.setEnabled(true);
-					LocustHealthActivity.this.cbSafClothingCaps.setEnabled(true);
-					LocustHealthActivity.this.cbSafClothingBoots.setEnabled(true);
-				}
-				LocustHealthActivity.this.edtClothing.setText(val);
-			}
-		};
-		cbSafClothingGoggles = (CheckBox) findViewById(R.id.cbSafClothingGoggles);
-		cbSafClothingGoggles.setOnCheckedChangeListener(cclsl);
-		cbSafClothingMasks = (CheckBox) findViewById(R.id.cbSafClothingMasks);
-		cbSafClothingMasks.setOnCheckedChangeListener(cclsl);
-		cbSafClothingGloves = (CheckBox) findViewById(R.id.cbSafClothingGloves);
-		cbSafClothingGloves.setOnCheckedChangeListener(cclsl);
-		cbSafClothingOveralls = (CheckBox) findViewById(R.id.cbSafClothingOveralls);
-		cbSafClothingOveralls.setOnCheckedChangeListener(cclsl);
-		cbSafClothingCaps = (CheckBox) findViewById(R.id.cbSafClothingCaps);
-		cbSafClothingCaps.setOnCheckedChangeListener(cclsl);
-		cbSafClothingBoots = (CheckBox) findViewById(R.id.cbSafClothingBoots);
-		cbSafClothingBoots.setOnCheckedChangeListener(cclsl);
-		cbSafClothingAbsent = (CheckBox) findViewById(R.id.cbSafClothingAbsent);
-		cbSafClothingAbsent.setOnCheckedChangeListener(cclsl);
-
-		edtClothing = (EditText) findViewById(R.id.edtClothing);
-		guiTable.add(edtClothing, "safety_clothing");
-
-		edtClothing.addTextChangedListener(new TextWatcher()
-		{
-			public void afterTextChanged(Editable s)
-			{
-			}
-
-			public void beforeTextChanged(CharSequence s, int start, int count, int after)
-			{
-			}
-
-			public void onTextChanged(CharSequence s, int start, int before, int count)
-			{
-				String str = LocustHealthActivity.this.edtClothing.getText().toString();
-
-				if (str.indexOf("1") != -1)
-					LocustHealthActivity.this.cbSafClothingGoggles.setChecked(true);
-				if (str.indexOf("2") != -1)
-					LocustHealthActivity.this.cbSafClothingMasks.setChecked(true);
-				if (str.indexOf("3") != -1)
-					LocustHealthActivity.this.cbSafClothingGloves.setChecked(true);
-				if (str.indexOf("4") != -1)
-					LocustHealthActivity.this.cbSafClothingOveralls.setChecked(true);
-				if (str.indexOf("5") != -1)
-					LocustHealthActivity.this.cbSafClothingCaps.setChecked(true);
-				if (str.indexOf("6") != -1)
-					LocustHealthActivity.this.cbSafClothingBoots.setChecked(true);
-				if (str.indexOf("7") != -1)
-					LocustHealthActivity.this.cbSafClothingAbsent.setChecked(true);
-
-			}
-		});
-
-		spiProtectiveClothingClean = findViewById(R.id.spiProtectiveClothingClean);
-		guiTable.add(spiProtectiveClothingClean, "safety_clothing_clean");
-		((selectDB)spiProtectiveClothingClean).addField("", "");
-		((selectDB)spiProtectiveClothingClean).addField(getString(R.string.Yes), "1");
-		((selectDB)spiProtectiveClothingClean).addField(getString(R.string.No), "0");
-
-		spiOperatorExposedInsecticide = findViewById(R.id.spiOperatorExposedInsecticide);
-		guiTable.add(spiOperatorExposedInsecticide, "safety_operator_health");
-		((selectDB)spiOperatorExposedInsecticide).addField("", "");
-		((selectDB)spiOperatorExposedInsecticide).addField(getString(R.string.Yes), "1");
-		((selectDB)spiOperatorExposedInsecticide).addField(getString(R.string.No), "0");
-
-		edtDescription = (EditText) findViewById(R.id.edtDescription); // если да, то какое
-		guiTable.add(edtDescription, "description");
-
-		cbTest = (CheckBox) findViewById(R.id.cbTest);
-		guiTable.add(cbTest, "test");
-
-		OnCheckedChangeListener ccl = new OnCheckedChangeListener()
-		{
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
-			{
-				String val = "";
-				if (LocustHealthActivity.this.cbSafInformFarmer.isChecked())
-					val += '1';
-				if (LocustHealthActivity.this.cbSafInformShepherd.isChecked())
-					val += '6';
-				if (LocustHealthActivity.this.cbSafInformVillager.isChecked())
-					val += '2';
-				if (LocustHealthActivity.this.cbSafInformOfficial.isChecked())
-					val += '3';
-				if (LocustHealthActivity.this.cbSafInformBeekeeper.isChecked())
-					val += '4';
-				if (LocustHealthActivity.this.cbSafInformOther.isChecked())
-					val += '5';
-				LocustHealthActivity.this.edtInform.setText(val);
-			}
-		};
-		cbSafInformFarmer = (CheckBox) findViewById(R.id.cbSafInformFarmer); // Кто был оповещен об обработках? Фермер
-		cbSafInformFarmer.setOnCheckedChangeListener(ccl);
-		cbSafInformShepherd = (CheckBox) findViewById(R.id.cbSafInformShepherd); // Кто был оповещен об обработках? Пастух
-		cbSafInformShepherd.setOnCheckedChangeListener(ccl);
-		cbSafInformVillager = (CheckBox) findViewById(R.id.cbSafInformVillager); // Кто был оповещен об обработках? Сельский житель
-		cbSafInformVillager.setOnCheckedChangeListener(ccl);
-		cbSafInformOfficial = (CheckBox) findViewById(R.id.cbSafInformOfficial); // Кто был оповещен об обработках? Чиновник
-		cbSafInformOfficial.setOnCheckedChangeListener(ccl);
-		cbSafInformBeekeeper = (CheckBox) findViewById(R.id.cbSafInformBeekeeper); // Кто был оповещен об обработках? Пчеловод
-		cbSafInformBeekeeper.setOnCheckedChangeListener(ccl);
-		cbSafInformOther = (CheckBox) findViewById(R.id.cbSafInformOther); // Кто был оповещен об обработках? Другие
-		cbSafInformOther.setOnCheckedChangeListener(ccl);
-
-		edtInform = (EditText) findViewById(R.id.edtInform);
-		guiTable.add(edtInform, "safety_inform");
-
-		edtInform.addTextChangedListener(new TextWatcher()
-		{
-			public void afterTextChanged(Editable s)
-			{
-			}
-
-			public void beforeTextChanged(CharSequence s, int start, int count, int after)
-			{
-			}
-
-			public void onTextChanged(CharSequence s, int start, int before, int count)
-			{
-				String str = LocustHealthActivity.this.edtInform.getText().toString();
-
-				if (str.indexOf("1") != -1)
-					LocustHealthActivity.this.cbSafInformFarmer.setChecked(true); // Кто был оповещен об обработках? Фермер
-				if (str.indexOf("6") != -1)
-					LocustHealthActivity.this.cbSafInformShepherd.setChecked(true); // Кто был оповещен об обработках? Фермер
-				if (str.indexOf("2") != -1)
-					LocustHealthActivity.this.cbSafInformVillager.setChecked(true); // Кто был оповещен об обработках? Сельский житель
-				if (str.indexOf("3") != -1)
-					LocustHealthActivity.this.cbSafInformOfficial.setChecked(true); // Кто был оповещен об обработках? Чиновник
-				if (str.indexOf("4") != -1)
-					LocustHealthActivity.this.cbSafInformBeekeeper.setChecked(true); // Кто был оповещен об обработках? Пчеловод
-				if (str.indexOf("5") != -1)
-					LocustHealthActivity.this.cbSafInformOther.setChecked(true); // Кто был оповещен об обработках? Пчеловод
-
-			}
-		});
-
-
-		//spiSafEmptyСontainers = findViewById(R.id.spiSafEmptyContainers); // Что сделали с пустыми контейнерами
-		//guiTable.add(spiSafEmptyСontainers, "safety_container_id");
-		//spiSafEmptyСontainers.addField(this, "", "");
-		dboh = new DbOpenHelper(this);
-		cursor = dboh
-				.getReadableDatabase()
-				.rawQuery(
-						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
-								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_containers d where d.del=0 order by d.sort,d.name", null);
-		if (cursor.moveToFirst())
-		{
-			do
-			{
-				//spiSafEmptyСontainers.addField(this, cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
-
-				if(cursor.getLong(cursor.getColumnIndex("id"))==1)
-					((CheckBox) findViewById(R.id.cbTripleRinsed)).setText(cursor.getString(cursor.getColumnIndex("name")));
-				if(cursor.getLong(cursor.getColumnIndex("id"))==2)
-					((CheckBox) findViewById(R.id.cbPunctured)).setText(cursor.getString(cursor.getColumnIndex("name")));
-				if(cursor.getLong(cursor.getColumnIndex("id"))==3)
-					((CheckBox) findViewById(R.id.cbTakenBackToBase)).setText(cursor.getString(cursor.getColumnIndex("name")));
-				if(cursor.getLong(cursor.getColumnIndex("id"))==4)
-					((CheckBox) findViewById(R.id.cbLeftInField)).setText(cursor.getString(cursor.getColumnIndex("name")));
-				if(cursor.getLong(cursor.getColumnIndex("id"))==5)
-					((CheckBox) findViewById(R.id.cbBuried)).setText(cursor.getString(cursor.getColumnIndex("name")));
-				if(cursor.getLong(cursor.getColumnIndex("id"))==6)
-					((CheckBox) findViewById(R.id.cbBurned)).setText(cursor.getString(cursor.getColumnIndex("name")));
-
-			} while (cursor.moveToNext());
-		}
-		cursor.close();
-		dboh.close();
-
-		ccl = new OnCheckedChangeListener()
-		{
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
-			{
-				String val = "";
-				if (LocustHealthActivity.this.cbTripleRinsed.isChecked())
-					val += '1';
-				if (LocustHealthActivity.this.cbPunctured.isChecked())
-					val += '2';
-				if (LocustHealthActivity.this.cbTakenBackToBase.isChecked())
-					val += '3';
-				if (LocustHealthActivity.this.cbLeftInField.isChecked())
-					val += '4';
-				if (LocustHealthActivity.this.cbBuried.isChecked())
-					val += '5';
-				if (LocustHealthActivity.this.cbBurned.isChecked())
-					val += '6';
-				LocustHealthActivity.this.edtSafEmptyContainers.setText(val);
-			}
-		};
-		cbTripleRinsed = (CheckBox) findViewById(R.id.cbTripleRinsed);
-		cbTripleRinsed.setOnCheckedChangeListener(ccl);
-		cbPunctured = (CheckBox) findViewById(R.id.cbPunctured);
-		cbPunctured.setOnCheckedChangeListener(ccl);
-		cbTakenBackToBase = (CheckBox) findViewById(R.id.cbTakenBackToBase);
-		cbTakenBackToBase.setOnCheckedChangeListener(ccl);
-		cbLeftInField = (CheckBox) findViewById(R.id.cbLeftInField);
-		cbLeftInField.setOnCheckedChangeListener(ccl);
-		cbBuried = (CheckBox) findViewById(R.id.cbBuried);
-		cbBuried.setOnCheckedChangeListener(ccl);
-		cbBurned = (CheckBox) findViewById(R.id.cbBurned);
-		cbBurned.setOnCheckedChangeListener(ccl);
-
-		edtSafEmptyContainers = (EditText) findViewById(R.id.edtSafEmptyContainers);
-		guiTable.add(edtSafEmptyContainers, "safety_container");
-
-
-		edtSafEmptyContainers.addTextChangedListener(new TextWatcher()
-		{
-			public void afterTextChanged(Editable s)
-			{
-			}
-
-			public void beforeTextChanged(CharSequence s, int start, int count, int after)
-			{
-			}
-
-			public void onTextChanged(CharSequence s, int start, int before, int count)
-			{
-				String str = LocustHealthActivity.this.edtSafEmptyContainers.getText().toString();
-				if (str.indexOf("1") != -1)
-					LocustHealthActivity.this.cbTripleRinsed.setChecked(true);
-				if (str.indexOf("2") != -1)
-					LocustHealthActivity.this.cbPunctured.setChecked(true);
-				if (str.indexOf("3") != -1)
-					LocustHealthActivity.this.cbTakenBackToBase.setChecked(true);
-				if (str.indexOf("4") != -1)
-					LocustHealthActivity.this.cbLeftInField.setChecked(true);
-				if (str.indexOf("5") != -1)
-					LocustHealthActivity.this.cbBuried.setChecked(true);
-				if (str.indexOf("6") != -1)
-					LocustHealthActivity.this.cbBurned.setChecked(true);
-			}
-		});
-
-		spiSafNonTarget = findViewById(R.id.spiSafNonTarget); // воздействие на нецелевые организмы
-		guiTable.add(spiSafNonTarget, "safety_non_target");
-		((selectDB)spiSafNonTarget).addField("", "");
-		((selectDB)spiSafNonTarget).addField(getString(R.string.Yes), "1");
-		((selectDB)spiSafNonTarget).addField(getString(R.string.No), "0");
-
-		edtSafNonTargetEffect = (EditText) findViewById(R.id.edtSafNonTargetEffect); // если да, то какое
-		guiTable.add(edtSafNonTargetEffect, "safety_non_target_effect");
-
-		// "safety_incident boolean," + //Другие инциденты по здоровью или окружающей среде, возникшие возможно при обработке
-		// "safety_incident_effect text," + //Если Да, тип инцидента и кем сообщен (описание)
-		spiSafIncident = findViewById(R.id.spiSafIncident); // Другие инциденты по здоровью или окружающей среде, возникшие возможно при обработке
-		guiTable.add(spiSafIncident, "safety_incident");
-		((selectDB)spiSafIncident).addField("", "");
-		((selectDB)spiSafIncident).addField(getString(R.string.Yes), "1");
-		((selectDB)spiSafIncident).addField(getString(R.string.No), "0");
-
-		edtSafIncidentEffect = (EditText) findViewById(R.id.edtSafIncidentEffect); // Если Да, тип инцидента и кем сообщен (описание)
-		guiTable.add(edtSafIncidentEffect, "safety_incident_effect");
-
-		edtComments = (EditText) findViewById(R.id.edtComments); // КОММЕНТАР�?�?
-		guiTable.add(edtComments, "comments");
-
-		// *** Кнопки ***
-		btnGetGPSCenter = (View) findViewById(R.id.btnGetGPSCenter);
-		OnClickListener oclBtnGetGPSCenter = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				DecimalFormatSymbols custom = new DecimalFormatSymbols(new Locale("en", "US"));
-				custom.setDecimalSeparator('.');
-
-				DecimalFormat df = new DecimalFormat("0.0000000");
-				df.setDecimalFormatSymbols(custom);
-
-				if(LocustHealthActivity.this._lat!=0 && LocustHealthActivity.this._lon!=0) {
-					LocustHealthActivity.this.edtLatCenter.setText(df.format(LocustHealthActivity.this._lat));
-					LocustHealthActivity.this.edtLonCenter.setText(df.format(LocustHealthActivity.this._lon));
-				}
-				//Checking if the GPS is active and if it is inactive, I display a warning about it
-				LocationManager locationManager = (LocationManager) LocustHealthActivity.this.getSystemService(Context.LOCATION_SERVICE);;
-				if(!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)){
-					Toast.makeText(LocustHealthActivity.this, LocustHealthActivity.this.getResources().getString(R.string.Please_activate_GPS), Toast.LENGTH_LONG).show();
-				}
-			}
-		};
-		btnGetGPSCenter.setOnClickListener(oclBtnGetGPSCenter);
-
-		btnDelGPSCenter = (View) findViewById(R.id.btnDelGPSCenter);
-		btnDelGPSCenter.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				LocustHealthActivity.this.edtLatCenter.setText("");
-				LocustHealthActivity.this.edtLonCenter.setText("");
-			}
-		});
-
-		btnOnMap = (View) findViewById(R.id.btnOnMap);
-		OnClickListener oclBtnOnMap = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				Intent intent = new Intent(LocustHealthActivity.this, MapsActivity.class);
-				intent.putParcelableArrayListExtra("LatLon", ((LatLonAdapter)latlonList.getAdapter()).latlonList);
-				intent.putExtra("uid", uid);
-				startActivityForResult(intent,4);
-			}
-		};
-		btnOnMap.setOnClickListener(oclBtnOnMap);
-
-		// android:id="@+id/btnOk"
-		btnOk = (View) findViewById(R.id.btnOk);
-		OnClickListener oclBtnOk = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				saveData();
-			}
-		};
-		btnOk.setOnClickListener(oclBtnOk);
-
-		btnCancel = (View) findViewById(R.id.btnCancel);
-		OnClickListener oclBtnCancel = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				AlertDialog.Builder adb = new AlertDialog.Builder(LocustHealthActivity.this, R.style.AlertDialogTheme);
-				adb.setTitle(getString(R.string.Warning));
-				adb.setMessage(LocustHealthActivity.this.getResources().getString(R.string.Cancel_filling_form));
-				adb.setPositiveButton(LocustHealthActivity.this.getResources().getString(R.string.Yes), new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int id) {
-						LocustHealthActivity.this.finish();
-					}
-				});
-				adb.setNegativeButton(LocustHealthActivity.this.getResources().getString(R.string.No), new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int id) {
-
-					}
-				});
-				AlertDialog ad = adb.show();
-				ad.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(Color.BLACK);
-				ad.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(Color.BLACK);
-			}
-		};
-		btnCancel.setOnClickListener(oclBtnCancel);
-		/*
-		 * btnImage = (View) findViewById(R.id.btnImage); OnClickListener oclBtnImage = new OnClickListener() {
-		 *
-		 * @Override public void onClick(View v) { File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust"); directory.mkdirs();
-		 *
-		 * tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
-		 *
-		 * File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName); mImageUri = Uri.fromFile(file);
-		 *
-		 * Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri); startActivityForResult(intent, 1); } }; btnImage.setOnClickListener(oclBtnImage);
-		 */
-
-		btnImage1 = (View) findViewById(R.id.btnImage1);
-		OnClickListener oclBtnImage = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				// Создаём папку если её нет
-				File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust");
-				directory.mkdirs();
-
-				tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
-
-				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName);
-
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-					mImageUri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider",file);
-				else
-					mImageUri = Uri.fromFile(file);
-
-				Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-				intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri);
-				startActivityForResult(intent, 1);
-			}
-		};
-		btnImage1.setOnClickListener(oclBtnImage);
-
-		btnImage2 = (View) findViewById(R.id.btnImage2);
-		oclBtnImage = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				// Создаём папку если её нет
-				File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust");
-				directory.mkdirs();
-
-				tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
-
-				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName);
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-					mImageUri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider",file);
-				else
-					mImageUri = Uri.fromFile(file);
-
-
-				Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-				intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri);
-				startActivityForResult(intent, 2);
-			}
-		};
-		btnImage2.setOnClickListener(oclBtnImage);
-
-		btnImage3 = (View) findViewById(R.id.btnImage3);
-		oclBtnImage = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				// Создаём папку если её нет
-				File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust");
-				directory.mkdirs();
-
-				tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
-
-				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName);
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-					mImageUri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider",file);
-				else
-					mImageUri = Uri.fromFile(file);
-
-				Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-				intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri);
-				startActivityForResult(intent, 3);
-			}
-		};
-		btnImage3.setOnClickListener(oclBtnImage);
-
-		/*
-		 * btnShowImage = (View) findViewById(R.id.btnShowImage1); OnClickListener oclBtnShowImage = new OnClickListener() {
-		 *
-		 * @Override public void onClick(View v) { File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage1.getText().toString()); Intent i = new Intent(); i.setAction(android.content.Intent.ACTION_VIEW); i.setDataAndType(Uri.fromFile(file), "image/jpg"); startActivity(i); } }; btnShowImage.setOnClickListener(oclBtnShowImage);
-		 */
-
-		btnShowImage1 = (View) findViewById(R.id.btnShowImage1); // Отобразить фотографию 1 в новом окне
-		OnClickListener oclBtnShowImage = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage1.getText().toString());
-				if(!file.isFile()) file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/_" + edtImage1.getText().toString());
-				if (file.isFile()) {
-					//Uri uri = Uri.fromFile(file);
-					Uri uri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider", file);
-
-					Intent i = new Intent();
-					i.setAction(Intent.ACTION_VIEW);
-					i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-					i.setDataAndType(uri, "image/jpg");
-					startActivity(i);
-				}
-			}
-		};
-		btnShowImage1.setOnClickListener(oclBtnShowImage);
-
-		btnShowImage2 = (View) findViewById(R.id.btnShowImage2); // Отобразить фотографию 1 в новом окне
-		oclBtnShowImage = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage2.getText().toString());
-				if(!file.isFile()) file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/_" + edtImage2.getText().toString());
-				if (file.isFile()) {
-					//Uri uri = Uri.fromFile(file);
-					Uri uri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider", file);
-
-					Intent i = new Intent();
-					i.setAction(Intent.ACTION_VIEW);
-					i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-					i.setDataAndType(uri, "image/jpg");
-					startActivity(i);
-				}
-			}
-		};
-		btnShowImage2.setOnClickListener(oclBtnShowImage);
-
-		btnShowImage3 = (View) findViewById(R.id.btnShowImage3); // Отобразить фотографию 3 в новом окне
-		oclBtnShowImage = new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage3.getText().toString());
-				if(!file.isFile()) file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/_" + edtImage3.getText().toString());
-				if (file.isFile()) {
-					//Uri uri = Uri.fromFile(file);
-					Uri uri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider", file);
-
-					Intent i = new Intent();
-					i.setAction(Intent.ACTION_VIEW);
-					i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-					i.setDataAndType(uri, "image/jpg");
-					startActivity(i);
-				}
-			}
-		};
-		btnShowImage3.setOnClickListener(oclBtnShowImage);
-
-		btnDelImage1 = (View) findViewById(R.id.btnDelImage1);
-		btnDelImage1.setOnClickListener(
-				new OnClickListener()
-				{
-					@Override
-					public void onClick(View v)
-					{
-						edtImage1.setText("");
-					}
-				}
-		);
-
-		btnDelImage2 = (View) findViewById(R.id.btnDelImage2);
-		btnDelImage2.setOnClickListener(
-				new OnClickListener()
-				{
-					@Override
-					public void onClick(View v)
-					{
-						edtImage2.setText("");
-					}
-				}
-		);
-
-		btnDelImage3 = (View) findViewById(R.id.btnDelImage3);
-		btnDelImage3.setOnClickListener(
-				new OnClickListener()
-				{
-					@Override
-					public void onClick(View v)
-					{
-						edtImage3.setText("");
-					}
-				}
-		);
-
-
-		// Взависимости от параметров создание или редактирование
-		editData(uid);
-		adapter.notifyDataSetChanged();
-		Tools.setListViewHeightBasedOnItems(latlonList);
-
-		//updateAlpha(); movied to onResume
-
-		// Чтоб слушать GPS (в конце метода чтобы успели присвоиться  GUI компоненты локальным переменным)
-		_lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-		if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-			return;
-		}
-		_lm.requestLocationUpdates(LocationManager.GPS_PROVIDER, 500, 1, this);
+//		((selectDB)spiCountry).setOnChangeValueListener(new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				((selectDB)spiRegion).clearFields();
+//				((selectDB)spiRegion).addField("", "");
+//
+//				if(((selectDB)spiCountry).getValue() != null && ((selectDB)spiCountry).getValue() != "")
+//				{
+//					DbOpenHelper dboh = new DbOpenHelper(LocustHealthActivity.this);
+//					Cursor cursor = dboh.getReadableDatabase().rawQuery(
+//							"select id, name from countriesregions where del=0 and country_id=" + ((selectDB)spiCountry).getValue() + " order by name", null);
+//					if (cursor.moveToFirst())
+//					{
+//						do
+//						{
+//							((selectDB)spiRegion).addField(cursor.getString(cursor.getColumnIndex("name")),
+//									cursor.getString(cursor.getColumnIndex("id")));
+//						} while (cursor.moveToNext());
+//					}
+//					cursor.close();
+//					dboh.close();
+//				}
+//			}
+//		});
+
+//		spiRegion = findViewById(R.id.spiRegion); // Регион
+//		guiTable.add(spiRegion, "region_id");
+//
+//		edtArea = (EditText) findViewById(R.id.edtArea); // Район
+//		guiTable.add(edtArea, "area");
+//		edtDistrict = (EditText) findViewById(R.id.edtDistrict);
+//		guiTable.add(edtDistrict, "district");
+//
+//		edtVillage = (EditText) findViewById(R.id.edtVillage); // Название местности либо урочища
+//		guiTable.add(edtVillage, "village");
+//		edtTerrain = (EditText) findViewById(R.id.edtTerrain); // Название местности либо урочища
+//		guiTable.add(edtTerrain, "terrain");
+
+//		edtObserver = (EditText) findViewById(R.id.edtObserver);
+//		guiTable.add(edtObserver, "observer");
+//		edtDate = (EditText) findViewById(R.id.edtDate); // Должна быть уникальной
+//		guiTable.add(edtDate, "date");
+
+//		View btnGetDate = (View) findViewById(R.id.btnGetDate);
+//        OnClickListener clk0 = new OnClickListener() {
+//            public void onClick(View v)
+//            {
+//                DatePickerDialog.OnDateSetListener myDateListener = new DatePickerDialog.OnDateSetListener() {
+//                    @Override
+//                    public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth)
+//                    {
+//
+//                        //SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+//                        //format.setTimeZone(TimeZone.getTimeZone("UTC"));
+//                        //LocustDelActivity.this.edtDate.setText(format.format(curDateTime));
+//
+//                        //Теперь выбираем время
+//                    	OnTimeSetListener myDateListener = new OnTimeSetListener() {
+//                    		@Override
+//                    	    public void onTimeSet(TimePicker view, int hourOfDay, int minute)
+//                            {
+//                    			long val = Long.parseLong(((fieldDB) LocustHealthActivity.this.edtDate).getValue());
+//                    			val += (hourOfDay*60+minute)*60;
+//								((fieldDB) LocustHealthActivity.this.edtDate).setValue(String.valueOf(val));
+//                            }
+//                        };
+//
+//                        if(((fieldDB) LocustHealthActivity.this.edtDate).getValue()!=null && !((fieldDB) LocustHealthActivity.this.edtDate).getValue().equals(""))
+//                        {
+//                            Date time = new Date(Long.parseLong(((fieldDB) LocustHealthActivity.this.edtDate).getValue())*1000);
+//                            Calendar myCal = new GregorianCalendar();
+//                            myCal.setTime(time);
+//                            int hour = myCal.get(Calendar.HOUR_OF_DAY);
+//                            int minute = myCal.get(Calendar.MINUTE);
+//                            TimePickerDialog tpd = new TimePickerDialog(LocustHealthActivity.this, R.style.AlertDialogTheme, myDateListener, hour, minute, true);
+//                            tpd.show();
+//                        }else
+//                        {
+//                            final Calendar myCal = Calendar.getInstance();
+//                            int hour = myCal.get(Calendar.HOUR_OF_DAY);
+//                            int minute = myCal.get(Calendar.MINUTE);
+//                            TimePickerDialog tpd = new TimePickerDialog(LocustHealthActivity.this, R.style.AlertDialogTheme, myDateListener, hour, minute, true);
+//                            tpd.show();
+//                        }
+//
+//                        Date date = new Date(year-1900, monthOfYear, dayOfMonth);
+//						((fieldDB) LocustHealthActivity.this.edtDate).setValue(String.valueOf(date.getTime()/1000));
+//
+//
+//                    }
+//                };
+//
+//                if(!LocustHealthActivity.this.edtDate.getText().toString().equals(""))
+//                {
+//                    Date date=null;
+//                    SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+//                    //format.setTimeZone(TimeZone.getTimeZone("UTC"));
+//                    try {
+//                        date = format.parse(LocustHealthActivity.this.edtDate.getText().toString());
+//                    } catch (ParseException e) {
+//                        e.printStackTrace();
+//                    }
+//                    if(date!=null)
+//                    {
+//                        Calendar myCal = new GregorianCalendar();
+//                        myCal.setTime(date);
+//                        int day = myCal.get(Calendar.DAY_OF_MONTH);
+//                        int month = myCal.get(Calendar.MONTH);
+//                        int year = myCal.get(Calendar.YEAR);
+//                        DatePickerDialog dpd = new DatePickerDialog(LocustHealthActivity.this, R.style.AlertDialogTheme, myDateListener, year, month, day);
+//                        dpd.show();
+//                    }
+//                }else
+//                {
+//                    final Calendar c = Calendar.getInstance();
+//                    int year = c.get(Calendar.YEAR);
+//                    int month = c.get(Calendar.MONTH);
+//                    int day = c.get(Calendar.DAY_OF_MONTH);
+//
+//                    DatePickerDialog dpd = new DatePickerDialog(LocustHealthActivity.this, R.style.AlertDialogTheme, myDateListener, year, month, day);
+//                    dpd.show();
+//                }
+//            }
+//        };
+//        btnGetDate.setOnClickListener(clk0);
+//
+//		edtTimeZone = (EditText) findViewById(R.id.edtTimeZone);
+//		guiTable.add(edtTimeZone,"timezone");
+//
+//		edtLatCenter = (EditText) findViewById(R.id.edtLatCenter); // Широта
+//		guiTable.add(edtLatCenter, "lat_center");
+//		edtLonCenter = (EditText) findViewById(R.id.edtLonCenter); // Долгота
+//		guiTable.add(edtLonCenter, "lon_center");
+//
+//		ArrayList<LatLon> latlon = new ArrayList<LatLon>();
+//		if(latlon.size()==0){
+//			latlon.add(new LatLon(0, 0));
+//		}
+//		latlonList = findViewById(R.id.latlonList);
+//		LatLonAdapter adapter = new LatLonAdapter(this, R.layout.list_lat_lon, latlon, this, latlonList);
+//		latlonList.setAdapter(adapter);
+//		adapter.clc=new OnClickListener() {
+//			@Override
+//			public void onClick(View view) {
+//				Tools.setListViewHeightBasedOnItems(LocustHealthActivity.this.latlonList);
+//			}
+//		};
+
+//		edtInfestedArea = (EditText) findViewById(R.id.edtInfestedArea); // заселенная площадь(га)
+//		guiTable.add(edtInfestedArea, "infested_area");
+//		edtTreatedArea = (EditText) findViewById(R.id.edtTreatedArea); // обработанная площадь(га)
+//		guiTable.add(edtTreatedArea, "treated_area");
+
+
+
+
+
+
+//		spiVegType = findViewById(R.id.spiVegType); // Тип(Дикая, Культурная)
+//		guiTable.add(spiVegType, "vegetation_type_id");
+//		((selectDB)spiVegType).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_vegetation d where d.del=0 order by d.sort, d.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiVegType).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		edtVegHeight = (EditText) findViewById(R.id.edtVegHeight); // Высота (м)
+//		guiTable.add(edtVegHeight, "vegetation_height");
+//
+//		spiVegCover = findViewById(R.id.spiVegCover); // Густота растительного покрова(%)
+//		guiTable.add(spiVegCover, "vegetation_cover_id");
+//		((selectDB)spiVegCover).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_cover d where d.del=0 order by d.sort, d.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiVegCover).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		edtVegCrop = (EditText) findViewById(R.id.edtVegCrop); // Перечисление культур
+//		guiTable.add(edtVegCrop, "vegetation_crop");
+//
+//		spiVegDamage = findViewById(R.id.spiVegDamage); // Повреждения растительного покрова(%)
+//		guiTable.add(spiVegDamage, "vegetation_damage");
+//		((selectDB)spiVegDamage).addField("", "");
+//		// Выбираем страны и заполняем поля
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_damage d where d.del=0 order by d.sort, d.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiVegDamage).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		edtVegDamageArea = (EditText) findViewById(R.id.edtVegDamageArea); // Площядь повреждения
+//		guiTable.add(edtVegDamageArea, "vegetation_damage_area");
+//
+//		edtInsName = (EditText) findViewById(R.id.edtInsName); // коммерческое название
+//		guiTable.add(edtInsName, "insecticide_name");
+//		edtInsActiveSubstance = (EditText) findViewById(R.id.edtInsActiveSubstance); // Наименование активного вещества отравы
+//		guiTable.add(edtInsActiveSubstance, "insecticide_active_substance");
+//		edtInsConcentration = (EditText) findViewById(R.id.edtInsConcentration); // концентрация(г д.в./л или%)
+//		guiTable.add(edtInsConcentration, "insecticide_concentration");
+//		//edtInsConcentration.setFilters(new InputFilter[] { new InputFilterMinMax("0", "100") }); потому что текст
+//
+//		spiInsFormulation = findViewById(R.id.spiInsFormulation); // формуляция(УМО, КЭ, др.)
+//		guiTable.add(spiInsFormulation, "insecticide_formulation_id");
+//		((selectDB)spiInsFormulation).addField("", "");
+//		// Выбираем страны и заполняем поля
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_formulation d where d.del=0 order by d.sort, d.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiInsFormulation).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		edtInsDose = (EditText) findViewById(R.id.edtInsDose); // норма расхода(л/га)
+//		guiTable.add(edtInsDose, "insecticide_dose");
+//		edtInsRate = (EditText) findViewById(R.id.edtInsRate); // расход рабочей жидкости(л/га)
+//		guiTable.add(edtInsRate, "insecticide_rate");
+//		edtInsUsedVolume = (EditText) findViewById(R.id.edtInsUsedVolume); // Общий объем использованной рабочей жидкости (л)
+//		guiTable.add(edtInsUsedVolume, "insecticide_used_volume");
+//
+//		spiWeaTimeStart = findViewById(R.id.spiWeaTimeStart); // время начала
+//		guiTable.add(spiWeaTimeStart, "weather_time_start");
+//		((selectDB)spiWeaTimeStart).addField("", "");
+//		for (int i = 0; i < 24; i++) {
+//			((selectDB) spiWeaTimeStart).addField(String.valueOf(i), String.valueOf(i)+".0");
+//		}
+//		spiWeaTimeEnd = findViewById(R.id.spiWeaTimeEnd); // время окончания
+//		guiTable.add(spiWeaTimeEnd, "weather_time_end");
+//		((selectDB)spiWeaTimeEnd).addField("", "");
+//		for (int i = 0; i < 24; i++) {
+//			((selectDB) spiWeaTimeEnd).addField(String.valueOf(i), String.valueOf(i)+".0");
+//		}
+//		edtWeaTemperatureStart = (EditText) findViewById(R.id.edtWeaTemperatureStart); // Температура нач.(°C)
+//		guiTable.add(edtWeaTemperatureStart, "weather_temperature_start");
+//		edtWeaTemperatureEnd = (EditText) findViewById(R.id.edtWeaTemperatureEnd); // Температура кон.(°C)
+//		guiTable.add(edtWeaTemperatureEnd, "weather_temperature_end");
+//
+//		edtWeaWindSpeedStart = (EditText) findViewById(R.id.edtWeaWindSpeedStart); // скорость ветра нач. (м/с)
+//		guiTable.add(edtWeaWindSpeedStart, "weather_wind_speed_start");
+//		edtWeaWindSpeedEnd = (EditText) findViewById(R.id.edtWeaWindSpeedEnd); // скорость ветра кон. (м/с)
+//		guiTable.add(edtWeaWindSpeedEnd, "weather_wind_speed_end");
+//
+//		spiWindDirectionStart = findViewById(R.id.spiWindDirectionStart); // направление ветра нач.
+//		guiTable.add(spiWindDirectionStart, "weather_direction_start");
+//		((selectDB)spiWindDirectionStart).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name, degree from list_directions d where d.del=0 order by d.degree", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiWindDirectionStart).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		spiWindDirectionEnd = findViewById(R.id.spiWindDirectionEnd); // направление ветра кон.
+//		guiTable.add(spiWindDirectionEnd, "weather_direction_end");
+//		((selectDB)spiWindDirectionEnd).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name, degree from list_directions d where d.del=0 order by d.degree", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiWindDirectionEnd).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		spiSprayDirectionStart = findViewById(R.id.spiSprayDirectionStart); // направление опрыскивания нач.
+//		guiTable.add(spiSprayDirectionStart, "weather_spray_direction_start");
+//		((selectDB)spiSprayDirectionStart).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name, d.degree from list_directions d where d.del=0 and d.degree>=0 order by d.degree",
+//						null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiSprayDirectionStart).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		spiSprayDirectionEnd = findViewById(R.id.spiSprayDirectionEnd); // направление опрыскивания кон.
+//		guiTable.add(spiSprayDirectionEnd, "weather_spray_direction_end");
+//		((selectDB)spiSprayDirectionEnd).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name, degree from list_directions d where d.del=0 and d.degree>=0 order by d.degree",
+//						null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiSprayDirectionEnd).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		// locuststypes
+//		/*spiLocSpecies = findViewById(R.id.spiLocSpeciese);
+//		guiTable.add(spiLocSpecies, "locust_type_id");
+//		((selectDB)spiLocSpecies).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select lt.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = lt.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),lt.name) name from LocustsTypes lt where lt.del=0 order by lt.sort,lt.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiLocSpecies).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();*/
+//
+//		spiLocHoppers = findViewById(R.id.spiLocHoppers); // Стадии личинок
+//		guiTable.add(spiLocHoppers, "locust_hoppers_id");
+//		((selectDB)spiLocHoppers).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select lt.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = lt.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),lt.name) name from list_age lt where lt.del=0 order by lt.sort,lt.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiLocHoppers).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		/*
+//		 * list = new ArrayList<String>(); list.add(""); list.add(getString(R.string.Younger)); // Младшие list.add(getString(R.string.Middle)); // Средние list.add(getString(R.string.Senior)); // Старшие list.add(getString(R.string.Adult)); // Имаго
+//		 *
+//		 * dataAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, list); dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spiLocHoppers.setAdapter(dataAdapter);
+//		 */
+//
+////		spiImago = findViewById(R.id.spiImago); // Стаи (да, нет)
+////		guiTable.add(spiImago, "locust_imago");
+////		((selectDB)spiImago).addField("", "");
+////		((selectDB)spiImago).addField(getString(R.string.Have), "1");
+////		((selectDB)spiImago).addField(getString(R.string.No), "0");
+//
+//		edtLocDensity = (EditText) findViewById(R.id.edtLocDensity); // плотность на м2
+//		guiTable.add(edtLocDensity, "locust_density");
+//
+////		spiKuliguli = findViewById(R.id.spiKuliguli); // Кулиги (да, нет)
+////		guiTable.add(spiKuliguli, "locust_kuliguli");
+////		((selectDB)spiKuliguli).addField("", "");
+////		((selectDB)spiKuliguli).addField(getString(R.string.Have), "1");
+////		((selectDB)spiKuliguli).addField(getString(R.string.No), "0");
+//
+////		spiSwarm = findViewById(R.id.spiSwarm); // Стаи (да, нет)
+////		guiTable.add(spiSwarm, "locust_swarm");
+////		((selectDB)spiSwarm).addField("", "");
+////		((selectDB)spiSwarm).addField(getString(R.string.Have), "1");
+////		((selectDB)spiSwarm).addField(getString(R.string.No), "0");
+//
+////		spiSparse = findViewById(R.id.spiSparse); // Разреженные (да, нет)
+////		guiTable.add(spiSparse, "locust_sparse");
+////		((selectDB)spiSparse).addField("", "");
+////		((selectDB)spiSparse).addField(getString(R.string.Have), "1");
+////		((selectDB)spiSparse).addField(getString(R.string.No), "0");
+//
+//		spiMainPurpose = findViewById(R.id.spiMainPurpose);
+//		guiTable.add(spiMainPurpose, "main_purpose");
+////TODO добавить выборку из справочника!
+//
+//		spiLocustPhaseId = findViewById(R.id.spiLocustPhaseId);
+//		guiTable.add(spiLocustPhaseId, "locust_phase_id");
+//		((selectDB)spiLocustPhaseId).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_phase d where d.del=0 order by d.sort,d.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiLocustPhaseId).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		spiSprPlatform = findViewById(R.id.spiSprPlatform); // Вид опрыскивания
+//		guiTable.add(spiSprPlatform, "spray_platform");
+//		((selectDB)spiSprPlatform).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from sprayers_types d where d.del=0 order by d.sort,d.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiSprPlatform).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		spiSprPlatformA = findViewById(R.id.spiSprPlatformA); // «Авиа» - выпадающий список:«Самолет», «Вертолет», «Дельтаплан».
+//		guiTable.add(spiSprPlatformA, "spray_platform_a");
+//		((selectDB)spiSprPlatformA).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from sprayers d where d.del=0 and d.sprayer_type_id=1 order by d.sort,d.name",
+//						null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiSprPlatformA).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		spiSprPlatformG = findViewById(R.id.spiSprPlatformG); // «Наземное» - выпадающий список:«Трактор», «Машина», «Аэроз.генераторG».
+//		guiTable.add(spiSprPlatformG, "spray_platform_g");
+//		((selectDB)spiSprPlatformG).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from sprayers d where d.del=0 and d.sprayer_type_id=3 order by d.sort,d.name",
+//						null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiSprPlatformG).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		spiSprPlatformH = findViewById(R.id.spiSprPlatformH); // «Ручное» - выпадающий список:«Ранцевый», «Моторный», «Батарейный».
+//		guiTable.add(spiSprPlatformH, "spray_platform_h");
+//		((selectDB)spiSprPlatformH).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from sprayers d where d.del=0 and d.sprayer_type_id=5 order by d.sort,d.name",
+//						null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiSprPlatformH).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		/*
+//		 * spiSprOperator = findViewById(R.id.spiSprOperator); // Оператор (пилот, водитель, др...) guiTable.add(spiSprOperator,"spray_operatortype_id"); spiSprOperator.addField(this, "", ""); dboh = new DbOpenHelper(this); cursor =
+//		 * dboh.getReadableDatabase().rawQuery("select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"+Tools.getLang()+"' LIMIT 1),d.name) name from list_operatorstypes d where d.del=0 order by d.sort,d.name", null); if (cursor.moveToFirst()) { do { spiSprOperator.addField(this, cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id"))); } while
+//		 * (cursor.moveToNext()); } cursor.close(); dboh.close();
+//		 */
+//
+//		// edtSprOperatorName = (EditText) findViewById(R.id.edtSprOperatorName); // Имя оператора
+//		// guiTable.add(edtSprOperatorName,"spray_operator_name");
+//		edtSprManufacturer = (EditText) findViewById(R.id.edtSprManufacturer); // Марка опрыскивателя/модель
+//		guiTable.add(edtSprManufacturer, "spray_manufacturer_name");
+//		//edtSprModel = (EditText) findViewById(R.id.edtSprModel); // Модель опрыскивателя
+//		//guiTable.add(edtSprModel, "spray_model_name");
+//
+//		// edtDateCalibration = (DateInput) findViewById(R.id.edtDateCalibration); // Дата последней калибровки
+//		// guiTable.add(edtDateCalibration,"spray_date_calibration");
+//		// edtDateCalibration.setVisibleDMY("my"); //Кроме дня
+//
+//		edtSprHeight = (EditText) findViewById(R.id.edtSprHeight); // Высота над поверхностью почвы (м)
+//		guiTable.add(edtSprHeight, "spray_height");
+//		// edtSprWidth = (EditText) findViewById(R.id.edtSprWidth); // Ширина захвата (м)
+//		// guiTable.add(edtSprWidth,"spray_width");
+//		// edtSprSpacing = (EditText) findViewById(R.id.edtSprSpacing); // Расстояние между проходами опрыскивателя (м)
+//		// guiTable.add(edtSprSpacing,"spray_spacing");
+//		spiSprBarrier = findViewById(R.id.spiSprBarrier); // Барьеры (да, нет)
+//		guiTable.add(spiSprBarrier, "spray_barrier");
+//		((selectDB)spiSprBarrier).addField("", "");
+//		((selectDB)spiSprBarrier).addField(getString(R.string.Barriers), "1");
+//		((selectDB)spiSprBarrier).addField(getString(R.string.Continuous), "0");
+//		//edtSprBarrierWidth = (EditText) findViewById(R.id.edtSprBarrierWidth); // ширина (м)
+//		//guiTable.add(edtSprBarrierWidth, "spray_barrier_width");
+//		edtSprBarrierSpace = (EditText) findViewById(R.id.edtSprBarrierSpace); // промежуток (м)
+//		guiTable.add(edtSprBarrierSpace, "spray_barrier_space");
+//
+//		edtSprSpeed = (EditText) findViewById(R.id.edtSprSpeed); // Скорость движения (км/ч)
+//		guiTable.add(edtSprSpeed, "spray_speed");
+//
+//		spiSprMarking = findViewById(R.id.spiSprMarking); // Наземная маркировка(Сиг-нальщики, GPS, Машина, Нет)
+//		guiTable.add(spiSprMarking, "spray_marking_id");
+//		((selectDB)spiSprMarking).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_markings d where d.del=0 order by d.sort,d.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiSprMarking).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		cbEffectiveness = (CheckBox) findViewById(R.id.cbEffectiveness);
+//		guiTable.add(cbEffectiveness, "efficiency");
+//
+//		OnClickListener oclCbBoxEggs = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				CheckBox cbx=(CheckBox)v;
+//				if(!cbx.isChecked()) {
+//					AlertDialog.Builder adb = new AlertDialog.Builder(LocustHealthActivity.this, R.style.AlertDialogTheme);
+//					adb.setTitle(getString(R.string.Warning));
+//					adb.setMessage(LocustHealthActivity.this.getResources().getString(R.string.Cancel_filling_section));
+//					adb.setPositiveButton(LocustHealthActivity.this.getResources().getString(R.string.Yes), new DialogInterface.OnClickListener() {
+//						@Override
+//						public void onClick(DialogInterface dialog, int id) {
+//							updateAlpha();
+//						}
+//					});
+//					adb.setNegativeButton(LocustHealthActivity.this.getResources().getString(R.string.No), new DialogInterface.OnClickListener() {
+//						public void onClick(DialogInterface dialog, int id) {
+//							cbx.setChecked(true);
+//						}
+//					});
+//					AlertDialog ad = adb.show();
+//					ad.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(Color.BLACK);
+//					ad.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(Color.BLACK);
+//
+//
+//				}else{
+//					updateAlpha();
+//				}
+//
+//			}
+//		};
+//		cbEffectiveness.setOnClickListener(oclCbBoxEggs);
+//
+//
+//		edtEffMortality = (EditText) findViewById(R.id.edtEffMortality); // смертность саранчи(%)
+//		guiTable.add(edtEffMortality, "efficacy_mortality");
+//		//edtEffMortality.setFilters(new InputFilter[] { new InputFilterMinMax("0", "100") });
+//
+//		edtEffTime = (EditText) findViewById(R.id.edtEffTime); // Прошло времени после обработки
+//		guiTable.add(edtEffTime, "efficacy_passed_time");
+//
+//		spiEffMethod = findViewById(R.id.spiEffMethod); // метод подсчета смертности "Визуальный", "Учётная рамка".
+//		guiTable.add(spiEffMethod, "efficacy_mortality_method");
+//		((selectDB)spiEffMethod).addField("", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_mortality d where d.del=0 order by d.sort,d.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				((selectDB)spiEffMethod).addField(cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		OnCheckedChangeListener cclsl = new OnCheckedChangeListener()
+//		{
+//			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+//			{
+//				String val = "";
+//				if (LocustHealthActivity.this.cbSafClothingGoggles.isChecked())
+//					val += '1';
+//				if (LocustHealthActivity.this.cbSafClothingMasks.isChecked())
+//					val += '2';
+//				if (LocustHealthActivity.this.cbSafClothingGloves.isChecked())
+//					val += '3';
+//				if (LocustHealthActivity.this.cbSafClothingOveralls.isChecked())
+//					val += '4';
+//				if (LocustHealthActivity.this.cbSafClothingCaps.isChecked())
+//					val += '5';
+//				if (LocustHealthActivity.this.cbSafClothingBoots.isChecked())
+//					val += '6';
+//
+//				if (LocustHealthActivity.this.cbSafClothingAbsent.isChecked())
+//				{
+//					val = "7";
+//					LocustHealthActivity.this.cbSafClothingGoggles.setEnabled(false);
+//					LocustHealthActivity.this.cbSafClothingMasks.setEnabled(false);
+//					LocustHealthActivity.this.cbSafClothingGloves.setEnabled(false);
+//					LocustHealthActivity.this.cbSafClothingOveralls.setEnabled(false);
+//					LocustHealthActivity.this.cbSafClothingCaps.setEnabled(false);
+//					LocustHealthActivity.this.cbSafClothingBoots.setEnabled(false);
+//				} else
+//				{
+//					LocustHealthActivity.this.cbSafClothingGoggles.setEnabled(true);
+//					LocustHealthActivity.this.cbSafClothingMasks.setEnabled(true);
+//					LocustHealthActivity.this.cbSafClothingGloves.setEnabled(true);
+//					LocustHealthActivity.this.cbSafClothingOveralls.setEnabled(true);
+//					LocustHealthActivity.this.cbSafClothingCaps.setEnabled(true);
+//					LocustHealthActivity.this.cbSafClothingBoots.setEnabled(true);
+//				}
+//				LocustHealthActivity.this.edtClothing.setText(val);
+//			}
+//		};
+//		cbSafClothingGoggles = (CheckBox) findViewById(R.id.cbSafClothingGoggles);
+//		cbSafClothingGoggles.setOnCheckedChangeListener(cclsl);
+//		cbSafClothingMasks = (CheckBox) findViewById(R.id.cbSafClothingMasks);
+//		cbSafClothingMasks.setOnCheckedChangeListener(cclsl);
+//		cbSafClothingGloves = (CheckBox) findViewById(R.id.cbSafClothingGloves);
+//		cbSafClothingGloves.setOnCheckedChangeListener(cclsl);
+//		cbSafClothingOveralls = (CheckBox) findViewById(R.id.cbSafClothingOveralls);
+//		cbSafClothingOveralls.setOnCheckedChangeListener(cclsl);
+//		cbSafClothingCaps = (CheckBox) findViewById(R.id.cbSafClothingCaps);
+//		cbSafClothingCaps.setOnCheckedChangeListener(cclsl);
+//		cbSafClothingBoots = (CheckBox) findViewById(R.id.cbSafClothingBoots);
+//		cbSafClothingBoots.setOnCheckedChangeListener(cclsl);
+//		cbSafClothingAbsent = (CheckBox) findViewById(R.id.cbSafClothingAbsent);
+//		cbSafClothingAbsent.setOnCheckedChangeListener(cclsl);
+//
+//		edtClothing = (EditText) findViewById(R.id.edtClothing);
+//		guiTable.add(edtClothing, "safety_clothing");
+//
+//		edtClothing.addTextChangedListener(new TextWatcher()
+//		{
+//			public void afterTextChanged(Editable s)
+//			{
+//			}
+//
+//			public void beforeTextChanged(CharSequence s, int start, int count, int after)
+//			{
+//			}
+//
+//			public void onTextChanged(CharSequence s, int start, int before, int count)
+//			{
+//				String str = LocustHealthActivity.this.edtClothing.getText().toString();
+//
+//				if (str.indexOf("1") != -1)
+//					LocustHealthActivity.this.cbSafClothingGoggles.setChecked(true);
+//				if (str.indexOf("2") != -1)
+//					LocustHealthActivity.this.cbSafClothingMasks.setChecked(true);
+//				if (str.indexOf("3") != -1)
+//					LocustHealthActivity.this.cbSafClothingGloves.setChecked(true);
+//				if (str.indexOf("4") != -1)
+//					LocustHealthActivity.this.cbSafClothingOveralls.setChecked(true);
+//				if (str.indexOf("5") != -1)
+//					LocustHealthActivity.this.cbSafClothingCaps.setChecked(true);
+//				if (str.indexOf("6") != -1)
+//					LocustHealthActivity.this.cbSafClothingBoots.setChecked(true);
+//				if (str.indexOf("7") != -1)
+//					LocustHealthActivity.this.cbSafClothingAbsent.setChecked(true);
+//
+//			}
+//		});
+//
+//		spiProtectiveClothingClean = findViewById(R.id.spiProtectiveClothingClean);
+//		guiTable.add(spiProtectiveClothingClean, "safety_clothing_clean");
+//		((selectDB)spiProtectiveClothingClean).addField("", "");
+//		((selectDB)spiProtectiveClothingClean).addField(getString(R.string.Yes), "1");
+//		((selectDB)spiProtectiveClothingClean).addField(getString(R.string.No), "0");
+//
+//		spiOperatorExposedInsecticide = findViewById(R.id.spiOperatorExposedInsecticide);
+//		guiTable.add(spiOperatorExposedInsecticide, "safety_operator_health");
+//		((selectDB)spiOperatorExposedInsecticide).addField("", "");
+//		((selectDB)spiOperatorExposedInsecticide).addField(getString(R.string.Yes), "1");
+//		((selectDB)spiOperatorExposedInsecticide).addField(getString(R.string.No), "0");
+//
+//		edtDescription = (EditText) findViewById(R.id.edtDescription); // если да, то какое
+//		guiTable.add(edtDescription, "description");
+//
+//		cbTest = (CheckBox) findViewById(R.id.cbTest);
+//		guiTable.add(cbTest, "test");
+//
+//		OnCheckedChangeListener ccl = new OnCheckedChangeListener()
+//		{
+//			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+//			{
+//				String val = "";
+//				if (LocustHealthActivity.this.cbSafInformFarmer.isChecked())
+//					val += '1';
+//				if (LocustHealthActivity.this.cbSafInformShepherd.isChecked())
+//					val += '6';
+//				if (LocustHealthActivity.this.cbSafInformVillager.isChecked())
+//					val += '2';
+//				if (LocustHealthActivity.this.cbSafInformOfficial.isChecked())
+//					val += '3';
+//				if (LocustHealthActivity.this.cbSafInformBeekeeper.isChecked())
+//					val += '4';
+//				if (LocustHealthActivity.this.cbSafInformOther.isChecked())
+//					val += '5';
+//				LocustHealthActivity.this.edtInform.setText(val);
+//			}
+//		};
+//		cbSafInformFarmer = (CheckBox) findViewById(R.id.cbSafInformFarmer); // Кто был оповещен об обработках? Фермер
+//		cbSafInformFarmer.setOnCheckedChangeListener(ccl);
+//		cbSafInformShepherd = (CheckBox) findViewById(R.id.cbSafInformShepherd); // Кто был оповещен об обработках? Пастух
+//		cbSafInformShepherd.setOnCheckedChangeListener(ccl);
+//		cbSafInformVillager = (CheckBox) findViewById(R.id.cbSafInformVillager); // Кто был оповещен об обработках? Сельский житель
+//		cbSafInformVillager.setOnCheckedChangeListener(ccl);
+//		cbSafInformOfficial = (CheckBox) findViewById(R.id.cbSafInformOfficial); // Кто был оповещен об обработках? Чиновник
+//		cbSafInformOfficial.setOnCheckedChangeListener(ccl);
+//		cbSafInformBeekeeper = (CheckBox) findViewById(R.id.cbSafInformBeekeeper); // Кто был оповещен об обработках? Пчеловод
+//		cbSafInformBeekeeper.setOnCheckedChangeListener(ccl);
+//		cbSafInformOther = (CheckBox) findViewById(R.id.cbSafInformOther); // Кто был оповещен об обработках? Другие
+//		cbSafInformOther.setOnCheckedChangeListener(ccl);
+//
+//		edtInform = (EditText) findViewById(R.id.edtInform);
+//		guiTable.add(edtInform, "safety_inform");
+//
+//		edtInform.addTextChangedListener(new TextWatcher()
+//		{
+//			public void afterTextChanged(Editable s)
+//			{
+//			}
+//
+//			public void beforeTextChanged(CharSequence s, int start, int count, int after)
+//			{
+//			}
+//
+//			public void onTextChanged(CharSequence s, int start, int before, int count)
+//			{
+//				String str = LocustHealthActivity.this.edtInform.getText().toString();
+//
+//				if (str.indexOf("1") != -1)
+//					LocustHealthActivity.this.cbSafInformFarmer.setChecked(true); // Кто был оповещен об обработках? Фермер
+//				if (str.indexOf("6") != -1)
+//					LocustHealthActivity.this.cbSafInformShepherd.setChecked(true); // Кто был оповещен об обработках? Фермер
+//				if (str.indexOf("2") != -1)
+//					LocustHealthActivity.this.cbSafInformVillager.setChecked(true); // Кто был оповещен об обработках? Сельский житель
+//				if (str.indexOf("3") != -1)
+//					LocustHealthActivity.this.cbSafInformOfficial.setChecked(true); // Кто был оповещен об обработках? Чиновник
+//				if (str.indexOf("4") != -1)
+//					LocustHealthActivity.this.cbSafInformBeekeeper.setChecked(true); // Кто был оповещен об обработках? Пчеловод
+//				if (str.indexOf("5") != -1)
+//					LocustHealthActivity.this.cbSafInformOther.setChecked(true); // Кто был оповещен об обработках? Пчеловод
+//
+//			}
+//		});
+//
+//
+//		//spiSafEmptyСontainers = findViewById(R.id.spiSafEmptyContainers); // Что сделали с пустыми контейнерами
+//		//guiTable.add(spiSafEmptyСontainers, "safety_container_id");
+//		//spiSafEmptyСontainers.addField(this, "", "");
+//		dboh = new DbOpenHelper(this);
+//		cursor = dboh
+//				.getReadableDatabase()
+//				.rawQuery(
+//						"select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
+//								+ Tools.getLang() + "' LIMIT 1),d.name) name from list_containers d where d.del=0 order by d.sort,d.name", null);
+//		if (cursor.moveToFirst())
+//		{
+//			do
+//			{
+//				//spiSafEmptyСontainers.addField(this, cursor.getString(cursor.getColumnIndex("name")), cursor.getString(cursor.getColumnIndex("id")));
+//
+//				if(cursor.getLong(cursor.getColumnIndex("id"))==1)
+//					((CheckBox) findViewById(R.id.cbTripleRinsed)).setText(cursor.getString(cursor.getColumnIndex("name")));
+//				if(cursor.getLong(cursor.getColumnIndex("id"))==2)
+//					((CheckBox) findViewById(R.id.cbPunctured)).setText(cursor.getString(cursor.getColumnIndex("name")));
+//				if(cursor.getLong(cursor.getColumnIndex("id"))==3)
+//					((CheckBox) findViewById(R.id.cbTakenBackToBase)).setText(cursor.getString(cursor.getColumnIndex("name")));
+//				if(cursor.getLong(cursor.getColumnIndex("id"))==4)
+//					((CheckBox) findViewById(R.id.cbLeftInField)).setText(cursor.getString(cursor.getColumnIndex("name")));
+//				if(cursor.getLong(cursor.getColumnIndex("id"))==5)
+//					((CheckBox) findViewById(R.id.cbBuried)).setText(cursor.getString(cursor.getColumnIndex("name")));
+//				if(cursor.getLong(cursor.getColumnIndex("id"))==6)
+//					((CheckBox) findViewById(R.id.cbBurned)).setText(cursor.getString(cursor.getColumnIndex("name")));
+//
+//			} while (cursor.moveToNext());
+//		}
+//		cursor.close();
+//		dboh.close();
+//
+//		ccl = new OnCheckedChangeListener()
+//		{
+//			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+//			{
+//				String val = "";
+//				if (LocustHealthActivity.this.cbTripleRinsed.isChecked())
+//					val += '1';
+//				if (LocustHealthActivity.this.cbPunctured.isChecked())
+//					val += '2';
+//				if (LocustHealthActivity.this.cbTakenBackToBase.isChecked())
+//					val += '3';
+//				if (LocustHealthActivity.this.cbLeftInField.isChecked())
+//					val += '4';
+//				if (LocustHealthActivity.this.cbBuried.isChecked())
+//					val += '5';
+//				if (LocustHealthActivity.this.cbBurned.isChecked())
+//					val += '6';
+//				LocustHealthActivity.this.edtSafEmptyContainers.setText(val);
+//			}
+//		};
+//		cbTripleRinsed = (CheckBox) findViewById(R.id.cbTripleRinsed);
+//		cbTripleRinsed.setOnCheckedChangeListener(ccl);
+//		cbPunctured = (CheckBox) findViewById(R.id.cbPunctured);
+//		cbPunctured.setOnCheckedChangeListener(ccl);
+//		cbTakenBackToBase = (CheckBox) findViewById(R.id.cbTakenBackToBase);
+//		cbTakenBackToBase.setOnCheckedChangeListener(ccl);
+//		cbLeftInField = (CheckBox) findViewById(R.id.cbLeftInField);
+//		cbLeftInField.setOnCheckedChangeListener(ccl);
+//		cbBuried = (CheckBox) findViewById(R.id.cbBuried);
+//		cbBuried.setOnCheckedChangeListener(ccl);
+//		cbBurned = (CheckBox) findViewById(R.id.cbBurned);
+//		cbBurned.setOnCheckedChangeListener(ccl);
+//
+//		edtSafEmptyContainers = (EditText) findViewById(R.id.edtSafEmptyContainers);
+//		guiTable.add(edtSafEmptyContainers, "safety_container");
+//
+//
+//		edtSafEmptyContainers.addTextChangedListener(new TextWatcher()
+//		{
+//			public void afterTextChanged(Editable s)
+//			{
+//			}
+//
+//			public void beforeTextChanged(CharSequence s, int start, int count, int after)
+//			{
+//			}
+//
+//			public void onTextChanged(CharSequence s, int start, int before, int count)
+//			{
+//				String str = LocustHealthActivity.this.edtSafEmptyContainers.getText().toString();
+//				if (str.indexOf("1") != -1)
+//					LocustHealthActivity.this.cbTripleRinsed.setChecked(true);
+//				if (str.indexOf("2") != -1)
+//					LocustHealthActivity.this.cbPunctured.setChecked(true);
+//				if (str.indexOf("3") != -1)
+//					LocustHealthActivity.this.cbTakenBackToBase.setChecked(true);
+//				if (str.indexOf("4") != -1)
+//					LocustHealthActivity.this.cbLeftInField.setChecked(true);
+//				if (str.indexOf("5") != -1)
+//					LocustHealthActivity.this.cbBuried.setChecked(true);
+//				if (str.indexOf("6") != -1)
+//					LocustHealthActivity.this.cbBurned.setChecked(true);
+//			}
+//		});
+//
+//		spiSafNonTarget = findViewById(R.id.spiSafNonTarget); // воздействие на нецелевые организмы
+//		guiTable.add(spiSafNonTarget, "safety_non_target");
+//		((selectDB)spiSafNonTarget).addField("", "");
+//		((selectDB)spiSafNonTarget).addField(getString(R.string.Yes), "1");
+//		((selectDB)spiSafNonTarget).addField(getString(R.string.No), "0");
+//
+//		edtSafNonTargetEffect = (EditText) findViewById(R.id.edtSafNonTargetEffect); // если да, то какое
+//		guiTable.add(edtSafNonTargetEffect, "safety_non_target_effect");
+//
+//		// "safety_incident boolean," + //Другие инциденты по здоровью или окружающей среде, возникшие возможно при обработке
+//		// "safety_incident_effect text," + //Если Да, тип инцидента и кем сообщен (описание)
+//		spiSafIncident = findViewById(R.id.spiSafIncident); // Другие инциденты по здоровью или окружающей среде, возникшие возможно при обработке
+//		guiTable.add(spiSafIncident, "safety_incident");
+//		((selectDB)spiSafIncident).addField("", "");
+//		((selectDB)spiSafIncident).addField(getString(R.string.Yes), "1");
+//		((selectDB)spiSafIncident).addField(getString(R.string.No), "0");
+//
+//		edtSafIncidentEffect = (EditText) findViewById(R.id.edtSafIncidentEffect); // Если Да, тип инцидента и кем сообщен (описание)
+//		guiTable.add(edtSafIncidentEffect, "safety_incident_effect");
+//
+//		edtComments = (EditText) findViewById(R.id.edtComments); // КОММЕНТАР�?�?
+//		guiTable.add(edtComments, "comments");
+//
+//		// *** Кнопки ***
+//		btnGetGPSCenter = (View) findViewById(R.id.btnGetGPSCenter);
+//		OnClickListener oclBtnGetGPSCenter = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				DecimalFormatSymbols custom = new DecimalFormatSymbols(new Locale("en", "US"));
+//				custom.setDecimalSeparator('.');
+//
+//				DecimalFormat df = new DecimalFormat("0.0000000");
+//				df.setDecimalFormatSymbols(custom);
+//
+//				if(LocustHealthActivity.this._lat!=0 && LocustHealthActivity.this._lon!=0) {
+//					LocustHealthActivity.this.edtLatCenter.setText(df.format(LocustHealthActivity.this._lat));
+//					LocustHealthActivity.this.edtLonCenter.setText(df.format(LocustHealthActivity.this._lon));
+//				}
+//				//Checking if the GPS is active and if it is inactive, I display a warning about it
+//				LocationManager locationManager = (LocationManager) LocustHealthActivity.this.getSystemService(Context.LOCATION_SERVICE);;
+//				if(!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)){
+//					Toast.makeText(LocustHealthActivity.this, LocustHealthActivity.this.getResources().getString(R.string.Please_activate_GPS), Toast.LENGTH_LONG).show();
+//				}
+//			}
+//		};
+//		btnGetGPSCenter.setOnClickListener(oclBtnGetGPSCenter);
+//
+//		btnDelGPSCenter = (View) findViewById(R.id.btnDelGPSCenter);
+//		btnDelGPSCenter.setOnClickListener(new OnClickListener() {
+//			@Override
+//			public void onClick(View v) {
+//				LocustHealthActivity.this.edtLatCenter.setText("");
+//				LocustHealthActivity.this.edtLonCenter.setText("");
+//			}
+//		});
+//
+//		btnOnMap = (View) findViewById(R.id.btnOnMap);
+//		OnClickListener oclBtnOnMap = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				Intent intent = new Intent(LocustHealthActivity.this, MapsActivity.class);
+//				intent.putParcelableArrayListExtra("LatLon", ((LatLonAdapter)latlonList.getAdapter()).latlonList);
+//				intent.putExtra("uid", uid);
+//				startActivityForResult(intent,4);
+//			}
+//		};
+//		btnOnMap.setOnClickListener(oclBtnOnMap);
+//
+//		// android:id="@+id/btnOk"
+//		btnOk = (View) findViewById(R.id.btnOk);
+//		OnClickListener oclBtnOk = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				saveData();
+//			}
+//		};
+//		btnOk.setOnClickListener(oclBtnOk);
+//
+//		btnCancel = (View) findViewById(R.id.btnCancel);
+//		OnClickListener oclBtnCancel = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				AlertDialog.Builder adb = new AlertDialog.Builder(LocustHealthActivity.this, R.style.AlertDialogTheme);
+//				adb.setTitle(getString(R.string.Warning));
+//				adb.setMessage(LocustHealthActivity.this.getResources().getString(R.string.Cancel_filling_form));
+//				adb.setPositiveButton(LocustHealthActivity.this.getResources().getString(R.string.Yes), new DialogInterface.OnClickListener() {
+//					@Override
+//					public void onClick(DialogInterface dialog, int id) {
+//						LocustHealthActivity.this.finish();
+//					}
+//				});
+//				adb.setNegativeButton(LocustHealthActivity.this.getResources().getString(R.string.No), new DialogInterface.OnClickListener() {
+//					public void onClick(DialogInterface dialog, int id) {
+//
+//					}
+//				});
+//				AlertDialog ad = adb.show();
+//				ad.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(Color.BLACK);
+//				ad.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(Color.BLACK);
+//			}
+//		};
+//		btnCancel.setOnClickListener(oclBtnCancel);
+//		/*
+//		 * btnImage = (View) findViewById(R.id.btnImage); OnClickListener oclBtnImage = new OnClickListener() {
+//		 *
+//		 * @Override public void onClick(View v) { File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust"); directory.mkdirs();
+//		 *
+//		 * tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
+//		 *
+//		 * File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName); mImageUri = Uri.fromFile(file);
+//		 *
+//		 * Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri); startActivityForResult(intent, 1); } }; btnImage.setOnClickListener(oclBtnImage);
+//		 */
+//
+//		btnImage1 = (View) findViewById(R.id.btnImage1);
+//		OnClickListener oclBtnImage = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				// Создаём папку если её нет
+//				File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust");
+//				directory.mkdirs();
+//
+//				tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
+//
+//				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName);
+//
+//				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+//					mImageUri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider",file);
+//				else
+//					mImageUri = Uri.fromFile(file);
+//
+//				Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+//				intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri);
+//				startActivityForResult(intent, 1);
+//			}
+//		};
+//		btnImage1.setOnClickListener(oclBtnImage);
+//
+//		btnImage2 = (View) findViewById(R.id.btnImage2);
+//		oclBtnImage = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				// Создаём папку если её нет
+//				File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust");
+//				directory.mkdirs();
+//
+//				tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
+//
+//				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName);
+//				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+//					mImageUri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider",file);
+//				else
+//					mImageUri = Uri.fromFile(file);
+//
+//
+//				Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+//				intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri);
+//				startActivityForResult(intent, 2);
+//			}
+//		};
+//		btnImage2.setOnClickListener(oclBtnImage);
+//
+//		btnImage3 = (View) findViewById(R.id.btnImage3);
+//		oclBtnImage = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				// Создаём папку если её нет
+//				File directory = new File(Environment.getExternalStorageDirectory() + File.separator + "Pictures" + File.separator + "Locust");
+//				directory.mkdirs();
+//
+//				tmp_ImageName = "locust_" + (System.currentTimeMillis() / 1000L) + ".jpg";
+//
+//				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + tmp_ImageName);
+//				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+//					mImageUri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider",file);
+//				else
+//					mImageUri = Uri.fromFile(file);
+//
+//				Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+//				intent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri);
+//				startActivityForResult(intent, 3);
+//			}
+//		};
+//		btnImage3.setOnClickListener(oclBtnImage);
+//
+//		/*
+//		 * btnShowImage = (View) findViewById(R.id.btnShowImage1); OnClickListener oclBtnShowImage = new OnClickListener() {
+//		 *
+//		 * @Override public void onClick(View v) { File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage1.getText().toString()); Intent i = new Intent(); i.setAction(android.content.Intent.ACTION_VIEW); i.setDataAndType(Uri.fromFile(file), "image/jpg"); startActivity(i); } }; btnShowImage.setOnClickListener(oclBtnShowImage);
+//		 */
+//
+//		btnShowImage1 = (View) findViewById(R.id.btnShowImage1); // Отобразить фотографию 1 в новом окне
+//		OnClickListener oclBtnShowImage = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage1.getText().toString());
+//				if(!file.isFile()) file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/_" + edtImage1.getText().toString());
+//				if (file.isFile()) {
+//					//Uri uri = Uri.fromFile(file);
+//					Uri uri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider", file);
+//
+//					Intent i = new Intent();
+//					i.setAction(Intent.ACTION_VIEW);
+//					i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+//					i.setDataAndType(uri, "image/jpg");
+//					startActivity(i);
+//				}
+//			}
+//		};
+//		btnShowImage1.setOnClickListener(oclBtnShowImage);
+//
+//		btnShowImage2 = (View) findViewById(R.id.btnShowImage2); // Отобразить фотографию 1 в новом окне
+//		oclBtnShowImage = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage2.getText().toString());
+//				if(!file.isFile()) file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/_" + edtImage2.getText().toString());
+//				if (file.isFile()) {
+//					//Uri uri = Uri.fromFile(file);
+//					Uri uri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider", file);
+//
+//					Intent i = new Intent();
+//					i.setAction(Intent.ACTION_VIEW);
+//					i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+//					i.setDataAndType(uri, "image/jpg");
+//					startActivity(i);
+//				}
+//			}
+//		};
+//		btnShowImage2.setOnClickListener(oclBtnShowImage);
+//
+//		btnShowImage3 = (View) findViewById(R.id.btnShowImage3); // Отобразить фотографию 3 в новом окне
+//		oclBtnShowImage = new OnClickListener()
+//		{
+//			@Override
+//			public void onClick(View v)
+//			{
+//				File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/" + edtImage3.getText().toString());
+//				if(!file.isFile()) file = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/Locust/_" + edtImage3.getText().toString());
+//				if (file.isFile()) {
+//					//Uri uri = Uri.fromFile(file);
+//					Uri uri = FileProvider.getUriForFile(LocustHealthActivity.this, BuildConfig.APPLICATION_ID + ".provider", file);
+//
+//					Intent i = new Intent();
+//					i.setAction(Intent.ACTION_VIEW);
+//					i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+//					i.setDataAndType(uri, "image/jpg");
+//					startActivity(i);
+//				}
+//			}
+//		};
+//		btnShowImage3.setOnClickListener(oclBtnShowImage);
+//
+//		btnDelImage1 = (View) findViewById(R.id.btnDelImage1);
+//		btnDelImage1.setOnClickListener(
+//				new OnClickListener()
+//				{
+//					@Override
+//					public void onClick(View v)
+//					{
+//						edtImage1.setText("");
+//					}
+//				}
+//		);
+//
+//		btnDelImage2 = (View) findViewById(R.id.btnDelImage2);
+//		btnDelImage2.setOnClickListener(
+//				new OnClickListener()
+//				{
+//					@Override
+//					public void onClick(View v)
+//					{
+//						edtImage2.setText("");
+//					}
+//				}
+//		);
+//
+//		btnDelImage3 = (View) findViewById(R.id.btnDelImage3);
+//		btnDelImage3.setOnClickListener(
+//				new OnClickListener()
+//				{
+//					@Override
+//					public void onClick(View v)
+//					{
+//						edtImage3.setText("");
+//					}
+//				}
+//		);
+//
+//
+//		// Взависимости от параметров создание или редактирование
+//		editData(uid);
+//		adapter.notifyDataSetChanged();
+//		Tools.setListViewHeightBasedOnItems(latlonList);
+//
+//		//updateAlpha(); movied to onResume
+//
+//		// Чтоб слушать GPS (в конце метода чтобы успели присвоиться  GUI компоненты локальным переменным)
+//		_lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+//		if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+//			return;
+//		}
+//		_lm.requestLocationUpdates(LocationManager.GPS_PROVIDER, 500, 1, this);
 	}
 
 	@Override
 	public void onResume(){
 		super.onResume();
-
-		if(spiCountry.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiCountry).updateAdapter(this);
-		if(spiRegion.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiRegion).updateAdapter(this);
-		if(spiVegType.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiVegType).updateAdapter(this);
-		if(spiVegCover.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiVegCover).updateAdapter(this);
-		if(spiVegDamage.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiVegDamage).updateAdapter(this);
-		if(spiInsFormulation.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiInsFormulation).updateAdapter(this);
-		if(spiWeaTimeStart.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiWeaTimeStart).updateAdapter(this);
-		if(spiWeaTimeEnd.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiWeaTimeEnd).updateAdapter(this);
-		if(spiWindDirectionStart.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiWindDirectionStart).updateAdapter(this);
-		if(spiWindDirectionEnd.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiWindDirectionEnd).updateAdapter(this);
-		if(spiSprayDirectionStart.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprayDirectionStart).updateAdapter(this);
-		if(spiSprayDirectionEnd.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprayDirectionEnd).updateAdapter(this);
-		//if(spiLocSpecies.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiLocSpeciese).updateAdapter(this);
-		if(spiLocHoppers.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiLocHoppers).updateAdapter(this);
-		//if(spiImago.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiImago).updateAdapter(this);
-		//if(spiKuliguli.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiKuliguli).updateAdapter(this);
-		//if(spiSwarm.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSwarm).updateAdapter(this);
-		//if(spiSparse.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSparse).updateAdapter(this);
-		if(spiMainPurpose.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiMainPurpose).updateAdapter(this);
-		if(spiLocustPhaseId.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiLocustPhaseId).updateAdapter(this);
-		if(spiSprPlatform.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatform).updateAdapter(this);
-		if(spiSprPlatformA.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatformA).updateAdapter(this);
-		if(spiSprPlatformG.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatformG).updateAdapter(this);
-		if(spiSprPlatformH.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatformH).updateAdapter(this);
-		if(spiSprBarrier.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprBarrier).updateAdapter(this);
-		if(spiSprMarking.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprMarking).updateAdapter(this);
-		if(spiEffMethod.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffMethod).updateAdapter(this);
-		if(spiProtectiveClothingClean.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiProtectiveClothingClean).updateAdapter(this);
-		if(spiOperatorExposedInsecticide.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiOperatorExposedInsecticide).updateAdapter(this);
-		if(spiSafNonTarget.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSafNonTarget).updateAdapter(this);
-		if(spiSafIncident.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSafIncident).updateAdapter(this);
-
-		updateAlpha();
+//
+//		if(spiCountry.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiCountry).updateAdapter(this);
+//		if(spiRegion.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiRegion).updateAdapter(this);
+//		if(spiVegType.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiVegType).updateAdapter(this);
+//		if(spiVegCover.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiVegCover).updateAdapter(this);
+//		if(spiVegDamage.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiVegDamage).updateAdapter(this);
+//		if(spiInsFormulation.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiInsFormulation).updateAdapter(this);
+//		if(spiWeaTimeStart.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiWeaTimeStart).updateAdapter(this);
+//		if(spiWeaTimeEnd.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiWeaTimeEnd).updateAdapter(this);
+//		if(spiWindDirectionStart.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiWindDirectionStart).updateAdapter(this);
+//		if(spiWindDirectionEnd.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiWindDirectionEnd).updateAdapter(this);
+//		if(spiSprayDirectionStart.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprayDirectionStart).updateAdapter(this);
+//		if(spiSprayDirectionEnd.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprayDirectionEnd).updateAdapter(this);
+//		//if(spiLocSpecies.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiLocSpeciese).updateAdapter(this);
+//		if(spiLocHoppers.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiLocHoppers).updateAdapter(this);
+//		//if(spiImago.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiImago).updateAdapter(this);
+//		//if(spiKuliguli.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiKuliguli).updateAdapter(this);
+//		//if(spiSwarm.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSwarm).updateAdapter(this);
+//		//if(spiSparse.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSparse).updateAdapter(this);
+//		if(spiMainPurpose.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiMainPurpose).updateAdapter(this);
+//		if(spiLocustPhaseId.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiLocustPhaseId).updateAdapter(this);
+//		if(spiSprPlatform.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatform).updateAdapter(this);
+//		if(spiSprPlatformA.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatformA).updateAdapter(this);
+//		if(spiSprPlatformG.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatformG).updateAdapter(this);
+//		if(spiSprPlatformH.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprPlatformH).updateAdapter(this);
+//		if(spiSprBarrier.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprBarrier).updateAdapter(this);
+//		if(spiSprMarking.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSprMarking).updateAdapter(this);
+//		if(spiEffMethod.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffMethod).updateAdapter(this);
+//		if(spiProtectiveClothingClean.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiProtectiveClothingClean).updateAdapter(this);
+//		if(spiOperatorExposedInsecticide.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiOperatorExposedInsecticide).updateAdapter(this);
+//		if(spiSafNonTarget.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSafNonTarget).updateAdapter(this);
+//		if(spiSafIncident.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiSafIncident).updateAdapter(this);
+//
+//		updateAlpha();
 	}
 
 	// Сохраняются настройки перед уничтожением формы
@@ -1860,31 +1891,31 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 	 */
 	public void editData(String uid)
 	{
-		if (uid == null || uid == "")
-		{
-			((fieldDB)edtDate).setValue(String.valueOf((new Date()).getTime()/1000));
-			edtTimeZone.setText(Tools.getTimezone());
-		}
-		guiTable.read(uid);
-		//Читаю список координат из базы данных
-		if (uid != null)
-		{
-			LatLonAdapter adapter = (LatLonAdapter)latlonList.getAdapter();
-			ArrayList<LatLon> list = adapter.latlonList;
-			list.clear();
-			DbOpenHelper dboh = new DbOpenHelper(this);
-			Cursor cursor = dboh.getReadableDatabase().rawQuery("select lat,lon from frmlocustdel_locations where frmlocustdel_uid='" + uid + "' order by pos", null);
-			if (cursor.moveToFirst())
-			{
-				do
-				{
-					list.add(new LatLon(cursor.getDouble(0), cursor.getDouble(1)));
-				} while (cursor.moveToNext());
-			}
-			cursor.close();
-			dboh.close();
-			list.add(new LatLon(0, 0));
-		}
+//		if (uid == null || uid == "")
+//		{
+//			((fieldDB)edtDate).setValue(String.valueOf((new Date()).getTime()/1000));
+//			edtTimeZone.setText(Tools.getTimezone());
+//		}
+//		guiTable.read(uid);
+//		//Читаю список координат из базы данных
+//		if (uid != null)
+//		{
+//			LatLonAdapter adapter = (LatLonAdapter)latlonList.getAdapter();
+//			ArrayList<LatLon> list = adapter.latlonList;
+//			list.clear();
+//			DbOpenHelper dboh = new DbOpenHelper(this);
+//			Cursor cursor = dboh.getReadableDatabase().rawQuery("select lat,lon from frmlocustdel_locations where frmlocustdel_uid='" + uid + "' order by pos", null);
+//			if (cursor.moveToFirst())
+//			{
+//				do
+//				{
+//					list.add(new LatLon(cursor.getDouble(0), cursor.getDouble(1)));
+//				} while (cursor.moveToNext());
+//			}
+//			cursor.close();
+//			dboh.close();
+//			list.add(new LatLon(0, 0));
+//		}
 	}
 
 	/***
@@ -1947,436 +1978,436 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 	 */
 	public void saveData()
 	{
-		// Checking for fullness of fields
-		String atxt = getString(R.string.Not_filled); // Текст для алерта: "Не заполнено поле".
-		boolean eFields = false; // У анкеты 2 состояния 1) Заполнены все обяз поля 2) Не заполнены все обяз поля
-
-		if (!eFields && !isGONE(spiCountry) && ((selectDB)spiCountry).getText().toString().equals(""))
-		{
-			scrollTo(spiCountry);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Country) + "\"!"; //@string/Country
-			eFields = true;
-		}
-		if (!eFields && !isGONE(spiRegion) && (((selectDB)spiRegion).getValue() == null || ((selectDB)spiRegion).getValue().equals("")))
-		{
-			scrollTo(spiRegion);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Region) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(edtArea) && edtArea.getText().toString().equals(""))
-		{
-			scrollTo(edtArea);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Area) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(edtVillage) && edtVillage.getText().toString().equals(""))
-		{
-			scrollTo(edtVillage);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Name_of_the_village) + "\"!";
-			eFields = true;
-		}
-		if(!eFields && !isGONE(edtObserver) && edtObserver.getText().toString().equals(""))
-		{
-			scrollTo(edtObserver);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Name_of_survey_team_leader) + "\"!";
-			eFields = true;
-		}
-
-		if (!eFields && !isGONE(edtDate) && (((fieldDB)edtDate).getValue() == null || ((fieldDB)edtDate).getValue().equals("")))
-		{
-			scrollTo(edtDate);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Date) + "\"!";
-			eFields = true;
-		}
-		// TODO Не забыть раскоментировать при публикации новой версии
-		if (!eFields && (!isGONE(edtLatCenter) && edtLatCenter.getText().toString().equals("") || Tools.getDouble(edtLatCenter.getText().toString(),0.0) == 0))
-		{
-			scrollTo(edtLatCenter);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Lat_center) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && (!isGONE(edtLonCenter) && edtLonCenter.getText().toString().equals("") || Tools.getDouble(edtLonCenter.getText().toString(),0.0) == 0))
-		{
-			scrollTo(edtLonCenter);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Lon_center) + "\"!";
-			eFields = true;
-		}
-
-		if (!eFields && !isGONE(edtInfestedArea))
-		{
-			if(edtInfestedArea.getText().toString().equals(""))
-			{
-				scrollTo(edtInfestedArea);
-				atxt = atxt + ": \"" + getResources().getString(R.string.Area_infested_ha) + "\"!";
-				eFields = true;
-			}else
-			if(!checkMinMaxI(edtInfestedArea,0,1000).isEmpty())
-			{
-				scrollTo(edtInfestedArea);
-				atxt = checkMinMaxI(edtInfestedArea,0,1000) + " \"" + getResources().getString(R.string.Area_infested_ha) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(edtTreatedArea))
-		{
-			if(edtTreatedArea.getText().toString().equals(""))
-			{
-				scrollTo(edtTreatedArea);
-				atxt = atxt + ": \"" + getResources().getString(R.string.Area_treated_ha) + "\"!";
-				eFields = true;
-			}else
-			if(!checkMinMaxI(edtTreatedArea,0,1000).isEmpty())
-			{
-				scrollTo(edtTreatedArea);
-				atxt = checkMinMaxI(edtTreatedArea,0,1000) + " \"" + getResources().getString(R.string.Area_treated_ha) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(spiVegType) && ((selectDB)spiVegType).getText().toString().equals(""))
-		{
-			scrollTo(spiVegType);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Vegetation_type) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(edtVegHeight))
-		{
-			if(edtVegHeight.getText().toString().equals(""))
-			{
-				scrollTo(edtVegHeight);
-				atxt = atxt + ": \"" + getResources().getString(R.string.Height_cm) + "\"!";
-				eFields = true;
-			}else
-			if(!checkMinMaxI(edtVegHeight,0,600).isEmpty())
-			{
-				scrollTo(edtVegHeight);
-				atxt = checkMinMaxI(edtVegHeight,0,600) + " \"" + getResources().getString(R.string.Height_cm) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(spiVegCover) && ((selectDB)spiVegCover).getText().toString().equals(""))
-		{
-			scrollTo(spiVegCover);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Del_Vegetation_cover) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(spiVegDamage) && ((selectDB)spiVegDamage).getText().toString().equals(""))
-		{
-			scrollTo(spiVegDamage);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Damage) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(edtVegDamageArea))
-		{
-			if(!checkMinMaxI(edtVegDamageArea,0,100000).isEmpty())
-			{
-				scrollTo(edtVegDamageArea);
-				atxt = checkMinMaxI(edtVegDamageArea,0,100000) + " \"" + getResources().getString(R.string.Damage_area_ha) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(edtInsName) && edtInsName.getText().toString().equals(""))
-		{
-			scrollTo(edtInsName);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Trade_name) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(edtInsActiveSubstance) && edtInsActiveSubstance.getText().toString().equals(""))
-		{
-			scrollTo(edtInsActiveSubstance);
-			atxt = atxt + ": \"" + getResources().getString(R.string.The_active_substance) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(edtInsConcentration))
-		{
-			if(edtInsConcentration.getText().toString().equals(""))
-			{
-				scrollTo(edtInsConcentration);
-				atxt = atxt + ": \"" + getResources().getString(R.string.Concentration_A_S) + "\"!";
-				eFields = true;
-			}/*else
-			if(!checkMinMaxI(edtInsConcentration,0,100).isEmpty())
-			{
-				scrollTo(edtInsConcentration);
-				atxt = checkMinMaxI(edtInsConcentration,0,100) + " \"" + getResources().getString(R.string.Concentration_A_S) + "\"!";
-				eFields = true;
-			}*/
-		}
-		if (!eFields && !isGONE(spiInsFormulation) && ((selectDB)spiInsFormulation).getText().toString().equals(""))
-		{
-			scrollTo(spiInsFormulation);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Formulation) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(edtInsDose))
-		{
-			if(!checkMinMaxI(edtInsDose,0.005f,5).isEmpty())
-			{
-				scrollTo(edtInsDose);
-				atxt = checkMinMaxI(edtInsDose,0.005f,5) + " \"" + getResources().getString(R.string.Dose_rate_l_of_commercial_product_ha) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(edtInsRate))
-		{
-			if(!checkMinMaxI(edtInsRate,0.1f,600).isEmpty())
-			{
-				scrollTo(edtInsRate);
-				atxt = checkMinMaxI(edtInsRate,0.1f,600) + " \"" + getResources().getString(R.string.Rate_of_working_solution_l_ha) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(edtInsUsedVolume))
-		{
-			if(edtInsUsedVolume.getText().toString().equals(""))
-			{
-				scrollTo(edtInsUsedVolume);
-				atxt = atxt + ": \"" + getResources().getString(R.string.Total_volume_of_working_solution_actually_applied_l) + "\"!";
-				eFields = true;
-			}else
-			if(!checkMinMaxI(edtInsUsedVolume,1,450000).isEmpty())
-			{
-				scrollTo(edtInsUsedVolume);
-				atxt = checkMinMaxI(edtInsUsedVolume,1,450000) + " \"" + getResources().getString(R.string.Total_volume_of_working_solution_actually_applied_l) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(spiWeaTimeStart) && ((selectDB)spiWeaTimeStart).getText().toString().equals(""))
-		{
-			scrollTo(spiWeaTimeStart);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Time_start) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(spiWeaTimeEnd) && ((selectDB)spiWeaTimeEnd).getText().toString().equals(""))
-		{
-			scrollTo(spiWeaTimeEnd);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Time_end) + "\"!";
-			eFields = true;
-		}		
-		if (!eFields && !isGONE(edtWeaTemperatureStart))
-		{
-			if(!checkMinMaxI(edtWeaTemperatureStart,0,50).isEmpty())
-			{
-				scrollTo(edtWeaTemperatureStart);
-				atxt = checkMinMaxI(edtWeaTemperatureStart,0,50) + " \"" + getResources().getString(R.string.Temperature_start) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(edtWeaTemperatureEnd))
-		{
-			if(!checkMinMaxI(edtWeaTemperatureEnd,0,50).isEmpty())
-			{
-				scrollTo(edtWeaTemperatureEnd);
-				atxt = checkMinMaxI(edtWeaTemperatureEnd,0,50) + " \"" + getResources().getString(R.string.Temperature_end) + "\"!";
-				eFields = true;
-			}
-		}
-
-		if (!eFields && !isGONE(edtWeaWindSpeedStart))
-		{
-			if(!checkMinMaxI(edtWeaWindSpeedStart,0,20).isEmpty())
-			{
-				scrollTo(edtWeaWindSpeedStart);
-				atxt = checkMinMaxI(edtWeaWindSpeedStart,0,20) + " \"" + getResources().getString(R.string.Wind_speed_start_m_s) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(edtWeaWindSpeedEnd))
-		{
-			if(!checkMinMaxI(edtWeaWindSpeedEnd,0,20).isEmpty())
-			{
-				scrollTo(edtWeaWindSpeedEnd);
-				atxt = checkMinMaxI(edtWeaWindSpeedEnd,0,20) + " \"" + getResources().getString(R.string.Wind_speed_end_m_s) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(spiLocSpecies) && ((selectDB)spiLocSpecies).getText().toString().equals(""))
-		{
-			scrollTo(spiLocSpecies);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Type) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(spiLocHoppers) && ((selectDB)spiLocHoppers).getText().toString().equals(""))
-		{
-			scrollTo(spiLocHoppers);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Hopper_stages) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(edtLocDensity))
-		{
-			if(edtLocDensity.getText().toString().equals(""))
-			{
-				scrollTo(edtLocDensity);
-				atxt = atxt + ": \"" + getResources().getString(R.string.Density_m2) + "\"!";
-				eFields = true;
-			}else
-			if(!checkMinMaxI(edtLocDensity,0,80000).isEmpty())
-			{
-				scrollTo(edtLocDensity);
-				atxt = checkMinMaxI(edtLocDensity,0,80000) + " \"" + getResources().getString(R.string.Density_m2) + "\"!";
-				eFields = true;
-			}				
-		}
-		if (!eFields && !isGONE(spiMainPurpose) && ((selectDB)spiMainPurpose).getText().toString().equals(""))
-		{
-			scrollTo(spiMainPurpose);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Main_purpose_of_treatment) + "\"!";
-			eFields = true;
-		}
-//		if (!eFields && !isGONE(spiKuliguli) && ((selectDB)spiKuliguli).getText().toString().equals(""))
+//		// Checking for fullness of fields
+//		String atxt = getString(R.string.Not_filled); // Текст для алерта: "Не заполнено поле".
+//		boolean eFields = false; // У анкеты 2 состояния 1) Заполнены все обяз поля 2) Не заполнены все обяз поля
+//
+//		if (!eFields && !isGONE(spiCountry) && ((selectDB)spiCountry).getText().toString().equals(""))
 //		{
-//			scrollTo(spiKuliguli);
-//			atxt = atxt + ": \"" + getResources().getString(R.string.Bands) + "\"!";
+//			scrollTo(spiCountry);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Country) + "\"!"; //@string/Country
 //			eFields = true;
 //		}
-//		if (!eFields && !isGONE(spiSwarm) && ((selectDB)spiSwarm).getText().toString().equals(""))
+//		if (!eFields && !isGONE(spiRegion) && (((selectDB)spiRegion).getValue() == null || ((selectDB)spiRegion).getValue().equals("")))
 //		{
-//			scrollTo(spiSwarm);
-//			atxt = atxt + ": \"" + getResources().getString(R.string.Swarms) + "\"!";
+//			scrollTo(spiRegion);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Region) + "\"!";
 //			eFields = true;
 //		}
-//		if (!eFields && !isGONE(spiSparse) && ((selectDB)spiSparse).getText().toString().equals(""))
+//		if (!eFields && !isGONE(edtArea) && edtArea.getText().toString().equals(""))
 //		{
-//			scrollTo(spiSparse);
-//			atxt = atxt + ": \"" + getResources().getString(R.string.Del_Scattered) + "\"!";
+//			scrollTo(edtArea);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Area) + "\"!";
 //			eFields = true;
 //		}
-		if (!eFields && !isGONE(spiSprPlatform) && ((selectDB)spiSprPlatform).getText().toString().equals(""))
-		{
-			scrollTo(spiSprPlatform);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Spray_platform) + "\"!";
-			eFields = true;
-		}
-		if (!eFields && !isGONE(edtSprHeight))
-		{
-			if(!checkMinMaxI(edtSprHeight,1,100).isEmpty())
-			{
-				scrollTo(edtSprHeight);
-				atxt = checkMinMaxI(edtSprHeight,1,100) + " \"" + getResources().getString(R.string.Atomizer_height_above_ground_m) + "\"!";
-				eFields = true;
-			}
-		}
-		if (!eFields && !isGONE(spiSprBarrier) && ((selectDB)spiSprBarrier).getText().toString().equals(""))
-		{
-			scrollTo(spiSprBarrier);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Barriers) + "\"!";
-			eFields = true;
-		}
-//		if (!eFields && !isGONE(edtSprBarrierWidth))
+//		if (!eFields && !isGONE(edtVillage) && edtVillage.getText().toString().equals(""))
 //		{
-//			if(!checkMinMaxI(edtSprBarrierWidth,1,300).isEmpty())
+//			scrollTo(edtVillage);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Name_of_the_village) + "\"!";
+//			eFields = true;
+//		}
+//		if(!eFields && !isGONE(edtObserver) && edtObserver.getText().toString().equals(""))
+//		{
+//			scrollTo(edtObserver);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Name_of_survey_team_leader) + "\"!";
+//			eFields = true;
+//		}
+//
+//		if (!eFields && !isGONE(edtDate) && (((fieldDB)edtDate).getValue() == null || ((fieldDB)edtDate).getValue().equals("")))
+//		{
+//			scrollTo(edtDate);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Date) + "\"!";
+//			eFields = true;
+//		}
+//		// TODO Не забыть раскоментировать при публикации новой версии
+//		if (!eFields && (!isGONE(edtLatCenter) && edtLatCenter.getText().toString().equals("") || Tools.getDouble(edtLatCenter.getText().toString(),0.0) == 0))
+//		{
+//			scrollTo(edtLatCenter);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Lat_center) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && (!isGONE(edtLonCenter) && edtLonCenter.getText().toString().equals("") || Tools.getDouble(edtLonCenter.getText().toString(),0.0) == 0))
+//		{
+//			scrollTo(edtLonCenter);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Lon_center) + "\"!";
+//			eFields = true;
+//		}
+//
+//		if (!eFields && !isGONE(edtInfestedArea))
+//		{
+//			if(edtInfestedArea.getText().toString().equals(""))
 //			{
-//				scrollTo(edtSprBarrierWidth);
-//				atxt = checkMinMaxI(edtSprBarrierWidth,1,300) + " \"" + getResources().getString(R.string.Barrier_width_m) + "\"!";
+//				scrollTo(edtInfestedArea);
+//				atxt = atxt + ": \"" + getResources().getString(R.string.Area_infested_ha) + "\"!";
+//				eFields = true;
+//			}else
+//			if(!checkMinMaxI(edtInfestedArea,0,1000).isEmpty())
+//			{
+//				scrollTo(edtInfestedArea);
+//				atxt = checkMinMaxI(edtInfestedArea,0,1000) + " \"" + getResources().getString(R.string.Area_infested_ha) + "\"!";
 //				eFields = true;
 //			}
 //		}
-		if (!eFields && !isGONE(edtSprBarrierSpace))
-		{
-			if(!checkMinMaxI(edtSprBarrierSpace,1,1000).isEmpty())
-			{
-				scrollTo(edtSprBarrierSpace);
-				atxt = checkMinMaxI(edtSprBarrierSpace,1,1000) + " \"" + getResources().getString(R.string.Spacing_of_barriers_m) + "\"!";
-				eFields = true;
-			}
-		}
-
-		if (!eFields && !isGONE(edtSprSpeed))
-		{
-			if(edtSprSpeed.getText().toString().equals(""))
-			{
-				scrollTo(edtSprSpeed);
-				atxt = atxt + ": \"" + getResources().getString(R.string.Forward_speed_km_h) + "\"!";
-				eFields = true;
-			}else
-			if(!checkMinMaxI(edtSprSpeed,1,300).isEmpty())
-			{
-				scrollTo(edtSprSpeed);
-				atxt = checkMinMaxI(edtSprSpeed,1,300) + " \"" + getResources().getString(R.string.Forward_speed_km_h) + "\"!";
-				eFields = true;
-			}
-		}
-		if(!eFields && !isGONE(edtEffMortality) )
-		{
-			if(edtEffMortality.getText().toString().equals(""))
-			{
-				scrollTo(edtEffMortality);
-				atxt = atxt + ": \"" + getResources().getString(R.string.Biological_efficiency_of_treatment) + "\"!";
-				eFields = true;
-			}else
-			if(!checkMinMaxI(edtEffMortality,0,100).isEmpty())
-			{
-				scrollTo(edtEffMortality);
-				atxt = checkMinMaxI(edtEffMortality,0,100) + " \"" + getResources().getString(R.string.Biological_efficiency_of_treatment) + "\"!";
-				eFields = true;
-			}				
-		}
-		if(!eFields && !isGONE(edtEffTime))
-		{
-			if(edtEffTime.getText().toString().equals(""))
-			{
-				scrollTo(edtEffTime);
-				atxt = atxt + ": \"" + getResources().getString(R.string.Time_after_treatment_hours) + "\"!";
-				eFields = true;
-			}else
-			if(!checkMinMaxI(edtEffTime,0,240).isEmpty())
-			{
-				scrollTo(edtEffTime);
-				atxt = checkMinMaxI(edtEffTime,0,240) + " \"" + getResources().getString(R.string.Time_after_treatment_hours) + "\"!";
-				eFields = true;
-			}			
-		}
-		if(!eFields && !isGONE(edtClothing) && edtClothing.getText().toString().equals(""))
-		{
-			scrollTo(edtClothing);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Protective_clothing) + "\"!";
-			eFields = true;
-		}
-		if(!eFields && !isGONE(spiSafNonTarget) && ((selectDB)spiSafNonTarget).getText().toString().equals("")) // воздействие на нецелевые организмы
-		{
-			scrollTo(spiSafNonTarget);
-			atxt = atxt + ": \"" + getResources().getString(R.string.Effect_on_non_terget_organism) + "\"!";
-			eFields = true;
-		}
-		if (eFields) // Если не заполнены все обязательные поля
-		{
-			m_Filled.setValue("0");
-
-			AlertDialog.Builder adb = new AlertDialog.Builder(this,R.style.AlertDialogTheme);
-			adb.setTitle(getString(R.string.Warning));
-
-			adb.setMessage(atxt + "\n" + getString(R.string.not_filled_fields));
-			adb.setPositiveButton(getString(R.string.Yes), new DialogInterface.OnClickListener()
-			{
-				@Override
-				public void onClick(DialogInterface arg0, int arg1)
-				{
-					// Do nothing
-				}
-			});
-			adb.setNegativeButton(getString(R.string.No), new DialogInterface.OnClickListener()
-			{
-				@Override
-				public void onClick(DialogInterface arg0, int arg1)
-				{
-					String uid=guiTable.write(); //Add or save data
-					saveLocations(uid);
-					LocustHealthActivity.this.finish(); // Close the form
-				}
-			});
-			AlertDialog ad = adb.show();
-			ad.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(Color.BLACK);
-			ad.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(Color.BLACK);
-
-		} else
-		{
-			m_Filled.setValue("1");
-
-			String uid=guiTable.write(); //Добавляем либо сохраняем данные
-			saveLocations(uid);
-
-			startService(new Intent(this, MainService.class).putExtra(MainService.PARAM_ACTION, "1")); // Чтоб вызвать событие таймера в сервисе
-			LocustHealthActivity.this.finish(); // Закрываем форму
-		}
+//		if (!eFields && !isGONE(edtTreatedArea))
+//		{
+//			if(edtTreatedArea.getText().toString().equals(""))
+//			{
+//				scrollTo(edtTreatedArea);
+//				atxt = atxt + ": \"" + getResources().getString(R.string.Area_treated_ha) + "\"!";
+//				eFields = true;
+//			}else
+//			if(!checkMinMaxI(edtTreatedArea,0,1000).isEmpty())
+//			{
+//				scrollTo(edtTreatedArea);
+//				atxt = checkMinMaxI(edtTreatedArea,0,1000) + " \"" + getResources().getString(R.string.Area_treated_ha) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(spiVegType) && ((selectDB)spiVegType).getText().toString().equals(""))
+//		{
+//			scrollTo(spiVegType);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Vegetation_type) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(edtVegHeight))
+//		{
+//			if(edtVegHeight.getText().toString().equals(""))
+//			{
+//				scrollTo(edtVegHeight);
+//				atxt = atxt + ": \"" + getResources().getString(R.string.Height_cm) + "\"!";
+//				eFields = true;
+//			}else
+//			if(!checkMinMaxI(edtVegHeight,0,600).isEmpty())
+//			{
+//				scrollTo(edtVegHeight);
+//				atxt = checkMinMaxI(edtVegHeight,0,600) + " \"" + getResources().getString(R.string.Height_cm) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(spiVegCover) && ((selectDB)spiVegCover).getText().toString().equals(""))
+//		{
+//			scrollTo(spiVegCover);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Del_Vegetation_cover) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(spiVegDamage) && ((selectDB)spiVegDamage).getText().toString().equals(""))
+//		{
+//			scrollTo(spiVegDamage);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Damage) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(edtVegDamageArea))
+//		{
+//			if(!checkMinMaxI(edtVegDamageArea,0,100000).isEmpty())
+//			{
+//				scrollTo(edtVegDamageArea);
+//				atxt = checkMinMaxI(edtVegDamageArea,0,100000) + " \"" + getResources().getString(R.string.Damage_area_ha) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(edtInsName) && edtInsName.getText().toString().equals(""))
+//		{
+//			scrollTo(edtInsName);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Trade_name) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(edtInsActiveSubstance) && edtInsActiveSubstance.getText().toString().equals(""))
+//		{
+//			scrollTo(edtInsActiveSubstance);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.The_active_substance) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(edtInsConcentration))
+//		{
+//			if(edtInsConcentration.getText().toString().equals(""))
+//			{
+//				scrollTo(edtInsConcentration);
+//				atxt = atxt + ": \"" + getResources().getString(R.string.Concentration_A_S) + "\"!";
+//				eFields = true;
+//			}/*else
+//			if(!checkMinMaxI(edtInsConcentration,0,100).isEmpty())
+//			{
+//				scrollTo(edtInsConcentration);
+//				atxt = checkMinMaxI(edtInsConcentration,0,100) + " \"" + getResources().getString(R.string.Concentration_A_S) + "\"!";
+//				eFields = true;
+//			}*/
+//		}
+//		if (!eFields && !isGONE(spiInsFormulation) && ((selectDB)spiInsFormulation).getText().toString().equals(""))
+//		{
+//			scrollTo(spiInsFormulation);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Formulation) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(edtInsDose))
+//		{
+//			if(!checkMinMaxI(edtInsDose,0.005f,5).isEmpty())
+//			{
+//				scrollTo(edtInsDose);
+//				atxt = checkMinMaxI(edtInsDose,0.005f,5) + " \"" + getResources().getString(R.string.Dose_rate_l_of_commercial_product_ha) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(edtInsRate))
+//		{
+//			if(!checkMinMaxI(edtInsRate,0.1f,600).isEmpty())
+//			{
+//				scrollTo(edtInsRate);
+//				atxt = checkMinMaxI(edtInsRate,0.1f,600) + " \"" + getResources().getString(R.string.Rate_of_working_solution_l_ha) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(edtInsUsedVolume))
+//		{
+//			if(edtInsUsedVolume.getText().toString().equals(""))
+//			{
+//				scrollTo(edtInsUsedVolume);
+//				atxt = atxt + ": \"" + getResources().getString(R.string.Total_volume_of_working_solution_actually_applied_l) + "\"!";
+//				eFields = true;
+//			}else
+//			if(!checkMinMaxI(edtInsUsedVolume,1,450000).isEmpty())
+//			{
+//				scrollTo(edtInsUsedVolume);
+//				atxt = checkMinMaxI(edtInsUsedVolume,1,450000) + " \"" + getResources().getString(R.string.Total_volume_of_working_solution_actually_applied_l) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(spiWeaTimeStart) && ((selectDB)spiWeaTimeStart).getText().toString().equals(""))
+//		{
+//			scrollTo(spiWeaTimeStart);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Time_start) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(spiWeaTimeEnd) && ((selectDB)spiWeaTimeEnd).getText().toString().equals(""))
+//		{
+//			scrollTo(spiWeaTimeEnd);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Time_end) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(edtWeaTemperatureStart))
+//		{
+//			if(!checkMinMaxI(edtWeaTemperatureStart,0,50).isEmpty())
+//			{
+//				scrollTo(edtWeaTemperatureStart);
+//				atxt = checkMinMaxI(edtWeaTemperatureStart,0,50) + " \"" + getResources().getString(R.string.Temperature_start) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(edtWeaTemperatureEnd))
+//		{
+//			if(!checkMinMaxI(edtWeaTemperatureEnd,0,50).isEmpty())
+//			{
+//				scrollTo(edtWeaTemperatureEnd);
+//				atxt = checkMinMaxI(edtWeaTemperatureEnd,0,50) + " \"" + getResources().getString(R.string.Temperature_end) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//
+//		if (!eFields && !isGONE(edtWeaWindSpeedStart))
+//		{
+//			if(!checkMinMaxI(edtWeaWindSpeedStart,0,20).isEmpty())
+//			{
+//				scrollTo(edtWeaWindSpeedStart);
+//				atxt = checkMinMaxI(edtWeaWindSpeedStart,0,20) + " \"" + getResources().getString(R.string.Wind_speed_start_m_s) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(edtWeaWindSpeedEnd))
+//		{
+//			if(!checkMinMaxI(edtWeaWindSpeedEnd,0,20).isEmpty())
+//			{
+//				scrollTo(edtWeaWindSpeedEnd);
+//				atxt = checkMinMaxI(edtWeaWindSpeedEnd,0,20) + " \"" + getResources().getString(R.string.Wind_speed_end_m_s) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(spiLocSpecies) && ((selectDB)spiLocSpecies).getText().toString().equals(""))
+//		{
+//			scrollTo(spiLocSpecies);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Type) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(spiLocHoppers) && ((selectDB)spiLocHoppers).getText().toString().equals(""))
+//		{
+//			scrollTo(spiLocHoppers);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Hopper_stages) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(edtLocDensity))
+//		{
+//			if(edtLocDensity.getText().toString().equals(""))
+//			{
+//				scrollTo(edtLocDensity);
+//				atxt = atxt + ": \"" + getResources().getString(R.string.Density_m2) + "\"!";
+//				eFields = true;
+//			}else
+//			if(!checkMinMaxI(edtLocDensity,0,80000).isEmpty())
+//			{
+//				scrollTo(edtLocDensity);
+//				atxt = checkMinMaxI(edtLocDensity,0,80000) + " \"" + getResources().getString(R.string.Density_m2) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(spiMainPurpose) && ((selectDB)spiMainPurpose).getText().toString().equals(""))
+//		{
+//			scrollTo(spiMainPurpose);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Main_purpose_of_treatment) + "\"!";
+//			eFields = true;
+//		}
+////		if (!eFields && !isGONE(spiKuliguli) && ((selectDB)spiKuliguli).getText().toString().equals(""))
+////		{
+////			scrollTo(spiKuliguli);
+////			atxt = atxt + ": \"" + getResources().getString(R.string.Bands) + "\"!";
+////			eFields = true;
+////		}
+////		if (!eFields && !isGONE(spiSwarm) && ((selectDB)spiSwarm).getText().toString().equals(""))
+////		{
+////			scrollTo(spiSwarm);
+////			atxt = atxt + ": \"" + getResources().getString(R.string.Swarms) + "\"!";
+////			eFields = true;
+////		}
+////		if (!eFields && !isGONE(spiSparse) && ((selectDB)spiSparse).getText().toString().equals(""))
+////		{
+////			scrollTo(spiSparse);
+////			atxt = atxt + ": \"" + getResources().getString(R.string.Del_Scattered) + "\"!";
+////			eFields = true;
+////		}
+//		if (!eFields && !isGONE(spiSprPlatform) && ((selectDB)spiSprPlatform).getText().toString().equals(""))
+//		{
+//			scrollTo(spiSprPlatform);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Spray_platform) + "\"!";
+//			eFields = true;
+//		}
+//		if (!eFields && !isGONE(edtSprHeight))
+//		{
+//			if(!checkMinMaxI(edtSprHeight,1,100).isEmpty())
+//			{
+//				scrollTo(edtSprHeight);
+//				atxt = checkMinMaxI(edtSprHeight,1,100) + " \"" + getResources().getString(R.string.Atomizer_height_above_ground_m) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if (!eFields && !isGONE(spiSprBarrier) && ((selectDB)spiSprBarrier).getText().toString().equals(""))
+//		{
+//			scrollTo(spiSprBarrier);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Barriers) + "\"!";
+//			eFields = true;
+//		}
+////		if (!eFields && !isGONE(edtSprBarrierWidth))
+////		{
+////			if(!checkMinMaxI(edtSprBarrierWidth,1,300).isEmpty())
+////			{
+////				scrollTo(edtSprBarrierWidth);
+////				atxt = checkMinMaxI(edtSprBarrierWidth,1,300) + " \"" + getResources().getString(R.string.Barrier_width_m) + "\"!";
+////				eFields = true;
+////			}
+////		}
+//		if (!eFields && !isGONE(edtSprBarrierSpace))
+//		{
+//			if(!checkMinMaxI(edtSprBarrierSpace,1,1000).isEmpty())
+//			{
+//				scrollTo(edtSprBarrierSpace);
+//				atxt = checkMinMaxI(edtSprBarrierSpace,1,1000) + " \"" + getResources().getString(R.string.Spacing_of_barriers_m) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//
+//		if (!eFields && !isGONE(edtSprSpeed))
+//		{
+//			if(edtSprSpeed.getText().toString().equals(""))
+//			{
+//				scrollTo(edtSprSpeed);
+//				atxt = atxt + ": \"" + getResources().getString(R.string.Forward_speed_km_h) + "\"!";
+//				eFields = true;
+//			}else
+//			if(!checkMinMaxI(edtSprSpeed,1,300).isEmpty())
+//			{
+//				scrollTo(edtSprSpeed);
+//				atxt = checkMinMaxI(edtSprSpeed,1,300) + " \"" + getResources().getString(R.string.Forward_speed_km_h) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if(!eFields && !isGONE(edtEffMortality) )
+//		{
+//			if(edtEffMortality.getText().toString().equals(""))
+//			{
+//				scrollTo(edtEffMortality);
+//				atxt = atxt + ": \"" + getResources().getString(R.string.Biological_efficiency_of_treatment) + "\"!";
+//				eFields = true;
+//			}else
+//			if(!checkMinMaxI(edtEffMortality,0,100).isEmpty())
+//			{
+//				scrollTo(edtEffMortality);
+//				atxt = checkMinMaxI(edtEffMortality,0,100) + " \"" + getResources().getString(R.string.Biological_efficiency_of_treatment) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if(!eFields && !isGONE(edtEffTime))
+//		{
+//			if(edtEffTime.getText().toString().equals(""))
+//			{
+//				scrollTo(edtEffTime);
+//				atxt = atxt + ": \"" + getResources().getString(R.string.Time_after_treatment_hours) + "\"!";
+//				eFields = true;
+//			}else
+//			if(!checkMinMaxI(edtEffTime,0,240).isEmpty())
+//			{
+//				scrollTo(edtEffTime);
+//				atxt = checkMinMaxI(edtEffTime,0,240) + " \"" + getResources().getString(R.string.Time_after_treatment_hours) + "\"!";
+//				eFields = true;
+//			}
+//		}
+//		if(!eFields && !isGONE(edtClothing) && edtClothing.getText().toString().equals(""))
+//		{
+//			scrollTo(edtClothing);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Protective_clothing) + "\"!";
+//			eFields = true;
+//		}
+//		if(!eFields && !isGONE(spiSafNonTarget) && ((selectDB)spiSafNonTarget).getText().toString().equals("")) // воздействие на нецелевые организмы
+//		{
+//			scrollTo(spiSafNonTarget);
+//			atxt = atxt + ": \"" + getResources().getString(R.string.Effect_on_non_terget_organism) + "\"!";
+//			eFields = true;
+//		}
+//		if (eFields) // Если не заполнены все обязательные поля
+//		{
+//			m_Filled.setValue("0");
+//
+//			AlertDialog.Builder adb = new AlertDialog.Builder(this,R.style.AlertDialogTheme);
+//			adb.setTitle(getString(R.string.Warning));
+//
+//			adb.setMessage(atxt + "\n" + getString(R.string.not_filled_fields));
+//			adb.setPositiveButton(getString(R.string.Yes), new DialogInterface.OnClickListener()
+//			{
+//				@Override
+//				public void onClick(DialogInterface arg0, int arg1)
+//				{
+//					// Do nothing
+//				}
+//			});
+//			adb.setNegativeButton(getString(R.string.No), new DialogInterface.OnClickListener()
+//			{
+//				@Override
+//				public void onClick(DialogInterface arg0, int arg1)
+//				{
+//					String uid=guiTable.write(); //Add or save data
+//					saveLocations(uid);
+//					LocustHealthActivity.this.finish(); // Close the form
+//				}
+//			});
+//			AlertDialog ad = adb.show();
+//			ad.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(Color.BLACK);
+//			ad.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(Color.BLACK);
+//
+//		} else
+//		{
+//			m_Filled.setValue("1");
+//
+//			String uid=guiTable.write(); //Добавляем либо сохраняем данные
+//			saveLocations(uid);
+//
+//			startService(new Intent(this, MainService.class).putExtra(MainService.PARAM_ACTION, "1")); // Чтоб вызвать событие таймера в сервисе
+//			LocustHealthActivity.this.finish(); // Закрываем форму
+//		}
 
 	}
 
diff --git a/app/src/main/java/kz/istt/locust/MainActivity.java b/app/src/main/java/kz/istt/locust/MainActivity.java
index 12c5752..86cf305 100644
--- a/app/src/main/java/kz/istt/locust/MainActivity.java
+++ b/app/src/main/java/kz/istt/locust/MainActivity.java
@@ -343,7 +343,7 @@ public class MainActivity extends Activity {
 
 	public void ShowLocustHealthActivity()
 	{
-		Intent intent = new Intent(this, LocustHealthActivity.class);
+		Intent intent = new Intent(this, LocustHealthListActivity.class);
 		startActivity(intent);
 	}
 
diff --git a/app/src/main/java/kz/istt/locust/SetupActivity.java b/app/src/main/java/kz/istt/locust/SetupActivity.java
index 9ce5c4b..973e08f 100644
--- a/app/src/main/java/kz/istt/locust/SetupActivity.java
+++ b/app/src/main/java/kz/istt/locust/SetupActivity.java
@@ -5,6 +5,7 @@ import android.app.PendingIntent;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
@@ -48,6 +49,7 @@ public class SetupActivity extends Activity {
 	public Button btnTm = null;
 	public Button btnAr = null;
 	public Button btnQR = null;
+	public Button btnDeleteAllData = null;
 	public CheckBox cbIdentifyCountryRegion = null;
 
 	public final static int TASK1_CODE = 1;
@@ -288,6 +290,28 @@ public class SetupActivity extends Activity {
 		};
 		btnQR.setOnClickListener(oclBtnQR);
 
+		//Delete all data
+		btnDeleteAllData = (Button) findViewById(R.id.btnDeleteAllData);
+		OnClickListener oclDeleteAllData = new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				DbOpenHelper dboh = new DbOpenHelper(SetupActivity.this);
+				dboh.dropAllTables(dboh.getReadableDatabase());
+				dboh.onCreate(dboh.getReadableDatabase());
+				dboh.close();
+
+				//Restarting APP
+				Intent intent = new Intent(SetupActivity.this, MainActivity.class);
+				intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+				intent.putExtra("EXIT", true);
+				startActivity(intent);
+				finish();
+			}
+		};
+		btnDeleteAllData.setOnClickListener(oclDeleteAllData);
+
 		//1 диалог на всё
 		/*dialog = new ProgressDialog(SetupActivity.this);
 		dialog.setMessage("Синхронизация...");
diff --git a/app/src/main/java/kz/istt/locust/XMLTools.java b/app/src/main/java/kz/istt/locust/XMLTools.java
index 56bd327..8d216ab 100644
--- a/app/src/main/java/kz/istt/locust/XMLTools.java
+++ b/app/src/main/java/kz/istt/locust/XMLTools.java
@@ -41,7 +41,7 @@ public class XMLTools
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Найти узел по имени
 	 * @param node
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 96300d5..cb0ebf1 100644
--- a/app/src/main/res/layout-land/activity_locust_health.xml
+++ b/app/src/main/res/layout-land/activity_locust_health.xml
@@ -7,7 +7,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".LocustDelActivity">
+    tools:context=".LocustHealthActivity">
 
     <ScrollView
         android:id="@+id/scrollView1"
@@ -24,228 +24,6 @@
             android:orientation="vertical"
             android:showDividers="middle">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:baselineAligned="false"
-                android:divider="@drawable/spacer_medium"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:showDividers="middle">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/transparent"
-                    app:boxBackgroundColor="@color/transparent">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtImage1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:enabled="false"
-                        android:focusable="false"
-                        android:hint="@string/Photo1"
-                        android:maxLines="1"
-                        android:singleLine="true" />
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnImage1"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_camera"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnShowImage1"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_photo"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnDelImage1"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_delete"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:baselineAligned="false"
-                android:divider="@drawable/spacer_medium"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:showDividers="middle">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/transparent"
-                    app:boxBackgroundColor="@color/transparent">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtImage2"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:enabled="false"
-                        android:focusable="false"
-                        android:hint="@string/Photo2"
-                        android:maxLines="1"
-                        android:singleLine="true" />
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnImage2"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_camera"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnShowImage2"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_photo"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnDelImage2"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_delete"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:baselineAligned="false"
-                android:divider="@drawable/spacer_medium"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:showDividers="middle">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/transparent"
-                    app:boxBackgroundColor="@color/transparent">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtImage3"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:enabled="false"
-                        android:focusable="false"
-                        android:hint="@string/Photo3"
-                        android:maxLines="1"
-                        android:singleLine="true" />
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnImage3"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_camera"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnShowImage3"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_photo"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnDelImage3"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_delete"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -331,30 +109,6 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/transparent"
-                    app:boxBackgroundColor="@color/transparent">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtDistrict"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:hint="@string/Rural_district"
-                        android:maxLines="1"
-                        android:singleLine="true" />
-                </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -382,31 +136,6 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/transparent"
-                    app:boxBackgroundColor="@color/transparent">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtTerrain"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:hint="@string/Farm_or_site"
-                        android:maxLines="1"
-                        android:singleLine="true" />
-                </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -604,29 +333,17 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center">
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
-                <com.google.android.material.textfield.TextInputLayout
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:id="@+id/textView13"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/transparent"
-                    app:boxBackgroundColor="@color/transparent">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtInfestedArea"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:hint="@string/Area_infested_ha"
-                        android:maxLines="1"
-                        android:singleLine="true"
-                        android:inputType="numberDecimal"/>
-                </com.google.android.material.textfield.TextInputLayout>
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Идентификация места мониторинга"
+                    android:textStyle="bold"/>
             </LinearLayout>
 
             <LinearLayout
@@ -643,46 +360,162 @@
                     android:layout_weight="1"
                     android:background="@color/transparent"
                     app:boxBackgroundColor="@color/transparent">
-
                     <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtTreatedArea"
+                        android:id="@+id/edtObserverHealth"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="@color/transparent"
-                        android:hint="@string/Area_treated_ha"
+                        android:hint="@string/Name_of_the_HH_Env_monitoring_team_leader"
                         android:maxLines="1"
-                        android:singleLine="true"
-                        android:inputType="numberDecimal"/>
+                        android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
-            <!--LinearLayout
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:gravity="center">
 
-                <TextView
-                    android:id="@+id/tvTreatedArea"
+                <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/Area_treated_ha"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
+                    android:src="@drawable/ic_star" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
-                <EditText
-                    android:id="@+id/edtTreatedArea"
-                    android:layout_width="0dp"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" />
-            </LinearLayout-->
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <dbfields.DateTimeTM
+                        android:id="@+id/edtMonitoringDate"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="@string/Date_of_monitoring"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <EditText
+                    android:id="@+id/edtMonitoringTimeZone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minWidth="2dp"
+                    android:visibility="invisible" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnMonitoringGetDate"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_clock"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/Was_a_spray_monitoring_form_for_this_treatment_filled_out_by_the_control_team">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiFrmLocustDelFilled"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Бригада по обработке"
+                    android:textStyle="bold"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtBrigadeCount"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Количество работников в бригаде по обработке"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="number"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtBrigadeCountTrained"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Из них количество работников, ранее обученных обращению с инсектицидами и их применению"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="number"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -814,50 +647,6 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center">
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
-                <com.google.android.material.textfield.TextInputLayout
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/Damage">
-                    <dbfields.AutoCompleteTextViewDB
-                        android:id="@+id/spiVegDamage"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-                </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/transparent"
-                    app:boxBackgroundColor="@color/transparent">
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtVegDamageArea"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:hint="@string/Damage_area_ha"
-                        android:maxLines="1"
-                        android:singleLine="true"
-                        android:inputType="numberDecimal"/>
-                </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -900,6 +689,80 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtInsPartNumber"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Номер партии препарата (если указан на контейнере)"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <dbfields.DateTimeTM
+                        android:id="@+id/edtInsManufacturedDate"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Дата производства или срок годности (срок хранения)"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <EditText
+                    android:id="@+id/edtInsManufacturedTimeZone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minWidth="2dp"
+                    android:visibility="invisible"
+                    android:inputType="text"/>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnInsManufacturedDate"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_clock"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -1002,7 +865,57 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/Commercial_product_diluted">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiInsDiluted"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtInsProportion"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="@string/Working_fluid_dilution_ratio"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1018,77 +931,31 @@
                         android:hint="@string/Rate_of_working_solution_l_ha"
                         android:maxLines="1"
                         android:singleLine="true"
-                        android:inputType="numberDecimal"/>
+                        android:inputType="numberDecimal"
+                        android:enabled="false"
+                        android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
                 <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/transparent"
-                    app:boxBackgroundColor="@color/transparent">
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtInsUsedVolume"
+                    android:hint="Состояние пакетов или контейнеров с инсектицидами">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiInsContainerState"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:hint="@string/Total_volume_of_working_solution_actually_applied_l"
-                        android:maxLines="1"
-                        android:singleLine="true"
-                        android:inputType="numberDecimal"/>
+                        android:enabled="false"
+                        android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
-            <!--LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvInsUsedVolume"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Total_volume_of_working_solution_actually_applied_l"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <EditText
-                    android:id="@+id/edtInsUsedVolume"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" />
-            </LinearLayout-->
-
-            <!--LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/transparent"
-                    app:boxBackgroundColor="@color/transparent">
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtInsNumberSpores"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:hint="@string/Number_of_spores_ml"
-                        android:maxLines="1"
-                        android:singleLine="true"
-                        android:inputType="numberDecimal"/>
-                </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout-->
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -1247,60 +1114,6 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_weight="1">
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        app:boxBackgroundColor="@color/transparent">
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/edtWeaWindSpeedStart"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:background="@color/transparent"
-                            android:hint="@string/Wind_speed_start_m_s"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:inputType="numberDecimal"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:paddingLeft="@dimen/activity_horizontal_margin"
-                    android:layout_weight="1">
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        app:boxBackgroundColor="@color/transparent">
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/edtWeaWindSpeedEnd"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:background="@color/transparent"
-                            android:hint="@string/Wind_speed_end_m_s"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:inputType="numberDecimal"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -1397,30 +1210,6 @@
                     android:textStyle="bold" />
             </LinearLayout>
 
-            <!--LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvLocSpeciese"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Type"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiLocSpeciese"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout-->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -1433,7 +1222,7 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/Locust_type">
+                    android:hint="@string/Species">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiLocSpecies"
                         android:layout_width="match_parent"
@@ -1468,27 +1257,8 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
-                <com.google.android.material.textfield.TextInputLayout
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/Imago">
-                    <dbfields.AutoCompleteTextViewDB
-                        android:id="@+id/spiImago"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-                </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center">
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1505,7 +1275,9 @@
                         android:hint="@string/Density_m2"
                         android:maxLines="1"
                         android:singleLine="true"
-                        android:inputType="numberDecimal"/>
+                        android:inputType="numberDecimal"
+                        android:enabled="false"
+                        android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -1516,73 +1288,19 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/Bands">
+                    android:hint="@string/Main_purpose_of_treatment">
                     <dbfields.AutoCompleteTextViewDB
-                        android:id="@+id/spiKuliguli"
+                        android:id="@+id/spiMainPurpose"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-                </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center">
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
-                <com.google.android.material.textfield.TextInputLayout
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/Swarms">
-                    <dbfields.AutoCompleteTextViewDB
-                        android:id="@+id/spiSwarm"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-                </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center">
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
-                <com.google.android.material.textfield.TextInputLayout
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/HOPPERS_SCATTERED">
-                    <dbfields.AutoCompleteTextViewDB
-                        android:id="@+id/spiSparse"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-                </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-                <com.google.android.material.textfield.TextInputLayout
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/Del_Phase">
-                    <dbfields.AutoCompleteTextViewDB
-                        android:id="@+id/spiLocustPhaseId"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:enabled="false"
+                        android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -1740,28 +1458,28 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center">
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/Barriers">
+                    android:hint="Механическая безопасность: наблюдалась ли утечка инсектицида?">
                     <dbfields.AutoCompleteTextViewDB
-                        android:id="@+id/spiSprBarrier"
+                        android:id="@+id/spiSprLeak"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
-            <!--LinearLayout
+            <LinearLayout
+                android:baselineAligned="false"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1769,17 +1487,63 @@
                     android:background="@color/transparent"
                     app:boxBackgroundColor="@color/transparent">
                     <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtSprBarrierWidth"
+                        android:id="@+id/edtSprLeakPlase"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="@color/transparent"
-                        android:hint="@string/Barrier_width_m"
+                        android:hint="Если Да, в какой части опрыскивателя имеется утечка?"
                         android:maxLines="1"
                         android:singleLine="true"
-                        android:inputType="numberDecimal"/>
+                        android:inputType="text"/>
                 </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout-->
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Система опрыскивания: повреждены распылители или сопла?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiSprDamage"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <!-- TODO в коде сделать android:visibility="gone" -->
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtSprDamagePlase"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Если Да, какие повреждения?"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="text"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -1788,7 +1552,31 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/Type_of_treatment">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiSprBarrier"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1804,7 +1592,9 @@
                         android:hint="@string/Spacing_of_barriers_m"
                         android:maxLines="1"
                         android:singleLine="true"
-                        android:inputType="numberDecimal"/>
+                        android:inputType="numberDecimal"
+                        android:enabled="false"
+                        android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -1815,7 +1605,8 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1832,6 +1623,348 @@
                         android:hint="@string/Forward_speed_km_h"
                         android:maxLines="1"
                         android:singleLine="true"
+                        android:inputType="numberDecimal"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/Ground_marking">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiSprMarking"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtTreatedArea"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="@string/Area_treated_ha"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtTreatedAreaCheck2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Обработанная площадь (проверено бригадой по мониторингу) (га)"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtSprFactVolume"
+
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Фактическая норма объема опрыскивания (л/га)"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Если проводилось наблюдение за опрыскиванием: соблюдалась ли надлежащая практика применения инсектицидов?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiSprObservation"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtSprDescription"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Замечания относительно наблюдаемой практики опрыскивания"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Калибровка опрыскивателя"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Проверялся ли расход жидкости опрыскивателя во время мониторинга?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiCalibrConsumptionCheck"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <!-- The following 3 submenus (fields) appear if yes is selected, by default the fields below are hidden -->
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtCalibrTime"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Время калибровки (мин.)"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtCalibrVolume"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Собранный объем (л)"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtCalibrRate"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Расход жидкости (л/мин)"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Проверялось ли осаждение капель во время мониторинга?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiCalibrPrecipitation"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtCalibrWidthCard"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Длина трансекты, определенная с использованием масляно-/водочувствительной бумаги (м)"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:baselineAligned="false"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtCalibrWindSpeed"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Средняя скорость ветра при осаждении капель (м/с)"
+                        android:maxLines="1"
+                        android:singleLine="true"
                         android:inputType="numberDecimal"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
@@ -1842,35 +1975,134 @@
                 android:gravity="center"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <com.google.android.material.textfield.TextInputLayout
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/Ground_marking">
-                    <dbfields.AutoCompleteTextViewDB
-                        android:id="@+id/spiSprMarking"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtCalibrDropletCoating"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Ширина захвата с хорошим покрытием капель (м)"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtCalibrPassesInterval"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Рекомендуемый интервал между проходами (м)"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
-                <CheckBox
-                    android:id="@+id/cbEffectiveness"
+                <TextView
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
-                    android:paddingLeft="@dimen/padding_checkbox"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
                     android:background="#dddddd"
-                    android:checked="false"
                     android:text="@string/CONTROL_EFFICACY"
                     android:textStyle="bold" />
             </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:divider="@drawable/spacer_medium"
+                    android:gravity="center"
+                    android:showDividers="middle">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Контроль эффективности проведен (бригада по обработке)">
+                        <dbfields.AutoCompleteTextViewDB
+                            android:id="@+id/spiEffectiveness"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:enabled="false"
+                            android:focusable="false"/>
+                    </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"
+                        android:insetLeft="0dp"
+                        android:insetTop="0dp"
+                        android:insetRight="0dp"
+                        android:insetBottom="0dp"
+                        android:minWidth="20dp"
+                        app:icon="@drawable/ic_information"
+                        app:iconGravity="textStart"
+                        app:iconPadding="0dp"
+                        app:iconSize="20dp"
+                        app:cornerRadius="20dp"/>
+                </LinearLayout>
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/llEffectiveness"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/Type_of_assessed_biological_impact">
+
+                        <dbfields.AutoCompleteTextViewDB
+                            android:id="@+id/spiTypeImpact"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:enabled="false"
+                            android:focusable="false" />
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1878,7 +2110,8 @@
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@drawable/ic_star" />
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"/>
                     <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -1895,9 +2128,12 @@
                             android:hint="@string/Biological_efficiency_of_treatment"
                             android:maxLines="1"
                             android:singleLine="true"
-                            android:inputType="numberDecimal"/>
+                            android:inputType="numberDecimal"
+                            android:enabled="false"
+                            android:focusable="false"/>
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1905,7 +2141,8 @@
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@drawable/ic_star" />
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"/>
                     <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -1921,9 +2158,12 @@
                             android:hint="@string/Time_after_treatment_hours"
                             android:maxLines="1"
                             android:singleLine="true"
-                            android:inputType="numberDecimal"/>
+                            android:inputType="numberDecimal"
+                            android:enabled="false"
+                            android:focusable="false"/>
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -1937,8 +2177,151 @@
                         <dbfields.AutoCompleteTextViewDB
                             android:id="@+id/spiEffMethod"
                             android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:enabled="false"
+                            android:focusable="false"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:divider="@drawable/spacer_medium"
+                    android:gravity="center"
+                    android:showDividers="middle">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Проведен ли контроль эффективности?">
+                        <dbfields.AutoCompleteTextViewDB
+                            android:id="@+id/spiEffControll"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content" />
                     </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"
+                        android:insetLeft="0dp"
+                        android:insetTop="0dp"
+                        android:insetRight="0dp"
+                        android:insetBottom="0dp"
+                        android:minWidth="20dp"
+                        app:icon="@drawable/ic_information"
+                        app:iconGravity="textStart"
+                        app:iconPadding="0dp"
+                        app:iconSize="20dp"
+                        app:cornerRadius="20dp"/>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/llEffectiveness"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/Type_of_assessed_biological_impact">
+                        <dbfields.AutoCompleteTextViewDB
+                            android:id="@+id/spiEffImpactType"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"/>
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        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"
+                            android:background="@color/transparent"
+                            android:hint="@string/Biological_efficiency_of_treatment"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:inputType="numberDecimal"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"/>
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        app:boxBackgroundColor="@color/transparent">
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/edtEffTime2"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:background="@color/transparent"
+                            android:hint="@string/Time_after_treatment_hours"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:inputType="numberDecimal"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/Method_of_biological_efficiency_estimation">
+                        <dbfields.AutoCompleteTextViewDB
+                            android:id="@+id/spiEffMethod2"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+                    </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
             </LinearLayout>
 
@@ -1954,10 +2337,11 @@
                     android:textColor="@color/text_title"
                     android:gravity="left|center"
                     android:background="#dddddd"
-                    android:text="@string/SAFETY_AND_ENVIRONMENT"
+                    android:text="Здоровье человека"
                     android:textStyle="bold" />
             </LinearLayout>
 
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -1965,10 +2349,12 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:paddingLeft="5dp"
                     android:text="@string/Protective_clothing"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold"/>
@@ -1980,6 +2366,7 @@
                 android:columnCount="3"
                 android:rowCount="3"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
+
                 <CheckBox
                     android:id="@+id/cbSafClothingGoggles"
                     android:layout_width="wrap_content"
@@ -1987,7 +2374,10 @@
                     android:layout_column="0"
                     android:layout_gravity="left|top"
                     android:layout_row="0"
-                    android:text="@string/Goggles" />
+                    android:text="@string/Goggles"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
                 <CheckBox
                     android:id="@+id/cbSafClothingMasks"
                     android:layout_width="wrap_content"
@@ -1995,7 +2385,10 @@
                     android:layout_column="1"
                     android:layout_gravity="left|top"
                     android:layout_row="0"
-                    android:text="@string/Masks" />
+                    android:text="@string/Masks"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
                 <CheckBox
                     android:id="@+id/cbSafClothingGloves"
                     android:layout_width="wrap_content"
@@ -2003,7 +2396,10 @@
                     android:layout_column="2"
                     android:layout_gravity="left|top"
                     android:layout_row="0"
-                    android:text="@string/Gloves" />
+                    android:text="@string/Gloves"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
                 <CheckBox
                     android:id="@+id/cbSafClothingOveralls"
                     android:layout_width="wrap_content"
@@ -2011,7 +2407,10 @@
                     android:layout_column="0"
                     android:layout_gravity="left|top"
                     android:layout_row="1"
-                    android:text="@string/Overalls" />
+                    android:text="@string/Overalls"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
                 <CheckBox
                     android:id="@+id/cbSafClothingCaps"
                     android:layout_width="wrap_content"
@@ -2019,7 +2418,10 @@
                     android:layout_column="1"
                     android:layout_gravity="left|top"
                     android:layout_row="1"
-                    android:text="@string/Caps" />
+                    android:text="@string/Caps"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
                 <CheckBox
                     android:id="@+id/cbSafClothingBoots"
                     android:layout_width="wrap_content"
@@ -2027,7 +2429,10 @@
                     android:layout_column="2"
                     android:layout_gravity="left|top"
                     android:layout_row="1"
-                    android:text="@string/Boots" />
+                    android:text="@string/Boots"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
                 <CheckBox
                     android:id="@+id/cbSafClothingAbsent"
                     android:layout_width="wrap_content"
@@ -2035,7 +2440,10 @@
                     android:layout_column="0"
                     android:layout_gravity="left|top"
                     android:layout_row="2"
-                    android:text="@string/Protection_is_absent" />
+                    android:text="@string/Protection_is_absent"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
                 <EditText
                     android:id="@+id/edtClothing"
                     android:layout_width="wrap_content"
@@ -2053,14 +2461,126 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star"/>
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/Protective_clothing_clean_and_in_good_state">
                     <dbfields.AutoCompleteTextViewDB
-                        android:id="@+id/spiProtectiveClothingClean"
+                        android:id="@+id/spiHlthProtectiveClothingClean"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtHlthClothingState"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Замечания относительно типа и состояния средств индивидуальной защиты"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="text"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="В бригаде или на ближайшей противосаранчовой базе имеется запасная защитная одежда (в частности, комбинезоны и перчатки)">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiHlthClothingReserve"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtHlthOperatorPassport"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Количество операторов с паспортами использования пестицидов"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="number"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtHlthPassportCount"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Количество правильно заполненных паспортов использования пестицидов"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="number"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Во время мониторинга измерялось ли ингибирование холинэстеразы?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiHlthInhibition"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
@@ -2073,7 +2593,8 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
@@ -2082,7 +2603,9 @@
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiOperatorExposedInsecticide"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:enabled="false"
+                        android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -2105,6 +2628,31 @@
                         android:background="@color/transparent"
                         android:hint="@string/If_yes_describe_what_happened_description"
                         android:maxLines="1"
+                        android:singleLine="true"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtHlthDescription"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Дополнительные сведения о случайном воздействии или отравлении"
+                        android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
@@ -2112,166 +2660,106 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:orientation="vertical">
-
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView51"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Inform_abaut_spraying"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <GridLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:columnCount="3"
-                    android:rowCount="2" >
-
-                    <CheckBox
-                        android:id="@+id/cbSafInformFarmer"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_column="0"
-                        android:layout_gravity="left|top"
-                        android:layout_row="0"
-                        android:text="@string/Farmer" />
-
-                    <CheckBox
-                        android:id="@+id/cbSafInformShepherd"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_column="1"
-                        android:layout_gravity="left|top"
-                        android:layout_row="0"
-                        android:text="@string/Shepherd" />
-
-                    <CheckBox
-                        android:id="@+id/cbSafInformBeekeeper"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_column="2"
-                        android:layout_gravity="left|top"
-                        android:layout_row="0"
-                        android:text="@string/Beekeeper" />
-
-                    <CheckBox
-                        android:id="@+id/cbSafInformVillager"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_column="0"
-                        android:layout_gravity="left|top"
-                        android:layout_row="1"
-                        android:text="@string/Villager" />
-
-                    <CheckBox
-                        android:id="@+id/cbSafInformOfficial"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_column="1"
-                        android:layout_gravity="left|top"
-                        android:layout_row="1"
-                        android:text="@string/Official" />
-
-                    <CheckBox
-                        android:id="@+id/cbSafInformOther"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_column="2"
-                        android:layout_gravity="left|top"
-                        android:layout_row="1"
-                        android:text="@string/Other_people" />
-
-                    <EditText
-                        android:id="@+id/edtInform"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_column="2"
-                        android:layout_row="0"
-                        android:hint=""
-                        android:visibility="invisible" />
-                </GridLayout>
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Состояние окружающей среды"
+                    android:textStyle="bold" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center">
+                android:orientation="horizontal"
+                android:gravity="center|left">
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvEmptyContainers"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:paddingLeft="5dp"
                     android:text="@string/Empty_containers"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold"/>
-            </LinearLayout>
-
-            <GridLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:columnCount="3"
-                android:rowCount="2"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-                <CheckBox
-                    android:id="@+id/cbTripleRinsed"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Farmer" />
-                <CheckBox
-                    android:id="@+id/cbPunctured"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Shepherd" />
-                <CheckBox
-                    android:id="@+id/cbTakenBackToBase"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Beekeeper" />
-                <CheckBox
-                    android:id="@+id/cbLeftInField"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Villager" />
-                <CheckBox
-                    android:id="@+id/cbBuried"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Official" />
-                <CheckBox
-                    android:id="@+id/cbBurned"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Other" />
                 <EditText
                     android:id="@+id/edtSafEmptyContainers"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_row="0"
                     android:hint=""
                     android:visibility="invisible" />
+            </LinearLayout>
+
+
+
+            <GridLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:columnCount="2"
+                android:rowCount="3"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+
+                <CheckBox
+                    android:id="@+id/cbTripleRinsed"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left|top"
+                    android:text="@string/Farmer"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
+                <CheckBox
+                    android:id="@+id/cbPunctured"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left|top"
+                    android:text="@string/Shepherd"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
+                <CheckBox
+                    android:id="@+id/cbTakenBackToBase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left|top"
+                    android:text="@string/Beekeeper"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
+                <CheckBox
+                    android:id="@+id/cbLeftInField"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left|top"
+                    android:text="@string/Villager"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
+                <CheckBox
+                    android:id="@+id/cbBuried"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left|top"
+                    android:text="@string/Official"
+                    android:enabled="false"
+                    android:focusable="false"/>
+
+                <CheckBox
+                    android:id="@+id/cbBurned"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left|top"
+                    android:text="@string/Other"
+                    android:enabled="false"
+                    android:focusable="false"/>
             </GridLayout>
 
             <LinearLayout
@@ -2281,7 +2769,52 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Наблюдалось или сообщалось о случайном загрязнении?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiSafObservedPollution"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtSafTypePollution"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Если Да, то где и какой тип загрязнения?"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
@@ -2290,7 +2823,9 @@
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSafNonTarget"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:enabled="false"
+                        android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -2313,7 +2848,9 @@
                         android:background="@color/transparent"
                         android:hint="@string/If_Yes_type_of_organisms_and_effects_description"
                         android:maxLines="1"
-                        android:singleLine="true" />
+                        android:singleLine="true"
+                        android:enabled="false"
+                        android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -2324,7 +2861,101 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star" />
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Наблюдалось или сообщалось о воздействии на нецелевые организмы?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiSafNonTarget2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtSafNonTargetEffect2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Если Да, то где и какое воздействие?"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:divider="@drawable/spacer_medium"
+                    android:gravity="center"
+                    android:showDividers="middle">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        app:boxBackgroundColor="@color/transparent">
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/edtSafNonTargetEffectPerson"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:background="@color/transparent"
+                            android:hint="Если информация поступила от прочих лиц, от кого именно?"
+                            android:maxLines="1"
+                            android:singleLine="true" />
+                    </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"
+                        android:insetLeft="0dp"
+                        android:insetTop="0dp"
+                        android:insetRight="0dp"
+                        android:insetBottom="0dp"
+                        android:minWidth="20dp"
+                        app:icon="@drawable/ic_information"
+                        app:iconGravity="textStart"
+                        app:iconPadding="0dp"
+                        app:iconSize="20dp"
+                        app:cornerRadius="20dp"/>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
@@ -2333,7 +2964,9 @@
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSafIncident"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:enabled="false"
+                        android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -2356,6 +2989,48 @@
                         android:background="@color/transparent"
                         android:hint="@string/If_Yes_type_of_incident_and_reported_by_whom_description"
                         android:maxLines="1"
+                        android:singleLine="true"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Осуществлялся ли бригадой по мониторингу ЗЧ и ОС контроль в отношении наблюдаемого или зарегистрированного воздействия на окружающую среду">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiSafControl"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtSafControlActions"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Если Да, опишите последующее действие(я)"
+                        android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
@@ -2382,7 +3057,993 @@
                 android:layout_width="match_parent"
                 android:layout_height="150dp"
                 android:ems="10"
-                android:inputType="textMultiLine" />
+                android:inputType="textMultiLine"
+                android:enabled="false"
+                android:focusable="false"
+                android:paddingLeft="@dimen/activity_horizontal_margin"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Карта и фотографии"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Была ли составлена ситуационная карта обработки?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiMapTreatment"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="false"
+                android:divider="@drawable/spacer_medium"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:showDividers="middle">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtImage1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:enabled="false"
+                        android:focusable="false"
+                        android:hint="Фото инцидента"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnImage1"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_camera"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp">
+                </com.google.android.material.button.MaterialButton>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnShowImage1"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_photo"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnDelImage1"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_delete"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Оценки риска"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:divider="@drawable/spacer_medium"
+                    android:gravity="center"
+                    android:showDividers="middle">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Имеются ли в непосредственной близости от обработок жилые дома или жилье?">
+                        <dbfields.AutoCompleteTextViewDB
+                            android:id="@+id/spiRiskHouse"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btnInfoRiskHouse"
+                        style="@style/Widget.MaterialComponents.Button.Icon"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:insetLeft="0dp"
+                        android:insetTop="0dp"
+                        android:insetRight="0dp"
+                        android:insetBottom="0dp"
+                        android:minWidth="20dp"
+                        app:icon="@drawable/ic_information"
+                        app:iconGravity="textStart"
+                        app:iconPadding="0dp"
+                        app:iconSize="20dp"
+                        app:cornerRadius="20dp"/>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskHouseDistance"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Расстояние от ближайшего края обрабатываемого участка (м) до ближайшего жилья:"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="number"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Соблюдались ли буферные зоны?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskHouseBufferZones"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Существует ли вероятность воздействия на жилые дома/жилье?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskHouseImpact"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Были ли проинформированы жители о применении инсектицидов?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskHouseInformed"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:divider="@drawable/spacer_medium"
+                    android:gravity="center"
+                    android:showDividers="middle">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Имеются ли в непосредственной близости от обработок поверхностные воды">
+                        <dbfields.AutoCompleteTextViewDB
+                            android:id="@+id/spiRiskWater"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                    </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"
+                        android:insetLeft="0dp"
+                        android:insetTop="0dp"
+                        android:insetRight="0dp"
+                        android:insetBottom="0dp"
+                        android:minWidth="20dp"
+                        app:icon="@drawable/ic_information"
+                        app:iconGravity="textStart"
+                        app:iconPadding="0dp"
+                        app:iconSize="20dp"
+                        app:cornerRadius="20dp"/>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskWaterDistance"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Расстояние от ближайшего края обрабатываемого участка (м) до ближайшего водоема:"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="number"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Соблюдались ли буферные зоны?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskWaterBufferZones"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Существует ли вероятность воздействия на поверхностные воды?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskWaterImpact"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:divider="@drawable/spacer_medium"
+                    android:gravity="center"
+                    android:showDividers="middle">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Имеются ли в непосредственной близости от обработок пчеловодства ">
+                        <dbfields.AutoCompleteTextViewDB
+                            android:id="@+id/spiRiskApiary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btnInfoRiskApiary"
+                        style="@style/Widget.MaterialComponents.Button.Icon"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:insetLeft="0dp"
+                        android:insetTop="0dp"
+                        android:insetRight="0dp"
+                        android:insetBottom="0dp"
+                        android:minWidth="20dp"
+                        app:icon="@drawable/ic_information"
+                        app:iconGravity="textStart"
+                        app:iconPadding="0dp"
+                        app:iconSize="20dp"
+                        app:cornerRadius="20dp"/>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskApiaryDistance"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Расстояние от ближайшего края обрабатываемого участка (м) до пасеки"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="number"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Были ли пчеловоды проинформированы о применении инсектицидов?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskApiaryInformed"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskApiaryMeasure"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Какие меры были предприняты для снижения отрицательного воздействия на пчел"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="text"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Существует ли вероятность воздействия на пчел?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskApiaryImpact"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_weight="1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Были ли обработаны или подверглись воздействию какие-либо сельхозкультуры?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskAgricultural"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskAgriculturalName"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Наименование сельхозкультуры"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="text"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskAgriculturalPhase"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Фаза развития сельхозкультуры"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="text"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Наблюдалась ли фитотоксичность">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskAgriculturalToxic"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Были ли фермеры проинформированы о предуборочном периоде">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskAgriculturalInform"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:divider="@drawable/spacer_medium"
+                    android:gravity="center"
+                    android:showDividers="middle">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Имеются ли в непосредственной близости от обработок шелководства">
+                        <dbfields.AutoCompleteTextViewDB
+                            android:id="@+id/spiRiskSilk"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btnInfoRiskSilk"
+                        style="@style/Widget.MaterialComponents.Button.Icon"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:insetLeft="0dp"
+                        android:insetTop="0dp"
+                        android:insetRight="0dp"
+                        android:insetBottom="0dp"
+                        android:minWidth="20dp"
+                        app:icon="@drawable/ic_information"
+                        app:iconGravity="textStart"
+                        app:iconPadding="0dp"
+                        app:iconSize="20dp"
+                        app:cornerRadius="20dp"/>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskSilkDistance"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Расстояние от ближайшего края обрабатываемого участка (м) до пасеки"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="number"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Были ли шелководы проинформированы о применении инсектицидов?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskSilkInform"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskSilkTreesMeasure"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Какие меры были предприняты для снижения отрицательного воздействия на тутовые деревья"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="text"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Существует ли вероятность воздействия на тутовые деревья">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskSilkTreesImpact"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_weight="1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Были ли обработаны луга или пастбища?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskPastures"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Были ли пастухи проинформированы о периодах удержания домашнего скота?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskPasturesInform"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:divider="@drawable/spacer_medium"
+                    android:gravity="center"
+                    android:showDividers="middle">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Имеются ли в непосредственной близости от обработок другие экологически чувствительные зоны">
+                        <dbfields.AutoCompleteTextViewDB
+                            android:id="@+id/spiRiskPark"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                    </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"
+                        android:insetLeft="0dp"
+                        android:insetTop="0dp"
+                        android:insetRight="0dp"
+                        android:insetBottom="0dp"
+                        android:minWidth="20dp"
+                        app:icon="@drawable/ic_information"
+                        app:iconGravity="textStart"
+                        app:iconPadding="0dp"
+                        app:iconSize="20dp"
+                        app:cornerRadius="20dp"/>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskParkType"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Какой тип экологически чувствительной зоны"
+                        android:inputType="text"
+                        android:maxLength="255"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskParkDistance"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Расстояние от ближайшего края обрабатываемого участка (м) до пасеки"
+                        android:maxLines="1"
+                        android:maxLength="255"
+                        android:singleLine="true"
+                        android:inputType="number"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Соблюдались ли буферные зоны?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskParkBufferZones"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Существует ли вероятность воздействия на экологически чувствительные зоны?">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskParkImpact"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Отбор проб для анализа остатков"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_weight="1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Пробы, взятые для анализа остатков">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiRiskProbeAnalysis"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskProbeAnalysisName"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Проба какого субстрата или организма была взята"
+                        android:inputType="text"
+                        android:maxLength="255"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtRiskProbeAnalysisNumber"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="Регистрационный номер формы отбора проб"
+                        android:inputType="text"
+                        android:maxLength="255"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-large/activity_locust.xml b/app/src/main/res/layout-large/activity_locust.xml
index bdb1830..d155a50 100644
--- a/app/src/main/res/layout-large/activity_locust.xml
+++ b/app/src/main/res/layout-large/activity_locust.xml
@@ -5,7 +5,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/gradient_example"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:screenOrientation="portrait"
@@ -30,7 +29,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:divider="@drawable/spacer_medium"
-                android:showDividers="middle">
+                android:showDividers="middle"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvImage1"
@@ -103,7 +103,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:divider="@drawable/spacer_medium"
-                android:showDividers="middle">
+                android:showDividers="middle"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvImage2"
@@ -176,7 +177,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:divider="@drawable/spacer_medium"
-                android:showDividers="middle">
+                android:showDividers="middle"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvImage3"
@@ -247,7 +249,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/textView1"
@@ -264,7 +267,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvCountry"
                     android:layout_width="wrap_content"
@@ -272,14 +280,6 @@
                     android:text="@string/Country"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiCountry"
                     android:layout_width="match_parent"
@@ -289,7 +289,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvRegion"
                     android:layout_width="wrap_content"
@@ -297,14 +302,6 @@
                     android:text="@string/Region"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRegion"
                     android:layout_width="match_parent"
@@ -314,7 +311,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvArea"
                     android:layout_width="wrap_content"
@@ -322,14 +324,6 @@
                     android:text="@string/Area"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtArea"
                     android:layout_width="0dp"
@@ -341,7 +335,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvDistrict"
@@ -361,7 +356,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvVillage"
@@ -370,15 +366,6 @@
                     android:text="@string/Name_of_the_village"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <!--
-                     TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" /
-                -->
-
                 <EditText
                     android:id="@+id/edtVillage"
                     android:layout_width="match_parent"
@@ -389,7 +376,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvTerrain"
@@ -409,7 +397,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvObserver"
                     android:layout_width="wrap_content"
@@ -417,14 +410,6 @@
                     android:text="@string/Name_of_survey_team_leader"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtObserver"
                     android:layout_width="0dp"
@@ -437,7 +422,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvDate"
                     android:layout_width="wrap_content"
@@ -445,14 +435,6 @@
                     android:text="@string/Date"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.DateTimeText
                     android:id="@+id/edtDate"
                     android:layout_width="0dp"
@@ -492,7 +474,12 @@
                 android:orientation="horizontal"
                 android:divider="@drawable/spacer_medium"
                 android:showDividers="middle">
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLatCenter"
                     android:layout_width="wrap_content"
@@ -500,14 +487,6 @@
                     android:text="@string/Lat_center"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtLatCenter"
                     android:layout_width="wrap_content"
@@ -516,7 +495,12 @@
                     android:ems="10"
                     android:enabled="false"
                     android:inputType="numberDecimal" />
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLonCenter"
                     android:layout_width="wrap_content"
@@ -524,14 +508,6 @@
                     android:text="@string/Lon_center"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtLonCenter"
                     android:layout_width="wrap_content"
@@ -571,19 +547,25 @@
                     app:iconSize="24dp" />
             </LinearLayout>
 
-            <ListView
-                android:id="@+id/latlonList"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <ListView
+                    android:id="@+id/latlonList"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center">
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnOnMap"
                     style="@style/Widget.MaterialComponents.Button.Icon"
@@ -601,7 +583,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvBioHectare"
                     android:layout_width="wrap_content"
@@ -609,14 +596,6 @@
                     android:text="@string/Surveyed_area_ha"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtBioHectare"
                     android:layout_width="0dp"
@@ -628,7 +607,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
@@ -644,7 +624,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvBioBiotope"
                     android:layout_width="wrap_content"
@@ -652,14 +637,6 @@
                     android:text="@string/Type_of_biotope"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiBioBiotope"
                     android:layout_width="match_parent"
@@ -669,7 +646,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvBioGreenery"
                     android:layout_width="wrap_content"
@@ -677,14 +659,6 @@
                     android:text="@string/Vegetation"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiBioGreenery"
                     android:layout_width="match_parent"
@@ -694,7 +668,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvBioGreeneryCover"
                     android:layout_width="wrap_content"
@@ -702,14 +681,6 @@
                     android:text="@string/Vegetation_cover"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiBioGreeneryCover"
                     android:layout_width="match_parent"
@@ -718,7 +689,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvBioTemperature"
@@ -737,7 +709,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvBioWind"
@@ -757,7 +730,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:layout_width="match_parent"
@@ -773,7 +747,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLocustHave"
                     android:layout_width="wrap_content"
@@ -781,14 +760,6 @@
                     android:text="@string/Are_locusts_present"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiLocustHave"
                     android:layout_width="match_parent"
@@ -798,7 +769,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLocustType"
                     android:layout_width="wrap_content"
@@ -806,14 +782,6 @@
                     android:text="@string/Locust_species"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiLocustType"
                     android:layout_width="match_parent"
@@ -823,7 +791,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLocustPopulated"
                     android:layout_width="wrap_content"
@@ -831,14 +804,6 @@
                     android:text="@string/Area_infested_ha"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtLocustPopulated"
                     android:layout_width="0dp"
@@ -848,19 +813,23 @@
                     android:inputType="numberDecimal" />
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <CheckBox
-                    android:id="@+id/cbEggs"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:background="#dddddd"
-                    android:paddingLeft="@dimen/padding_checkbox"
-                    android:text="@string/Eggs"
-                    android:textStyle="bold" />
+                    android:layout_height="wrap_content">
+
+                    <CheckBox
+                        android:id="@+id/cbEggs"
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:background="#dddddd"
+                        android:paddingLeft="@dimen/padding_checkbox"
+                        android:text="@string/Eggs"
+                        android:textStyle="bold" />
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
@@ -869,17 +838,10 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical" >
 
-                <!--TextView
-                    android:id="@+id/tvEggs"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="#dddddd"
-                    android:text="@string/Eggs"
-                    android:textStyle="bold" /-->
-
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
                         android:id="@+id/tvEggsCapsulesArea"
@@ -900,7 +862,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvEggsCapsulesDensity"
                         android:layout_width="wrap_content"
@@ -916,12 +883,6 @@
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
 
                     <EditText
                         android:id="@+id/edtEggsCapsulesDensity"
@@ -930,7 +891,12 @@
                         android:layout_weight="1"
                         android:ems="10"
                         android:inputType="numberDecimal" />
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvEggsCapsulesDensityTo"
                         android:layout_width="wrap_content"
@@ -939,13 +905,6 @@
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtEggsCapsulesDensityTo"
                         android:layout_width="wrap_content"
@@ -957,7 +916,8 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
                         android:id="@+id/tvEggsCapsules"
@@ -978,7 +938,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvEggsLive"
                         android:layout_width="wrap_content"
@@ -986,14 +951,6 @@
                         android:text="@string/Eggs_viable"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtEggsLive"
                         android:layout_width="0dp"
@@ -1006,7 +963,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvEggsEnemies"
                         android:layout_width="wrap_content"
@@ -1014,14 +976,6 @@
                         android:text="@string/Natural_enemies"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiEggsEnemies"
                         android:layout_width="match_parent"
@@ -1029,33 +983,35 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <CheckBox
-                android:id="@+id/cbHoppers"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/padding_checkbox"
-                android:background="#dddddd"
-                android:text="@string/HOPPERS_SCATTERED"
-                android:textStyle="bold" />
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <CheckBox
+                    android:id="@+id/cbHoppers"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/padding_checkbox"
+                    android:background="#dddddd"
+                    android:text="@string/HOPPERS_SCATTERED"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/llHoppers"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical" >
 
-
-                <!--TextView
-                    android:id="@+id/tvHoppers"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="#dddddd"
-                    android:text="@string/Hoppers"
-                    android:textStyle="bold" /-->
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvLarvaBorn"
                         android:layout_width="wrap_content"
@@ -1063,14 +1019,6 @@
                         android:text="@string/Hatching"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiLarvaBorn"
                         android:layout_width="match_parent"
@@ -1080,7 +1028,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvLarvaAge"
                         android:layout_width="wrap_content"
@@ -1088,14 +1041,6 @@
                         android:text="@string/Hopper_stages"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiLarvaAge"
                         android:layout_width="match_parent"
@@ -1104,7 +1049,8 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
                         android:id="@+id/tvLarvaPainting"
@@ -1122,7 +1068,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvLarvaBehavior"
                         android:layout_width="wrap_content"
@@ -1130,14 +1081,6 @@
                         android:text="@string/Spatial_distribution"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiLarvaBehavior"
                         android:layout_width="match_parent"
@@ -1147,7 +1090,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvLarvaDensity"
                         android:layout_width="wrap_content"
@@ -1162,14 +1110,6 @@
                         android:text="@string/from"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtLarvaDensity"
                         android:layout_width="wrap_content"
@@ -1177,7 +1117,12 @@
                         android:layout_weight="1"
                         android:ems="10"
                         android:inputType="numberDecimal" />
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvLarvaDensityTo"
                         android:layout_width="wrap_content"
@@ -1185,14 +1130,6 @@
                         android:text="@string/to"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtLarvaDensityTo"
                         android:layout_width="wrap_content"
@@ -1203,33 +1140,35 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <CheckBox
-                android:id="@+id/cbBands"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/padding_checkbox"
-                android:background="#dddddd"
-                android:text="@string/Bands"
-                android:textStyle="bold" />
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <CheckBox
+                    android:id="@+id/cbBands"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/padding_checkbox"
+                    android:background="#dddddd"
+                    android:text="@string/Bands"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/llBands"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical" >
 
-                <!--TextView
-                    android:id="@+id/tvBands"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="#dddddd"
-                    android:text="@string/BANDS"
-                    android:textStyle="bold" /-->
-
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvKuliguliDensity"
                         android:layout_width="wrap_content"
@@ -1237,14 +1176,6 @@
                         android:text="@string/Minimum_density_in_the_band_in_m2"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtKuliguliDensity"
                         android:layout_width="0dp"
@@ -1257,7 +1188,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvKuliguliDensityTo"
                         android:layout_width="wrap_content"
@@ -1265,14 +1201,6 @@
                         android:text="@string/Maximum_density_in_the_band_in_m2"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtKuliguliDensityTo"
                         android:layout_width="0dp"
@@ -1285,7 +1213,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvKuliguliSize"
                         android:layout_width="wrap_content"
@@ -1293,14 +1226,6 @@
                         android:text="@string/Band_sizes_m2"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtKuliguliSize"
                         android:layout_width="0dp"
@@ -1312,7 +1237,8 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
                         android:id="@+id/tvKuliguliCount"
@@ -1321,15 +1247,6 @@
                         android:text="@string/Number_of_bands"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                    <!--
-                        TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" /
-                    -->
-
                     <EditText
                         android:id="@+id/edtKuliguliCount"
                         android:layout_width="0dp"
@@ -1342,7 +1259,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvKuliguliAction"
                         android:layout_width="wrap_content"
@@ -1350,14 +1272,6 @@
                         android:text="@string/Action"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiKuliguliAction"
                         android:layout_width="match_parent"
@@ -1367,7 +1281,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvKuliguliAge"
                         android:layout_width="wrap_content"
@@ -1375,14 +1294,6 @@
                         android:text="@string/Hopper_stages"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiKuliguliAge"
                         android:layout_width="match_parent"
@@ -1390,32 +1301,35 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <CheckBox
-                android:id="@+id/cbAdults"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/padding_checkbox"
-                android:background="#dddddd"
-                android:text="@string/Adults"
-                android:textStyle="bold" />
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <CheckBox
+                    android:id="@+id/cbAdults"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/padding_checkbox"
+                    android:background="#dddddd"
+                    android:text="@string/Adults"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/llAdults"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical" >
 
-                <!--TextView
-                    android:id="@+id/tvAdults"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="#dddddd"
-                    android:text="@string/Adults"
-                    android:textStyle="bold" /-->
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvImagoWing"
                         android:layout_width="wrap_content"
@@ -1423,14 +1337,6 @@
                         android:text="@string/Fledging"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiImagoWing"
                         android:layout_width="match_parent"
@@ -1440,7 +1346,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvImagoMaturity"
                         android:layout_width="wrap_content"
@@ -1448,14 +1359,6 @@
                         android:text="@string/Maturity"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiImagoMaturity"
                         android:layout_width="match_parent"
@@ -1465,7 +1368,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvImagoPhase"
                         android:layout_width="wrap_content"
@@ -1473,14 +1381,6 @@
                         android:text="@string/Phase"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiImagoPhase"
                         android:layout_width="match_parent"
@@ -1490,7 +1390,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvImagoAction"
                         android:layout_width="wrap_content"
@@ -1498,14 +1403,6 @@
                         android:text="@string/Spatial_distribution"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiImagoAction"
                         android:layout_width="match_parent"
@@ -1514,7 +1411,8 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
                         android:id="@+id/tvImagoDensityGa"
@@ -1535,7 +1433,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvImagoDensity"
                         android:layout_width="wrap_content"
@@ -1543,14 +1446,6 @@
                         android:text="@string/Adult_density_m2"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtImagoDensity"
                         android:layout_width="0dp"
@@ -1558,19 +1453,17 @@
                         android:layout_weight="1"
                         android:ems="10"
                         android:inputType="numberDecimal" />
-
-                    <!--
-                        dbfields.SpinnerDB
-                        android:id="@+id/spiDensityType"
-                        android:layout_width="70dp"
-                        android:layout_height="wrap_content"/
-                    -->
                 </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvImagoFeeding"
                         android:layout_width="wrap_content"
@@ -1578,14 +1471,6 @@
                         android:text="@string/Feeding_and_roosting"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiImagoFeeding"
                         android:layout_width="match_parent"
@@ -1595,7 +1480,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvImagoCopulation"
                         android:layout_width="wrap_content"
@@ -1603,14 +1493,6 @@
                         android:text="@string/Copulating"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiImagoCopulation"
                         android:layout_width="match_parent"
@@ -1620,7 +1502,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvImagolaying"
                         android:layout_width="wrap_content"
@@ -1628,14 +1515,6 @@
                         android:text="@string/Laying"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiImagolaying"
                         android:layout_width="match_parent"
@@ -1645,7 +1524,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvImagoFlying"
                         android:layout_width="wrap_content"
@@ -1653,14 +1537,6 @@
                         android:text="@string/Flying"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiImagoFlying"
                         android:layout_width="match_parent"
@@ -1668,14 +1544,19 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <CheckBox
-                android:id="@+id/cbSwarms"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/padding_checkbox"
-                android:background="#dddddd"
-                android:text="@string/SWARMS"
-                android:textStyle="bold" />
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <CheckBox
+                    android:id="@+id/cbSwarms"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/padding_checkbox"
+                    android:background="#dddddd"
+                    android:text="@string/SWARMS"
+                    android:textStyle="bold" />
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/llSwarms"
@@ -1694,7 +1575,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvSwarmMaturity"
                         android:layout_width="wrap_content"
@@ -1702,14 +1588,6 @@
                         android:text="@string/Maturity"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiSwarmMaturity"
                         android:layout_width="match_parent"
@@ -1719,7 +1597,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvSwarmDensity"
                         android:layout_width="wrap_content"
@@ -1727,16 +1610,6 @@
                         android:text="@string/Density_of_swarm"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
-                    <!-- Почеуто фокусируется -->
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiSwarmDensity"
                         android:layout_width="match_parent"
@@ -1745,7 +1618,8 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
                         android:id="@+id/tvSwarmSize"
@@ -1765,7 +1639,8 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
                         android:id="@+id/tvSwarmCount"
@@ -1785,7 +1660,8 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
                         android:id="@+id/tvSwarmFlying"
@@ -1802,7 +1678,8 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
                         android:id="@+id/tvSwarmHeight"
@@ -1821,7 +1698,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:id="@+id/tvDescription"
                     android:layout_width="match_parent"
@@ -1834,16 +1712,22 @@
                     android:gravity="left|center"/>
             </LinearLayout>
 
-            <EditText
-                android:id="@+id/edtDescription"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="150dp"
-                android:ems="10"
-                android:inputType="textMultiLine" />
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <EditText
+                    android:id="@+id/edtDescription"
+                    android:layout_width="match_parent"
+                    android:layout_height="150dp"
+                    android:ems="10"
+                    android:inputType="textMultiLine" />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <CheckBox
                     android:id="@+id/cbTest"
                     android:layout_width="match_parent"
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 da4b7e5..a551e05 100644
--- a/app/src/main/res/layout-large/activity_locust_del.xml
+++ b/app/src/main/res/layout-large/activity_locust_del.xml
@@ -5,7 +5,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/gradient_example"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".LocustDelActivity">
@@ -27,7 +26,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:divider="@drawable/spacer_medium"
-                android:showDividers="middle">
+                android:showDividers="middle"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:id="@+id/tvImage1"
                     android:maxLines="1"
@@ -98,7 +98,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:divider="@drawable/spacer_medium"
-                android:showDividers="middle">
+                android:showDividers="middle"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvImage2"
@@ -170,7 +171,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:divider="@drawable/spacer_medium"
-                android:showDividers="middle">
+                android:showDividers="middle"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvImage3"
@@ -255,7 +257,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvCountry"
                     android:layout_width="wrap_content"
@@ -263,14 +270,6 @@
                     android:text="@string/Country"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiCountry"
                     android:layout_width="match_parent"
@@ -280,7 +279,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvRegion"
                     android:layout_width="wrap_content"
@@ -288,14 +292,6 @@
                     android:text="@string/Region"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRegion"
                     android:layout_width="match_parent"
@@ -305,7 +301,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvArea"
                     android:layout_width="wrap_content"
@@ -313,14 +314,6 @@
                     android:text="@string/Area"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtArea"
                     android:layout_width="0dp"
@@ -332,7 +325,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvDistrict"
@@ -355,7 +349,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvVillage"
                     android:layout_width="wrap_content"
@@ -363,14 +362,6 @@
                     android:text="@string/Name_of_the_village"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-                
 	            <EditText
 	                android:id="@+id/edtVillage"
 	                android:hint=""
@@ -382,7 +373,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvTerrain"
@@ -404,7 +396,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvName"
                     android:layout_width="wrap_content"
@@ -412,14 +409,6 @@
                     android:text="@string/Name_of_control_team_leader"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtObserver"
                     android:hint=""
@@ -432,7 +421,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvDate"
                     android:layout_width="wrap_content"
@@ -440,14 +434,6 @@
                     android:text="@string/Date"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.DateTimeText
                     android:id="@+id/edtDate"
                     android:layout_width="0dp"
@@ -488,7 +474,12 @@
                 android:orientation="horizontal"
                 android:divider="@drawable/spacer_medium"
                 android:showDividers="middle">
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLatCenter"
                     android:layout_width="wrap_content"
@@ -496,14 +487,6 @@
                     android:text="@string/Lat_center"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtLatCenter"
                     android:layout_width="wrap_content"
@@ -512,7 +495,12 @@
                     android:ems="10"
                     android:enabled="false"
                     android:inputType="numberDecimal" />
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLonCenter"
                     android:layout_width="wrap_content"
@@ -520,14 +508,6 @@
                     android:text="@string/Lon_center"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtLonCenter"
                     android:layout_width="wrap_content"
@@ -567,32 +547,47 @@
                     app:iconSize="24dp" />
             </LinearLayout>
 
-            <ListView
-                android:id="@+id/latlonList"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <ListView
+                    android:id="@+id/latlonList"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </LinearLayout>
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btnOnMap"
-                style="@style/Widget.MaterialComponents.Button.Icon"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:minWidth="190dp"
-                android:minHeight="40dp"
-                android:text="@string/Show_map"
-                app:icon="@drawable/ic_map"
-                app:iconGravity="textStart"
-                android:paddingLeft="@dimen/activity_horizontal_margin"/>
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnOnMap"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:minWidth="190dp"
+                    android:minHeight="40dp"
+                    android:text="@string/Show_map"
+                    app:icon="@drawable/ic_map"
+                    app:iconGravity="textStart"
+                    android:paddingLeft="@dimen/activity_horizontal_margin"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvInfestedArea"
                     android:layout_width="wrap_content"
@@ -600,14 +595,6 @@
                     android:text="@string/Area_infested_ha"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtInfestedArea"
                     android:layout_width="0dp"
@@ -620,7 +607,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvTreatedArea"
                     android:layout_width="wrap_content"
@@ -628,14 +620,6 @@
                     android:text="@string/Area_treated_ha"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtTreatedArea"
                     android:layout_width="0dp"
@@ -647,7 +631,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:id="@+id/textView13"
                     android:layout_width="match_parent"
@@ -663,7 +648,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvVegType"
                     android:layout_width="wrap_content"
@@ -671,14 +661,6 @@
                     android:text="@string/Vegetation_type"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiVegType"
                     android:layout_width="match_parent"
@@ -688,7 +670,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvVegHeight"
                     android:layout_width="wrap_content"
@@ -696,14 +683,6 @@
                     android:text="@string/Height_cm"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtVegHeight"
                     android:layout_width="0dp"
@@ -716,7 +695,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvVegCover"
                     android:layout_width="wrap_content"
@@ -724,14 +708,6 @@
                     android:text="@string/Del_Vegetation_cover"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiVegCover"
                     android:layout_width="match_parent"
@@ -740,7 +716,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvVegCrop"
@@ -761,7 +738,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvVegDamage"
                     android:layout_width="wrap_content"
@@ -769,14 +751,6 @@
                     android:text="@string/Damage"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiVegDamage"
                     android:layout_width="match_parent"
@@ -785,7 +759,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvVegDamageArea"
@@ -805,7 +780,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
@@ -820,7 +796,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvInsName"
                     android:layout_width="wrap_content"
@@ -828,14 +809,6 @@
                     android:text="@string/Trade_name"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtInsName"
                     android:layout_width="0dp"
@@ -848,7 +821,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvInsActiveSubstance"
                     android:layout_width="wrap_content"
@@ -856,14 +834,6 @@
                     android:text="@string/The_active_substance"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtInsActiveSubstance"
                     android:layout_width="0dp"
@@ -876,7 +846,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvInsConcentration"
                     android:layout_width="wrap_content"
@@ -884,14 +859,6 @@
                     android:text="@string/Concentration_A_S"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtInsConcentration"
                     android:layout_width="0dp"
@@ -904,7 +871,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvInsFormulation"
                     android:layout_width="wrap_content"
@@ -912,14 +884,6 @@
                     android:text="@string/Formulation"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiInsFormulation"
                     android:layout_width="match_parent"
@@ -928,7 +892,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvInsDose"
@@ -948,7 +913,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvInsRate"
@@ -969,7 +935,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvInsUsedVolume"
                     android:layout_width="wrap_content"
@@ -977,12 +948,6 @@
                     android:text="@string/Total_volume_of_working_solution_actually_applied_l"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
                 <EditText
                     android:id="@+id/edtInsUsedVolume"
                     android:layout_width="0dp"
@@ -1014,7 +979,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:id="@+id/textView26"
                     android:layout_width="match_parent"
@@ -1030,7 +996,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvWeaTimeStart"
                     android:layout_width="wrap_content"
@@ -1038,20 +1009,17 @@
                     android:text="@string/Time_start"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiWeaTimeStart"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvWeaTimeEnd"
                     android:layout_width="wrap_content"
@@ -1059,14 +1027,6 @@
                     android:text="@string/Time_end"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiWeaTimeEnd"
                     android:layout_width="match_parent"
@@ -1076,7 +1036,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvWeaTemperatureStart"
@@ -1111,7 +1072,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvWeaWindSpeedStart"
@@ -1146,7 +1108,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvWindDirectionStart"
@@ -1177,7 +1140,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvSprayDirectionStart"
@@ -1208,7 +1172,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:id="@+id/textView39"
                     android:layout_width="match_parent"
@@ -1224,7 +1189,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLocSpecies"
                     android:layout_width="wrap_content"
@@ -1232,14 +1202,6 @@
                     android:text="@string/Locust_type"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiLocSpecies"
                     android:layout_width="match_parent"
@@ -1249,7 +1211,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLocHoppers"
                     android:layout_width="wrap_content"
@@ -1257,14 +1224,6 @@
                     android:text="@string/Hopper_stages"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiLocHoppers"
                     android:layout_width="match_parent"
@@ -1299,7 +1258,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLocDensity"
                     android:layout_width="wrap_content"
@@ -1307,14 +1271,6 @@
                     android:text="@string/Density_m2"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtLocDensity"
                     android:layout_width="0dp"
@@ -1403,7 +1359,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvSparse"
                     android:layout_width="wrap_content"
@@ -1411,14 +1372,6 @@
                     android:text="@string/Main_purpose_of_treatment"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiMainPurpose"
                     android:layout_width="match_parent"
@@ -1427,7 +1380,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvLocustPhaseId"
@@ -1444,7 +1398,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
@@ -1459,7 +1414,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvSprPlatform"
                     android:layout_width="wrap_content"
@@ -1467,14 +1427,6 @@
                     android:text="@string/Spray_platform"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprPlatform"
                     android:layout_width="match_parent"
@@ -1490,7 +1442,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Spray_platform_a"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:paddingLeft="@dimen/activity_horizontal_margin"/>
 
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprPlatformA"
@@ -1507,7 +1460,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Ground"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:paddingLeft="@dimen/activity_horizontal_margin"/>
 
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprPlatformG"
@@ -1524,7 +1478,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Spray_platform_h"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:paddingLeft="@dimen/activity_horizontal_margin"/>
 
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprPlatformH"
@@ -1558,7 +1513,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Spray_manufacturer_model"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:paddingLeft="@dimen/activity_horizontal_margin"/>
 
                 <EditText
                     android:id="@+id/edtSprManufacturer"
@@ -1591,7 +1547,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvSprHeight"
@@ -1613,7 +1570,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvSprBarrier"
                     android:layout_width="wrap_content"
@@ -1621,14 +1583,6 @@
                     android:text="@string/Barriers"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprBarrier"
                     android:layout_width="match_parent"
@@ -1659,7 +1613,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvSprBarrierSpace"
                     android:layout_width="wrap_content"
@@ -1667,12 +1626,6 @@
                     android:text="@string/Spacing_of_barriers_m"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
                 <EditText
                     android:id="@+id/edtSprBarrierSpace"
                     android:layout_width="0dp"
@@ -1686,7 +1639,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvSprSpeed"
                     android:layout_width="wrap_content"
@@ -1694,14 +1652,6 @@
                     android:text="@string/Forward_speed_km_h"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtSprSpeed"
                     android:layout_width="0dp"
@@ -1714,7 +1664,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvSprMarking"
@@ -1732,19 +1683,25 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="#dddddd" >
-                <CheckBox
-                    android:id="@+id/cbEffectiveness"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:checked="false"
-                    android:text="@string/CONTROL_EFFICACY"
-                    android:textStyle="bold" />
+                    android:background="#dddddd">
+                    <CheckBox
+                        android:id="@+id/cbEffectiveness"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:checked="false"
+                        android:text="@string/CONTROL_EFFICACY"
+                        android:textStyle="bold" />
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvEffMethod"
@@ -1767,7 +1724,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvEffMortality"
                         android:layout_width="wrap_content"
@@ -1775,14 +1737,6 @@
                         android:text="@string/Biological_efficiency_of_treatment"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtEffMortality"
                         android:layout_width="0dp"
@@ -1795,7 +1749,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvEffTime"
                         android:layout_width="wrap_content"
@@ -1803,14 +1762,6 @@
                         android:text="@string/Time_after_treatment_hours"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtEffTime"
                         android:layout_width="0dp"
@@ -1823,7 +1774,8 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
                     <TextView
                         android:id="@+id/tvEffMethod"
@@ -1841,7 +1793,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:id="@+id/textView49"
                     android:layout_width="match_parent"
@@ -1857,6 +1810,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <dbfields.TextViewHTML
                     android:id="@+id/tvClothing"
                     android:layout_width="wrap_content"
@@ -1864,19 +1823,14 @@
                     android:text="@string/Protective_clothing"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
             </LinearLayout>
 
             <GridLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:columnCount="3"
-                android:rowCount="3" >
+                android:rowCount="3"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <CheckBox
                     android:id="@+id/cbSafClothingGoggles"
@@ -1954,6 +1908,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <dbfields.TextViewHTML
                     android:id="@+id/tvOperatorExposedInsecticide"
                     android:layout_width="wrap_content"
@@ -1961,12 +1921,6 @@
                     android:text="@string/Operator_accidentally_exposed_to_insecticide_or_feeling_unwell"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
             </LinearLayout>
 
             <dbfields.SpinnerDB
@@ -1976,7 +1930,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvDescription"
@@ -1993,18 +1948,24 @@
                     android:inputType="text" />
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/textView51"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/Inform_abaut_spraying"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:id="@+id/textView51"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Inform_abaut_spraying"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+            </LinearLayout>
 
             <GridLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:columnCount="3"
-                android:rowCount="2" >
+                android:rowCount="2"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <CheckBox
                     android:id="@+id/cbSafInformFarmer"
@@ -2098,6 +2059,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvEmptyContainers"
                     android:layout_width="wrap_content"
@@ -2105,19 +2072,14 @@
                     android:text="@string/Empty_containers"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
             </LinearLayout>
 
             <GridLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:columnCount="3"
-                android:rowCount="2" >
+                android:rowCount="2"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <CheckBox
                     android:id="@+id/cbTripleRinsed"
@@ -2186,7 +2148,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
@@ -2194,37 +2161,45 @@
                     android:text="@string/Effect_on_non_terget_organism"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSafNonTarget"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
-            <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"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <EditText
-                android:id="@+id/edtSafNonTargetEffect"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:ems="10"
-                android:inputType="text" />
+                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"
+                    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/edtSafNonTargetEffect"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="text" />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <dbfields.TextViewHTML
                     android:id="@+id/tvSafIncident"
                     android:layout_width="wrap_content"
@@ -2233,53 +2208,73 @@
                     android:text="@string/Other_environmental_or_health_incident_reported_that_might_have_been_caused_by_the_treatment"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
             </LinearLayout>
 
-            <dbfields.SpinnerDB
-                android:id="@+id/spiSafIncident"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:minWidth="10dp" />
-
-            <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"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <EditText
-                android:id="@+id/edtSafIncidentEffect"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ems="10"
-                android:inputType="text"
-                android:minWidth="10dp" />
-
-            <TextView
-                android:id="@+id/tvComments"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/Comments_problems" />
-
-            <EditText
-                android:id="@+id/edtComments"
-                android:layout_width="match_parent"
-                android:layout_height="150dp"
-                android:ems="10"
-                android:inputType="textMultiLine" />
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiSafIncident"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:minWidth="10dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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"
+                    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/edtSafIncidentEffect"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="10"
+                    android:inputType="text"
+                    android:minWidth="10dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:id="@+id/tvComments"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Comments_problems" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <EditText
+                    android:id="@+id/edtComments"
+                    android:layout_width="match_parent"
+                    android:layout_height="150dp"
+                    android:ems="10"
+                    android:inputType="textMultiLine" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <CheckBox
                     android:id="@+id/cbTest"
                     android:layout_width="match_parent"
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 a8e7639..8aa595a 100644
--- a/app/src/main/res/layout-large/activity_locust_health.xml
+++ b/app/src/main/res/layout-large/activity_locust_health.xml
@@ -5,10 +5,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/gradient_example"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
+
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".LocustDelActivity">
+    tools:context=".LocustHealthActivity">
 
     <ScrollView
         android:id="@+id/scrollView1"
@@ -25,221 +25,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:divider="@drawable/spacer_medium"
-                android:showDividers="middle">
-                <TextView
-                    android:id="@+id/tvImage1"
-                    android:maxLines="1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Photo1"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-                <EditText
-                    android:id="@+id/edtImage1"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:inputType="text"
-                    android:hint=""
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:enabled="false"
-                    android:focusable="false"/>
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnImage1"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_camera"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnShowImage1"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_photo"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnDelImage1"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_delete"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:divider="@drawable/spacer_medium"
-                android:showDividers="middle">
-
-                <TextView
-                    android:id="@+id/tvImage2"
-                    android:maxLines="1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Photo2"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-                <EditText
-                    android:id="@+id/edtImage2"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:inputType="text"
-                    android:hint=""
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:enabled="false"
-                    android:focusable="false"/>
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnImage2"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_camera"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnShowImage2"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_photo"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnDelImage2"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_delete"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:divider="@drawable/spacer_medium"
-                android:showDividers="middle">
-
-                <TextView
-                    android:id="@+id/tvImage3"
-                    android:maxLines="1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Photo3"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-                <EditText
-                    android:id="@+id/edtImage3"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:inputType="text"
-                    android:hint=""
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:enabled="false"
-                    android:focusable="false"/>
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnImage3"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_camera"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnShowImage3"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_photo"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnDelImage3"
-                    style="@style/Widget.MaterialComponents.Button.Icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    android:minWidth="40dp"
-                    app:icon="@drawable/ic_delete"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconSize="24dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
                 <TextView
                     android:id="@+id/textView5"
                     android:layout_width="match_parent"
@@ -255,7 +42,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvCountry"
                     android:layout_width="wrap_content"
@@ -263,14 +55,6 @@
                     android:text="@string/Country"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiCountry"
                     android:layout_width="match_parent"
@@ -280,7 +64,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvRegion"
                     android:layout_width="wrap_content"
@@ -288,14 +77,6 @@
                     android:text="@string/Region"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRegion"
                     android:layout_width="match_parent"
@@ -305,7 +86,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvArea"
                     android:layout_width="wrap_content"
@@ -314,18 +100,13 @@
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtArea"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
             </LinearLayout>
@@ -333,29 +114,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvDistrict"
-                    android:hint=""
+                <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/Rural_district"
-                    android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-                <EditText
-                    android:id="@+id/edtDistrict"
-                    android:hint=""
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvVillage"
                     android:layout_width="wrap_content"
@@ -363,48 +127,24 @@
                     android:text="@string/Name_of_the_village"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-                
 	            <EditText
 	                android:id="@+id/edtVillage"
-	                android:hint=""
 	                android:layout_width="match_parent"
 	                android:layout_height="wrap_content"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
 	                android:ems="10" />
-
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvTerrain"
+                <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/Farm_or_site"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-	            <EditText
-	                android:id="@+id/edtTerrain"
-	                android:hint=""
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:ems="10" />
-
-            </LinearLayout>
-            
-            
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvName"
                     android:layout_width="wrap_content"
@@ -412,27 +152,26 @@
                     android:text="@string/Name_of_control_team_leader"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtObserver"
                     android:hint=""
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvDate"
                     android:layout_width="wrap_content"
@@ -440,14 +179,6 @@
                     android:text="@string/Date"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.DateTimeText
                     android:id="@+id/edtDate"
                     android:layout_width="0dp"
@@ -463,6 +194,8 @@
                     android:layout_height="wrap_content"
                     android:layout_column="2"
                     android:layout_row="0"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:hint=""
                     android:visibility="invisible" />
 
@@ -488,7 +221,12 @@
                 android:orientation="horizontal"
                 android:divider="@drawable/spacer_medium"
                 android:showDividers="middle">
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLatCenter"
                     android:layout_width="wrap_content"
@@ -496,23 +234,22 @@
                     android:text="@string/Lat_center"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtLatCenter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:enabled="false"
                     android:inputType="numberDecimal" />
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLonCenter"
                     android:layout_width="wrap_content"
@@ -520,19 +257,13 @@
                     android:text="@string/Lon_center"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtLonCenter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:enabled="false"
                     android:inputType="numberDecimal" />
@@ -576,80 +307,236 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btnOnMap"
-                style="@style/Widget.MaterialComponents.Button.Icon"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:minWidth="190dp"
-                android:minHeight="40dp"
-                android:text="@string/Show_map"
-                app:icon="@drawable/ic_map"
-                app:iconGravity="textStart"
-                android:paddingLeft="@dimen/activity_horizontal_margin"/>
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnOnMap"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:minWidth="190dp"
+                    android:minHeight="40dp"
+                    android:text="@string/Show_map"
+                    app:icon="@drawable/ic_map"
+                    app:iconGravity="textStart"
+                    android:paddingLeft="@dimen/activity_horizontal_margin"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="@string/Identification_of_the_monitoring_site"
+                    android:textStyle="bold"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvInfestedArea"
+                <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/Area_infested_ha"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Name_of_the_HH_Env_monitoring_team_leader"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
-                    android:id="@+id/edtInfestedArea"
+                    android:id="@+id/edtObserverHealth"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" />
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold" />
+                <dbfields.DateTimeText
+                    android:id="@+id/edtMonitoringDate"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:hint=""
+                    android:inputType="date" />
+
+                <EditText
+                    android:id="@+id/edtMonitoringTimeZone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_column="2"
+                    android:layout_row="0"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:hint=""
+                    android:visibility="invisible" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnMonitoringGetDate"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_clock"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Was_a_spray_monitoring_form_for_this_treatment_filled_out_by_the_control_team"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
 
-                <TextView
-                    android:id="@+id/tvTreatedArea"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Area_treated_ha"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
-                <EditText
-                    android:id="@+id/edtTreatedArea"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" />
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiFrmLocustDelFilled"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Бригада по обработке"
+                    android:textStyle="bold"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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="Количество работников в бригаде по обработке"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold" />
+                <EditText
+                    android:id="@+id/edtBrigadeCount"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="number" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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="Из них количество работников, ранее обученных обращению с инсектицидами и их применению"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold" />
+                <EditText
+                    android:id="@+id/edtBrigadeCountTrained"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="number" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <EditText
+                    android:id="@+id/edtBrigadeCountTrained"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="number" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
                 <TextView
-                    android:id="@+id/textView13"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:paddingLeft="10dp"
@@ -660,10 +547,16 @@
                     android:textStyle="bold"/>
             </LinearLayout>
 
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvVegType"
                     android:layout_width="wrap_content"
@@ -671,14 +564,6 @@
                     android:text="@string/Vegetation_type"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiVegType"
                     android:layout_width="match_parent"
@@ -688,7 +573,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvVegHeight"
                     android:layout_width="wrap_content"
@@ -696,19 +586,13 @@
                     android:text="@string/Height_cm"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtVegHeight"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
             </LinearLayout>
@@ -716,7 +600,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvVegCover"
                     android:layout_width="wrap_content"
@@ -724,14 +613,6 @@
                     android:text="@string/Del_Vegetation_cover"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiVegCover"
                     android:layout_width="match_parent"
@@ -740,7 +621,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvVegCrop"
@@ -754,58 +636,15 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
             </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvVegDamage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Damage"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiVegDamage"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvVegDamageArea"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Damage_area_ha"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <EditText
-                    android:id="@+id/edtVegDamageArea"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
@@ -820,7 +659,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvInsName"
                     android:layout_width="wrap_content"
@@ -828,27 +672,91 @@
                     android:text="@string/Trade_name"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtInsName"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Номер партии препарата (если указан на контейнере)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtInsPartNumber"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="text" />
+            </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Дата производства или срок годности (срок хранения)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <dbfields.DateTimeText
+                    android:id="@+id/edtInsManufacturedDate"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:hint=""
+                    android:inputType="date" />
+
+                <EditText
+                    android:id="@+id/edtInsManufacturedTimeZone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_column="2"
+                    android:layout_row="0"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:hint=""
+                    android:visibility="invisible" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnInsManufacturedDate"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_clock"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvInsActiveSubstance"
                     android:layout_width="wrap_content"
@@ -856,19 +764,13 @@
                     android:text="@string/The_active_substance"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtInsActiveSubstance"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
             </LinearLayout>
@@ -876,7 +778,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvInsConcentration"
                     android:layout_width="wrap_content"
@@ -884,19 +791,13 @@
                     android:text="@string/Concentration_A_S"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtInsConcentration"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
             </LinearLayout>
@@ -904,7 +805,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvInsFormulation"
                     android:layout_width="wrap_content"
@@ -912,14 +818,6 @@
                     android:text="@string/Formulation"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiInsFormulation"
                     android:layout_width="match_parent"
@@ -928,7 +826,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvInsDose"
@@ -942,13 +841,53 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                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"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiInsDiluted"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvInsRate"
@@ -962,53 +901,31 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvInsUsedVolume"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/Total_volume_of_working_solution_actually_applied_l"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <EditText
-                    android:id="@+id/edtInsUsedVolume"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" />
+                    android:text="Состояние пакетов или контейнеров с инсектицидами"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiInsContainerState"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
             </LinearLayout>
 
-            <!--LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvInsNumberSpores"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Number_of_spores_ml"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <EditText
-                    android:id="@+id/edtInsNumberSpores"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" />
-            </LinearLayout-->
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:id="@+id/textView26"
                     android:layout_width="match_parent"
@@ -1024,7 +941,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvWeaTimeStart"
                     android:layout_width="wrap_content"
@@ -1032,20 +954,17 @@
                     android:text="@string/Time_start"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiWeaTimeStart"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvWeaTimeEnd"
                     android:layout_width="wrap_content"
@@ -1053,14 +972,6 @@
                     android:text="@string/Time_end"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiWeaTimeEnd"
                     android:layout_width="match_parent"
@@ -1070,7 +981,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvWeaTemperatureStart"
@@ -1084,6 +996,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
 
@@ -1099,48 +1013,16 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvWeaWindSpeedStart"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Wind_speed_start_m_s"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <EditText
-                    android:id="@+id/edtWeaWindSpeedStart"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" />
-
-                <TextView
-                    android:id="@+id/tvWeaWindSpeedEnd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Wind_speed_end_m_s"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <EditText
-                    android:id="@+id/edtWeaWindSpeedEnd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvWindDirectionStart"
@@ -1171,7 +1053,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvSprayDirectionStart"
@@ -1202,7 +1085,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:id="@+id/textView39"
                     android:layout_width="match_parent"
@@ -1218,7 +1102,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLocSpecies"
                     android:layout_width="wrap_content"
@@ -1226,14 +1115,6 @@
                     android:text="@string/Locust_type"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiLocSpecies"
                     android:layout_width="match_parent"
@@ -1243,7 +1124,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLocHoppers"
                     android:layout_width="wrap_content"
@@ -1251,14 +1137,6 @@
                     android:text="@string/Hopper_stages"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiLocHoppers"
                     android:layout_width="match_parent"
@@ -1268,32 +1146,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvImago"
+                <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/Imago"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiImago"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvLocDensity"
                     android:layout_width="wrap_content"
@@ -1301,19 +1159,13 @@
                     android:text="@string/Density_m2"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <EditText
                     android:id="@+id/edtLocDensity"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
             </LinearLayout>
@@ -1321,98 +1173,28 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvKuliguli"
+                <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/Bands"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Main_purpose_of_treatment"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
-                    android:id="@+id/spiKuliguli"
+                    android:id="@+id/spiMainPurpose"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvSwarm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Swarms"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiSwarm"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvSparse"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/HOPPERS_SCATTERED"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiSparse"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvLocustPhaseId"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Del_Phase"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiLocustPhaseId"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
@@ -1427,7 +1209,12 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvSprPlatform"
                     android:layout_width="wrap_content"
@@ -1435,14 +1222,6 @@
                     android:text="@string/Spray_platform"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprPlatform"
                     android:layout_width="match_parent"
@@ -1451,7 +1230,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvSprPlatformA"
@@ -1468,7 +1248,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvSprPlatformG"
@@ -1485,7 +1266,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvSprPlatformH"
@@ -1500,26 +1282,10 @@
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
-            <!--LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvSprCapacity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Spray_type"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiSprCapacity"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout-->
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvSprManufacturer"
@@ -1533,13 +1299,16 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvSprHeight"
@@ -1553,126 +1322,25 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:ems="10"
-                    android:inputType="numberDecimal" >
-                </EditText>
+                    android:inputType="numberDecimal"/>
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvSprBarrier"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Barriers"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiSprBarrier"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
-            <!--LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvSprBarrierWidth"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Barrier_width_m"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <EditText
-                    android:id="@+id/edtSprBarrierWidth"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" >
-                </EditText>
-            </LinearLayout-->
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvSprBarrierSpace"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Spacing_of_barriers_m"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-                <EditText
-                    android:id="@+id/edtSprBarrierSpace"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" >
-                </EditText>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvSprSpeed"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Forward_speed_km_h"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
-                <EditText
-                    android:id="@+id/edtSprSpeed"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:inputType="numberDecimal" >
-                </EditText>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/tvSprMarking"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Ground_marking"
+                    android:text="Механическая безопасность: наблюдалась ли утечка инсектицида?"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <dbfields.SpinnerDB
-                    android:id="@+id/spiSprMarking"
+                    android:id="@+id/spiSprLeak"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
@@ -1680,12 +1348,469 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="#dddddd" >
-                <CheckBox
-                    android:id="@+id/cbEffectiveness"
-                    android:layout_width="match_parent"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:id="@+id/tvVegHeight"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:checked="false"
+                    android:text="Если да то в какой части опрыскивателя имеется утечка?"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtSprLeakPlase"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Система опрыскивания: повреждены распылители или сопла?"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiSprDamage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Если Да, какие повреждения?"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtSprDamagePlase"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiSprBarrier"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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/Spacing_of_barriers_m"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold"/>
+                <EditText
+                    android:id="@+id/edtSprBarrierSpace"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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/Forward_speed_km_h"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold" />
+                <EditText
+                    android:id="@+id/edtSprSpeed"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold" />
+                <EditText
+                    android:id="@+id/edtTreatedArea"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Обработанная площадь (проверено бригадой по мониторингу) (га)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtTreatedAreaCheck2"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Фактическая норма объема опрыскивания (л/га)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtSprFactVolume"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Если проводилось наблюдение за опрыскиванием: соблюдалась ли надлежащая практика применения инсектицидов?"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiSprObservation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Замечания относительно наблюдаемой практики опрыскивания"
+                    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_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="text" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="0dp">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Калибровка опрыскивателя"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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="Проверялся ли расход жидкости опрыскивателя во время мониторинга?"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiCalibrConsumptionCheck"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Время калибровки (мин.)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtCalibrTime"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Собранный объем (л)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtCalibrVolume"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Расход жидкости (л/мин)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtCalibrRate"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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="Проверялось ли осаждение капель во время мониторинга?"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiCalibrPrecipitation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Длина трансекты, определенная с использованием масляно-/водочувствительной бумаги (м)"
+                    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/edtCalibrWidthCard"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Средняя скорость ветра при осаждении капель (м/с)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtCalibrWindSpeed"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Ширина захвата с хорошим покрытием капель (м)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtCalibrDropletCoating"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Рекомендуемый интервал между проходами (м)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtCalibrPassesInterval"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:id="@+id/textView49"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
                     android:text="@string/CONTROL_EFFICACY"
                     android:textStyle="bold" />
             </LinearLayout>
@@ -1695,10 +1820,46 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Контроль эффективности проведен (бригада по обработке)"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                    <dbfields.SpinnerDB
+                        android:id="@+id/spiEffectiveness"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/Type_of_assessed_biological_impact"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                    <dbfields.SpinnerDB
+                        android:id="@+id/spiTypeImpact"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvEffMortality"
                         android:layout_width="wrap_content"
@@ -1706,19 +1867,13 @@
                         android:text="@string/Biological_efficiency_of_treatment"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtEffMortality"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:importantForAutofill="no"
+                        android:autofillHints=""
                         android:ems="10"
                         android:inputType="numberDecimal" />
                 </LinearLayout>
@@ -1726,7 +1881,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
-
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"
+                        android:layout_gravity="center_vertical"/>
                     <TextView
                         android:id="@+id/tvEffTime"
                         android:layout_width="wrap_content"
@@ -1734,19 +1894,13 @@
                         android:text="@string/Time_after_treatment_hours"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/star"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textColor="#ff0000" />
-
                     <EditText
                         android:id="@+id/edtEffTime"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:importantForAutofill="no"
+                        android:autofillHints=""
                         android:ems="10"
                         android:hint="@string/Hours"
                         android:inputType="numberDecimal" />
@@ -1754,40 +1908,130 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
-
+                    android:layout_height="wrap_content"
+                    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"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
-
                     <dbfields.SpinnerDB
                         android:id="@+id/spiEffMethod"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Проведен ли контроль эффективности?"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                    <dbfields.SpinnerDB
+                        android:id="@+id/spiEffControll"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/Type_of_assessed_biological_impact"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                    <dbfields.SpinnerDB
+                        android:id="@+id/spiEffImpactType"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        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"
+                        android:importantForAutofill="no"
+                        android:autofillHints=""
+                        android:ems="10"
+                        android:inputType="number" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/Time_after_treatment_hours"
+                        android:textAppearance="?android:attr/textAppearanceSmall"/>
+                    <EditText
+                        android:id="@+id/edtEffTime2"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:importantForAutofill="no"
+                        android:autofillHints=""
+                        android:ems="10"
+                        android:inputType="number" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/Method_of_biological_efficiency_estimation"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                    <dbfields.SpinnerDB
+                        android:id="@+id/spiEffMethod2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/textView49"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:paddingLeft="10dp"
                     android:textColor="@color/text_title"
                     android:gravity="left|center"
                     android:background="#dddddd"
-                    android:text="@string/SAFETY_AND_ENVIRONMENT"
+                    android:text="Здоровье человека"
                     android:textStyle="bold" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <dbfields.TextViewHTML
                     android:id="@+id/tvClothing"
                     android:layout_width="wrap_content"
@@ -1795,19 +2039,14 @@
                     android:text="@string/Protective_clothing"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
             </LinearLayout>
 
             <GridLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:columnCount="3"
-                android:rowCount="3" >
+                android:rowCount="3"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <CheckBox
                     android:id="@+id/cbSafClothingGoggles"
@@ -1878,14 +2117,20 @@
                     android:layout_height="wrap_content"
                     android:layout_column="1"
                     android:layout_row="2"
-                    android:hint=""
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:visibility="invisible" />
             </GridLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
-
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvProtectiveClothingClean"
                     android:layout_width="wrap_content"
@@ -1893,24 +2138,124 @@
                     android:text="@string/Protective_clothing_clean_and_in_good_state"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiProtectiveClothingClean"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Замечания относительно типа и состояния средств индивидуальной защиты"
+                    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/edtHlthClothingState"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:inputType="text" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="В бригаде или на ближайшей противосаранчовой базе имеется запасная защитная одежда (в частности, комбинезоны и перчатки)"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiHlthClothingReserve"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Количество операторов с паспортами использования пестицидов"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtHlthOperatorPassport"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="number" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Количество правильно заполненных паспортов использования пестицидов"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <EditText
+                    android:id="@+id/edtHlthPassportCount"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="number" />
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Во время мониторинга измерялось ли ингибирование холинэстеразы?"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiHlthInhibition"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <dbfields.TextViewHTML
                     android:id="@+id/tvOperatorExposedInsecticide"
                     android:layout_width="wrap_content"
@@ -1918,22 +2263,22 @@
                     android:text="@string/Operator_accidentally_exposed_to_insecticide_or_feeling_unwell"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
             </LinearLayout>
 
-            <dbfields.SpinnerDB
-                android:id="@+id/spiOperatorExposedInsecticide"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiOperatorExposedInsecticide"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <TextView
                     android:id="@+id/tvDescription"
@@ -1947,114 +2292,57 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:inputType="text" />
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/textView51"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/Inform_abaut_spraying"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <GridLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:columnCount="3"
-                android:rowCount="2" >
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
-                <CheckBox
-                    android:id="@+id/cbSafInformFarmer"
+                <TextView
+                    android:id="@+id/tvDescription"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Farmer" />
-
-                <CheckBox
-                    android:id="@+id/cbSafInformShepherd"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Shepherd" />
-
-                <CheckBox
-                    android:id="@+id/cbSafInformBeekeeper"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Beekeeper" />
-
-                <CheckBox
-                    android:id="@+id/cbSafInformVillager"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Villager" />
-
-                <CheckBox
-                    android:id="@+id/cbSafInformOfficial"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Official" />
-
-                <CheckBox
-                    android:id="@+id/cbSafInformOther"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Other_people" />
+                    android:text="Дополнительные сведения о случайном воздействии или отравлении"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <EditText
-                    android:id="@+id/edtInform"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/edtHlthDescription"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_row="0"
-                    android:hint=""
-                    android:visibility="invisible" />
-            </GridLayout>
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:inputType="text" />
+            </LinearLayout>
 
-            <!--LinearLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
-                    android:id="@+id/tvSafEmptyContainers"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Empty_containers"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiSafEmptyContainers"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout-->
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Состояние окружающей среды"
+                    android:textStyle="bold" />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvEmptyContainers"
                     android:layout_width="wrap_content"
@@ -2062,19 +2350,14 @@
                     android:text="@string/Empty_containers"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
             </LinearLayout>
 
             <GridLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:columnCount="3"
-                android:rowCount="2" >
+                android:rowCount="2"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
 
                 <CheckBox
                     android:id="@+id/cbTripleRinsed"
@@ -2136,14 +2419,74 @@
                     android:layout_height="wrap_content"
                     android:layout_column="2"
                     android:layout_row="0"
-                    android:hint=""
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
                     android:visibility="invisible" />
             </GridLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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="Наблюдалось или сообщалось о случайном загрязнении? (например, разлив инсектицидов, неправильная очистка оборудования и т. д.)"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold" />
+            </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiSafObservedPollution"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Если Да, то где и какой тип загрязнения?"
+                    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/edtSafTypePollution"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="text" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/tvSafNonTarget"
                     android:layout_width="wrap_content"
@@ -2151,37 +2494,73 @@
                     android:text="@string/Effect_on_non_terget_organism"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSafNonTarget"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
-            <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"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <EditText
-                android:id="@+id/edtSafNonTargetEffect"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:ems="10"
-                android:inputType="text" />
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:id="@+id/textView43"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Если Да, то где и какое воздействие?"
+                    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/edtSafNonTargetEffect2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="text" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Если информация поступила от прочих лиц, от кого именно?"
+                    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/btnInfoSafNonTargetEffectPerson"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="text" />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
                 <dbfields.TextViewHTML
                     android:id="@+id/tvSafIncident"
                     android:layout_width="wrap_content"
@@ -2190,62 +2569,501 @@
                     android:text="@string/Other_environmental_or_health_incident_reported_that_might_have_been_caused_by_the_treatment"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/star"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ff0000" />
             </LinearLayout>
 
-            <dbfields.SpinnerDB
-                android:id="@+id/spiSafIncident"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:minWidth="10dp" />
-
-            <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"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <EditText
-                android:id="@+id/edtSafIncidentEffect"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ems="10"
-                android:inputType="text"
-                android:minWidth="10dp" />
-
-            <TextView
-                android:id="@+id/tvComments"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/Comments_problems" />
-
-            <EditText
-                android:id="@+id/edtComments"
-                android:layout_width="match_parent"
-                android:layout_height="150dp"
-                android:ems="10"
-                android:inputType="textMultiLine" />
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <CheckBox
-                    android:id="@+id/cbTest"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiSafIncident"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:minWidth="10dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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"
+                    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/edtSafIncidentEffect"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="text"
+                    android:minWidth="10dp" />
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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"
+                    android:text="Осуществлялся ли бригадой по мониторингу ЗЧ и ОС контроль в отношении наблюдаемого или зарегистрированного воздействия на окружающую среду"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiSafControl"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:minWidth="10dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Если Да, опишите последующее действие(я)"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+                <EditText
+                    android:id="@+id/edtSafControlActions"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="text"
+                    android:minWidth="10dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
-                    android:paddingLeft="@dimen/padding_checkbox"
-                    android:text="@string/Test_questionnaire"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="@string/Comments_problems"
                     android:textStyle="bold" />
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <EditText
+                    android:id="@+id/edtComments"
+                    android:layout_width="match_parent"
+                    android:layout_height="150dp"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="textMultiLine" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Карта и фотографии"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Была ли составлена ситуационная карта обработки?"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiMapTreatment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:divider="@drawable/spacer_medium"
+                android:showDividers="middle"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:id="@+id/tvImage1"
+                    android:maxLines="1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Фото инцидента"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+                <EditText
+                    android:id="@+id/edtImage1"
+                    android:maxLines="1"
+                    android:singleLine="true"
+                    android:inputType="text"
+                    android:hint=""
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="10"
+                    android:enabled="false"
+                    android:focusable="false"/>
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnImage1"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_camera"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnShowImage1"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_photo"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnDelImage1"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_delete"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:textColor="@color/text_title"
+                    android:gravity="left|center"
+                    android:background="#dddddd"
+                    android:text="Оценки риска"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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="Имеются ли в непосредственной близости от обработок жилые дома или жилье?"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <dbfields.SpinnerDB
+                    android:id="@+id/btnInfoRiskHouse"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Расстояние от ближайшего края обрабатываемого участка (м) до ближайшего жилья:"
+                    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/edtRiskHouseDistance"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="text"
+                    android:minWidth="10dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Соблюдались ли буферные зоны?"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiRiskHouseBufferZones"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Существует ли вероятность воздействия на жилые дома/жилье?"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiRiskHouseImpact"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Были ли проинформированы жители о применении инсектицидов?"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiRiskHouseInformed"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    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="Имеются ли в непосредственной близости от обработок поверхностные воды"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiRiskWater"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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=" Расстояние от ближайшего края обрабатываемого участка (м) до ближайшего водоема:"
+                    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/edtRiskWaterDistance"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="text"
+                    android:minWidth="10dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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=" Были ли пчеловоды проинформированы о применении инсектицидов?"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiRiskApiaryInformed"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Какие меры были предприняты для снижения отрицательного воздействия на пчел"
+                    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/edtRiskApiaryMeasure"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:importantForAutofill="no"
+                    android:autofillHints=""
+                    android:ems="10"
+                    android:inputType="text"
+                    android:minWidth="10dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                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="Существует ли вероятность воздействия на пчел?"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiRiskApiaryImpact"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <CheckBox
+                        android:id="@+id/cbTest"
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:paddingLeft="@dimen/padding_checkbox"
+                        android:text="@string/Test_questionnaire"
+                        android:textStyle="bold" />
+                </LinearLayout>
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_locust_health.xml b/app/src/main/res/layout/activity_locust_health.xml
index 26903c3..fdf5c0c 100644
--- a/app/src/main/res/layout/activity_locust_health.xml
+++ b/app/src/main/res/layout/activity_locust_health.xml
@@ -7,7 +7,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    tools:context=".LocustDelActivity">
+    tools:context=".LocustHealthActivity">
 
     <ScrollView
         android:id="@+id/scrollView1"
@@ -442,34 +442,32 @@
                     android:textColor="@color/text_title"
                     android:gravity="left|center"
                     android:background="#dddddd"
-                    android:text="Идентификация места мониторинга"
+                    android:text="@string/Identification_of_the_monitoring_site"
                     android:textStyle="bold"/>
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center">
-
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_star"
                     android:contentDescription="@null"/>
-
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:background="@color/transparent"
                     app:boxBackgroundColor="@color/transparent">
-
                     <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/edtRiskAgriculturalPhase"
+                        android:id="@+id/edtObserverHealth"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="@color/transparent"
-                        android:hint="Имя руководителя бригады по мониторингу ЗЧ и ОС"
+                        android:hint="@string/Name_of_the_HH_Env_monitoring_team_leader"
                         android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
@@ -494,18 +492,18 @@
                     app:boxBackgroundColor="@color/transparent">
 
                     <dbfields.DateTimeTM
-                        android:id="@+id/edtMonitoringDate2"
+                        android:id="@+id/edtMonitoringDate"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="@color/transparent"
-                        android:hint="Дата мониторинга"
+                        android:hint="@string/Date_of_monitoring"
                         android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <EditText
-                    android:id="@+id/edtTimeZone"
+                    android:id="@+id/edtMonitoringTimeZone"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:minWidth="2dp"
@@ -513,7 +511,7 @@
                     android:inputType="text"/>
 
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnGetDate"
+                    android:id="@+id/btnMonitoringGetDate"
                     style="@style/Widget.MaterialComponents.Button.Icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -541,7 +539,7 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="Заполнялась ли Форма по Мониторингу противосаранчовых обработок бригадой по обработке?">
+                    android:hint="@string/Was_a_spray_monitoring_form_for_this_treatment_filled_out_by_the_control_team">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiFrmLocustDelFilled"
                         android:layout_width="match_parent"
@@ -869,12 +867,6 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="0dp">
 
-                <!--ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star"
-                    android:contentDescription="@null"/-->
-
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 5ffe37e..196b22a 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -201,6 +201,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/Identify_country_region" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -219,6 +220,30 @@
 
             </LinearLayout>
 
+            <CheckBox
+                android:id="@+id/cbShowAdvancedSettings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/Show_advanced_settings" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="0.05"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btnDeleteAllData"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:minWidth="190dp"
+                    android:minHeight="40dp"
+                    android:layout_margin="2dp"
+                    android:text="@string/Delete_all_data" />
+
+            </LinearLayout>
+
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 064239d..fb518ef 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -335,4 +335,5 @@
     <string name="Type_of_assessed_biological_impact">Qiymətləndirilmiş bioloji təsir növü</string>
     <string name="Commercial_product_diluted">Ticarət məhsulu seyreltilirmi?</string>
     <string name="Working_fluid_dilution_ratio">İşçi mayenin seyreltmə nisbəti</string>
+	<string name="Show_advanced_settings">Qabaqcıl parametrləri göstərin</string>
 </resources>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index 13cd37c..38793b4 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -346,4 +346,5 @@
     <string name="Type_of_assessed_biological_impact">Գնահատված կենսաբանական ազդեցության տեսակը</string>
     <string name="Commercial_product_diluted">Արդյո՞ք կոմերցիոն արտադրանքը նոսրացված է:</string>
     <string name="Working_fluid_dilution_ratio">Աշխատանքային հեղուկի նոսրացման հարաբերակցությունը</string>
+	<string name="Show_advanced_settings">Ցույց տալ առաջադեմ կարգավորումները</string>
 </resources>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 499746d..d3573bf 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -337,4 +337,5 @@
     <string name="Type_of_assessed_biological_impact">შეფასებული ბიოლოგიური ზემოქმედების ტიპი</string>
     <string name="Commercial_product_diluted">კომერციული პროდუქტი განზავებულია?</string>
     <string name="Working_fluid_dilution_ratio">სამუშაო სითხის განზავების თანაფარდობა</string>
+	<string name="Show_advanced_settings">გაფართოებული პარამეტრების ჩვენება</string>
 </resources>
diff --git a/app/src/main/res/values-kg/strings.xml b/app/src/main/res/values-kg/strings.xml
index 46bb720..c5af0b4 100644
--- a/app/src/main/res/values-kg/strings.xml
+++ b/app/src/main/res/values-kg/strings.xml
@@ -340,4 +340,5 @@
     <string name="Type_of_assessed_biological_impact">Бааланган биологиялык таасирдин түрү</string>
     <string name="Commercial_product_diluted">Коммерциялык продукт суюлтулганбы?</string>
     <string name="Working_fluid_dilution_ratio">Жумушчу суюктуктун суюлтуу катышы</string>
+	<string name="Show_advanced_settings">Өркүндөтүлгөн орнотууларды көрсөтүү</string>
 </resources>
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 9157ef3..f55d4a2 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -344,5 +344,6 @@
     <string name="Type_of_assessed_biological_impact">Бағаланған биологиялық әсердің түрі</string>
     <string name="Commercial_product_diluted">Коммерциялық өнім сұйылтылған ба?</string>
     <string name="Working_fluid_dilution_ratio">Жұмыс сұйықтығының сұйылту коэффициенті</string>
+	<string name="Show_advanced_settings">Қосымша параметрлерді көрсету</string>
 
 </resources>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 56dfa9b..bfbd885 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -350,4 +350,5 @@
     <string name="Type_of_assessed_biological_impact">نوع تاثیر بیولوژیکی ارزیابی شده</string>
     <string name="Commercial_product_diluted">آیا محصول تجاری رقیق شده است؟</string>
 	<string name="Working_fluid_dilution_ratio">نسبت رقت مایع کاری</string>
+	<string name="Show_advanced_settings">پرمختللي ترتیبات ښکاره کړئ</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 85fd0a4..551df45 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -225,7 +225,7 @@
 	<string name="Forward_speed_km_h">Средняя скорость движения (км/ч)</string>
 	<string name="Antenna_DGPS_used">Антенна: DGPS использовалась</string>
 	<string name="Ground_marking">Наземная маркировка</string>
-	<string name="CONTROL_EFFICACY">Контроль эффективности проведен</string>
+	<string name="CONTROL_EFFICACY">Контроль эффективности</string>
 	<string name="Biological_efficiency_of_treatment">Наблюдаемая эффективность обработки (%)</string>
 	<string name="Time_after_treatment_hours">Прошло времени после обработки (часов)</string>
 	<string name="Method_of_biological_efficiency_estimation">Метод оценки эффективности обработок</string>
@@ -355,6 +355,13 @@
 	<string name="Type_of_assessed_biological_impact">Тип оцениваемого биологического воздействия</string>
     <string name="Commercial_product_diluted">Коммерческий препарат разбавлен?</string>
 	<string name="Working_fluid_dilution_ratio">Пропорция разбавления рабочей жидкости</string>
-
+    <string name="title_activity_locust_health_list">"Формы по мониторингу здоровья человека и окружающей среды (ЗЧ и ОС) "</string>
+	<string name="Show_advanced_settings">Показать дополнительные настройки</string>
+	<string name="Delete_all_data">Удалить все данные</string>
+	<string name="Help">Помощь</string>
+	<string name="Identification_of_the_monitoring_site">Идентификация места мониторинга</string>
+	<string name="Date_of_monitoring">Дата мониторинга</string>
+	<string name="Name_of_the_HH_Env_monitoring_team_leader">Имя руководителя бригады по мониторингу ЗЧ и ОС </string>
+	<string name="Was_a_spray_monitoring_form_for_this_treatment_filled_out_by_the_control_team">Заполнялась ли Форма по Мониторингу противосаранчовых обработок бригадой по обработке?</string>
 
 </resources>
diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml
index 336d1e9..d1fe0dc 100644
--- a/app/src/main/res/values-tg/strings.xml
+++ b/app/src/main/res/values-tg/strings.xml
@@ -348,4 +348,5 @@
     <string name="Type_of_assessed_biological_impact">Навъи таъсири биологӣ арзёбӣ мешавад</string>
     <string name="Commercial_product_diluted">Оё маҳсулоти тиҷоратӣ ҳал карда шудааст?</string>
 	<string name="Working_fluid_dilution_ratio">Таносуби маҳлули моеъи корӣ</string>
+    <string name="Show_advanced_settings">Танзимоти пешрафтаро нишон диҳед</string>
 </resources>
diff --git a/app/src/main/res/values-tk/strings.xml b/app/src/main/res/values-tk/strings.xml
index 1f138a1..1446649 100644
--- a/app/src/main/res/values-tk/strings.xml
+++ b/app/src/main/res/values-tk/strings.xml
@@ -348,4 +348,5 @@
     <string name="Type_of_assessed_biological_impact">Bahalandyrylan biologiki täsiriň görnüşi</string>
     <string name="Commercial_product_diluted">Söwda önümi suwuklandyrylýarmy?</string>
 	<string name="Working_fluid_dilution_ratio">Işleýän suwuklygyň eriş gatnaşygy</string>
+    <string name="Show_advanced_settings">Öňdebaryjy sazlamalary görkeziň</string>
 </resources>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index 9d60259..f5098c4 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -349,4 +349,5 @@
     <string name="Type_of_assessed_biological_impact">Bahalandyrylan biologiki täsiriň görnüşi</string>
     <string name="Commercial_product_diluted">Savdo mahsuloti suyultirilganmi?</string>
 	<string name="Working_fluid_dilution_ratio">Ishchi suyuqlikni suyultirish nisbati</string>
+    <string name="Show_advanced_settings">Kengaytirilgan sozlamalarni ko\'rsatish</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd97b46..7e5fb7f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -353,5 +353,16 @@
     <string name="Continuous">Continuous</string>
     <string name="Commercial_product_diluted">Is the commercial product diluted?</string>
     <string name="Working_fluid_dilution_ratio">Working fluid dilution ratio</string>
+    <string name="title_activity_locust_health_list">Human Health and Environment (HH&amp;Env) Monitoring Forms</string>
+    <string name="Show_advanced_settings">Show advanced settings</string>
+    <string name="Delete_all_data">Delete all data</string>
+    <string name="Help">Help</string>
+    <string name="Identification_of_the_monitoring_site">Identification of the monitoring site</string>
+    <string name="Date_of_monitoring">Date of monitoring</string>
+    <string name="Name_of_the_HH_Env_monitoring_team_leader">Name of the HH&amp;Env monitoring team leader</string>
+
+    <string name="Was_a_spray_monitoring_form_for_this_treatment_filled_out_by_the_control_team">Was a spray monitoring form for this treatment filled out by the control team?</string>
+
+
 
 </resources>