From 9aed8783056b6ac220289a096e342f98a4b14e1c Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Thu, 25 Jul 2013 22:45:04 +0200
Subject: Add user filter
Users can now either look at the whole list or only tasks assigned to
them. Currently this waits for the refresh to change the list, this
should be fixed in the future.
---
defmodule.lisp | 3 +++
pg-datastore.lisp | 7 +++++++
scrumli.lisp | 6 ++++++
static/js/main.js | 37 ++++++++++++++++++++++++++++++++++---
templates/scrumli.tmpl | 1 +
5 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/defmodule.lisp b/defmodule.lisp
index 3ca601a..9381d31 100644
--- a/defmodule.lisp
+++ b/defmodule.lisp
@@ -25,6 +25,9 @@
(define-method get-all-stories ()
"Get all of the stories in the datastore.")
+ (define-method get-stories-for (username)
+ "Get all of the storiess for USERNAME.")
+
(define-method get-story (id)
"Get a story from the datastore.")
diff --git a/pg-datastore.lisp b/pg-datastore.lisp
index 39e2646..5505de1 100644
--- a/pg-datastore.lisp
+++ b/pg-datastore.lisp
@@ -60,6 +60,13 @@
(query (:order-by (:select :* (:as (:md5 'assignee) 'md5)
:from 'story) 'priority) :alists)))
+(defmethod datastore-get-stories-for ((datastore pg-datastore) username)
+ (with-connection (connection-spec datastore)
+ (query (:order-by (:select :* (:as (:md5 'assignee) 'md5)
+ :from 'story
+ :where (:= 'assignee username))
+ 'priority) :alists)))
+
(defmethod datastore-get-story ((datastore pg-datastore) id)
(with-connection (connection-spec datastore)
(append (query (:select :* (:as (:md5 'assignee) 'md5) :from 'story
diff --git a/scrumli.lisp b/scrumli.lisp
index df6b442..14a2cdd 100644
--- a/scrumli.lisp
+++ b/scrumli.lisp
@@ -102,6 +102,12 @@
(encode-json-to-string (get-all-stories))
403))
+(define-route my-stories-json ("stories/mine" :content-type "text/json")
+ (if (logged-in-p)
+ (encode-json-to-string (get-stories-for
+ (hunchentoot:session-value :username)))
+ 403))
+
(defmacro with-post-parameters (parameters &body body)
`(let ,(mapcar (lambda (p)
(list (intern (string-upcase p))
diff --git a/static/js/main.js b/static/js/main.js
index c20c615..457bd6f 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -393,15 +393,18 @@ var StoryForm = React.createClass({
var StoryPage = React.createClass({
loadStoriesFromServer: function() {
- $.get(this.props.url)
+ $.get(this.state.url)
.done(function(data) {
this.setState({data: []});
this.setState({data: data});
}.bind(this));
},
getInitialState: function() {
- return {data: []};
+ return {data: [], url: this.props.url};
},
+ setUrl: React.autoBind(function(url) {
+ this.setState({url: url});
+ }),
componentWillMount: function() {
this.loadStoriesFromServer();
setInterval(
@@ -456,7 +459,35 @@ var StoryPage = React.createClass({
}
});
+var StoryFilter = React.createClass({
+ getInitialState: function() {
+ return {filter: 'all'};
+ },
+ handleClick: React.autoBind(function(event) {
+ this.setState({filter: (this.state.filter != 'all'
+ ? 'all' : 'user')});
+ scrumli_page.setUrl((this.state.filter == "all"
+ ? "/stories" : "/stories/mine"));
+ }),
+ render: function() {
+ var classes = {all: ['icon-group', 'All'],
+ user: ['icon-user', 'Mine']};
+
+ return (
+
+ {" "} {classes[this.state.filter][1]}
+ );
+ }
+});
+
+var scrumli_page =