Issue 15.

diff --git a/Current Development Check List.md b/Current Development Check List.md
index 4a85df6e8ea29a49430a71c409507c58e03db2f8..557a876892d65d8e7d7b2ed8a5393275a2ad1132 100644 (file)
--- a/Current Development Check List.md
+++ b/Current Development Check List.md
@@ -55,8 +55,8 @@ This version is not compatible in data structure to prior versions. Data migrati
 
 ### v. 1.8 Encountered/Fixed
 
-* Bug 16 - Saving new log entries with rtf overrites previous log entries rtf.
-* Issue 15 Date diff, showes upside down first range by current date with multiple selections.
+* Bug 16 - Saving new log entries with rtf overides previous log entries rtf.
+* ✔ Issue 15 Date diff, showes upside down first range by current date with multiple selections.
 
   * Range should be selected from date in selected latest to current date last as inbetween difference.
 

diff --git a/htdocs/cgi-bin/remove.cgi b/htdocs/cgi-bin/data.cgi
similarity index 77%
rename from htdocs/cgi-bin/remove.cgi
rename to htdocs/cgi-bin/data.cgi
index db7792bf5eb490cad98879f5c8f44471eb25f206..fc602e0deec09764159cfdf28d96f0f82e15c3a5 100755 (executable)
--- a/htdocs/cgi-bin/remove.cgi
+++ b/htdocs/cgi-bin/data.cgi
@@ -9,7 +9,7 @@ use warnings;
 use Try::Tiny;
 use Switch;
 
- 
+
 use CGI;
 use CGI::Session '-ip_match';
 use DBI;
@@ -52,26 +52,16 @@ my $PRC_WIDTH = &Settings::pagePrcWidth;
 my $TH_CSS = &Settings::css;
 my $BGCOL  = &Settings::bgcol;
 #Set to 1 to get debug help. Switch off with 0.
-my $DEBUG        = &Settings::debug;
+my $DEBUG  = &Settings::debug;
 #END OF SETTINGS
 
 my $today = DateTime->now;
 $today->set_time_zone(&Settings::timezone);
 
-my %hshCats ={};
 my $tbl_rc =0;
-my $stm;
-my $stmtCat = "SELECT ID, NAME FROM CAT;";
-my $st = $db->prepare( $stmtCat );
-my $rv = $st->execute();
-
-
-while(my @row = $st->fetchrow_array()) {
-    $hshCats{$row[0]} = $row[1];
-}
-
+my ($stm,$st, $rv);
 
-my $tbl = '<form name="frm_log_del" action="remove.cgi" onSubmit="return formDelValidation();">
+my $tbl = '<form name="frm_log_del" action="data.cgi" onSubmit="return formDelValidation();">
            <table class="tbl_rem" width="'.$PRC_WIDTH.'%">
            <tr class="hdr" style="text-align:left;"><th>Date</th> <th>Time</th><th>Log</th><th>Category</th></tr>';
 
@@ -79,25 +69,25 @@ my $tbl = '<form name="frm_log_del" action="remove.cgi" onSubmit="return formDel
 my $datediff = $cgi->param("datediff");
 my $confirmed = $cgi->param('confirmed');
 if ($datediff){
-         print $cgi->header(-expires=>"+6os");    
+         print $cgi->header(-expires=>"+6os");
          print $cgi->start_html(-title => "Date Difference Report", -BGCOLOR => $BGCOL,
                  -script=>{-type => 'text/javascript', -src => 'wsrc/main.js'},
                  -style =>{-type => 'text/css', -src => "wsrc/$TH_CSS"}
 
-        );       
+        );
         &DisplayDateDiffs;
-}elsif (!$confirmed){
-         print $cgi->header(-expires=>"+6os");    
+}elsif ($confirmed){
+    &ConfirmedDelition;
+}else{
+         print $cgi->header(-expires=>"+6os");
          print $cgi->start_html(-title => "Personal Log Record Removal", -BGCOLOR => $BGCOL,
                  -script=>{-type => 'text/javascript', -src => 'wsrc/main.js'},
                  -style =>{-type => 'text/css', -src => "wsrc/$TH_CSS"}
 
-        );       
+        );
 
 
         &NotConfirmed;
-}else{
-        &ConfirmedDelition;
 }
 
 
