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-08-01 18:17:15 +05:00
parent b54efc8537
commit 3e130d841e
7 changed files with 482 additions and 233 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> <selectionStates>
<SelectionState runConfigName="app"> <SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" /> <option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2024-07-31T03:43:56.671614800Z"> <DropdownSelection timestamp="2024-08-01T07:51:45.210388Z">
<Target type="DEFAULT_BOOT"> <Target type="DEFAULT_BOOT">
<handle> <handle>
<DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ivanov.i\.android\avd\Pixel_3a_API_34_extension_level_7_x86_64.avd" /> <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ivanov.i\.android\avd\Pixel_Tablet_API_33.avd" />
</handle> </handle>
</Target> </Target>
</DropdownSelection> </DropdownSelection>

144
app/src/main/java/kz/istt/locust/LocustActivity.java
View File

@ -78,6 +78,7 @@ import dbfields.StringDB;
import dbfields.fieldDB; import dbfields.fieldDB;
import dbfields.selectDB; import dbfields.selectDB;
import tools.LatLonListener; import tools.LatLonListener;
import tools.OnClickListenerDateTime2;
public class LocustActivity extends FragmentActivity implements LocationListener, LatLonListener { public class LocustActivity extends FragmentActivity implements LocationListener, LatLonListener {
private LocationManager lm; private LocationManager lm;
@ -336,79 +337,80 @@ public class LocustActivity extends FragmentActivity implements LocationListener
guiTable.add(edtDate, "date"); //Обязательное поле! guiTable.add(edtDate, "date"); //Обязательное поле!
View btnGetDate = (View) findViewById(R.id.btnGetDate); View btnGetDate = (View) findViewById(R.id.btnGetDate);
View.OnClickListener clk0 = new View.OnClickListener() { btnGetDate.setOnClickListener(new OnClickListenerDateTime2((fieldDB)edtDate,this));
public void onClick(View v) {
DatePickerDialog.OnDateSetListener myDateListener = new DatePickerDialog.OnDateSetListener() {
@Override
public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
//Закоментил так как создал отдельный класс: OnClickListenerDateTime2
// View.OnClickListener clk0 = new View.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"));
// //LocustActivity.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)LocustActivity.this.edtDate).getValue());
// val += (hourOfDay * 60 + minute) * 60;
// ((fieldDB)LocustActivity.this.edtDate).setValue(String.valueOf(val));
// }
// };
//
// if (((fieldDB)LocustActivity.this.edtDate).getValue() != null && !((fieldDB)LocustActivity.this.edtDate).getValue().equals("")) {
// Date time = new Date(Long.parseLong(((fieldDB)LocustActivity.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(LocustActivity.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(LocustActivity.this, R.style.AlertDialogTheme, myDateListener, hour, minute, true);
// tpd.show();
// }
//
// Date date = new Date(year - 1900, monthOfYear, dayOfMonth);
// ((fieldDB)LocustActivity.this.edtDate).setValue(String.valueOf(date.getTime() / 1000));
// }
// };
//
// if (!LocustActivity.this.edtDate.getText().toString().equals("")) {
// Date date = null;
// SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm"); // SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
//format.setTimeZone(TimeZone.getTimeZone("UTC")); // //format.setTimeZone(TimeZone.getTimeZone("UTC"));
//LocustActivity.this.edtDate.setText(format.format(curDateTime)); // try {
// date = format.parse(LocustActivity.this.edtDate.getText().toString());
//Теперь выбираем время // } catch (ParseException e) {
OnTimeSetListener myDateListener = new OnTimeSetListener() { // e.printStackTrace();
@Override // }
public void onTimeSet(TimePicker view, int hourOfDay, int minute) { // if (date != null) {
long val = Long.parseLong(((fieldDB)LocustActivity.this.edtDate).getValue()); // Calendar myCal = new GregorianCalendar();
val += (hourOfDay * 60 + minute) * 60; // myCal.setTime(date);
((fieldDB)LocustActivity.this.edtDate).setValue(String.valueOf(val)); // int day = myCal.get(Calendar.DAY_OF_MONTH);
} // int month = myCal.get(Calendar.MONTH);
}; // int year = myCal.get(Calendar.YEAR);
// DatePickerDialog dpd = new DatePickerDialog(LocustActivity.this, R.style.AlertDialogTheme, myDateListener, year, month, day);
if (((fieldDB)LocustActivity.this.edtDate).getValue() != null && !((fieldDB)LocustActivity.this.edtDate).getValue().equals("")) { // dpd.show();
Date time = new Date(Long.parseLong(((fieldDB)LocustActivity.this.edtDate).getValue()) * 1000); // }
Calendar myCal = new GregorianCalendar(); // } else {
myCal.setTime(time); // final Calendar c = Calendar.getInstance();
int hour = myCal.get(Calendar.HOUR_OF_DAY); // int year = c.get(Calendar.YEAR);
int minute = myCal.get(Calendar.MINUTE); // int month = c.get(Calendar.MONTH);
TimePickerDialog tpd = new TimePickerDialog(LocustActivity.this, R.style.AlertDialogTheme, myDateListener, hour, minute, true); // int day = c.get(Calendar.DAY_OF_MONTH);
tpd.show(); //
} else { // DatePickerDialog dpd = new DatePickerDialog(LocustActivity.this, R.style.AlertDialogTheme, myDateListener, year, month, day);
final Calendar myCal = Calendar.getInstance(); // dpd.show();
int hour = myCal.get(Calendar.HOUR_OF_DAY); // }
int minute = myCal.get(Calendar.MINUTE); // }
TimePickerDialog tpd = new TimePickerDialog(LocustActivity.this, R.style.AlertDialogTheme, myDateListener, hour, minute, true); // };
tpd.show(); // btnGetDate.setOnClickListener(clk0);
}
Date date = new Date(year - 1900, monthOfYear, dayOfMonth);
((fieldDB)LocustActivity.this.edtDate).setValue(String.valueOf(date.getTime() / 1000));
}
};
if (!LocustActivity.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(LocustActivity.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(LocustActivity.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(LocustActivity.this, R.style.AlertDialogTheme, myDateListener, year, month, day);
dpd.show();
}
}
};
btnGetDate.setOnClickListener(clk0);
edtTimeZone = (EditText) findViewById(R.id.edtTimeZone); edtTimeZone = (EditText) findViewById(R.id.edtTimeZone);
guiTable.add(edtTimeZone, "timezone"); guiTable.add(edtTimeZone, "timezone");

163
app/src/main/java/kz/istt/locust/LocustDelActivity.java
View File

@ -77,6 +77,7 @@ import dbfields.StringDB;
import dbfields.fieldDB; import dbfields.fieldDB;
import dbfields.selectDB; import dbfields.selectDB;
import tools.LatLonListener; import tools.LatLonListener;
import tools.OnClickListenerDateTime2;
public class LocustDelActivity extends FragmentActivity implements LocationListener, LatLonListener public class LocustDelActivity extends FragmentActivity implements LocationListener, LatLonListener
{ {
@ -367,87 +368,89 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
guiTable.add(edtDate, "date"); guiTable.add(edtDate, "date");
View btnGetDate = (View) findViewById(R.id.btnGetDate); View btnGetDate = (View) findViewById(R.id.btnGetDate);
View.OnClickListener clk0 = new View.OnClickListener() { btnGetDate.setOnClickListener(new OnClickListenerDateTime2((fieldDB)edtDate,this));
public void onClick(View v) //Закоментил так как создал отдельный класс: OnClickListenerDateTime2
{ // View.OnClickListener clk0 = new View.OnClickListener() {
DatePickerDialog.OnDateSetListener myDateListener = new DatePickerDialog.OnDateSetListener() { // public void onClick(View v)
@Override // {
public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) // 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)LocustDelActivity.this.edtDate).getValue());
// val += (hourOfDay*60+minute)*60;
// ((fieldDB)LocustDelActivity.this.edtDate).setValue(String.valueOf(val));
// }
// };
//
// if(((fieldDB)LocustDelActivity.this.edtDate).getValue()!=null && !((fieldDB)LocustDelActivity.this.edtDate).getValue().equals(""))
// {
// Date time = new Date(Long.parseLong(((fieldDB)LocustDelActivity.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(LocustDelActivity.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(LocustDelActivity.this, R.style.AlertDialogTheme, myDateListener, hour, minute, true);
// tpd.show();
// }
//
// Date date = new Date(year-1900, monthOfYear, dayOfMonth);
// ((fieldDB)LocustDelActivity.this.edtDate).setValue(String.valueOf(date.getTime()/1000));
//
//
// }
// };
//
// if(!LocustDelActivity.this.edtDate.getText().toString().equals(""))
// {
// Date date=null;
// SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm"); // SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
//format.setTimeZone(TimeZone.getTimeZone("UTC")); // //format.setTimeZone(TimeZone.getTimeZone("UTC"));
//LocustDelActivity.this.edtDate.setText(format.format(curDateTime)); // try {
// date = format.parse(LocustDelActivity.this.edtDate.getText().toString());
//Теперь выбираем время // } catch (ParseException e) {
OnTimeSetListener myDateListener = new OnTimeSetListener() { // e.printStackTrace();
@Override // }
public void onTimeSet(TimePicker view, int hourOfDay, int minute) // if(date!=null)
{ // {
long val = Long.parseLong(((fieldDB)LocustDelActivity.this.edtDate).getValue()); // Calendar myCal = new GregorianCalendar();
val += (hourOfDay*60+minute)*60; // myCal.setTime(date);
((fieldDB)LocustDelActivity.this.edtDate).setValue(String.valueOf(val)); // int day = myCal.get(Calendar.DAY_OF_MONTH);
} // int month = myCal.get(Calendar.MONTH);
}; // int year = myCal.get(Calendar.YEAR);
// DatePickerDialog dpd = new DatePickerDialog(LocustDelActivity.this, R.style.AlertDialogTheme, myDateListener, year, month, day);
if(((fieldDB)LocustDelActivity.this.edtDate).getValue()!=null && !((fieldDB)LocustDelActivity.this.edtDate).getValue().equals("")) // dpd.show();
{ // }
Date time = new Date(Long.parseLong(((fieldDB)LocustDelActivity.this.edtDate).getValue())*1000); // }else
Calendar myCal = new GregorianCalendar(); // {
myCal.setTime(time); // final Calendar c = Calendar.getInstance();
int hour = myCal.get(Calendar.HOUR_OF_DAY); // int year = c.get(Calendar.YEAR);
int minute = myCal.get(Calendar.MINUTE); // int month = c.get(Calendar.MONTH);
TimePickerDialog tpd = new TimePickerDialog(LocustDelActivity.this, R.style.AlertDialogTheme, myDateListener, hour, minute, true); // int day = c.get(Calendar.DAY_OF_MONTH);
tpd.show(); //
}else // DatePickerDialog dpd = new DatePickerDialog(LocustDelActivity.this, R.style.AlertDialogTheme, myDateListener, year, month, day);
{ // dpd.show();
final Calendar myCal = Calendar.getInstance(); // }
int hour = myCal.get(Calendar.HOUR_OF_DAY); // }
int minute = myCal.get(Calendar.MINUTE); // };
TimePickerDialog tpd = new TimePickerDialog(LocustDelActivity.this, R.style.AlertDialogTheme, myDateListener, hour, minute, true); // btnGetDate.setOnClickListener(clk0);
tpd.show();
}
Date date = new Date(year-1900, monthOfYear, dayOfMonth);
((fieldDB)LocustDelActivity.this.edtDate).setValue(String.valueOf(date.getTime()/1000));
}
};
if(!LocustDelActivity.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(LocustDelActivity.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(LocustDelActivity.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(LocustDelActivity.this, R.style.AlertDialogTheme, myDateListener, year, month, day);
dpd.show();
}
}
};
btnGetDate.setOnClickListener(clk0);
edtTimeZone = (EditText) findViewById(R.id.edtTimeZone); edtTimeZone = (EditText) findViewById(R.id.edtTimeZone);
guiTable.add(edtTimeZone,"timezone"); guiTable.add(edtTimeZone,"timezone");

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

@ -67,11 +67,12 @@ import java.util.Locale;
import java.util.zip.CRC32; import java.util.zip.CRC32;
import dbfields.AutoCompleteTextViewDB; import dbfields.AutoCompleteTextViewDB;
import dbfields.DateTimeTM;
import dbfields.StringDB; import dbfields.StringDB;
import dbfields.fieldDB; import dbfields.fieldDB;
import dbfields.selectDB; import dbfields.selectDB;
import tools.LatLonListener; import tools.LatLonListener;
import tools.OnClickListenerDateTime; import tools.OnClickListenerDateTime2;
public class LocustHealthActivity extends FragmentActivity implements LocationListener, LatLonListener public class LocustHealthActivity extends FragmentActivity implements LocationListener, LatLonListener
{ {
@ -482,7 +483,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
edtMonitoringTimeZone = (EditText) findViewById(R.id.edtMonitoringTimeZone); edtMonitoringTimeZone = (EditText) findViewById(R.id.edtMonitoringTimeZone);
guiTableHealth.add(edtMonitoringTimeZone,"timezone"); guiTableHealth.add(edtMonitoringTimeZone,"timezone");
View btnMonitoringGetDate = (View) findViewById(R.id.btnMonitoringGetDate); View btnMonitoringGetDate = (View) findViewById(R.id.btnMonitoringGetDate);
btnMonitoringGetDate.setOnClickListener(new OnClickListenerDateTime(edtMonitoringDate,this)); btnMonitoringGetDate.setOnClickListener(new OnClickListenerDateTime2((fieldDB)edtMonitoringDate,this));
//**********Бригада по обработке********** //**********Бригада по обработке**********
@ -550,11 +551,11 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
edtInsPartNumber = (EditText) findViewById(R.id.edtInsPartNumber); edtInsPartNumber = (EditText) findViewById(R.id.edtInsPartNumber);
guiTableHealth.add(edtInsPartNumber, "insecticide_part_number"); guiTableHealth.add(edtInsPartNumber, "insecticide_part_number");
//H Дата производства или Срок годности (срок хранения) //H Дата производства или Срок годности (срок хранения)
edtInsManufacturedDate = (EditText) findViewById(R.id.edtInsPartNumber); edtInsManufacturedDate = (EditText) findViewById(R.id.edtInsManufacturedDate);
guiTableHealth.add(edtInsManufacturedDate, "insecticide_manufactured_date"); guiTableHealth.add(edtInsManufacturedDate, "insecticide_manufactured_date");
View btnInsManufacturedDate = (View) findViewById(R.id.btnInsManufacturedDate); View btnInsManufacturedDate = (View) findViewById(R.id.btnInsManufacturedDate);
btnInsManufacturedDate.setOnClickListener(new OnClickListenerDateTime(edtInsManufacturedDate,this)); btnInsManufacturedDate.setOnClickListener(new OnClickListenerDateTime2((fieldDB)edtInsManufacturedDate,this));
++++++++
// Наименование активного вещества отравы // Наименование активного вещества отравы
edtInsActiveSubstance = (EditText) findViewById(R.id.edtInsActiveSubstance); edtInsActiveSubstance = (EditText) findViewById(R.id.edtInsActiveSubstance);
guiTableDel.add(edtInsActiveSubstance, "insecticide_active_substance"); guiTableDel.add(edtInsActiveSubstance, "insecticide_active_substance");
@ -1022,14 +1023,14 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
((selectDB)spiEffControl).addField("", ""); ((selectDB)spiEffControl).addField("", "");
((selectDB)spiEffControl).addField(getString(R.string.Yes), "1"); ((selectDB)spiEffControl).addField(getString(R.string.Yes), "1");
((selectDB)spiEffControl).addField(getString(R.string.No), "0"); ((selectDB)spiEffControl).addField(getString(R.string.No), "0");
findViewById(R.id.btnEffControl).setOnClickListener(new OnClickListener() if(findViewById(R.id.btnEffControl)!=null) {
{ findViewById(R.id.btnEffControl).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) public void onClick(View v) {
{
alert(getString(R.string.Control_efficacy_conducted_control_team)); alert(getString(R.string.Control_efficacy_conducted_control_team));
} }
}); });
}
//Тип оцениваемого биологического воздействия //Тип оцениваемого биологического воздействия
spiEffTypeImpact = findViewById(R.id.spiEffTypeImpact); spiEffTypeImpact = findViewById(R.id.spiEffTypeImpact);
@ -1085,14 +1086,14 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
((selectDB)spiEffControl2).addField("", ""); ((selectDB)spiEffControl2).addField("", "");
((selectDB)spiEffControl2).addField(getString(R.string.Yes), "1"); ((selectDB)spiEffControl2).addField(getString(R.string.Yes), "1");
((selectDB)spiEffControl2).addField(getString(R.string.No), "0"); ((selectDB)spiEffControl2).addField(getString(R.string.No), "0");
findViewById(R.id.btnEffControl2).setOnClickListener(new OnClickListener() if(findViewById(R.id.btnEffControl2)!=null) {
{ findViewById(R.id.btnEffControl2).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) public void onClick(View v) {
{
alert(getString(R.string.Control_efficacy_conducted_monitoring_team)); alert(getString(R.string.Control_efficacy_conducted_monitoring_team));
} }
}); });
}
//H Тип оцениваемого биологического воздействия //H Тип оцениваемого биологического воздействия
spiEffTypeImpact2 = findViewById(R.id.spiEffTypeImpact2); spiEffTypeImpact2 = findViewById(R.id.spiEffTypeImpact2);
guiTableHealth.add(spiEffTypeImpact2, "efficacy_impact_type_id"); guiTableHealth.add(spiEffTypeImpact2, "efficacy_impact_type_id");
@ -1329,14 +1330,14 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
//H Если информация поступила от прочих лиц, от кого именно? (укажите имя, номер телефона, адрес) //H Если информация поступила от прочих лиц, от кого именно? (укажите имя, номер телефона, адрес)
edtSafNonTargetEffectPerson = (EditText) findViewById(R.id.edtSafNonTargetEffectPerson); edtSafNonTargetEffectPerson = (EditText) findViewById(R.id.edtSafNonTargetEffectPerson);
guiTableHealth.add(edtSafNonTargetEffectPerson, "safety_non_target_effect_person"); guiTableHealth.add(edtSafNonTargetEffectPerson, "safety_non_target_effect_person");
findViewById(R.id.btnSafNonTargetEffectPerson).setOnClickListener(new OnClickListener() if(findViewById(R.id.btnSafNonTargetEffectPerson)!=null) {
{ findViewById(R.id.btnSafNonTargetEffectPerson).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) public void onClick(View v) {
{
alert(getString(R.string.If_reported_by_another_person_by_whom)); alert(getString(R.string.If_reported_by_another_person_by_whom));
} }
}); });
}
// Другие инциденты по здоровью или окружающей среде, возникшие возможно при обработке // Другие инциденты по здоровью или окружающей среде, возникшие возможно при обработке
spiSafIncident = findViewById(R.id.spiSafIncident); spiSafIncident = findViewById(R.id.spiSafIncident);
@ -1390,14 +1391,14 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
((selectDB)spiRiskHouse).addField("", ""); ((selectDB)spiRiskHouse).addField("", "");
((selectDB)spiRiskHouse).addField(getString(R.string.Yes), "1"); ((selectDB)spiRiskHouse).addField(getString(R.string.Yes), "1");
((selectDB)spiRiskHouse).addField(getString(R.string.No), "0"); ((selectDB)spiRiskHouse).addField(getString(R.string.No), "0");
findViewById(R.id.btnRiskHouse).setOnClickListener(new OnClickListener() if(findViewById(R.id.btnRiskHouse)!=null) {
{ findViewById(R.id.btnRiskHouse).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) public void onClick(View v) {
{
alert(getString(R.string.Any_dwellings_or_housing_nearby_the_treatment)); alert(getString(R.string.Any_dwellings_or_housing_nearby_the_treatment));
} }
}); });
}
// Чтоб при изменении значения скрывались соответствующие поля // Чтоб при изменении значения скрывались соответствующие поля
((selectDB)spiRiskHouse).setOnChangeValueListener(new OnClickListener() ((selectDB)spiRiskHouse).setOnChangeValueListener(new OnClickListener()
{ {
@ -1453,14 +1454,14 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
((selectDB)spiRiskWater).addField("", ""); ((selectDB)spiRiskWater).addField("", "");
((selectDB)spiRiskWater).addField(getString(R.string.Yes), "1"); ((selectDB)spiRiskWater).addField(getString(R.string.Yes), "1");
((selectDB)spiRiskWater).addField(getString(R.string.No), "0"); ((selectDB)spiRiskWater).addField(getString(R.string.No), "0");
findViewById(R.id.btnRiskWater).setOnClickListener(new OnClickListener() if(findViewById(R.id.btnRiskWater)!=null) {
{ findViewById(R.id.btnRiskWater).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) public void onClick(View v) {
{
alert(getString(R.string.Any_surface_waters_nearby_the_treatment)); alert(getString(R.string.Any_surface_waters_nearby_the_treatment));
} }
}); });
}
// Чтоб при изменении значения скрывались соответствующие поля // Чтоб при изменении значения скрывались соответствующие поля
((selectDB)spiRiskWater).setOnChangeValueListener(new OnClickListener() ((selectDB)spiRiskWater).setOnChangeValueListener(new OnClickListener()
{ {
@ -1506,14 +1507,14 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
((selectDB)spiRiskApiary).addField("", ""); ((selectDB)spiRiskApiary).addField("", "");
((selectDB)spiRiskApiary).addField(getString(R.string.Yes), "1"); ((selectDB)spiRiskApiary).addField(getString(R.string.Yes), "1");
((selectDB)spiRiskApiary).addField(getString(R.string.No), "0"); ((selectDB)spiRiskApiary).addField(getString(R.string.No), "0");
findViewById(R.id.btnRiskApiary).setOnClickListener(new OnClickListener() if(findViewById(R.id.btnRiskApiary)!=null) {
{ findViewById(R.id.btnRiskApiary).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) public void onClick(View v) {
{
alert(getString(R.string.Any_apiculture_nearby_the_treatment)); alert(getString(R.string.Any_apiculture_nearby_the_treatment));
} }
}); });
}
// Чтоб при изменении значения скрывались соответствующие поля // Чтоб при изменении значения скрывались соответствующие поля
((selectDB)spiRiskApiary).setOnChangeValueListener(new OnClickListener() ((selectDB)spiRiskApiary).setOnChangeValueListener(new OnClickListener()
{ {
@ -1618,14 +1619,15 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
((selectDB)spiRiskSilk).addField("", ""); ((selectDB)spiRiskSilk).addField("", "");
((selectDB)spiRiskSilk).addField(getString(R.string.Yes), "1"); ((selectDB)spiRiskSilk).addField(getString(R.string.Yes), "1");
((selectDB)spiRiskSilk).addField(getString(R.string.No), "0"); ((selectDB)spiRiskSilk).addField(getString(R.string.No), "0");
findViewById(R.id.btnRiskSilk).setOnClickListener(new OnClickListener()
{ if(findViewById(R.id.btnRiskSilk)!=null) {
findViewById(R.id.btnRiskSilk).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) public void onClick(View v) {
{
alert(getString(R.string.Any_sericulture_nearby_the_treatment)); alert(getString(R.string.Any_sericulture_nearby_the_treatment));
} }
}); });
}
// Чтоб при изменении значения скрывались соответствующие поля // Чтоб при изменении значения скрывались соответствующие поля
((selectDB)spiRiskSilk).setOnChangeValueListener(new OnClickListener() ((selectDB)spiRiskSilk).setOnChangeValueListener(new OnClickListener()
@ -1736,14 +1738,14 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
} }
} }
}); });
findViewById(R.id.btnRiskPark).setOnClickListener(new OnClickListener() if(findViewById(R.id.btnRiskPark)!=null) {
{ findViewById(R.id.btnRiskPark).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) public void onClick(View v) {
{
alert(getString(R.string.Any_other_ecologically_sensitive_areas_nearby_the_treatment)); alert(getString(R.string.Any_other_ecologically_sensitive_areas_nearby_the_treatment));
} }
}); });
}
//H Какой тип экологически чувствительной зоны //H Какой тип экологически чувствительной зоны
edtRiskParkType = (EditText) findViewById(R.id.edtRiskParkType); edtRiskParkType = (EditText) findViewById(R.id.edtRiskParkType);

