From 783ffb713df23d286d275bcb05e8baac36e6492a Mon Sep 17 00:00:00 2001 From: Vidyut Luther Date: Wed, 9 May 2007 21:05:20 +0000 Subject: [PATCH] - Legacy-Id: 111 --- ietf/agenda/models.py | 4 +- ietf/meeting/__init__.py | 0 ietf/meeting/__init__.pyc | Bin 0 -> 140 bytes ietf/meeting/models.py | 11 ++++ ietf/meeting/models.pyc | Bin 0 -> 261 bytes ietf/meeting/urls.py | 24 +++++++++ ietf/meeting/urls.pyc | Bin 0 -> 570 bytes ietf/meeting/views.py | 81 +++++++++++++++++++++++++++++ ietf/meeting/views.pyc | Bin 0 -> 3043 bytes ietf/proceedings/models.py | 13 ++--- ietf/templates/meeting/agenda.html | 30 +++++++++++ ietf/templates/meeting/index.html | 0 ietf/templates/meeting/list.html | 22 ++++++++ ietf/urls.py | 2 + 14 files changed, 180 insertions(+), 7 deletions(-) create mode 100644 ietf/meeting/__init__.py create mode 100644 ietf/meeting/__init__.pyc create mode 100644 ietf/meeting/models.py create mode 100644 ietf/meeting/models.pyc create mode 100644 ietf/meeting/urls.py create mode 100644 ietf/meeting/urls.pyc create mode 100644 ietf/meeting/views.py create mode 100644 ietf/meeting/views.pyc create mode 100644 ietf/templates/meeting/agenda.html create mode 100644 ietf/templates/meeting/index.html create mode 100644 ietf/templates/meeting/list.html diff --git a/ietf/agenda/models.py b/ietf/agenda/models.py index 71a836239..cff65c809 100644 --- a/ietf/agenda/models.py +++ b/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 diff --git a/ietf/meeting/__init__.py b/ietf/meeting/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/ietf/meeting/__init__.pyc b/ietf/meeting/__init__.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3146663b751fb7fe6fa112b5e6466418f18ba552 GIT binary patch literal 140 zcmd1(#LM-t)!HqY0SXv_v;zlIX%fQ+^WnOqDa06!ld ASpWb4 literal 0 HcmV?d00001 diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py new file mode 100644 index 000000000..a4426df42 --- /dev/null +++ b/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. diff --git a/ietf/meeting/models.pyc b/ietf/meeting/models.pyc new file mode 100644 index 0000000000000000000000000000000000000000..38e9f0a515d9123e31be28d86b3759f26d72b55d GIT binary patch literal 261 zcmYL@!3x4K42IKnhzbMW!kyZ)CwCH03KKl+HfpHf`@ELs@pTKkz4dhEglAqtc zqvi3H?5^;QfNR3puNelQ0;mOK0)!ue-yoopkV!BCPO*QAh5wo{tTR~mhdAV(77TOG zo5Cq`q5qmzyeN@ws_onr(UeWm)7)R@gj8A_Ra38;N=D2%fi~Rfv#TE#d%brS^)L*b ebELiC1f`~Gk;R%qPo`A+B(Jy~&3c28jKUB8JU0pe literal 0 HcmV?d00001 diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py new file mode 100644 index 000000000..d0e4279dd --- /dev/null +++ b/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\d+)/$', views.show), + (r'^(?P\d+)/agenda.html$', views.show_html_agenda), + (r'^(?P\d+)/materials.html$', views.show_html_materials), + + +# (r'^update/(?P\d+)/$', views.update), +# (r'^new-(?P(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\d{4})/$', 'archive_year', archive), +# (r'^(?P\d{4})/(?P[a-z]{3})/$', 'archive_month', archive), +#) + + diff --git a/ietf/meeting/urls.pyc b/ietf/meeting/urls.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a7de1fe6eec046e4587a6e90ee9898ad2bba7843 GIT binary patch literal 570 zcmZ{h!AiqG5Qb-yCaE=o(1UoD3Q-|BdJ)@`coM1NA&4b(H*M^0wsa>3&%Te(ln}KygCHq$C_*1@OojtQbfKQU|09sS8Z>fIGll z5H1uR3A9S4s#h%Ehd#)b%sJI7>$6WM?f~h>~aV5|td8)17T9L$N6`Y1+=aXh5xa zOu}EYa-rk7F7vqBPy-ivR!KA%Qne76$DJYEu7KMW?6T_&X?$tWCT6K?Ss27#m*8Os zGwX8JI>zC@%Rhg(Pxs{GcVy&JKDDE!wlcLpj_9<4mqf{vmX#7Fxz$P}bzN_?#>6^r fC63$Jt&ucauHT!-8QT{!cGG|j9iN3x$U^o5RtSjI literal 0 HcmV?d00001 diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py new file mode 100644 index 000000000..c19c635d6 --- /dev/null +++ b/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}) diff --git a/ietf/meeting/views.pyc b/ietf/meeting/views.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8985ba961d47b9cd3a5f4340fc5d3f530402f3ff GIT binary patch literal 3043 zcma)8+m0JW5UuguUhgJ*A!H$e0R=P<#489wJRp&1vye!^L9-D^ez9g}+Uv>A#Z0#` zD|uhoJR<&)U*HRVq;kB35Kkt&8J9~Mea@=Pla*6Rij zN{7KjY3xYiOq~@fxX^YhmeV{^i4LI(PnDlze)KjEM%*0}U03)_Ea}g9c&tXjG%@ZZ zI9Fe|v)GJX)_kE|le>C)b{~ALcUdx3%Ea0EQ4(v@8=Ew-HX9slZ5BgJQ|7--l{Oxe zB!l^usiR-=WSS~{^dwK!(QGy=^4uK7%8cyL>)H3>q~BvT)4j>1sEn+kZPue}(Cd)% zMo;JB?8?*6S^jaXCrNPW2JE0VZa#9=A55@IZWQY<$@P>2{w7zE0)un0*++E6TTAiG zy6KBpi>G>=&mfA>uk6J#LXQ|pX1->EGZQ-$S17L1HPKatOr7Qqajt5N&^a$Ofyi@* z{^IT5iCZv5Kj6XrQ5pA<`>gcoQIfbn*-UBo#W*l-P$)OfTr*a#zSKsgu7QDNkhR|8 z$$f2t!VIIpsJ@3)$*P5uM88xibbj_yg+?1V5+sQa0Qmfn=;Z@A%tpy1F97AUOTnAO z%ExiC#lsdEBx*i90{%75M|Srr4JSmz7EzOky^dup_y0d{Hb>AWH6#`oSWtRD%%K1|t_A`TLL7i=8Gu)_;l;JFx;Gaxq8*r0g>?F1=wII+%ERb*O{YUWo; zK4hxIorGn$jT~Op-zwKw$~E6A*IdfA-chdej&kj{%C&GVK+LedvFWS$S0lqMv26j~ zp?Q@-U9;f;!SSjIXN%@_A-Xhg3b9S|786ndI~@GJ0J2P`FVMKb>@3fQnrk`cccDgH zT5JnHs4yOoHm*3%CvsixKH^4~MS*lS(`7zGd!a-NW0fy0P?g7U> zirn1f;n(xBd`_)RKAM;h6=HsAsg&F(P8e_26VySurscqXo-H)U0kGabfEuxPb^e!| zjIX2`3w18m`_SwoP*S#@lqBLI=lXX*-Cl~wQMWK%p67pv=?6S)77yHA6^{+63mz0u zb+5Kp^(u@1y~>?MiKF4Q&yd%B&Cc%!~@(5-g;-np<8Vh@i zg?+oQFIx{NzsnA6h#Xjv1IpmtduRh=H2oU(pcJ?h+*;rraMB;~aLUce4O~4@VLXaM z_vz36+6^W-6tHVRV}b5SnIKNIz*|x;5YgPoQ6#vj`ri92Z=r{DFxr$skv-B{6%acq zio6h5TLcM=WfQO@5M6zh2%PQrilBTl%yPru1b|a{-}2QEM=CS%=u+?*=4r}PTWvXC zSVg%9s7m5cWtwm6VLpK|a{VwVmvR(`#=wYYPmfRfrzgYXC(oHW75h(5o}C=OSh7%e zS|#kcxtu7eY&*?onTn($e1zFU5bT|W#^M9&61h#xLk^gKj5mq`m)C)F$GKhp+s+~X zJI-ClLrPYSA$l2P=XsAe7bcvt;|R{{-+yA0xL0n-)NGU&sg|fMCw1Oz+4x*5MW<$& z^-pp3Cp<`|@Y&UqRf!;`(yW9(De_RMh@-82v`inm<%ae@1_fC7xDovx4<6c&or*Be w?1IIL2um;@VBs4KOIt+qW<=48zDLuRw$XOBovyR*@VnBkwd?JzZnb;wKhal3CIA2c literal 0 HcmV?d00001 diff --git a/ietf/proceedings/models.py b/ietf/proceedings/models.py index 0b36f4e80..4c456dafc 100644 --- a/ietf/proceedings/models.py +++ b/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_ref = models.ForeignKey(NonSessionRef) - meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True) - time_desc = models.CharField(blank=True, maxlength=75) - class Meta: - db_table = 'non_session' + non_session_id = models.IntegerField(primary_key=True) + day_id = models.IntegerField() + non_session_ref = models.ForeignKey(NonSessionRef) + meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True) + time_desc = models.CharField(blank=True, maxlength=75) + class Meta: + db_table = 'non_session' class Proceeding(models.Model): meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True, primary_key=True) diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html new file mode 100644 index 000000000..b7eb5ff34 --- /dev/null +++ b/ietf/templates/meeting/agenda.html @@ -0,0 +1,30 @@ +{% extends "base.html" %} +{% block title %} Meeting Agenda {% endblock %} +{% block content %} + +
+ Agenda of the {{ meeting_num }}th IETF Meeting
+ Date of Meeting {{ meeting.start_date }} - {{ meeting.end_date }}
+Updated As of :
+
+ + Text Format of the Agenda
+

+*** Click on an acronym of the group to get a charter page ***
+*** Click on a name of the group to get a meeting agenda ***
+

+ + +{{ cbreak_time.time_desc }} +
+{% for session in all_sessions %} + +The sessions are: +{{ session.num_session }} + + +
+{% endfor %} + + +{% endblock %} diff --git a/ietf/templates/meeting/index.html b/ietf/templates/meeting/index.html new file mode 100644 index 000000000..e69de29bb diff --git a/ietf/templates/meeting/list.html b/ietf/templates/meeting/list.html new file mode 100644 index 000000000..cec5d5343 --- /dev/null +++ b/ietf/templates/meeting/list.html @@ -0,0 +1,22 @@ +{% extends "base.html" %} +{% block title %} Meetings {% endblock %} +{% block content %} + +

The following meeting are in chronological order

+ + + + +{% for meeting in meetings %} + + + + +{% endfor %} + +{% endblock %} diff --git a/ietf/urls.py b/ietf/urls.py index ec964c32d..f35bba794 100644 --- a/ietf/urls.py +++ b/ietf/urls.py @@ -23,6 +23,8 @@ urlpatterns = patterns('', (r'^mailinglists/', include('ietf.mailinglists.urls')), (r'^(?Ppublic|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:
Meeting City Agenda Minutes
{{ meeting.city}} ({{ meeting.meeting_num }}) HTML · + Text + + HTML · + Text +