Merge pull request #139 from AdamGuidarini/history-crash-as-needed

History crash as needed
AdamGuidarini · Dec 11, 2024 · 6963b49 · 6963b49
2 parents 91ca4f5 + 893bef5
commit 6963b49
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         targetSdkVersion 34
         compileSdk 34
 
-        versionCode 33
-        versionName "0.13.4"
+        versionCode 34
+        versionName "0.13.5"
         resourceConfigurations += ['en', 'de', 'es', 'it', 'tr']
 
         ndk {

diff --git a/app/src/main/cpp/MediTrakCore/DatabaseController/DatabaseController.cpp b/app/src/main/cpp/MediTrakCore/DatabaseController/DatabaseController.cpp
@@ -365,7 +365,7 @@ void DatabaseController::exportCsv(const string &exportPath, map<string, vector<
 
 Medication DatabaseController::getMedication(long medicationId) {
     string query = "SELECT * FROM " + MEDICATION_TABLE + " m "
-                   + " INNER JOIN " + MEDICATION_TIMES + " mt "
+                   + " LEFT JOIN " + MEDICATION_TIMES + " mt "
                    + " ON " + "m." + MED_ID + "= mt." + MED_ID
                    + " WHERE m." + MED_ID + "=" + to_string(medicationId);
     Medication medication;
@@ -393,7 +393,11 @@ Medication DatabaseController::getMedication(long medicationId) {
     }
 
     while (!table->isAfterLast()) {
-        times.push_back(table->getItem(DRUG_TIME));
+        string t = table->getItem(DRUG_TIME);
+
+        if (!t.empty()) {
+            times.push_back(table->getItem(DRUG_TIME));
+        }
 
         table->moveToNext();
     }

diff --git a/app/src/main/java/projects/medicationtracker/Adapters/HistoryAdapter.java b/app/src/main/java/projects/medicationtracker/Adapters/HistoryAdapter.java
@@ -65,12 +65,18 @@ public void onBindViewHolder(@NonNull HistoryAdapter.ViewHolder holder, int posi
         LocalDateTime scheduledDateTime = doses[position].getDoseTime();
         LocalDateTime takenDateTime = doses[position].getTimeTaken();
 
-        String scheduleDate = DateTimeFormatter.ofPattern(
-                dateFormat, Locale.getDefault()
-        ).format(scheduledDateTime.toLocalDate());
-        String scheduleTime = DateTimeFormatter.ofPattern(
-                timeFormat, Locale.getDefault()
-        ).format(scheduledDateTime.toLocalTime());
+        if (currentMed.getFrequency() == 0) {
+            holder.scheduledDateLabel.setText("N/A");
+        } else {
+            String scheduleDate = DateTimeFormatter.ofPattern(
+                    dateFormat, Locale.getDefault()
+            ).format(scheduledDateTime.toLocalDate());
+            String scheduleTime = DateTimeFormatter.ofPattern(
+                    timeFormat, Locale.getDefault()
+            ).format(scheduledDateTime.toLocalTime());
+
+            holder.scheduledDateLabel.setText(scheduleDate + "\n" + scheduleTime);
+        }
 
         String takenDate = DateTimeFormatter.ofPattern(
                 dateFormat, Locale.getDefault()
@@ -93,7 +99,6 @@ public void onBindViewHolder(@NonNull HistoryAdapter.ViewHolder holder, int posi
             doseLbl += currentMed.getDosageUnits();
         }
 
-        holder.scheduledDateLabel.setText(scheduleDate + "\n" + scheduleTime);
         holder.takenDateLabel.setText(takenDate + "\n" + takenTime);
         holder.dosageAmount.setText(doseLbl);
 

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files