Dropdown interaction and date widged, search view.

diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi
index 0326108fdccd83d6ba2c31ae1f64ea1d06c6a819..54051bd40d5c2168f99d448f1521ca3798520e44 100755 (executable)
--- a/htdocs/cgi-bin/config.cgi
+++ b/htdocs/cgi-bin/config.cgi
@@ -173,7 +173,7 @@ my  $frm = qq(
                  <td colspan="3"><div style="text-align:left; float"><font color="red">WARNING!</font> 
                   Removing or changing categories is permanent! Each category one must have an unique ID. 
                         Blank a category name to remove it. LOG records will change to the 
-                        <b>Unspecified</b> (id 1) category! And the category <b>Unspecified</b>, can't be removed!
+                        <b>Unspecified</b> (id 1) category! And the categories <b>Unspecified</b>, <b>Income</b> and <b>Expense</b>  can't be removed!
                         </div>
                        </td>                   
                </tr>
@@ -483,7 +483,7 @@ elsif ($change == 1){
 
          if($pnm ne $cnm || $pds ne $cds){
                
-                if($cid!=1 && $pnm eq  ""){
+                if( ($cid!=1 && $cid!=32 && $cid!=35) && $pnm eq  ""){
 
                   $s = "SELECT rowid, ID_CAT FROM LOG WHERE ID_CAT =".$cid.";";
                   $d = $db->prepare($s); 
@@ -1001,6 +1001,7 @@ sub cats{
                my $cats = qq(<select id="cats" name="cats"><option value="0">---</option>\n);
                $dbs = dbExecute("SELECT ID, NAME, DESCRIPTION FROM CAT ORDER BY ID;");
                while ( my @row = $dbs->fetchrow_array() ) {
+
                                $cats .= qq(<option value="$row[0]">$row[1]</option>\n);
                }
                $cats .= '</select>';

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index be7d6e176f62578979092010899e7d6c229a2e99..88b1d1c44cbbe94789378283693e3fe3130744c9 100755 (executable)
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -715,8 +715,8 @@ _TXT
    <tr class="collpsd">
     <td align="right"><b>View by Date:</b></td>
        <td align="left">
-        From:&nbsp;<input name="v_from" type="text" size="16" value="$rs_dat_from"/>&nbsp;&nbsp;
-        To:&nbsp;<input name="v_to" type="text" size="16" value="$rs_dat_to"/>
+        From:&nbsp;<input id="srh_date_from" name="v_from" type="text" size="16" value="$rs_dat_from"/>&nbsp;&nbsp;
+        To:&nbsp;<input id="srh_date_to" name="v_to" type="text" size="16" value="$rs_dat_to"/>
         &nbsp;&nbsp;<button id="btn_dat" onclick="viewByDate(this);">View</button>
     </td>
        </tr>

diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css
index c8a550cd525737718a58a0236830310b3e8f15cd..eb96a95078ab4bc50027895f32e258280090429a 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main.css
+++ b/htdocs/cgi-bin/wsrc/main.css
@@ -224,4 +224,5 @@ img {
 
 #btnRTF {
     float: right;
-}
\ No newline at end of file
+}
+

diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js
index 3e1ee82d5a5fca36fe080671555475649e6a3b03..893bfc919d58171a5874913aba802e8b99870c4b 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main.js
+++ b/htdocs/cgi-bin/wsrc/main.js
@@ -1,5 +1,5 @@
 /*
- Programed in vim by: Will Budic
+ Programed by: Will Budic
  Open Source License -> https://choosealicense.com/licenses/isc/
 */
 
@@ -15,6 +15,9 @@ var _show_all = true;
 
 var DEF_BACKGROUND = 'white';
 
+var RTF_DOC_RESIZED = false;
+var RTF_DOC_ORIG;
+
 
 function loadedBody(toggle) {
 
@@ -32,6 +35,15 @@ function loadedBody(toggle) {
         firstDay: 1
     });
 
+    $('#srh_date_from').datepicker({
+        dateFormat: 'yy-mm-dd',
+        firstDay: 1
+    });
+
+    $('#srh_date_to').datepicker({
+        dateFormat: 'yy-mm-dd',
+        firstDay: 1
+    });
     $('#ed').poshytip({
         content: "Select here date and time of your log.",
         className: 'tip-yellowsimple',
@@ -136,11 +148,30 @@ function loadedBody(toggle) {
     DEF_BACKGROUND = RGBToHex($('#editor-container').css('background-color'));
     $("#fldBG").val(DEF_BACKGROUND);
 
+   // $( function() {        
+        var amf = $( "#amf" );//Amount Field Type dropdown        
+        var ec = $( "#ec" );  //Category dropdown 
+                        
+        $( amf ).selectmenu({style: "dropdown", width:120, 
+          change: function( event, data ) {
+            var evv =ec.val();
+            if(ec.val()<2||evv==32||evv==35||data.item.value == 0){
+                var sel = null;
+                if(data.item.label == "Income"){ sel = 35; }
+                else if(data.item.label == "Expense"){sel = 32; }
+                else if(data.item.value == 0 && (evv == 35||evv==32)){sel = 1; }
+                if(sel){
+                    ec.val(sel);
+                    ec.selectmenu("refresh");
+                }
+            }
+          }});
+    
 
 }
 
 
-function encodeText(el) {
+function encodeText(el){
     var el = $("#frm_entry [name=log]");
     var txt = el.val();
     txt = txt.replace(/\r\n/g, "\\n");
@@ -350,10 +381,6 @@ function viewAll() {
     return false;
 }
 
-
-
-var RTF_DOC_RESIZED = false;
-var RTF_DOC_ORIG;
 function resizeDoc() {
     var css = $("#editor-container").prop('style');
     if(RTF_DOC_RESIZED){
@@ -698,20 +725,17 @@ function editorBackground(reset){
 
 function RGBToHex(rgb) {
     // Choose correct separator
-    let sep = rgb.indexOf(",") > -1 ? "," : " ";
+    var sep = rgb.indexOf(",") > -1 ? "," : " ";
     // Turn "rgb(r,g,b)" into [r,g,b]
     rgb = rgb.substr(4).split(")")[0].split(sep);
   
-    let r = (+rgb[0]).toString(16),
+    var r = (+rgb[0]).toString(16),
         g = (+rgb[1]).toString(16),
         b = (+rgb[2]).toString(16);
   
-    if (r.length == 1)
-      r = "0" + r;
-    if (g.length == 1)
-      g = "0" + g;
-    if (b.length == 1)
-      b = "0" + b;
+    if (r.length == 1)  r = "0" + r;
+    if (g.length == 1)  g = "0" + g;
+    if (b.length == 1)  b = "0" + b;
   
     return "#" + r + g + b;
 }