From eab49a59e30a3da6b4470cf0003cf1bf023f4a7f Mon Sep 17 00:00:00 2001 From: Prajwal Date: Tue, 30 May 2023 19:25:49 +0530 Subject: [PATCH] NAS-207: Reselecting date not maintaining state is fixed. --- .../app/knowledgeEngine/Node.java | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/intelehealth/app/knowledgeEngine/Node.java b/app/src/main/java/org/intelehealth/app/knowledgeEngine/Node.java index 1a62a0f7e8..1146ecd608 100644 --- a/app/src/main/java/org/intelehealth/app/knowledgeEngine/Node.java +++ b/app/src/main/java/org/intelehealth/app/knowledgeEngine/Node.java @@ -970,12 +970,26 @@ public static void askDate(final Node node, final Activity context, final Questi */ // for rest other than physexam screen the maxdate will be todays date so that future dates isnt allowed. // if (!context.getClass().getSimpleName().equalsIgnoreCase("PhysicalExamActivity")) - if (!node.getText().contains("follow-up")) - datePickerDialog.getDatePicker().setMaxDate(System.currentTimeMillis()); + if (!node.getDisplay().contains("follow-up")) { + try { + datePickerDialog.getDatePicker().setMaxDate(System.currentTimeMillis()); + } + catch (Exception e) { + Log.v("ddd", "askdate 978line: " + e.toString()); + } + } // if (context.getClass().getSimpleName().equalsIgnoreCase("PhysicalExamActivity")) - if (node.getText().contains("follow-up")) - datePickerDialog.getDatePicker().setMinDate(System.currentTimeMillis() - 1000); + if (node.getDisplay().contains("follow-up")) { + try { + datePickerDialog.getDatePicker().setMinDate(System.currentTimeMillis() - 1000); + } + catch (Exception e) { + Log.v("ddd", "askdate 999line: " + e.toString()); + } + } + + Log.v("ddd", "dddd: " + node.getText()); datePickerDialog.setOnCancelListener(dialog -> { @@ -1638,13 +1652,26 @@ public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth // for rest other than physexam screen the maxdate will be todays date so that future dates isnt allowed. // if (!context.getClass().getSimpleName().equalsIgnoreCase("PhysicalExamActivity")) - if (!node.getText().contains("follow-up")) - datePickerDialog.getDatePicker().setMaxDate(System.currentTimeMillis()); + if (!node.getDisplay().contains("follow-up")) { + try { + datePickerDialog.getDatePicker().setMaxDate(System.currentTimeMillis()); + } + catch (Exception e) { + Log.v("ddd", "askdate 1660line: " + e.toString()); + } + } // if (context.getClass().getSimpleName().equalsIgnoreCase("PhysicalExamActivity")) - if (node.getText().contains("follow-up")) - datePickerDialog.getDatePicker().setMinDate(System.currentTimeMillis() - 1000); + if (node.getDisplay().contains("follow-up")) { + try { + datePickerDialog.getDatePicker().setMinDate(System.currentTimeMillis() - 1000); + } + catch (Exception e) { + Log.v("ddd", "askdate 1670line: " + e.toString()); + } + } + Log.v("ddd", "dddd subdate: " + node.getText()); datePickerDialog.show(); }