add: Populate date in the new quote form

4 files changed, 11 insertions, 6 deletions

diff --git a/src/data/templates/add.hbs b/src/data/templates/add.hbs
index dedc0db..1c7b853 100644
--- a/src/data/templates/add.hbs
+++ b/src/data/templates/add.hbs
@@ -6,8 +6,8 @@
 <form action="add.jsp" method="post">
 ditt nick:<br>
 <input type=text name="nick" size=20><br>
-dato, YYYY-MM-DD (blank for dagens dato):<br>
-<input type=text name="date" size=20><br>
+dato:<br>
+<input type=text name="date" value="{{date}}" size=20><br>
 quote:<br>
 <textarea name="quote" rows="20" cols="80"></textarea><br>
 Prøv å bruke sånn ca. samme timestamp-format (HH:MM) o.l. som eksisterende quotes :-)<br><br>
diff --git a/src/error.rs b/src/error.rs
index 3ccb73c..41b4e64 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -2,7 +2,7 @@ use std;
 use std::fmt;
 use std::convert::From;
 use rusqlite;
-use iron::{self, Response, IronError, status};
+use iron::{IronError, status};
 use iron::headers::ContentType;
 use iron::modifiers::Header;
 
diff --git a/src/lib.rs b/src/lib.rs
index 2052a02..6b3e4fb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,6 +11,7 @@ extern crate serde_derive;
 extern crate rusqlite;
 extern crate persistent;
 extern crate params;
+extern crate chrono;
 
 pub mod server;
 pub mod data;
diff --git a/src/server.rs b/src/server.rs
index ee51ef3..bd3e8ac 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -11,6 +11,7 @@ use handlebars_iron::handlebars::to_json;
 use serde_json::Map;
 use params;
 use error::LinoError;
+use chrono;
 
 #[derive(Debug)]
 pub struct State {
@@ -87,11 +88,14 @@ fn quotes(r: &mut Request) -> IronResult<Response> {
     )))
 }
 
-fn add_get(r: &mut Request) -> IronResult<Response> {
+fn add_get(_r: &mut Request) -> IronResult<Response> {
+    let date = chrono::offset::Local::now().format("%Y-%m-%d").to_string();
+    let mut result = Map::new();
+    result.insert("date".to_string(), to_json(&date));
     Ok(Response::with((
         status::Ok,
         Header(ContentType::html()),
-        Template::new("add", Map::new()),
+        Template::new("add", result)
     )))
 }
 
@@ -175,7 +179,7 @@ pub fn vote(r: &mut Request) -> IronResult<Response> {
     let quote = {
         let mu = r.get::<Write<State>>().unwrap();
         let state = mu.lock().unwrap();
-        data::new_vote(&state.connection, quote_id, vote);
+        data::new_vote(&state.connection, quote_id, vote)?;
         data::get_quote(&state.connection, quote_id)?
     };