104
app/src/main/java/tools/OnClickListenerDateTime2.java Normal file
View File

@ -0,0 +1,104 @@
package tools;
import android.app.DatePickerDialog;
import android.app.TimePickerDialog;
import android.content.Context;
import android.view.View;
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.TimePicker;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import dbfields.DateTimeTM;
import dbfields.fieldDB;
import kz.istt.locust.LocustActivity;
import kz.istt.locust.R;
public class OnClickListenerDateTime2 implements View.OnClickListener {
private fieldDB edtDate=null;
private Context context=null;
public OnClickListenerDateTime2(fieldDB edtDate, Context context){
this.edtDate = edtDate;
this.context = context;
}
@Override
public void onClick(View view) {
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"));
//LocustActivity.this.edtDate.setText(format.format(curDateTime));
//Теперь выбираем время
TimePickerDialog.OnTimeSetListener myDateListener = new TimePickerDialog.OnTimeSetListener() {
@Override
public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
long val = Long.parseLong(edtDate.getValue());
val += (hourOfDay * 60 + minute) * 60;
edtDate.setValue(String.valueOf(val));
}
};
if (edtDate.getValue() != null && !edtDate.getValue().equals("")) {
Date time = new Date(Long.parseLong(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(context, 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(context, R.style.AlertDialogTheme, myDateListener, hour, minute, true);
tpd.show();
}
Date date = new Date(year - 1900, monthOfYear, dayOfMonth);
edtDate.setValue(String.valueOf(date.getTime() / 1000));
}
};
//if (!edtDate.getText().toString().equals("")) {
if(edtDate.getValue() != null && !edtDate.getValue().equals("")){
Date date = null;
date = new Date(Long.parseLong(edtDate.getValue())*1000);
//SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
//format.setTimeZone(TimeZone.getTimeZone("UTC"));
//try {
// date = format.parse(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(context, 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(context, R.style.AlertDialogTheme, myDateListener, year, month, day);
dpd.show();
}
}
}

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

