Chrome Browser testing and style fixes. Date bug fix.

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 8e5c16624a3ce866180b422792715a1cb46fa2ec..34c628d1afa87e8c67808862e82cd2f315113775 100755 (executable)
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -189,13 +189,16 @@ if($tbl_start>0){
         }else{
                 $tfId = 1;
         }
-        my @chunks = split(/($re_a_tag)/si , $log) ;
-  
-        foreach my $chunks_i ( @chunks ) {
-            next if $chunks_i =~ /$re_a_tag/ ;
-               $chunks_i =~ s/($RE{URI}{HTTP})/<a href="$1" target=_blank>$1<\/a>/gsi;
+
+        #Replace with a full link an HTTP URI
+        my @chnks = split(/($re_a_tag)/si , $log) ;  
+        foreach my $ch_i ( @chnks ) {
+            next if $ch_i =~ /$re_a_tag/ ;
+               $ch_i =~ s/https/http/gsi;
+               $ch_i =~ s/($RE{URI}{HTTP})/<a href="$1" target=_blank>$1<\/a>/gsi;
         }      
-        $log = join('' , @chunks) ;
+        $log = join('' , @chnks) ;
+
 
          $tbl = $tbl . '<tr class="r'.$tfId.'"><td id="y'.$id.'">'. $dt->ymd . '</td>'. 
                          '<td id="t'.$id.'">' . $dt->hms . "</td>" .
@@ -244,9 +247,13 @@ if($tbl_start>0){
  }
 
  $tbl = $tbl . '<tr class="r0"><td colspan="6" align="right">
- <input type="reset" value="Unselect All"/><input type="submit" value="Delete Selected"/>
- </form></td></tr>
-<tr class="r0"><td><form id="frm_srch" action="main.cgi">Keywords:</td><td colspan="4">
+
+ <input type="hidden" name="datediff" id="datediff" value="0"/>
+ <input type="submit" value="Date Diff Selected" onclick="return dateDiffSelected()"/>&nbsp;
+ <input type="reset" value="Unselect All"/>
+ <input type="submit" value="Delete Selected"/>
+ </td></tr></form>
+<tr class="r0"><form id="frm_srch" action="main.cgi"><td>Keywords:</td><td colspan="4">
 <input name="keywords" type="text" size="60"/></td>
 <td><input type="submit" value="Search"/></form></td></tr>
  </table>';
@@ -260,15 +267,18 @@ my  $frm = qq(<a name="top"></a>
         <td>Date:</td><td id="al"><input id="ed" type="text" name="date" size="16" value=") .$today->ymd.
         " ". $today->hms .
         qq(">&nbsp;<button type="button" onclick="return setNow();">Now</button>
-             &nbsp;<button type="reset">Clear</button>
-             &nbsp; <button id="btn_srch" onclick="toggleSearch(this); return false;">Show Search</button></td>
+             &nbsp;<button type="reset">Reset</button>
+             </td>
                <td>Category:</td>
         </tr>
                 <tr><td>Log:</td>
                  <td id="al"><textarea id="el" name="log" rows="2" cols="60"></textarea></td>
                  <td>).$cats.qq(</td></tr>
                 <tr><td><a href="#bottom">&#x21A1;</a>&nbsp;Ammount:</td>
-                <td id="al"><input id="am" name="am" type="number" step="any"></td>
+                <td id="al">
+                  <input id="am" name="am" type="number" step="any">
+                  <button id="btn_srch" onclick="toggleSearch(this); return false;"i style="float: right;">Show Search</button>
+                </td>
                 <td><input type="submit" value="Submit"/>
                 </td>
        </tr></table>

diff --git a/htdocs/cgi-bin/remove.cgi b/htdocs/cgi-bin/remove.cgi
index 9a876a112f1cf066164a4f5f76069228a6a25310..a7b8214563fa7df681aea25c3eca438f0f64df4b 100755 (executable)
--- a/htdocs/cgi-bin/remove.cgi
+++ b/htdocs/cgi-bin/remove.cgi
@@ -1,5 +1,8 @@
 #!/usr/bin/perl
-package PersonalLog;
+#
+# Programed in vim by: Will Budic
+# Open Source License -> https://choosealicense.com/licenses/isc/
+#
 
 use strict;
 use warnings;
@@ -17,29 +20,21 @@ my $database = "../../dbLifeLog/data_log.db";
 my $dsn = "DBI:$driver:dbname=$database";
 my $userid = "";
 my $password = "";
-my $dbh = DBI->connect($dsn, $userid, $password, { RaiseError => 1 }) 
+my $db = DBI->connect($dsn, $userid, $password, { RaiseError => 1 }) 
    or die "<p>Error->"& $DBI::errstri &"</p>";
-
-
-
-
-
-
 my $today = DateTime->now;
-$today->set_time_zone( 'Australia/Sydney' );
+   $today->set_time_zone( 'Australia/Sydney' );
 
 my $stmtCat = "SELECT * FROM CAT;";
-
-
-my $sth = $dbh->prepare( $stmtCat );
-my $rv = $sth->execute() or die or die "<p>Error->"& $DBI::errstri &"</p>";
+my $st = $db->prepare( $stmtCat );
+my $rv = $st->execute() or die or die "<p>Error->"& $DBI::errstri &"</p>";
 
 my %hshCats;
 my $tbl_rc =0;
 
- while(my @row = $sth->fetchrow_array()) {
+while(my @row = $st->fetchrow_array()) {
        $hshCats{$row[0]} = $row[1];
- }
+}
 
 
 my $stmS = "SELECT rowid, ID_CAT, DATE, LOG from LOG WHERE";
@@ -47,23 +42,46 @@ 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>';
-my $confirmed = $q->param('confirmed');
-if (!$confirmed){
-     print $q->header(-expires=>"+6os");    
-     print $q->start_html(-title => "Personal Log Record Removal", 
-                            -script=>{-type => 'text/javascript', -src => 'wsrc/main.js'},
-                    -style =>{-type => 'text/css', -src => 'wsrc/main.css'}
 
-        );       
+print $q->header(-expires=>"+6os");    
+
+my $datediff = $q->param("datediff");
+my $confirmed = $q->param('confirmed');
+if ($datediff){
+            print $q->start_html(-title => "Date Difference Report", 
+                            -script=>{-type => 'text/javascript', -src => 'wsrc/main.js'},
+                            -style =>{-type => 'text/css', -src => 'wsrc/main.css'}
 
-                       &NotConfirmed;
-       print $q->end_html;
+               );        
+                               &DisplayDateDiffs;
 }
 else{
-       &ConfirmedDelition;
+       if (!$confirmed){
+            print $q->start_html(-title => "Personal Log Record Removal", 
+                            -script=>{-type => 'text/javascript', -src => 'wsrc/main.js'},
+                            -style =>{-type => 'text/css', -src => 'wsrc/main.css'}
+
+               );        
+
+                               &NotConfirmed;
+       }
+       else{
+               &ConfirmedDelition;
+       }
 }
 
-$dbh->disconnect();
+print $q->end_html;
+$db->disconnect();
+exit;
+
+sub DisplayDateDiffs{
+    $tbl = '<table class="tbl">
+           <tr class="r0"><h2>Under Development Sorry!</h2></tr>';
+
+    $tbl .= '</table>';
+
+print "<div>".$tbl."</div>";
+}
 
 
 sub ConfirmedDelition{
@@ -73,8 +91,8 @@ sub ConfirmedDelition{
 
        foreach my $prm ($q->param('chk')){
                $stm = $stmS . "rowid = '" . $prm ."';";
-               $sth = $dbh->prepare( $stm );
-               $rv = $sth->execute() or die or die "<p>Error->"& $DBI::errstri &"</p>";
+               $st = $db->prepare( $stm );
+               $rv = $st->execute() or die or die "<p>Error->"& $DBI::errstri &"</p>";
                if($rv < 0) {
                     print "<p>Error->"& $DBI::errstri &"</p>";
                }
@@ -83,27 +101,28 @@ sub ConfirmedDelition{
        
        print $q->redirect('main.cgi');
 
+       $st->finish;
 }
 
 sub NotConfirmed{
 #Get prms and build confirm table and check
 my $stm = $stmS ." ";
-foreach my $prm ($q->param('chk')){
-       $stm = $stm . "rowid = '" . $prm . "' OR ";
-}
+       foreach my $prm ($q->param('chk')){
+               $stm = $stm . "rowid = '" . $prm . "' OR ";
+       }
 #rid=0 hack! ;)
        $stm = $stm . "rowid = '0' " . $stmE;
 
 #
-$sth = $dbh->prepare( $stm );
-$rv = $sth->execute() or die or die "<p>Error->"& $DBI::errstri &"</p>";
+$st = $db->prepare( $stm );
+$rv = $st->execute() or die or die "<p>Error->"& $DBI::errstri &"</p>";
 if($rv < 0) {
             print "<p>Error->"& $DBI::errstri &"</p>";
 }
 
 
 my $r_cnt = 0;
-while(my @row = $sth->fetchrow_array()) {
+while(my @row = $st->fetchrow_array()) {
 
         my $ct = $hshCats{@row[1]};
         my $dt = DateTime::Format::SQLite->parse_datetime( $row[2] );
@@ -132,4 +151,6 @@ if($r_cnt>1){
 
 print '<center><div>' . $tbl .'</div></center>';
 
+ $st->finish;
 }
+

diff --git a/htdocs/cgi-bin/stats.cgi b/htdocs/cgi-bin/stats.cgi
index d659fe27897645aed12ec2b19a324a6940e26e71..ce614bb47bdc77a3f1ddd4b4d17c84121d0e6693 100755 (executable)
--- a/htdocs/cgi-bin/stats.cgi
+++ b/htdocs/cgi-bin/stats.cgi
@@ -39,7 +39,7 @@ print $q->start_html(-title => "Log Data Stats",
                        );        
 
 
-my $tbl = '<table class="tbl" border="1px"><tr class="r1"><td colspan="4">Personal Log Data Stats</td></tr>';
+my $tbl = '<table class="tbl" border="1px"><tr class="r0"><td colspan="4"><b>* PERSONAL LOG DATA STATS *</b></td></tr>';
 
 
 
@@ -68,9 +68,9 @@ my  $processes = `$prc | sort -u -r -`;
 #Strip kernel 0 processes reported
 $processes =~ s/\s*0.00.*//gd;
  
-$tbl = $tbl . '<tr class="r0"><td>Number of Records:</td><td>'.
+$tbl = $tbl . '<tr class="r1"><td>Number of Records:</td><td>'.
                $log_rc.'</td></tr>
-               <tr class="r1"><td>No. of Records This Year:</td><td>'.
+               <tr class="r0"><td>No. of Records This Year:</td><td>'.
                $log_this_year_rc.'</td></tr>
                <tr class="r0"><td># Sum of Expenses For Year '.$today->year().
                '</td><td>'.$expense.'</td></tr>

diff --git a/htdocs/cgi-bin/wsrc/.main.js.swp b/htdocs/cgi-bin/wsrc/.main.css.swp
similarity index 53%
rename from htdocs/cgi-bin/wsrc/.main.js.swp
rename to htdocs/cgi-bin/wsrc/.main.css.swp
index b39e5779cfb1ca7426a0a2740ea61f01d22aeb5b..77e4799b857107b20e002e7af696f40493c7bba0 100644 (file)
Binary files a/htdocs/cgi-bin/wsrc/.main.js.swp and b/htdocs/cgi-bin/wsrc/.main.css.swp differ

diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js
index 58bd665eb0fc4635632aa69aee8ef5803041f74a..78f7e0e8069bd6e0dea698af68e68addf03cb39d 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main.js
+++ b/htdocs/cgi-bin/wsrc/main.js
@@ -44,8 +44,7 @@ function setNow(){
        var mm = fix0(dt.getMonth()+1);
        var dd = fix0(dt.getUTCDate()); 
        date.value = dt.getFullYear()+"-"+mm+"-"+dd+ " " + 
-       dt.getHours() + ":" + dt.getMinutes() +":"+dt.getSeconds();
-
+       fix0(dt.getHours()) + ":" + fix0(dt.getMinutes()) +":"+ fix0(dt.getSeconds());
 return false;
 }
 
@@ -166,3 +165,8 @@ function submitNewCategory(){
            frm.cchg.value = cid.value;
   return true;
 }
+
+function dateDiffSelected(){
+ document.getElementById("datediff").value = 1;
+  return true;
+}