From a589e0bf736929a8dd2f51c99a0fccba05025bf5 Mon Sep 17 00:00:00 2001
From: Yaron <prsnca@gmail.com>
Date: Sat, 17 May 2014 19:19:09 +0300
Subject: [PATCH] added meeting pages

---
 committeeVotes/models.py                      |  1 +
 committeeVotes/templates/base.html            |  5 +++
 .../committeeVotes/meeting_detail.html        | 36 +++++++++++++++
 .../templates/committeeVotes/meetings.html    | 44 +++++++++++++++++++
 committeeVotes/views.py                       | 14 +++++-
 openCommittee/urls.py                         |  9 +++-
 6 files changed, 106 insertions(+), 3 deletions(-)
 create mode 100644 committeeVotes/templates/committeeVotes/meeting_detail.html
 create mode 100644 committeeVotes/templates/committeeVotes/meetings.html

diff --git a/committeeVotes/models.py b/committeeVotes/models.py
index 96057c8..9337436 100644
--- a/committeeVotes/models.py
+++ b/committeeVotes/models.py
@@ -4,6 +4,7 @@
 class Bill(models.Model):
     name = models.CharField(max_length=500)
     description = models.TextField()
+    #oknesset_url = models.CharField(max_length=100, blank=True, null=True)
     def __unicode__(self):
         return self.name
 
diff --git a/committeeVotes/templates/base.html b/committeeVotes/templates/base.html
index fcfb0d5..9ab50e5 100644
--- a/committeeVotes/templates/base.html
+++ b/committeeVotes/templates/base.html
@@ -43,6 +43,11 @@
                     <a href="{% url 'ministers' %}">
                         השרים
                     </a>
+                </li>
+                                <li>
+                    <a href="{% url 'meetings' %}">
+ישיבות הועדה
+                    </a>
                 </li>
             </ul>
             <ul class="nav navbar-nav">
diff --git a/committeeVotes/templates/committeeVotes/meeting_detail.html b/committeeVotes/templates/committeeVotes/meeting_detail.html
new file mode 100644
index 0000000..8af1ba8
--- /dev/null
+++ b/committeeVotes/templates/committeeVotes/meeting_detail.html
@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+{% block content %}
+{% load staticfiles %}
+
+<div class="container">
+
+
+    <div class="row">
+        <div class="col-md-12">
+            <h2>
+               ישיבת הועדה שנערכה בתאריך {{ meeting.took_place }}
+            </h2>
+
+            <h3>
+הצעות החוק שעלו בישיבה
+            </h3>
+
+
+            <table class="table table-hover">
+                <thead>
+                <th>
+                    שם ההצעה
+                </th>
+                </thead>
+                {% for b in bills %}
+                <tr>
+                    <td><a href="{% url 'detail' b.id %}">{{b}}</a></td>
+                </tr>
+                {% endfor %}
+            </table>
+        </div>
+    </div>
+</div>
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/committeeVotes/templates/committeeVotes/meetings.html b/committeeVotes/templates/committeeVotes/meetings.html
new file mode 100644
index 0000000..75031eb
--- /dev/null
+++ b/committeeVotes/templates/committeeVotes/meetings.html
@@ -0,0 +1,44 @@
+{% extends "base.html" %}
+{% block content %}
+    {% load staticfiles %}
+
+    <div class="container">
+
+        <div class="row">
+            <div class="col-md-6">
+                <h2>
+                    ישיבות הועדה
+                </h2>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <table class="table table-hover">
+                    <thead>
+                    <tr>
+                        <th class="text-right">
+                            תאריך הישיבה
+                        </th>
+                        <th class="text-right">
+                            מספר ההצעות שנידונו
+                        </th>
+
+                    </tr>
+                    </thead>
+                    {% for m in meetings %}
+
+                        <tr>
+                            <td><a href="{% url 'meeting' m.id %}">{{ m.took_place | date }}</a></td>
+                            <td>{{ m.proposed_bills.count }}</td>
+                        </tr>
+                    {% endfor %}
+                </table>
+
+            </div>
+        </div>
+
+
+    </div>
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/committeeVotes/views.py b/committeeVotes/views.py
index 8f60584..0ba06c1 100644
--- a/committeeVotes/views.py
+++ b/committeeVotes/views.py
@@ -3,7 +3,7 @@
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponse
 from django.core.urlresolvers import reverse
-from committeeVotes.models import Bill, Minister, Vote, VoteType
+from committeeVotes.models import Bill, Minister, Vote, VoteType, Meeting
 import json
 
 def index(request):
@@ -69,3 +69,15 @@ def ministers(request):
     context = {'ministers': ministers}
     return render(request, 'committeeVotes/ministers.html', context)
 
+def meetings(request):
+    meetings = Meeting.objects.all()
+    context = {'meetings': meetings}
+    return render(request, 'committeeVotes/meetings.html', context)
+
+def meeting_details(request, meeting_id):
+    meeting = get_object_or_404(Meeting,pk=meeting_id)
+    bills = meeting.proposed_bills.all()
+    context = {'meeting': meeting,
+               'bills': bills}
+    return render(request, 'committeeVotes/meeting_detail.html', context)
+
diff --git a/openCommittee/urls.py b/openCommittee/urls.py
index 49d4a0a..5094431 100644
--- a/openCommittee/urls.py
+++ b/openCommittee/urls.py
@@ -13,10 +13,15 @@
 
 
     url(r'^$', views.index, name='index'),
+    url(r'^bills/$', views.bills, name='bills'),
     url(r'^bills/(?P<bill_id>\d+)/$', views.detail, name='detail'),
-    url(r'^minister/(?P<minister_id>\d+)/$', views.minister_details, name='minister'),
+
     url(r'^minister/$', views.ministers, name='ministers'),
-    url(r'^bills/$', views.bills, name='bills'),
+    url(r'^minister/(?P<minister_id>\d+)/$', views.minister_details, name='minister'),
+
+    url(r'meetings/$',views.meetings, name='meetings'),
+    url(r'^meetings/(?P<meeting_id>\d+)/$', views.meeting_details, name='meeting'),
+
     url(r'^search.json', views.search, name='search'),
     url(r'^bills.json', views.searchBills, name='searchBills'),
     url(r'^ministers.json', views.searchMinisters, name='searchMinisters'),