@ -1820,7 +1820,24 @@
<dbfields.SpinnerDB <dbfields.SpinnerDB
android:id="@+id/spiEffControl" android:id="@+id/spiEffControl"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_weight="1"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnEffControl"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
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 <LinearLayout
@ -1919,7 +1936,25 @@
<dbfields.SpinnerDB <dbfields.SpinnerDB
android:id="@+id/spiEffControll" android:id="@+id/spiEffControll"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_weight="1"
/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnEffControl2"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
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 <LinearLayout
@ -2570,12 +2605,30 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"> android:paddingLeft="@dimen/activity_horizontal_margin">
<EditText <EditText
android:id="@+id/edtSafNonTargetEffectPerson"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:importantForAutofill="no" android:importantForAutofill="no"
android:autofillHints="" android:autofillHints=""
android:ems="10" android:ems="10"
android:inputType="text" /> android:inputType="text" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnSafNonTargetEffectPerson"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
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 <LinearLayout
@ -2847,9 +2900,26 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"> android:paddingLeft="@dimen/activity_horizontal_margin">
<dbfields.SpinnerDB <dbfields.SpinnerDB
android:id="@+id/btnInfoRiskHouse" android:id="@+id/spiRiskHouse"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_weight="1"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnRiskHouse"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
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 <LinearLayout
@ -2953,7 +3023,24 @@
<dbfields.SpinnerDB <dbfields.SpinnerDB
android:id="@+id/spiRiskWater" android:id="@+id/spiRiskWater"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_weight="1"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnRiskWater"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
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 <LinearLayout
@ -3036,7 +3123,24 @@
<dbfields.SpinnerDB <dbfields.SpinnerDB
android:id="@+id/spiRiskApiary" android:id="@+id/spiRiskApiary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_weight="1"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnRiskApiary"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
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 <LinearLayout
@ -3242,7 +3346,24 @@
<dbfields.SpinnerDB <dbfields.SpinnerDB
android:id="@+id/spiRiskSilk" android:id="@+id/spiRiskSilk"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_weight="1"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnRiskSilk"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
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 <LinearLayout
@ -3381,7 +3502,24 @@
<dbfields.SpinnerDB <dbfields.SpinnerDB
android:id="@+id/spiRiskPark" android:id="@+id/spiRiskPark"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_weight="1"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnRiskPark"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

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

@ -938,7 +938,7 @@
android:background="@color/transparent" android:background="@color/transparent"
app:boxBackgroundColor="@color/transparent"> app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText <dbfields.DateTimeTM
android:id="@+id/edtInsManufacturedDate" android:id="@+id/edtInsManufacturedDate"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"