igor/org.ccalm.asdc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+поля

Browse Source
This commit is contained in:
Igor I
2024-07-31 17:56:56 +05:00
parent cdba2fbcca
commit 723c5a5415
6 changed files with 922 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/deploymentTargetSelector.xml generated
View File

@ -4,10 +4,10 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2024-07-30T15:06:27.253720500Z">
<DropdownSelection timestamp="2024-07-31T03:43:56.671614800Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\igor\.android\avd\Pixel_Tablet_API_34.avd" />
<DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ivanov.i\.android\avd\Pixel_3a_API_34_extension_level_7_x86_64.avd" />
</handle>
</Target>
</DropdownSelection>

1
app/src/main/java/kz/istt/locust/LocustHealthActivity.java
View File

@ -1009,7 +1009,6 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
edtCalibrPassesInterval = (EditText) findViewById(R.id.edtCalibrPassesInterval);
guiTableHealth.add(edtCalibrPassesInterval, "calibr_passes_interval");
//********** Контроль эфективности **********
//Контроль эфективности
spiEffControl = findViewById(R.id.spiEffControl);

676
app/src/main/res/layout-land/activity_locust_health.xml
View File

File diff suppressed because it is too large Load Diff

11
app/src/main/res/layout-large/activity_locust_del.xml
View File

@ -1734,6 +1734,12 @@
</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"
@ -1751,11 +1757,6 @@
android:layout_height="wrap_content" />
</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" >

2
app/src/main/res/layout-large/activity_locust_health.xml
View File

@ -1818,7 +1818,7 @@
android:text="@string/Control_efficacy_conducted_control_team"
android:textAppearance="?android:attr/textAppearanceSmall" />
<dbfields.SpinnerDB
android:id="@+id/spiEffectiveness"
android:id="@+id/spiEffControl"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

22
app/src/main/res/layout/activity_locust_health.xml
View File

@ -948,6 +948,28 @@
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