Config sections, bug fixes.

diff --git a/Current Development Check List.md b/Current Development Check List.md
index 1ae2758f1f52ac8cbe8ac3966082180c532eb5fa..0889ca8c0833cb547cf0692e6cc7e4cb54ef4e28 100644 (file)
--- 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
 
 *✔ Dropdown for type of log amount (Mark as Expense). Default is Asset. Asset is neither, income or expense.
-
-
 *✔ Implement RTF Documents.
 > Useful as more document style formated details can be added instead of just plain text.
-
 *✔ Preserve Search view selections. After edits and submit.
 > * ✔ Preserve from to date selections.
 > * ✔ Date View not working on Local entered date format.
-
 *✔ Sum selected, income, expense, totals. 
-*✔ Sum on view.
+✔ Sum on view.
 
 
 ## Urgent FIXES and Known Issuses
 ✔ Dynamic toggle of page sections, interaction fixed, bettered.
 ✔ View by Date - search not showing current month entries.
-
 ✔ Fix Interaction jumping edits and creating new entries via now button.
 >✔  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
-* ✔ Config Export of Log and Categories to be provided as a button.
-*Theme colours to be revisited, bettered.
+* ✔ Config page, links on menu to sections.
+* Theme colours to be revisited, bettered
+* ✔ Config Export of Log and Categories to be provided as a button..
 * ✔ Provide Exclude an Category View (if posible multiple categories). Should have option to session or not.
 * ✔ 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
 
-*✔ Separate JSON service page.
+✔ Separate JSON service page.
 >* Provide for file attachments. 
 > ✔ Display in log, read only RTF on click of button.
 > ✔ Uses compressed RTF Documents in a Notes tabe.
 >✔ 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.
 * ✔ Bug - 06, Invalid Time 00. Javascript error thrown, when 00am used.
 * ✔ Bug - 05, CRLF and apostrophe replacement not working.

diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi
index d1b230120aabd13537954338b6a045adfba01f18..866d32aa858aaa9066fda6cc90b53f13e4ef58df 100755 (executable)
--- 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 c7ffe6027dce428811395f47c8d01a397e815ebd..51a143d46f1debd4504aa0074ef8c00bcf5fcb89 100755 (executable)
--- 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;