- Legacy-Id: 111

ietf/agenda/models.py

@@ -1,3 +1,5 @@
 from django.db import models
-
+from ietf.proceedings.models import Meeting, MeetingVenue, WgMeetingSession, WgAgenda 
 # Create your models here.
+from ietf.idtracker.models import Acronym, PersonOrOrgInfo, IRTF
+import datetime

ietf/meeting/models.py

@@ -0,0 +1,11 @@
+from django.db import models
+#from django.db import models
+
+from ietf.proceedings import models
+#from ietf.proceedings.models import Meeting, MeetingVenue, WgMeetingSession, WgAgenda
+#from ietf.proceedings.models import NonSession, NonSessionRef,SessionName
+ 
+import datetime
+
+
+# Create your models here.

ietf/meeting/urls.py

@@ -0,0 +1,24 @@
+from django.conf.urls.defaults import *
+from ietf.meeting import models, views
+
+urlpatterns = patterns('',
+     (r'^$', views.showlist),
+     
+	 (r'^(?P<meeting_num>\d+)/$', views.show),
+	(r'^(?P<meeting_num>\d+)/agenda.html$', views.show_html_agenda),
+	(r'^(?P<meeting_num>\d+)/materials.html$', views.show_html_materials),
+
+
+#     (r'^update/(?P<meeting_id>\d+)/$', views.update),
+#     (r'^new-(?P<type>(specific|generic|thirdpty))/$', views.new),
+)
+
+#queryset = models.IprDetail.objects.all()
+#archive = {'queryset':queryset, 'date_field': 'submitted_date', 'allow_empty':True }
+
+#urlpatterns += patterns('django.views.generic.date_based',
+#	(r'^(?P<year>\d{4})/$', 'archive_year', archive),
+#	(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'archive_month', archive),
+#)
+
+

ietf/meeting/views.py

@@ -0,0 +1,81 @@
+# Create your views here.
+import models
+from django.shortcuts import render_to_response as render
+import django.newforms as forms
+from django.utils.html import escape, linebreaks
+import ietf.utils
+from ietf.proceedings import models
+
+def default(request):
+    """Default page, with links to sub-pages"""
+    return render("meeting/list.html", {})
+
+def showlist(request):
+    """Display a list of existing disclosures"""
+    return list(request, 'meeting/list.html')
+
+
+def list(request, template):
+    """ Get A List of All Meetings That are in the system """  
+    meetings  = models.Meeting.objects.all()
+    
+    return render(template,
+        {
+            'meetings' : meetings.order_by(* ['-start_date', ] ),
+        } )
+
+# Details views
+
+def show_html_materials(request, meeting_num=None):
+	return render("meeting/list.html",{})
+
+def show_html_agenda(request, meeting_num=None):
+	#a=models.MeetingTime.objects.all().filter(meeting=68,day_id=0)
+	#print a
+	session = models.WgMeetingSession.objects.all()
+
+# There has to be a better way to do this, than the way i'm doing it here.. 
+# I'm copying the formula from the cgi script.. 
+	sessions = session.filter(meeting=meeting_num)
+# First we get the non sessions lines 98 - 100 from the cgi..
+#	non_sessions = models.NonSession.objects.filter(meeting_num=meeting_num)
+	cbreak_time = models.NonSession.objects.filter(
+					meeting_num=meeting_num).filter(non_session_ref=2)[0]
+	break_time = models.NonSession.objects.filter(
+					meeting_num=meeting_num).filter(non_session_ref=3)[0]
+	fbreak_time = models.NonSession.objects.filter(
+					meeting_num=meeting_num).filter(non_session_ref=6)[0]
+	abreak_time1 = models.NonSession.objects.filter(
+						meeting_num=meeting_num).filter(non_session_ref=6)[0]
+	abreak_time2 = models.NonSession.objects.filter(
+						meeting_num=meeting_num).filter(non_session_ref=6)[0]
+	reg_time = models.NonSession.objects.filter(meeting_num=meeting_num).filter(non_session_ref=1)
+
+	meeting = models.Meeting.objects.filter(meeting_num=meeting_num)[0]
+
+	return render("meeting/agenda.html",
+	{
+		"all_sessions": sessions,
+		"meeting_num": meeting_num,
+		"meeting": meeting,
+		"cbreak_time": cbreak_time,
+		"break_time": break_time,
+		"fbreak_time": fbreak_time
+
+	} )
+
+
+def show(request, meeting_num=None):
+    """Show a specific IPR disclosure"""
+    assert meeting_num != None
+    meeting = models.Meeting.objects.filter(meeting_num=meeting_num)[0]
+    meeting.p_notes = linebreaks(escape(meeting.p_notes))
+    meeting.discloser_identify = linebreaks(escape(meeting.discloser_identify))
+    meeting.comments = linebreaks(escape(meeting.comments))
+    meeting.other_notes = linebreaks(escape(meeting.other_notes))
+    opt = meeting.licensing_option
+    meeting.licensing_option = dict(models.LICENSE_CHOICES)[meeting.licensing_option]
+    meeting.selecttype = dict(models.SELECT_CHOICES)[meeting.selecttype]
+    if meeting.selectowned:
+        meeting.selectowned = dict(models.SELECT_CHOICES)[meeting.selectowned]
+    return render("meeting/details.html",  {"meeting": meeting, "section_list": section_list})

