From 4ee05c01c96a3577d419860da7c4453761a4f5db Mon Sep 17 00:00:00 2001
From: paul-arg <paul.arguillere@gmail.com>
Date: Sat, 23 Mar 2024 20:34:23 +0100
Subject: [PATCH] code cleanup

---
 apps/elapsed_t/app.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/elapsed_t/app.js b/apps/elapsed_t/app.js
index 8237ef32c..7d1df0c57 100644
--- a/apps/elapsed_t/app.js
+++ b/apps/elapsed_t/app.js
@@ -358,7 +358,6 @@ function diffToTarget() {
 }
 
 function draw() {
-
   var nowFormatted = formatDateTime(new Date(), settings.dateFormat, settings.time24, temp_displaySeconds);
   var targetFormatted = formatDateTime(target, settings.dateFormat, settings.time24, true);
   var diff = diffToTarget();
@@ -394,21 +393,20 @@ function draw() {
     // draw target date
     g.setFont("Vector", SMALL_FONT_SIZE).setFontAlign(-1, -1).setColor(COLOUR_RED);
     g.drawString(targetFormatted.date, 4 + 16 + 6, y);
+    y += SMALL_FONT_SIZE;
+
+    // draw target time
+    g.setFont("Vector", SMALL_FONT_SIZE).setFontAlign(-1, -1).setColor(COLOUR_RED);
+    g.drawString(targetFormatted.time, 4, y);
+    y += SMALL_FONT_SIZE + 4;
+
   } else {
     // draw NOT SET
     g.setFont("Vector", SMALL_FONT_SIZE).setFontAlign(-1, -1).setColor(COLOUR_RED);
     g.drawString("NOT SET", 4 + 16 + 6, y);
+    y += 2 * SMALL_FONT_SIZE + 4;
   }
 
-  y += SMALL_FONT_SIZE;
-
-  // draw target time
-  if (data.target.isSet) {
-    g.setFont("Vector", SMALL_FONT_SIZE).setFontAlign(-1, -1).setColor(COLOUR_RED);
-    g.drawString(targetFormatted.time, 4, y);
-  }
-  y += SMALL_FONT_SIZE + 4;
-
   // draw separator
   g.setColor(COLOUR_BLACK);
   g.drawLine(0, y - 4, SCREEN_WIDTH, y - 4);