From 4908007842a1b73e8a69af5b644ba62cccd99001 Mon Sep 17 00:00:00 2001
From: Metabox <vilijanac@gmail.com>
Date: Thu, 3 Oct 2019 09:59:11 +1000
Subject: [PATCH] Config sections, bug fixes.

---
 Current Development Check List.md | 15 ++++++---------
 htdocs/cgi-bin/config.cgi         | 15 +++++++++++----
 htdocs/cgi-bin/main.cgi           |  4 ++--
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Current Development Check List.md b/Current Development Check List.md
index 1ae2758..0889ca8 100644
--- a/Current Development Check List.md	
+++ b/Current Development Check List.md	
@@ -11,23 +11,18 @@ This version is not compatible in data structure to prior versions. Data migrati
 > i.e. $SESSN_EXPR, $RELEASE_VER, $TIME_ZONE, $LOG_PATH
 
 *&#10004; Dropdown for type of log amount (Mark as Expense). Default is Asset. Asset is neither, income or expense.
-
-
 *&#10004; Implement RTF Documents.
 > Useful as more document style formated details can be added instead of just plain text.
-
 *&#10004; Preserve Search view selections. After edits and submit.
 > * &#10004; Preserve from to date selections.
 > * &#10004; Date View not working on Local entered date format.
-
 *&#10004; Sum selected, income, expense, totals. 
-*&#10004; Sum on view.
+&#10004; Sum on view.
 
 
 ## Urgent FIXES and Known Issuses
 &#10004; Dynamic toggle of page sections, interaction fixed, bettered.
 &#10004; View by Date - search not showing current month entries.
-
 &#10004; Fix Interaction jumping edits and creating new entries via now button.
 >&#10004;  Fix some LTAGS not saved as LTags server side.
 
@@ -45,8 +40,9 @@ This version is not compatible in data structure to prior versions. Data migrati
 
 
 ## New Features of Minor Relevance
-* &#10004; Config Export of Log and Categories to be provided as a button.
-*Theme colours to be revisited, bettered.
+* &#10004; Config page, links on menu to sections.
+* Theme colours to be revisited, bettered
+* &#10004; Config Export of Log and Categories to be provided as a button..
 * &#10004; Provide Exclude an Category View (if posible multiple categories). Should have option to session or not.
 * &#10004; Provide Themes
 * Enable sticky log entries
@@ -65,13 +61,14 @@ This version is not compatible in data structure to prior versions. Data migrati
 
 ## LifeLog RTF Documents using Quill Javascript RTF API
 
-*&#10004; Separate JSON service page.
+&#10004; Separate JSON service page.
 >* Provide for file attachments. 
 > &#10004; Display in log, read only RTF on click of button.
 > &#10004; Uses compressed RTF Documents in a Notes tabe.
 >&#10004; Deletion of log, deletes the document.
 
 ## Bugs
+* Bug - 08 CSV imports duplicate on DB Fix in config page.
 * Bug - 07, Editing and RTF entry, Dosen't strip the attached html to view in place.
 * &#10004; Bug - 06, Invalid Time 00. Javascript error thrown, when 00am used.
 * &#10004; Bug - 05, CRLF and apostrophe replacement not working.
diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi
index d1b2301..866d32a 100755
--- a/htdocs/cgi-bin/config.cgi
+++ b/htdocs/cgi-bin/config.cgi
@@ -107,6 +107,13 @@ print qq(<div id="menu" title="To close this menu click on its heart, and wait."
 <hr>
 <a class="a_" href="stats.cgi">Stats</a><hr>
 <a class="a_" href="main.cgi">Log</a><hr>
+<font size="2"><b>Jump to Sections</b>
+<a href="#top">Categories</a><br>
+<a href="#vars">System</a><br>
+<a href="#dbsets">DB Fix</a><br>
+<a href="#passets">Password</a>
+</font>
+<hr>
 <br>
 <a class="a_" href="login_ctr.cgi?logout=bye">LOGOUT</a>
 </div>);
@@ -333,9 +340,9 @@ my  $frmPASS = qq(
 print qq(
 <a name="top"></a><center>
     <div>$frm</div>
-    <div>$frmVars</div>
-    <div>$frmDB</div>
-    <div>$frmPASS</div>
+    <div><a name="vars"></a>$frmVars</div>
+    <div><a name="dbsets"></a>$frmDB</div>
+    <div><a name="passets"></a>$frmPASS</div>
     <div id="rz" style="text-align:center;width:$PRC_WIDTH%;">
                 <a href="#top">&#x219F;</a>&nbsp;Configuration status -> <b>$status</b>&nbsp;<a href="#bottom">&#x21A1;</a>
     </div>
@@ -766,7 +773,7 @@ try{
         $dbs = $db->do("VACUUM;");
 
         if($LOGOUT){
-                &logout; 
+                &logout;
         }		
             
             
diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index c7ffe60..51a143d 100755
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -278,7 +278,7 @@ qq(<form id="frm_log" action="remove.cgi" onSubmit="return formDelValidation();"
     }
     else {
         if($prm_xc>0){
-            $stmt = $stmS . " ID_CAT!=$prm_xc";
+            $stmt = $stmS . " ID_CAT!=$prm_xc" . $stmE;
         }
         if ($stmD) {
             $stmt = $stmS . $stmD . $stmE;
@@ -290,7 +290,7 @@ qq(<form id="frm_log" action="remove.cgi" onSubmit="return formDelValidation();"
 ###############
     #
     # Uncomment bellow to see main query statement issued!
-    #print $cgi->pre("### -> ".$stmt);
+    # print $cgi->pre("### -> ".$stmt);
     #
     my $tfId      = 0;
     my $id        = 0;
-- 
2.34.1