From ed819069a77a9c3d7bb8814dc51f627716c0cc63 Mon Sep 17 00:00:00 2001
From: wbudic <vilijanac@gmail.com>
Date: Tue, 21 Aug 2018 20:35:45 +1000
Subject: [PATCH] Modified select and andded del form, no cgi file for deletion
 yet.

---
 htdocs/cgi-bin/.main.cgi.swo | Bin 16384 -> 0 bytes
 htdocs/cgi-bin/.main.cgi.swp | Bin 12288 -> 0 bytes
 htdocs/cgi-bin/main.cgi      |  54 +++++++++++++++++++----------------
 3 files changed, 30 insertions(+), 24 deletions(-)
 delete mode 100644 htdocs/cgi-bin/.main.cgi.swo
 delete mode 100644 htdocs/cgi-bin/.main.cgi.swp

diff --git a/htdocs/cgi-bin/.main.cgi.swo b/htdocs/cgi-bin/.main.cgi.swo
deleted file mode 100644
index 2dcb35b909a471a68ef34c43a53d2f999933637c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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

diff --git a/htdocs/cgi-bin/.main.cgi.swp b/htdocs/cgi-bin/.main.cgi.swp
deleted file mode 100644
index f15b2e05fee0baedb29a637dc82bdba434e008b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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
D>CEhv

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 4588661..365faa8 100755
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -41,10 +41,9 @@ if(!$sth->fetchrow_array()) {
 			my $stmt = qq(
 
 			CREATE TABLE LOG (
-			  ID INT PRIMARY KEY NOT NULL,
-			  ID_CAT TINY,
+			  ID_CAT TINY NOT NULL,
 			  DATE DATETIME  NOT NULL,
-			  LOG VCHAR(60)
+			  LOG VCHAR(60) NOT NULL
 					);
 						   
 			);
@@ -55,9 +54,9 @@ if(!$sth->fetchrow_array()) {
 				      print "<p>Error->"& $DBI::errstri &"</p>";
 			} 
 
-			$sth = $dbh->prepare('INSERT INTO LOG VALUES (?,?,?,?)');
+			$sth = $dbh->prepare('INSERT INTO LOG VALUES (?,?,?)');
 
-	$sth->execute(1, 3, $today, "DB Created!");
+			$sth->execute( 3, $today, "DB Created!");
 
 			
 			 $stmt = qq(
@@ -85,7 +84,7 @@ if(!$sth->fetchrow_array()) {
 	$sth->execute(32, "Expense");
 }
 my $stmtCat = "SELECT * FROM CAT;";
-my $stmt = "SELECT * from LOG;";
+my $stmt = "SELECT rowid, ID_CAT, DATE, LOG from LOG ORDER BY rowid DESC, DATE DESC;";
 
 
 $sth = $dbh->prepare( $stmtCat );
@@ -95,14 +94,14 @@ my $cats = '<select name="cat">\n';
 my %hshCats;
 
  while(my @row = $sth->fetchrow_array()) {
-	$cats = $cats. '<option value="'.@row[0].'">'.@row[1].'</option>\n';
-	$hshCats{@row[0]} = @row[1];
+	$cats = $cats. '<option value="'.$row[0].'">'.$row[1].'</option>\n';
+	$hshCats{$row[0]} = $row[1];
  }
 
 $cats = $cats.'</select>';
 
 
-my $tbl = '<table border="1px" width="480px"><tr><th>Date</th><th>Time</th><th>Log</th><th>Category</th></tr>';
+my $tbl = '<form name="frm_log_del" action="remove.cgi" onSubmit="return formDelValidation();"><table border="1px" width="580px"><tr><th>Date</th><th>Time</th><th>Log</th><th>Category</th><th>Del</th></tr>';
 my $tbl_rc = 0;
 
 ##################################
@@ -126,19 +125,21 @@ if($rv < 0) {
 
 	         $tbl = $tbl . "<tr><td>". $dt->ymd . "</td>" . 
 		          "<td>" . $dt->hms . "</td>" . "<td>" . $row[3] . "</td>".
-			  "<td>" . $ct ."</td></tr>\n";
+			  "<td>" . $ct .
+			  "</td><td><input type=\"radio\" value=\"".$row[0]."\"/> </td></tr>\n";
 	$tbl_rc +=1;	
  }
 
  if($tbl_rc==1){
-	 $tbl = $tbl . "<tr><td colspan=\"4\"><b>Table is Empty!</b></td></tr>\n";
+	 $tbl = $tbl . "<tr><td colspan=\"5\"><b>Table is Empty!</b></td></tr>\n";
  }
- $tbl = $tbl . "</table>";
+ $tbl = $tbl . "<tr><td colspan=\"4\"></td><td><input type=\"submit\" value=\"Del\"/></td></tr>";
+ $tbl = $tbl . "</table></form>";
 
 my  $frm = qq(
  <form name="frm_log" action="main.cgi" onSubmit="return formValidation();">
 	 <table><tr>
-		 <td>Date</td><td><input type="text" name="date" value=") .$today->ymd . qq("></td>
+		 <td>Date</td><td><input type="text" name="date" value=") .$today->ymd ." ". $today->hms . qq("></td>
 		 </tr>
 		 <tr><td>Log:</td> <td><textarea name="log" rows="2" cols="40"></textarea></td>
  		 <td>).$cats.qq(</td></tr>
@@ -149,9 +150,8 @@ my  $frm = qq(
 
 
 
-print "<div id=\"tbl\">\n" . $tbl ."</div>";
 print "<div id=\"frm\">\n" . $frm ."</div>";
-
+print "<div id=\"tbl\">\n" . $tbl ."</div>";
 print $q->end_html;
 
 $dbh->disconnect();
@@ -163,17 +163,23 @@ sub processSubmit {
 	my $log = $q->param('log');
 	my $cat = $q->param('cat');
 
+	if($log && $date && $cat){
+		#check for double entry
+		#
+		
+		my $sth = $dbh->prepare(
+			  "SELECT DATE,LOG FROM LOG where DATE='".$date ."' AND LOG='".$log."';"
+			);
 
-	if($log){
-		print "<h2>Received!". $log. "</h2>";
-
-	}
-	if($date){
-		print "<h2>Received!". $date. "</h2>";
+		$sth->execute();
+		if(my @row = $sth->fetchrow_array()){
+			return;
+		}
 
-	}
-	if($cat){
-		print "<h2>Received!". $hshCats{$cat}. "</h2>";
+		
+		$sth = $dbh->prepare('INSERT INTO LOG VALUES (?,?,?)');
 
+		$sth->execute( $cat, $date, $log);
+	
 	}
 }
-- 
2.34.1