mirror of
https://github.com/jfoucry/Pilldroid.git
synced 2024-09-20 19:14:19 +02:00
solve addItem bug;
add try/catch to avoid bug add javadoc style
This commit is contained in:
parent
8822b8d679
commit
053eb53459
1 changed files with 31 additions and 12 deletions
|
@ -249,21 +249,27 @@ public class MedicamentListActivity extends AppCompatActivity {
|
||||||
|
|
||||||
long dateSchedule;
|
long dateSchedule;
|
||||||
|
|
||||||
Medicament firstMedicament = medicaments.get(0);
|
Medicament firstMedicament = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
firstMedicament = medicaments.get(0);
|
||||||
|
}
|
||||||
|
catch (Exception ignored){}
|
||||||
|
|
||||||
|
if (firstMedicament != null) {
|
||||||
Date dateAlert = UtilDate.removeDaysToDate(firstMedicament.getAlertThreshold(), firstMedicament.getDateEndOfStock());
|
Date dateAlert = UtilDate.removeDaysToDate(firstMedicament.getAlertThreshold(), firstMedicament.getDateEndOfStock());
|
||||||
|
|
||||||
if (dateAlert.getTime() < now.getTime())
|
if (dateAlert.getTime() < now.getTime()) {
|
||||||
{
|
|
||||||
dateSchedule = now.getTime() + 50000; // If dateAlert < now we schedule an alert for now + 5 seconds (3600000 pour 1 heure)[in prod define delay]
|
dateSchedule = now.getTime() + 50000; // If dateAlert < now we schedule an alert for now + 5 seconds (3600000 pour 1 heure)[in prod define delay]
|
||||||
} else {
|
} else {
|
||||||
dateSchedule = dateAlert.getTime(); // If dateAlert > now we use dateAlert as scheduleDate
|
dateSchedule = dateAlert.getTime(); // If dateAlert > now we use dateAlert as scheduleDate
|
||||||
}
|
}
|
||||||
|
|
||||||
long delay = dateSchedule - now.getTime();
|
long delay = dateSchedule - now.getTime();
|
||||||
scheduleNotification(getNotification(getString(R.string.notification_text)),delay);
|
scheduleNotification(getNotification(getString(R.string.notification_text)), delay);
|
||||||
|
|
||||||
Log.d(TAG, "Notification scheduled for "+ UtilDate.convertDate(dateSchedule));
|
Log.d(TAG, "Notification scheduled for " + UtilDate.convertDate(dateSchedule));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -328,6 +334,9 @@ public class MedicamentListActivity extends AppCompatActivity {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* show keybordInput dialoo
|
||||||
|
*/
|
||||||
protected void showInputDialog() {
|
protected void showInputDialog() {
|
||||||
// get prompts.xml view
|
// get prompts.xml view
|
||||||
LayoutInflater layoutInflater = LayoutInflater.from(MedicamentListActivity.this);
|
LayoutInflater layoutInflater = LayoutInflater.from(MedicamentListActivity.this);
|
||||||
|
@ -352,6 +361,11 @@ public class MedicamentListActivity extends AppCompatActivity {
|
||||||
alert.show();
|
alert.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/***
|
||||||
|
* Ask if the medicament found in the database should be include in the
|
||||||
|
* user database
|
||||||
|
* @param Medicament med - medicament to be added
|
||||||
|
*/
|
||||||
private void askToAddInDB(Medicament med) {
|
private void askToAddInDB(Medicament med) {
|
||||||
AlertDialog.Builder dlg = new AlertDialog.Builder(this);
|
AlertDialog.Builder dlg = new AlertDialog.Builder(this);
|
||||||
dlg.setTitle(getString(R.string.app_name));
|
dlg.setTitle(getString(R.string.app_name));
|
||||||
|
@ -376,11 +390,15 @@ public class MedicamentListActivity extends AppCompatActivity {
|
||||||
dlg.show();
|
dlg.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add New medimenant to the user database
|
||||||
|
* @param Medicament med - medicament to be added
|
||||||
|
*/
|
||||||
private void addMedToList(Medicament med)
|
private void addMedToList(Medicament med)
|
||||||
{
|
{
|
||||||
med.setDateEndOfStock();
|
med.setDateEndOfStock();
|
||||||
dbHelper.addDrug(med);
|
|
||||||
mAdapter.addItem(med);
|
mAdapter.addItem(med);
|
||||||
|
dbHelper.addDrug(med);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
|
private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
|
||||||
|
@ -506,6 +524,7 @@ public class MedicamentListActivity extends AppCompatActivity {
|
||||||
Context context = v.getContext();
|
Context context = v.getContext();
|
||||||
Intent intent = new Intent(context, MedicamentDetailActivity.class);
|
Intent intent = new Intent(context, MedicamentDetailActivity.class);
|
||||||
intent.putExtra("medicament", medicamentCourant);
|
intent.putExtra("medicament", medicamentCourant);
|
||||||
|
int requestCode =1;
|
||||||
startActivityForResult(intent, requestCode);
|
startActivityForResult(intent, requestCode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue