From 431b6009a53e53a11dba4fa0231f366cedfd931f Mon Sep 17 00:00:00 2001
From: Cervinko Cera <cervinkocera@gmail.com>
Date: Mon, 2 May 2016 22:43:50 +0200
Subject: [PATCH 1/4] add advanced search

---
 cps/static/css/style.css  |  5 +++++
 cps/templates/layout.html |  3 ++-
 cps/web.py                | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 4b7e8b8b..48971ebe 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -31,3 +31,8 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te
 
 .btn-file {position: relative; overflow: hidden;}
 .btn-file input[type=file] {position: absolute; top: 0; right: 0; min-width: 100%; min-height: 100%; font-size: 100px; text-align: right; filter: alpha(opacity=0); opacity: 0; outline: none; background: white; cursor: inherit; display: block;}
+
+.btn-toolbar .btn { margin-bottom: 5px; }
+
+.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary{ background-color: #1C5484; }
+.btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #89B9E2; }
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index d75061dd..85d71db0 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -57,9 +57,10 @@
                 <div class="form-group">
                   <input type="text" class="form-control" name="query" placeholder="Search">
                 </div>
-                <button type="submit" class="btn btn-default">Submit</button>
+                <button type="submit" class="btn btn-default">Go!</button>
               </form>
             </li>
+            <li><a href="{{url_for('advanced_search')}}"><span class="glyphicon glyphicon-search"></span> Advanced Search</a></li>
           </ul>
           <ul class="nav navbar-nav navbar-right" id="main-nav">
             {% if g.user.is_authenticated() %}
diff --git a/cps/web.py b/cps/web.py
index 374650d9..36dc82f6 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -318,6 +318,26 @@ def get_series_json():
         entries = db.session.execute("select name from series where name like '%" + query + "%'")
         json_dumps = json.dumps([dict(r) for r in entries])
         return json_dumps
+        
+@app.route("/get_matching_tags", methods = ['GET', 'POST'])
+@login_required_if_no_ano
+def get_matching_tags(): 
+    tag_dict = {'tags': []}
+    if request.method == "GET":
+        q = db.session.query(db.Books)
+        author_input = request.args.get('author_name')
+        title_input = request.args.get('book_title')
+        tag_inputs = request.args.getlist('tag')
+        q = q.filter(db.Books.authors.any(db.Authors.name.like("%" +  author_input + "%")), db.Books.title.like("%"+title_input+"%"))
+        if len(tag_inputs) > 0:
+            for tag in tag_inputs:
+                q = q.filter(db.Books.tags.any(db.Tags.id == tag))
+        for book in q:
+            for tag in book.tags:
+                if tag.id not in tag_dict['tags']:
+                    tag_dict['tags'].append(tag.id)
+    json_dumps = json.dumps(tag_dict)
+    return json_dumps
 
 @app.route("/", defaults={'page': 1})
 @app.route('/page/<int:page>')
@@ -421,6 +441,25 @@ def search():
         return render_template('search.html', searchterm=term, entries=entries)
     else:
         return render_template('search.html', searchterm="")
+        
+@app.route("/advanced_search", methods=["GET"])
+@login_required_if_no_ano
+def advanced_search():
+    if request.method == 'GET':
+        print "GETTTTTTTTTTTT"
+        q = db.session.query(db.Books)
+        tag_inputs = request.args.getlist('tag')
+        author_name = request.args.get("author_name")
+        book_title = request.args.get("book_title")
+        if tag_inputs or author_name or book_title:
+            q = q.filter(db.Books.authors.any(db.Authors.name.like("%" +  author_name + "%")), db.Books.title.like("%"+book_title+"%"))
+            random = db.session.query(db.Books).order_by(func.random()).limit(config.RANDOM_BOOKS)
+            for tag in tag_inputs:
+                q = q.filter(db.Books.tags.any(db.Tags.id == tag))
+            q = q.all()
+            return render_template('search.html', searchterm="tags", entries=q)
+    tags = db.session.query(db.Tags).order_by(db.Tags.name).all()
+    return render_template('search_form.html', tags=tags)
 
 @app.route("/author")
 @login_required_if_no_ano

From 7fce28790dcc441db99cb2845fd75286fb67ffe0 Mon Sep 17 00:00:00 2001
From: Cervinko Cera <cervinkocera@gmail.com>
Date: Mon, 2 May 2016 23:25:21 +0200
Subject: [PATCH 2/4] add search_form.html

---
 cps/templates/search_form.html | 50 ++++++++++++++++++++++++++++++++++
 cps/web.py                     |  1 -
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 cps/templates/search_form.html

diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
new file mode 100644
index 00000000..13fbe8bf
--- /dev/null
+++ b/cps/templates/search_form.html
@@ -0,0 +1,50 @@
+{% extends "layout.html" %}
+{% block body %}
+<div class="col-sm-8">
+  <form role="form" action="{{ url_for('advanced_search') }}" method="GET">
+    <div class="form-group">
+      <label for="book_title">Book Title</label>
+      <input type="text" class="form-control" name="book_title" id="book_title" value="">
+    </div>
+    <div class="form-group">
+      <label for="bookAuthor">Author</label>
+      <input type="text" class="form-control typeahead" name="author_name" id="bookAuthor" value="" autocomplete="off">
+    </div>
+    <label for="Tags">Select Tags</label>
+    <div class="form-group">
+      <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
+        {% for tag in tags %}
+          <label id="tag_{{tag.id}}" class="btn btn-primary tag_click">
+            <input type="checkbox" autocomplete="off" name="tag" value="{{tag.id}}">{{tag.name}}</input>
+          </label>
+        {% endfor %}
+      </div>
+    </div>
+    <button type="submit" class="btn btn-default">Submit</button>
+  </form>
+</div>
+{% endblock %}
+
+{% block js %}
+<script src="{{ url_for('static', filename='js/typeahead.bundle.js') }}"></script>
+<script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
+<script>
+  $('form').on('change input', function() {
+    form = $('form').serialize();
+    $.getJSON( "{{ url_for('get_matching_tags') }}", form, function( data ) {
+      $('.tag_click').each(function() {
+        console.log(data.tags);
+        if ($.inArray(parseInt($(this).children('input').first().val(), 10), data.tags) == -1 ) {
+          $(this).addClass('disabled');
+        }
+        else {
+          $(this).removeClass('disabled');
+        }
+      });
+    });
+  });
+</script>
+{% endblock %}
+{% block header %}
+<link href="{{ url_for('static', filename='css/typeahead.css') }}" rel="stylesheet" media="screen">
+{% endblock %}
diff --git a/cps/web.py b/cps/web.py
index 36dc82f6..a77ee5c7 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -446,7 +446,6 @@ def search():
 @login_required_if_no_ano
 def advanced_search():
     if request.method == 'GET':
-        print "GETTTTTTTTTTTT"
         q = db.session.query(db.Books)
         tag_inputs = request.args.getlist('tag')
         author_name = request.args.get("author_name")

From 80c3c19c01c3907a015225c70d1f130d53769562 Mon Sep 17 00:00:00 2001
From: Cervinko Cera <cervinkocera@gmail.com>
Date: Tue, 3 May 2016 11:00:45 +0200
Subject: [PATCH 3/4] some fixes for advanced search

---
 cps/static/css/style.css       |  1 +
 cps/templates/search_form.html |  3 +--
 cps/web.py                     | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 48971ebe..a884f5de 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -36,3 +36,4 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te
 
 .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary{ background-color: #1C5484; }
 .btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #89B9E2; }
+.btn-toolbar>.btn+.btn, .btn-toolbar>.btn-group+.btn, .btn-toolbar>.btn+.btn-group, .btn-toolbar>.btn-group+.btn-group { margin-left:0px; }
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index 13fbe8bf..a126dc52 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -29,11 +29,10 @@
 <script src="{{ url_for('static', filename='js/typeahead.bundle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
 <script>
-  $('form').on('change input', function() {
+  $('form').on('change input typeahead:selected', function() {
     form = $('form').serialize();
     $.getJSON( "{{ url_for('get_matching_tags') }}", form, function( data ) {
       $('.tag_click').each(function() {
-        console.log(data.tags);
         if ($.inArray(parseInt($(this).children('input').first().val(), 10), data.tags) == -1 ) {
           $(this).addClass('disabled');
         }
diff --git a/cps/web.py b/cps/web.py
index a77ee5c7..b6ceaee2 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -451,12 +451,17 @@ def advanced_search():
         author_name = request.args.get("author_name")
         book_title = request.args.get("book_title")
         if tag_inputs or author_name or book_title:
+            searchterm = []
+            searchterm.extend((author_name, book_title))
+            tag_names = db.session.query(db.Tags).filter(db.Tags.id.in_(tag_inputs)).all()
+            searchterm.extend(tag.name for tag in tag_names)
+            searchterm = " + ".join(filter(None, searchterm))
             q = q.filter(db.Books.authors.any(db.Authors.name.like("%" +  author_name + "%")), db.Books.title.like("%"+book_title+"%"))
             random = db.session.query(db.Books).order_by(func.random()).limit(config.RANDOM_BOOKS)
             for tag in tag_inputs:
                 q = q.filter(db.Books.tags.any(db.Tags.id == tag))
             q = q.all()
-            return render_template('search.html', searchterm="tags", entries=q)
+            return render_template('search.html', searchterm=searchterm, entries=q)
     tags = db.session.query(db.Tags).order_by(db.Tags.name).all()
     return render_template('search_form.html', tags=tags)
 
@@ -958,7 +963,6 @@ def edit_book(book_id):
             if len(book.ratings) > 0:
                 old_rating = book.ratings[0].rating
             ratingx2 = int(float(to_save["rating"]) *2)
-            print ratingx2
             if ratingx2 != old_rating:
                 is_rating = db.session.query(db.Ratings).filter(db.Ratings.rating == ratingx2).first()
                 if is_rating:
@@ -983,7 +987,6 @@ def edit_book(book_id):
                 if to_save[cc_string].strip():
                     if c.datatype == 'rating':
                         to_save[cc_string] = str(int(float(to_save[cc_string]) *2))
-                        print to_save[cc_string]
                     if to_save[cc_string].strip() != cc_db_value:
                         if cc_db_value != None:
                             #remove old cc_val
@@ -1046,7 +1049,6 @@ def edit_book(book_id):
                         new_tag = db.session.query(db.cc_classes[c.id]).filter(db.cc_classes[c.id].value == add_tag).first()
                         # if no tag is found add it
                         if new_tag == None:
-                            print add_tag
                             new_tag = db.cc_classes[c.id](value=add_tag)
                             db.session.add(new_tag)
                             new_tag = db.session.query(db.cc_classes[c.id]).filter(db.cc_classes[c.id].value == add_tag).first()

From c26eb6aa08011f9f9f500d312a79dc8c8787d35c Mon Sep 17 00:00:00 2001
From: Cervinko Cera <cervinkocera@gmail.com>
Date: Tue, 3 May 2016 14:27:38 +0200
Subject: [PATCH 4/4] add exclude tags to advanced search

---
 cps/templates/search_form.html | 22 +++++++++++++++++-----
 cps/web.py                     | 21 ++++++++++++++-------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index a126dc52..e6a0fef5 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -10,12 +10,22 @@
       <label for="bookAuthor">Author</label>
       <input type="text" class="form-control typeahead" name="author_name" id="bookAuthor" value="" autocomplete="off">
     </div>
-    <label for="Tags">Select Tags</label>
+    <label for="Tags">Include Tags</label>
     <div class="form-group">
       <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
         {% for tag in tags %}
-          <label id="tag_{{tag.id}}" class="btn btn-primary tag_click">
-            <input type="checkbox" autocomplete="off" name="tag" value="{{tag.id}}">{{tag.name}}</input>
+          <label id="tag_{{tag.id}}" class="btn btn-primary tags_click">
+            <input type="checkbox" autocomplete="off" name="include_tag" value="{{tag.id}}">{{tag.name}}</input>
+          </label>
+        {% endfor %}
+      </div>
+    </div>
+    <label for="Tags">Exclude Tags</label>
+    <div class="form-group">
+      <div class="btn-toolbar btn-toolbar-lg" data-toggle="buttons">
+        {% for tag in tags %}
+          <label id="tag_{{tag.id}}" class="btn btn-danger tags_click">
+            <input type="checkbox" autocomplete="off" name="exclude_tag" value="{{tag.id}}">{{tag.name}}</input>
           </label>
         {% endfor %}
       </div>
@@ -32,9 +42,11 @@
   $('form').on('change input typeahead:selected', function() {
     form = $('form').serialize();
     $.getJSON( "{{ url_for('get_matching_tags') }}", form, function( data ) {
-      $('.tag_click').each(function() {
+      $('.tags_click').each(function() {
         if ($.inArray(parseInt($(this).children('input').first().val(), 10), data.tags) == -1 ) {
-          $(this).addClass('disabled');
+          if (!($(this).hasClass('active'))) {
+            $(this).addClass('disabled');
+          }
         }
         else {
           $(this).removeClass('disabled');
diff --git a/cps/web.py b/cps/web.py
index b6ceaee2..85dce9d6 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -327,11 +327,15 @@ def get_matching_tags():
         q = db.session.query(db.Books)
         author_input = request.args.get('author_name')
         title_input = request.args.get('book_title')
-        tag_inputs = request.args.getlist('tag')
+        include_tag_inputs = request.args.getlist('include_tag')
+        exclude_tag_inputs = request.args.getlist('exclude_tag')
         q = q.filter(db.Books.authors.any(db.Authors.name.like("%" +  author_input + "%")), db.Books.title.like("%"+title_input+"%"))
-        if len(tag_inputs) > 0:
-            for tag in tag_inputs:
+        if len(include_tag_inputs) > 0:
+            for tag in include_tag_inputs:
                 q = q.filter(db.Books.tags.any(db.Tags.id == tag))
+        if len(exclude_tag_inputs) > 0:
+            for tag in exclude_tag_inputs:
+                q = q.filter(not_(db.Books.tags.any(db.Tags.id == tag)))
         for book in q:
             for tag in book.tags:
                 if tag.id not in tag_dict['tags']:
@@ -447,19 +451,22 @@ def search():
 def advanced_search():
     if request.method == 'GET':
         q = db.session.query(db.Books)
-        tag_inputs = request.args.getlist('tag')
+        include_tag_inputs = request.args.getlist('include_tag')
+        exclude_tag_inputs = request.args.getlist('exclude_tag')
         author_name = request.args.get("author_name")
         book_title = request.args.get("book_title")
-        if tag_inputs or author_name or book_title:
+        if include_tag_inputs or exclude_tag_inputs or author_name or book_title:
             searchterm = []
             searchterm.extend((author_name, book_title))
-            tag_names = db.session.query(db.Tags).filter(db.Tags.id.in_(tag_inputs)).all()
+            tag_names = db.session.query(db.Tags).filter(db.Tags.id.in_(include_tag_inputs)).all()
             searchterm.extend(tag.name for tag in tag_names)
             searchterm = " + ".join(filter(None, searchterm))
             q = q.filter(db.Books.authors.any(db.Authors.name.like("%" +  author_name + "%")), db.Books.title.like("%"+book_title+"%"))
             random = db.session.query(db.Books).order_by(func.random()).limit(config.RANDOM_BOOKS)
-            for tag in tag_inputs:
+            for tag in include_tag_inputs:
                 q = q.filter(db.Books.tags.any(db.Tags.id == tag))
+            for tag in exclude_tag_inputs:
+                q = q.filter(not_(db.Books.tags.any(db.Tags.id == tag)))
             q = q.all()
             return render_template('search.html', searchterm=searchterm, entries=q)
     tags = db.session.query(db.Tags).order_by(db.Tags.name).all()