From bab2e1d5896c5f34a3fb47df6194e549092264ec Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Tue, 20 Jun 2023 13:39:39 +0200
Subject: [PATCH 1/3] Custom date format for LoTW badge in /logbook

---
 application/views/view_log/partial/log_ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index cb4ea12e6..900bad856 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -99,7 +99,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
             <?php } ?>
             <td>
                 <a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a>
-                <?php echo ($row->callsign == '' ? '' : ' <small id="lotw_info" class="badge badge-success" data-toggle="tooltip" data-original-title="LoTW User. Last upload was ' . $row->lastupload . '">L</small>'); ?>
+                <?php $timestamp = strtotime($row->lastupload); echo ($row->callsign == '' ? '' : ' <small id="lotw_info" class="badge badge-success" data-toggle="tooltip" data-original-title="LoTW User. Last upload was '.date($custom_date_format." H:i", $timestamp).'">L</small>'); ?>
             </td>
 			<?php
 

From 2994012543c208003616ef7e202e0feeda630f21 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Tue, 20 Jun 2023 15:03:30 +0200
Subject: [PATCH 2/3] Show last LoTW upload as visual hint

---
 application/views/view_log/partial/log_ajax.php | 13 ++++++++++++-
 assets/css/general.css                          | 12 ++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index 900bad856..57e298655 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -99,7 +99,18 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
             <?php } ?>
             <td>
                 <a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a>
-                <?php $timestamp = strtotime($row->lastupload); echo ($row->callsign == '' ? '' : ' <small id="lotw_info" class="badge badge-success" data-toggle="tooltip" data-original-title="LoTW User. Last upload was '.date($custom_date_format." H:i", $timestamp).'">L</small>'); ?>
+                <?php
+                   $lotw_hint = '';
+                   $diff = (time() - strtotime($row->lastupload)) / 86400;
+                   if ($diff > 365) {
+                      $lotw_hint = ' lotw_info_red';
+                   } elseif ($diff > 30) {
+                      $lotw_hint = ' lotw_info_orange';
+                   } elseif ($diff > 7) {
+                      $lotw_hint = ' lotw_info_yellow';
+                   }
+                ?>
+                <?php $timestamp = strtotime($row->lastupload); echo ($row->callsign == '' ? '' : ' <small id="lotw_info" class="badge badge-success'.$lotw_hint.'" data-toggle="tooltip" data-original-title="LoTW User. Last upload was '.date($custom_date_format." H:i", $timestamp).'">L</small>'); ?>
             </td>
 			<?php
 
diff --git a/assets/css/general.css b/assets/css/general.css
index 985cf3bf8..edfa24c78 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -441,3 +441,15 @@ div#station_logbooks_linked_table_paginate {
 #lotw_manual_results {
     padding-top: 10px;
 }
+
+.lotw_info_yellow {
+   background-image: linear-gradient(to bottom, #3fb618, yellow);
+}
+
+.lotw_info_orange {
+   background-image: linear-gradient(to bottom, #3fb618, orange);
+}
+
+.lotw_info_red {
+   background-image: linear-gradient(to bottom, #3fb618, red);
+}

From 64eddd3b241eee660f29a982e318dd2aefb2a626 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Tue, 20 Jun 2023 21:39:16 +0200
Subject: [PATCH 3/3] Apply LoTW hint color to advanced logbook

---
 assets/js/sections/logbookadvanced.js |  4 ++--
 src/QSLManager/QSO.php                | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index 58cb84821..984d5620a 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -26,7 +26,7 @@ function updateRow(qso) {
 	let c = 1;
 	cells.eq(c++).text(qso.qsoDateTime);
 	cells.eq(c++).text(qso.de);
-	cells.eq(c++).html('<a id="edit_qso" href="javascript:displayQso('+qso.qsoID+')">'+qso.dx+'</a>' + (qso.callsign == '' ? '' : ' <small id="lotw_info" class="badge badge-success" data-toggle="tooltip" data-original-title="LoTW User. Last upload was ' + qso.lastupload + '">L</small>'));
+	cells.eq(c++).html('<a id="edit_qso" href="javascript:displayQso('+qso.qsoID+')">'+qso.dx+'</a>' + (qso.callsign == '' ? '' : ' <small id="lotw_info" class="badge badge-success'+qso.lotw_hint+'" data-toggle="tooltip" data-original-title="LoTW User. Last upload was ' + qso.lastupload + '">L</small>'));
 	cells.eq(c++).text(qso.mode);
 	cells.eq(c++).text(qso.rstS);
 	cells.eq(c++).text(qso.rstR);
@@ -81,7 +81,7 @@ function loadQSOTable(rows) {
 		data.push('<div class="form-check"><input class="form-check-input" type="checkbox" /></div>');
 		data.push(qso.qsoDateTime);
 		data.push(qso.de);
-		data.push('<a id="edit_qso" href="javascript:displayQso('+qso.qsoID+')">'+qso.dx+'</a>' + (qso.callsign == '' ? '' : ' <small id="lotw_info" class="badge badge-success" data-toggle="tooltip" data-original-title="LoTW User. Last upload was ' + qso.lastupload + ' ">L</small>'));
+		data.push('<a id="edit_qso" href="javascript:displayQso('+qso.qsoID+')">'+qso.dx+'</a>' + (qso.callsign == '' ? '' : ' <small id="lotw_info" class="badge badge-success'+qso.lotw_hint+'" data-toggle="tooltip" data-original-title="LoTW User. Last upload was ' + qso.lastupload + ' ">L</small>'));
 		data.push(qso.mode);
 		data.push(qso.rstS);
 		data.push(qso.rstR);
diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php
index a64bd4029..22033afe4 100644
--- a/src/QSLManager/QSO.php
+++ b/src/QSLManager/QSO.php
@@ -62,6 +62,7 @@ class QSO
 	/** Lotw callsign info **/
 	private string $callsign;
 	private string $lastupload;
+	private string $lotw_hint;
 
 	/**
 	 * @param array $data Does no validation, it's assumed to be a row from the database in array format
@@ -195,6 +196,19 @@ class QSO
 		}
 		$this->callsign = ($data['callsign'] === null) ? '' :$data['callsign'];
 		$this->lastupload = ($data['lastupload'] === null) ? '' : date($custom_date_format . " H:i", strtotime($data['lastupload']));
+		$lotw_hint = '';
+		if ($data['lastupload'] !== null) {
+			$diff = time();
+			$diff = (time() - strtotime($data['lastupload'])) / 86400;
+			if ($diff > 365) {
+				$lotw_hint = ' lotw_info_red';
+			} elseif ($diff > 30) {
+				$lotw_hint = ' lotw_info_orange';
+			} elseif ($diff > 7) {
+				$lotw_hint = ' lotw_info_yellow';
+			}
+		}
+		$this->lotw_hint = $lotw_hint;
 
 	}
 	
@@ -776,6 +790,7 @@ class QSO
 			'end' => $this->end === null ? null : $this->end->format("Y-m-d"),
 			'callsign' => $this->callsign,
 			'lastupload' => $this->lastupload,
+			'lotw_hint' => $this->lotw_hint,
 		];
 	}