ietf/proceedings/models.py

@@ -59,12 +59,13 @@ class NonSessionRef(models.Model):
         db_table = 'non_session_ref'
 
 class NonSession(models.Model):
-    day_id = models.IntegerField()
+	non_session_id = models.IntegerField(primary_key=True)
-    non_session_ref = models.ForeignKey(NonSessionRef)
+	day_id = models.IntegerField()
-    meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True)
+	non_session_ref = models.ForeignKey(NonSessionRef)
-    time_desc = models.CharField(blank=True, maxlength=75)
+	meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True)
-    class Meta:
+	time_desc = models.CharField(blank=True, maxlength=75)
-        db_table = 'non_session'
+	class Meta:
+		db_table = 'non_session'
 
 class Proceeding(models.Model):
     meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True, primary_key=True)

ietf/templates/meeting/agenda.html

@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{% block title %} Meeting Agenda  {% endblock %}
+{% block content %}
+
+<center> 
+<strong> Agenda of the {{ meeting_num }}th IETF Meeting </strong> <br/> 
+<strong> Date of Meeting  {{ meeting.start_date }} - {{ meeting.end_date }} </strong><br />
+Updated As of : <br />
+</center> 
+
+<a href="/meeting/{{meeting_num}}/agenda.txt"> Text Format of the Agenda </a> <br />
+<P>
+*** Click on an acronym of the group to get a charter page *** <br />
+*** Click on a name of the group to get a meeting agenda *** <br />
+</P>
+
+
+{{ cbreak_time.time_desc }}
+ <br />
+{% for session in all_sessions %}
+
+The sessions are: 
+{{ session.num_session }}
+
+
+<br />
+{% endfor %}
+
+
+{% endblock %}

ietf/templates/meeting/list.html

@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+{% block title %} Meetings {% endblock %}
+{% block content %}
+
+<h3> The following meeting are in chronological order </h3>
+<table border="1" cellpadding="2" cellspacing="2" width="820">
+    <tr>
+         <th> Meeting City </th> <th> Agenda </th> <th> Minutes </th>
+    </tr>
+{% for meeting in meetings %}
+<tr>
+ <td>  {{ meeting.city}} ({{ meeting.meeting_num }}) </td>
+ <td> <a href="/meeting/{{meeting.meeting_num}}/agenda.html"> HTML</a> &middot;
+<a href="/meeting/{{meeting.meeting_num}}/agenda.txt"> Text  </a>
+</td> <td>
+<a href="/meeting/{{meeting.meeting_num}}/minutes.html"> HTML</a> &middot;
+<a href="/meeting/{{meeting.meeting_num}}/minutes.txt"> Text  </a>
+</td>
+</tr>
+{% endfor %}
+
+{% endblock %}

ietf/urls.py

@@ -23,6 +23,8 @@ urlpatterns = patterns('',
       (r'^mailinglists/', include('ietf.mailinglists.urls')),
       (r'^(?P<path>public|cgi-bin)/', include('ietf.redirects.urls')),
       (r'^ipr/', include('ietf.ipr.urls')),
+      (r'^meeting/', include('ietf.meeting.urls')),
+
       (r'^$', ietf.views.apps),
 
     # Uncomment this for admin: