From 136d1dd7c34d6e88650e13cb27b8070e65ce8e55 Mon Sep 17 00:00:00 2001
From: tirilane <tirilane@pvv.ntnu.no>
Date: Sun, 6 Mar 2011 17:14:25 +0000
Subject: [PATCH] =?UTF-8?q?#9=20og=20#10=20l=C3=B8st.=20Alt=20ser=20ut=20t?=
 =?UTF-8?q?il=20=C3=A5=20fungere.=20Mer=20funksjonalitet=20kan=20legges=20?=
 =?UTF-8?q?til,=20men=20generelt=20ser=20ting=20greit=20ut.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 python/web/library/models.py          |  2 +-
 python/web/library/views.py           | 47 +++++++++++++++++++++----
 python/web/media/styles/scaffold.css  |  3 ++
 python/web/templates/book/view.html   | 49 ++++++++++++++++++++++++---
 python/web/templates/person/view.html | 14 ++++++--
 5 files changed, 102 insertions(+), 13 deletions(-)

diff --git a/python/web/library/models.py b/python/web/library/models.py
index 7a02e20..c54696f 100644
--- a/python/web/library/models.py
+++ b/python/web/library/models.py
@@ -208,7 +208,7 @@ class BookPerson(models.Model):
 		return self.person.first_name +u' '+ self.person.last_name+ u' '+ self.relation.name+ u' of '+self.book.title
 
 class Placement(models.Model):
-	category = models.ForeignKey(Category,related_name='placement')
+	category = models.ForeignKey(Category, related_name='placement')
 	shelf = models.CharField(max_length=10)
 
 	def __unicode__(self):
diff --git a/python/web/library/views.py b/python/web/library/views.py
index 335c0b4..8874222 100644
--- a/python/web/library/views.py
+++ b/python/web/library/views.py
@@ -3,19 +3,54 @@ from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.db.models import Q
 
+
+relations = {'Author' : u'Forfatter', 'Illustrator' : u'Tegner', 'Translator' : u'Oversetter'}
+
+
+# Create your views here.
 def BookView(request,book_identifier):
-	book=get_object_or_404(Book,isbn=book_identifier)
-	people = book.persons.all()
-	return render_to_response('book/view.html', {'book' : book, 'people' : people})
+    book=get_object_or_404(Book,isbn=book_identifier)
+    people = book.persons.all()
+    shelves = None
+    global relations
+    if book.category:
+        if book.category.placement:
+            shelves = book.category.placement.all()
+    contributors = {}
+    for person in people:
+        print person.relation
+        if str(person.relation) in relations:
+            relation = relations[str(person.relation)]
+        else: 
+            relation = 'Medvirkende'
+        if not relation in contributors:
+            contributors[relation] = [0, []]
+#            contributors[person.relation] = "%s %s" % (person.person.first_name, person.person.last_name)
+#        else:
+        contributors[relation][0] += 1
+        contributors[relation][1].append(person)
+    print contributors
+    return render_to_response('book/view.html', {'book' : book, 'people' : people, 'shelves' : shelves, 'contributors' : contributors})
 
 def BookRedirect(request,book_identifier):
 	ident=get_object_or_404(Id,id=book_identifier)
 	return HttpResponseRedirect('/book/'+ident.book.isbn)
 
 def PersonView(request,person_identifier):
-	person = get_object_or_404(Person,id=person_identifier)
-	books = person.books.all()
-	return render_to_response('person/view.html', {'title' : 'Worblehat: person '+person.first_name+' '+person.last_name,'person' : person, 'books' : books})
+    global relations
+    person = get_object_or_404(Person,id=person_identifier)
+    books = person.books.all()
+    contributed = {}
+    for book in books:
+        if str(book.relation) in relations:
+            relation = relations[str(book.relation)]
+        else:
+            relation = 'Medvirkende'
+        if not relation in contributed:
+            contributed[relation] = [0, []]
+        contributed[relation][0] += 1
+        contributed[relation][1].append(book)
+    return render_to_response('person/view.html', {'title' : 'Worblehat: person '+person.first_name+' '+person.last_name, 'person' : person, 'books' : books, 'contributed' : contributed })
 
 def MapView(request,shelf_identifier):
     if shelf_identifier not in Placement.get_all_shelves():