@@ -106,31 +96,45 @@ $db->disconnect();
 exit;
 
 sub DisplayDateDiffs{
+
     $tbl = '<table class="tbl" width="'.$PRC_WIDTH.'%">
         <tr class="r0"><td colspan="2"><b>* DATE DIFFERENCES *</b></td></tr>';
 
-    $stm = 'SELECT DATE, LOG FROM LOG WHERE '; 
+    $stm = 'SELECT DATE, LOG FROM VW_LOG WHERE ';
     my  @ids = $cgi->param('chk');
 
+     @ids = reverse @ids;
+
     foreach (@ids){
-        $stm .= "rowid = '" . $_ ."'";
+        $stm .= "PID = " . $_ ."";
         if(  \$_ != \$ids[-1]  ) {
             $stm = $stm." OR ";
         }
     }
     $stm .= ';';
+    print $cgi->pre("###[stm:$stm]") if($DEBUG);
     $st = $db->prepare( $stm );
     $st->execute() or die or die "<p>Error->"& $DBI::errstri &"</p>";
 
-    my $dt_prev = $today;
+    my ($dt,$dif,$first,$last,$tnext, $dt_prev) = (0,0,0,0,0,$today);
     while(my @row = $st->fetchrow_array()) {
 
-         my $dt = DateTime::Format::SQLite->parse_datetime( $row[0] );
-         my $dif = dateDiff($dt_prev, $dt);
-         $tbl .= '<tr class="r1"><td>'. $dt->ymd . '</td> 
+         $dt = DateTime::Format::SQLite->parse_datetime( $row[0] );
+         $dif = dateDiff($dt_prev, $dt);
+         $tbl .= '<tr class="r1"><td>'. $dt->ymd . '</td>
                     </td><td style="text-align:left;">'.$row[1]."</td></tr>".
-                 '<tr class="r0"><td colspan="2">'.$dif. '</td> </tr>';        
-        $dt_prev = $dt;
+                 '<tr class="r0"><td colspan="2">'.$dif.'</td> </tr>';
+         $last = $dt_prev;
+         $dt_prev = $dt;
+         if($tnext){
+             $dif = dateDiff($today, $dt,'');
+             $tbl .= '<tr class="r0"><td colspan="2">'.$dif. '</td> </tr>';
+         }
+         else{$tnext=1; $first = $dt;}
+    }
+    if($first != $last){
+        $dif = dateDiff($first, $dt_prev,'(first above)');
+        $tbl .= '<tr class="r0"><td colspan="2">'.$dif. '</td> </tr>';
     }
     $tbl .= '</table>';
 
@@ -138,57 +142,61 @@ print '<center><div>'.$tbl.'</div><br><div><a href="main.cgi">Back to Main Log</
 }
 
 
