@@ -38,6 +41,7 @@ This might only be one interface to this library:
| diff --git a/app/templates/base.html b/app/templates/base.html index f407b49..fcf238d 100755 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -99,6 +99,31 @@ socket.on('connect', function() { }); socket.on('channel-' + app.channel, function(msg) { + console.log("new: "+msg.text) + + + $(".messageback1").each(function() { + var oldColor = $(this).css("background-color"); + var randomColor = colorHash(msg.text).rgb; + console.log("old: "+oldColor) + console.log("new: "+randomColor) + $(this).css({ + background: "-webkit-gradient(linear, left top, left bottom, from("+oldColor+"), to("+randomColor+"))", + backgroundColor: randomColor + }); + + $('.messageback2').animate({ + opacity: 0 + }, 1000, function() { + $('.messageback2').css({background: "-webkit-gradient(linear, left top, left bottom, from("+oldColor+"), to("+randomColor+"))", opacity: 1}) + }); + + +}); + + + + // Add new message to HTML let my_messages = app.messages; my_messages.push({ diff --git a/app/templates/home.html b/app/templates/home.html index 089c2ba..78e8c8b 100755 --- a/app/templates/home.html +++ b/app/templates/home.html @@ -25,7 +25,10 @@ This might only be one interface to this library: | How much time has been spent with this item? |
{{ book.time or '?' }} |
|---|---|---|
| Instances: | +{% set got = {} %} + {% set all = 1 %} + {% for instance in book.instances %} - - |
+ -
-
Instances:
- {% set got = {} %} - {% set all = 1 %} - {% for instance in book.instances %} + {% for instance, value in got.items() %} + {% set result = value/(book.instances|length) %} + {{ instance }}: {{ (result*100)|round|int }}%+ {% endfor %} - {% if instance.name in got %} - {% set x=got.__setitem__(instance.name, got[instance.name]+1) %} - {% else %} - {% set x=got.__setitem__(instance.name, 1) %} - {% endif %} - {% set all = loop.index %} - {% endfor %} + + - {% for instance, value in got.items() %} - {% set result = value/(book.instances|length) %} - {{ instance }}: {{ (result*100)|round|int }}%
- {% endfor %}
diff --git a/app/views.py b/app/views.py index b8b4447..f28a01c 100755 --- a/app/views.py +++ b/app/views.py @@ -258,7 +258,9 @@ def add_book(): sameness = upload_form.sameness.data gender = upload_form.gender.data diversity = upload_form.diversity.data - time = upload_form.time.data + time = None + if time: + time = upload_form.time.data who = upload_form.who.data if year_published=="": @@ -677,9 +679,11 @@ def import_csv(): year_published = int(row['year_published']) else: year_published = None; - book = Book(row['title'], row['file'], cover, row['fileformat'], row['category'],year_published, None, None, None, None, None, None) - book.scapeX = float(row['scapeX']) - book.scapeY = float(row['scapeY']) + book = Book(row['title'], row['file'], cover, row['fileformat'], row['category'], year_published, None, None, None, None, None, None) + if row['scapeX']: + book.scapeX = float(row['scapeX']) + if row['scapeY']: + book.scapeY = float(row['scapeY']) db.session.add(book) numberadded = numberadded+1 diff --git a/init_db.sh b/init_db.sh index c90baea..bf72ab5 100644 --- a/init_db.sh +++ b/init_db.sh @@ -1,5 +1,5 @@ #!/bin/bash -rm app/mydatabase.db +#rm app/mydatabase.db mkdir -p app/uploads/cover chmod 777 app/uploads/ chmod 777 app/uploads/cover diff --git a/whoosh/Book/MAIN_071mbyqoitijmyv4.seg b/whoosh/Book/MAIN_071mbyqoitijmyv4.seg deleted file mode 100644 index 93716a0..0000000 Binary files a/whoosh/Book/MAIN_071mbyqoitijmyv4.seg and /dev/null differ diff --git a/whoosh/Book/MAIN_2a7vygakwdvdefoe.seg b/whoosh/Book/MAIN_2a7vygakwdvdefoe.seg deleted file mode 100644 index b928bfb..0000000 Binary files a/whoosh/Book/MAIN_2a7vygakwdvdefoe.seg and /dev/null differ diff --git a/whoosh/Book/MAIN_5id3ip2mvmsu2mbl.seg b/whoosh/Book/MAIN_5id3ip2mvmsu2mbl.seg deleted file mode 100644 index 99e6446..0000000 Binary files a/whoosh/Book/MAIN_5id3ip2mvmsu2mbl.seg and /dev/null differ diff --git a/whoosh/Book/MAIN_6bsjkp9xdes7zrrx.seg b/whoosh/Book/MAIN_6bsjkp9xdes7zrrx.seg deleted file mode 100644 index 6764b53..0000000 Binary files a/whoosh/Book/MAIN_6bsjkp9xdes7zrrx.seg and /dev/null differ diff --git a/whoosh/Book/MAIN_es8t5xyup7nfqm7j.seg b/whoosh/Book/MAIN_es8t5xyup7nfqm7j.seg deleted file mode 100644 index 30a931a..0000000 Binary files a/whoosh/Book/MAIN_es8t5xyup7nfqm7j.seg and /dev/null differ diff --git a/whoosh/Book/MAIN_hljrpqpa46dk3vgc.seg b/whoosh/Book/MAIN_hljrpqpa46dk3vgc.seg deleted file mode 100644 index ee33184..0000000 Binary files a/whoosh/Book/MAIN_hljrpqpa46dk3vgc.seg and /dev/null differ diff --git a/whoosh/Book/MAIN_p6r8oedtat7ay25v.seg b/whoosh/Book/MAIN_p6r8oedtat7ay25v.seg deleted file mode 100644 index 6105580..0000000 Binary files a/whoosh/Book/MAIN_p6r8oedtat7ay25v.seg and /dev/null differ diff --git a/whoosh/Book/MAIN_q0ohjvxyt5ufv1vl.seg b/whoosh/Book/MAIN_q0ohjvxyt5ufv1vl.seg deleted file mode 100644 index 386444d..0000000 Binary files a/whoosh/Book/MAIN_q0ohjvxyt5ufv1vl.seg and /dev/null differ diff --git a/whoosh/Book/_MAIN_293.toc b/whoosh/Book/_MAIN_293.toc deleted file mode 100644 index 85f8b84..0000000 Binary files a/whoosh/Book/_MAIN_293.toc and /dev/null differ