diff --git a/python/web/media/styles/scaffold.css b/python/web/media/styles/scaffold.css
index 6742cee..2fb22b6 100644
--- a/python/web/media/styles/scaffold.css
+++ b/python/web/media/styles/scaffold.css
@@ -75,6 +75,9 @@ img.aligncenter {
 }
 
 .img {
+  float: left;
+  display: inline;
+  margin-right: 10px;
   text-align: left;
 }
 
diff --git a/python/web/templates/book/view.html b/python/web/templates/book/view.html
index 20e3844..9e20ff3 100644
--- a/python/web/templates/book/view.html
+++ b/python/web/templates/book/view.html
@@ -1,15 +1,56 @@
 {% extends "base/main.html" %}
 
 {%block title%}
-Worblehat 0.1: {{ book.title }}
+Worblehat: {{ book.title }}
 {% endblock %}
 {% block content %}
+{% if book.thumbnail %}
+<span class="img">
+  <img src="/media/{{ book.thumbnail }}" alt="{{ book.title }}">
+</span>
+{% endif %}
+<span class="img">
+<h2>{{ book.title }}</h2>
+{% if book.subtitle %}
+  <h3>{{ book.subtitle }}</h3>
+{% endif %}
+<!--- 
 <span class="key">Title:</span> {{ book.title }} <br>
 {% if book.subtitle %}
-<span class="key">Subtitle:</span> {{ book.subtitle }} <br>
-{% endif %}
-<span class="key">ISBN:</span> {{ book.isbn }} <br>
+  <span class="key">Subtitle:</span> {{ book.subtitle }} <br>
+{% endif %} 
 {% for person in people  %}
 <span class="key">{{ person.relation }}:</span> <a href=/person/{{person.person.id}}>{{ person.person.first_name }} {{ person.person.last_name }}</a> <br>
 {% endfor %}
+---!>
+{% for relation, persons in contributors.iteritems %}
+<span class="key">{{ relation }}{% if persons.0 != 1 and relation != 'Medvirkende' %}e{% endif %}:</span> 
+{% for person in persons.1 %} 
+<a href=/person/{{person.person.id}}>{{ person.person.first_name }} {{ person.person.last_name }}</a>{% if not forloop.last %}, {% endif %}
+{% endfor %}
+<br>
+{% endfor %}
+{% if book.category %}
+  <span class="key">Kategori:</span> {{ book.category }} <br>
+{% endif %}
+{% if book.shelves %}
+  <span class="key">Hylle:</span> {{ book.shelves }} <br>
+{% endif %}
+{% if book.published_year %}
+  <span class="key">År:</span> {{ book.published_year }} <br>
+{% endif %}
+{% if book.edition %}
+  <span class="key">Utgave:</span> {{ book.edition }} <br>
+{% endif %}
+{% if book.num_pages %}
+  <span class="key">Antall sider:</span> {{ book.num_pages }} <br>
+{% endif %}
+{% if book.series %}
+  <span class="key">Serie:</span> {{ book.series }} <br>
+{% endif %}
+{% if book.description %}
+  <span class="key">Beskrivelse:</span> {{ book.description }} <br>
+{% endif %}
+<span class="key">ISBN:</span> {{ book.isbn }} <br>
+</span>
 {% endblock %}
diff --git a/python/web/templates/person/view.html b/python/web/templates/person/view.html
index fae65a9..f8d9483 100644
--- a/python/web/templates/person/view.html
+++ b/python/web/templates/person/view.html
@@ -1,12 +1,22 @@
 {% extends "base/main.html" %}
 
 {% block title%}
-Worblehat 0.1: {{ person.first_name }} {{ person.last_name }}
+Worblehat: {{ person.first_name }} {{ person.last_name }}
 {% endblock %}
 
 {% block content %}
-<span class="key">Name:</span> {{person.first_name}} {{person.last_name}}<br>
+<h2>{{ person.first_name }} {{ person.last_name }}</h2>
+{% for relation, books in contributed.iteritems %}
+<span class="key">{{ relation }}:</span><br/> 
+<ul>
+{% for book in books.1 %} 
+<li> <a href=/bok/{{book.book.isbn}}>{{ book.book.title }}</a>
+<!--- <span class="key">Name:</span> {{person.first_name}} {{person.last_name}}<br>
 {% for book in books %}
 <span class="key">{{ book.relation.name }} of:</span> <a href=/bok/{{ book.book.isbn }}>{{ book.book.title }}</a> <br>
+---!>
+{% endfor %}
+<br/>
+</ul>
 {% endfor %}
 {% endblock %}