-sub dateDiff{
-    my($d1,$d2)=@_;
+sub dateDiff {
+    my($d1,$d2,$ff)=@_;
     my $span = DateTime::Format::Human::Duration->new();
     my $dur = $span->format_duration($d2 - $d1);
-return sprintf( "%s <br>between %s and %s", $dur, boldDate($d1), boldDate($d2));
+    my $t = "<font color='red'> today </font>";
+       $t = "" if ($d1!=$today);
+return sprintf( "%s <br>between $t $ff %s and %s", $dur, boldDate($d1), boldDate($d2));
 
 }
 
-sub boldDate{
+sub boldDate {
     my($d)=@_;
 return "<b>".$d->ymd."</b> ".$d->hms;
 }
 
 
-sub ConfirmedDelition{
+sub ConfirmedDelition {
 
+try{
 
     foreach my $id ($cgi->param('chk')){
-        
+        print $cgi->p("###[deleting:$id]")  if(Settings::debug());
         $st = $db->prepare("DELETE FROM LOG WHERE rowid = '$id';");
         $rv = $st->execute() or die or die "<p>Error->"& $DBI::errstri &"</p>";
         $st = $st = $db->prepare("DELETE FROM NOTES WHERE LID = '$id';");
         $rv = $st->execute();
 
-        if($rv < 0) {
-             print "<p>Error->"& $DBI::errstri &"</p>";
-             exit;
-        }
-        
+       # if($rv == 0) {
+          #   die "<p>Error->"& $DBI::errstri &"</p>";
+       # }
+
     }
-    
-    
     $st->finish;
 
     print $cgi->redirect('main.cgi');
 
+}catch{
+    print $cgi->p("<font color=red><b>ERROR</b></font>  " . $_);
+}
+
 }
 
-sub NotConfirmed{
+sub NotConfirmed {
 
-    my $stmS = "SELECT rowid, ID_CAT, DATE, LOG from LOG WHERE";
-    my $stmE = " ORDER BY DATE DESC, rowid DESC;";
+    my $stmS = "SELECT ID, PID, (select NAME from CAT WHERE ID_CAT == CAT.ID) as CAT, DATE, LOG from VW_LOG WHERE";
+    my $stmE = " ORDER BY DATE DESC, ID DESC;";
 
     #Get ids and build confirm table and check
     my $stm = $stmS ." ";
         foreach my $id ($cgi->param('chk')){
-            $stm = $stm . "rowid = '" . $id . "' OR ";
+            $stm = $stm . "PID = " . $id . " OR ";
         }
-    #OR end to rid=0 hack! ;)
-        $stm = $stm . "rowid = '0' " . $stmE;
-    #
+        $stm =~ s/ OR $//; $stm .= $stmE;
+
+    print $cgi->pre("###[stm:$stm][confirmed:$confirmed]")  if($DEBUG);
     $st = $db->prepare( $stm );
     $rv = $st->execute() or die "<p>Error->"& $DBI::errstri &"</p>";
     if($rv < 0) {
@@ -199,11 +207,11 @@ sub NotConfirmed{
     my $rs = "r1";
     while(my @row = $st->fetchrow_array()) {
 
-        my $ct = $hshCats{$row[1]};
-        my $dt = DateTime::Format::SQLite->parse_datetime( $row[2] );
-        my $log = log2html($row[3]);
-        
-        $tbl = $tbl . '<tr class="r1"><td class="'.$rs.'">'. $dt->ymd . "</td>" . 
+        my $ct = $row[2];
+        my $dt = DateTime::Format::SQLite->parse_datetime( $row[3] );
+        my $log = log2html($row[4]);
+
+        $tbl = $tbl . '<tr class="r1"><td class="'.$rs.'">'. $dt->ymd . "</td>" .
             '<td class="'.$rs.'">' . $dt->hms . "</td>" .
             '<td class="'.$rs.'" style="font-weight:bold; color:maroon;">'."$log</td>\n".
             '<td class="'.$rs.'">' . $ct. '<input type="hidden" name="chk" value="'.$row[0].'"></td></tr>';
@@ -222,7 +230,7 @@ sub NotConfirmed{
 
  $tbl = $tbl .  '<tr class="r0"><td colspan="4">
  <center>
- <h2>Please Confirm You Want <br/>The Above Record'.$plural.' Deleted?</h2>
+ <h2>Please Confirm You Want<br>The Above Record'.$plural.' Deleted?</h2>
  (Or hit you Browsers Back Button!)</center>
  </td></tr>
  <tr class="r0"><td colspan="4"><center>
@@ -240,7 +248,7 @@ print '<center><div>' . $tbl .'</div></center>';
 sub log2html{
     my $log = shift;
     my ($re_a_tag, $sub)  = qr/<a\s+.*?>.*<\/a>/si;
-    $log =~ s/''/'/g;    
+    $log =~ s/''/'/g;
     $log =~ s/\r\n/<br>/gs;
     $log =~ s/\\n/<br>/gs;
 
@@ -300,7 +308,7 @@ sub log2html{
         $log =~ s/$a/$b/o;
         $a = q(</iframe>);
         $b = q(</iframe></div>);
-        $log =~ s/$a/$b/o;        
+        $log =~ s/$a/$b/o;
     }
     else {
         my @chnks = split( /($re_a_tag)/si, $log );

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 91595916d9b735e2a5a16eeebb2ec7bc20aa3bbe..24eaa45ee86ccd857c566148e01dd3441747577e 100755 (executable)
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -66,7 +66,7 @@ my $rs_dat_to   = $cgi->param('v_to');
 my $rs_prev     = $cgi->param('rs_prev');
 my $rs_cur      = $cgi->param('rs_cur');
 my $rs_page     = $cgi->param('rs_page');
-my $stmS        = 'SELECT ID, ID_CAT, DATE, LOG, AMOUNT, AFLAG, RTF, STICKY from VW_LOG WHERE';
+my $stmS        = 'SELECT PID, ID_CAT, DATE, LOG, AMOUNT, AFLAG, RTF, STICKY from VW_LOG WHERE';
 my $stmE        = "";
 my $stmD        = "";
 my $sm_reset_all;
@@ -212,7 +212,7 @@ print $cgi->start_html(
 my $rv;
 my $st;
 my $stmtCat = "SELECT ID, NAME, DESCRIPTION FROM CAT ORDER BY ID;";
-my $stmt    = "SELECT ID, ID_CAT, DATE, LOG, AMOUNT, AFLAG, RTF, STICKY FROM VW_LOG WHERE STICKY = 1;";
+my $stmt    = "SELECT PID, ID_CAT, DATE, LOG, AMOUNT, AFLAG, RTF, STICKY FROM VW_LOG WHERE STICKY = 1;";
 
 print qq("## Using db -> $dsn) if $DEBUG;
 
@@ -267,7 +267,7 @@ for my $key ( keys %hshDesc ) {
     }
 }
 my $log_output =
-qq(<form id="frm_log" action="remove.cgi" onSubmit="return formDelValidation();">
+qq(<form id="frm_log" action="data.cgi" onSubmit="return formDelValidation();">
 <TABLE class="tbl" border="0" width=").&Settings::pagePrcWidth.qq(%">
 <tr class="r0">
        <th>Date</th>
@@ -1032,14 +1032,14 @@ try {
 
 
                    if(scalar @lid > 0){
-            #By Notes.LID contraint, there should NOT be an already existing log rowid entry just submitted in the Notes table!
+            #By Notes.LID constraint, there should NOT be an already existing log rowid entry just submitted in the Notes table!
             #What happened? We must check and delete, regardles. As data is renumerated and shuffled from perl in database. :(
                       $st = $db->prepare("SELECT LID FROM NOTES WHERE LID = '$lid[0]';");
                       $st->execute();
                       if($st->fetchrow_array()){
                           $st = $db->prepare("DELETE FROM NOTES WHERE LID = '$lid[0]';");
                           $st->execute();
-                          print qq(<p>Warning deleted (possible old) NOTES.LID[$lid[0]] -> lid:$lid[0]</p>);
+                          print qq(<p>Warning deleted (possible old) NOTES.LID[$lid[0]] -> lid:@lid</p>);
                       }
                       $st = $db->prepare("INSERT INTO NOTES(LID, DOC) VALUES (?, ?);");
                      #