From: wbudic <redacted>
Date: Wed, 7 Nov 2018 03:04:06 +0000 (+1100)
Subject: SQL query order by DATE field takes precedence.
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=e111a4ae0b491a29461e6c872df3a2842c8c7001;p=LifeLog.git

SQL query order by DATE field takes precedence.
---

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 59360e2..043ae44 100755
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -46,7 +46,7 @@ $today->set_time_zone( $TIME_ZONE );
 #####################
 
 my $stmtCat = "SELECT * FROM CAT;";
-my $stmt    = "SELECT rowid, ID_CAT, DATE, LOG, AMMOUNT FROM LOG ORDER BY rowid DESC, DATE DESC;";
+my $stmt    = "SELECT rowid, ID_CAT, DATE, LOG, AMMOUNT FROM LOG ORDER BY DATE DESC, rowid DESC;";
 
 
 $sth = $dbh->prepare( $stmtCat );
@@ -297,7 +297,7 @@ try{
 
 		if($rs_cur){
 			 $stmt = 'SELECT rowid, ID_CAT, DATE, LOG, AMMOUNT from LOG 
-			          where rowid <= "'.$rs_cur.'" ORDER BY rowid DESC, DATE DESC;';
+			          where rowid <= "'.$rs_cur.'" ORDER BY DATE DESC, rowid DESC;';
 			 return;
 		}
 	}
diff --git a/htdocs/cgi-bin/remove.cgi b/htdocs/cgi-bin/remove.cgi
index e04c26e..2b113e6 100755
--- a/htdocs/cgi-bin/remove.cgi
+++ b/htdocs/cgi-bin/remove.cgi
@@ -42,7 +42,7 @@ my $tbl_rc =0;
 
 
 my $stmS = "SELECT rowid, ID_CAT, DATE, LOG from LOG WHERE";
-my $stmE = " ORDER BY rowid DESC, DATE DESC;";
+my $stmE = " ORDER BY DATE DESC, rowid DESC;";
 my $tbl = '<form name="frm_log_del" action="remove.cgi" onSubmit="return formDelValidation();">
 		<table class="tbl">
 		<tr class="r0"><th>Date</th><th>Time</th><th>Log</th><th>Category</th></tr>';