Commit graph

280 commits

Author SHA1 Message Date
Robert Sparks 0f6e3f434e Closed off the old paths for materials upload (redirecting some old entry points). Commit ready for merge.
- Legacy-Id: 12000
2016-09-19 19:06:22 +00:00
Robert Sparks bcac1dfff8 Added slide sorting. Commit ready to merge.
- Legacy-Id: 11995
2016-09-16 20:36:59 +00:00
Robert Sparks 02ee5dc5d7 (somewhat bumpy) merge forward from proceedings/6.31.1.dev0
- Legacy-Id: 11992
2016-09-14 22:09:30 +00:00
Robert Sparks 53f41a6327 Added an order field to SessionPresentation.
Set up removing the order field from Document.
Modified the meeting materials, proceedings, and session details views to use the order field on SessionPresentation.
Added bootstrapped views to upload session materials (agendas, slides, minutes, and bluesheets). 
Integrated upload into the session details view.
Commit ready for merge.
 - Legacy-Id: 11989
2016-09-14 19:11:31 +00:00
Henrik Levkowetz 5a5446ca28 Added object IDs to /meeting/<num>/agenda.json.
- Legacy-Id: 11984
2016-09-13 13:51:01 +00:00
Henrik Levkowetz ec684e1b4e Added a pylint rc-file, and fixed or silenced a number of issues found by pylint using the settings .pylintrc (which enable only error checking).
- Legacy-Id: 11941
2016-09-08 14:48:59 +00:00
Henrik Levkowetz f97204ceee Fixed a number of places where events were given the document time, but the document had not been given a new time yet, after the eventsave refactoring code changes of [11841]. Fixes issue #2004.
- Legacy-Id: 11901
Note: SVN reference [11841] has been migrated to Git commit d868371aff
2016-08-31 10:54:27 +00:00
Henrik Levkowetz eb22690d78 Merged in [11891] from rjsparks@nostrum.com:
Modify agenda.json to properly handle meetings that do not have an agenda yet. Fixes #2003.
 - Legacy-Id: 11896
Note: SVN reference [11891] has been migrated to Git commit 9f409480c0
2016-08-30 18:23:12 +00:00
Henrik Levkowetz 375f2a710d Added page caching for json_agenda(). Changed localization of naive time from database in json_agenda to use settings.PRODUCTION_TIMEZONE.
- Legacy-Id: 11893
2016-08-30 16:32:58 +00:00
Henrik Levkowetz 02e2f591bc Merged in [11888] from rjsparks@nostrum.com:
Added an order field to sessionpresentation to allow ordering slides. Reworked the session details page to break slides and drafts into their own sections.
 - Legacy-Id: 11892
Note: SVN reference [11888] has been migrated to Git commit 89a3afe025
2016-08-30 16:29:51 +00:00
Robert Sparks 9f409480c0 Modify agenda.json to properly handle meetings that do not have an agenda yet. Fixes #2003. Commit ready for merge.
- Legacy-Id: 11891
2016-08-30 14:57:28 +00:00
Robert Sparks 89a3afe025 Added an order field to sessionpresentation to allow ordering slides. Reworked the session details page to break slides and drafts into their own sections. Commit ready for merge.
- Legacy-Id: 11888
2016-08-26 21:06:01 +00:00
Robert Sparks 89c128de63 merge forward from 6.30.1.dev0
- Legacy-Id: 11879
2016-08-25 19:36:08 +00:00
Henrik Levkowetz 7e6ed23f70 Merged in [11858] from rjsparks@nostrum.com:
Merge forward Ryan's IETF Overview pages.
 - Legacy-Id: 11874
Note: SVN reference [11858] has been migrated to Git commit cb3af1a2d9
2016-08-25 13:36:48 +00:00
Robert Sparks cb3af1a2d9 Merge forward Ryan's IETF Overview pages. Commit ready for merge.
- Legacy-Id: 11858
2016-08-24 17:20:54 +00:00
Henrik Levkowetz 4b0a9360f0 Merged in ^/branch/iola/event-saving-refactor-r10291, which refactors document saving to always use doc.save_with_history(events), and requires accompanying events. This branch also provides refactoring of recurring regexes in url patterns into a dictionary. As part of the merge, also refactored new code which didn't use the save_with_history() method.
- Legacy-Id: 11840
2016-08-23 10:52:08 +00:00
Henrik Levkowetz 52c5c0daa0 Merged in [11792] from rcross@amsl.com:
Requests for virtual interim meeting should go directly Scheduled - Waiting for announcement state and an email notification sent to the secretariat.  Fixes issue #1994.
 - Legacy-Id: 11822
Note: SVN reference [11792] has been migrated to Git commit a13b751e1a
2016-08-18 15:03:55 +00:00
Henrik Levkowetz 250af833aa Undid erroneous commit [11820].
- Legacy-Id: 11821
Note: SVN reference [11820] has been migrated to Git commit f497367658
2016-08-18 14:13:06 +00:00
Henrik Levkowetz f497367658 Provide a test materials directory for the bluesheets tests, to avoid dependency on the local directory setup.
- Legacy-Id: 11820
2016-08-18 14:10:28 +00:00
Henrik Levkowetz 2386fa8884 Merged in [11781] from rcross@amsl.com:
Fix issue with interim meeting series of more than two meetings.  Changed to not send meeting change notifications for meetings not yet announced.
 - Legacy-Id: 11817
Note: SVN reference [11781] has been migrated to Git commit f65335e258
2016-08-18 11:39:06 +00:00
Henrik Levkowetz 6f05b23837 Merged in [11778] from rjsparks@nostrum.com:
Enabled and refined document_main view for bluesheets.
Improved migration for 95 and 96 bluesheets, adding DocAlias and DocEvent creation.
Added bluesheet upload to the session details view.
Moved a function out of secr/proceedings/views into its own util.py file to allow reusing it in other modules without introducing circular imports.
 - Legacy-Id: 11811
Note: SVN reference [11778] has been migrated to Git commit 0611444b36bc071e8db068a093cc1ad93bb69659
2016-08-17 18:28:02 +00:00
Ryan Cross a13b751e1a Fixes #1994. Requests for virtual interim meeting should go directly Scheduled - Waiting for announcement state and an email notification sent to the secretariat. Commit ready for merge.
- Legacy-Id: 11792
2016-08-15 21:04:31 +00:00
Ryan Cross f65335e258 Fix issue with interim meeting series of more than two meetings. Changed to not send meeting change notifications for meetings not yet announced. Commit ready for merge.
- Legacy-Id: 11781
2016-08-12 21:32:13 +00:00
Robert Sparks 0b196e5eb5 Merged from rcross: Add Introduction header to proceedings. Add Acknowlegements to the meeting model. Add a view for acknowlegements. Commit ready for merge.
- Legacy-Id: 11770
2016-08-09 19:21:42 +00:00
Ryan Cross 485fcd0e53 Add new field meeting.acknowledgements and corresponding page in meeting proceedings. Commit ready for merge.
- Legacy-Id: 11765
2016-08-08 23:26:51 +00:00
Robert Sparks 57afa06fcd Moved the materials start, cutoff, and revision dates into the Meeting object
Add a bit to meeting to note whether proceedings are final. 
Update proceedings view to reflect the status of that bit. 
Add a function that finalizes a meetings proceedings.
Straighten out a migration numbering collision introduced in an earlier merge.
Commit ready for merge.
 - Legacy-Id: 11764
2016-08-08 20:34:37 +00:00
Robert Sparks 162845dcb8 Add a bit to meeting to note whether proceedings are final. Update proceedings view to reflect the status of that bit. Add a function that finalizes a meetings proceedings
- Legacy-Id: 11763
2016-08-08 20:14:04 +00:00
Robert Sparks f617e2688f Shift all datetimes for iphone json view to UTC. Commit ready for merge.
- Legacy-Id: 11759
2016-08-05 16:03:53 +00:00
Robert Sparks f2964b9733 Continued iterative-improvements to auto-generated proceedings:
- Migration to create documents and sessionpresentations for ietf95 and 96 bluesheets. Add bluesheets to proceedings.
- Refactor columns for proceedings to group agenda, minutes, and bluesheets into one column.
- Add a column for recordings. Show the recordings for all sessions for a group.
- Refactored all_meeting_ functions on session. Improved (with a hack) how recordings are displayed.
- Add guards against very old meetings. For more modern, past, meetings, add a warning that these are not the official proceedings and provide a link to the official proceedings.

Commit ready for merge.
 - Legacy-Id: 11758
2016-08-04 21:20:06 +00:00
Robert Sparks 56c232ec1d Add guards against very old meetings. For more modern, past, meetings, add a warning that these are not the official proceedings and provide a link to the official proceedings.
- Legacy-Id: 11757
2016-08-04 21:08:56 +00:00
Robert Sparks c68ae7669e Provides a custom json view of meetings optimized for the iphone app. Commit ready for merge.
- Legacy-Id: 11756
2016-08-04 19:51:52 +00:00
Henrik Levkowetz 4f3cc26d04 Don't show iaoc leadership sessions on the materials page.
- Legacy-Id: 11720
2016-07-19 17:04:38 +00:00
Henrik Levkowetz 081abec0e8 Merged in [11711] from rjsparks@nostrum.com:
Starting a page for direct rendering of proceedings.
 - Legacy-Id: 11717
Note: SVN reference [11711] has been migrated to Git commit d9b1528f36e092892c9a18602615f7151edf75c3
2016-07-19 11:22:00 +00:00
Henrik Levkowetz 57a79aecd6 Show only 'session' and 'other' type meetings on the materials page, especially do not show leadership meetings.
- Legacy-Id: 11695
2016-07-17 12:55:59 +00:00
Henrik Levkowetz 10435774c3 Merged in [11664] from rcross@amsl.com:
Send email to secretariat when an interim meeting has been approved and is waiting for announcement.
 - Legacy-Id: 11685
Note: SVN reference [11664] has been migrated to Git commit 54969aa236
2016-07-16 15:13:47 +00:00
Ryan Cross 54969aa236 Send email to secretariat when an interim meeting has been approved and is waiting for announcement. Commit ready for merge.
- Legacy-Id: 11664
2016-07-16 11:33:39 +00:00
Henrik Levkowetz 14e97a732c Provide the agenda template with the time now
This makes it possible to display either audio and video stream links
when a session is live, or links to the archives after a session.
 - Legacy-Id: 11643
2016-07-13 13:01:26 +00:00
Henrik Levkowetz cb439fa3d4 Fixed some pyflakes issues.
- Legacy-Id: 11593
2016-07-10 14:07:17 +00:00
Henrik Levkowetz df5417e7b3 Use xslugify on floor and room names, instead of slugify which ignores slashes.
- Legacy-Id: 11592
2016-07-10 14:01:10 +00:00
Henrik Levkowetz d53da28d00 Added support in the interim meeting request form for taking a group id parameter as query arg.
- Legacy-Id: 11577
2016-07-09 19:45:11 +00:00
Henrik Levkowetz 58044b103e Added another test, and fixed a code flaw it discovered.
- Legacy-Id: 11560
2016-07-08 11:19:09 +00:00
Henrik Levkowetz 8fee031802 Added a floorplan view function, and urls to go with it.
- Legacy-Id: 11543
2016-07-07 12:39:46 +00:00
Robert Sparks b3883b6ac4 Allow non-official schedules to be viewed in the same ways the official schedule for a meeting can be viewed. Fixes #1959. Commit ready for merge.
- Legacy-Id: 11500
2016-06-29 20:56:08 +00:00
Henrik Levkowetz bea74cb8b4 Added an optional parameter 'owner' to meeting.views.agenda(). Fixed issues #1959 and #1615
- Legacy-Id: 11463
2016-06-23 15:08:39 +00:00
Henrik Levkowetz 377a84c52b Normalized session agenda html content before running it into PyQuery to avoid later occurrences of '&#13;' for each carriage return.
- Legacy-Id: 11430
2016-06-20 22:02:05 +00:00
Henrik Levkowetz 7dde59f873 Avoid multiple doctype declarations and other html errors by parsing sesion agenda html files and inserting our title and doctype.
- Legacy-Id: 11417
2016-06-20 18:01:35 +00:00
Henrik Levkowetz d298785fda Merged in ^/branch/amsl/interim@11230, which provides interim meeting management support. Also fixes issues #1961, #1962 and #1964.
- Legacy-Id: 11402
2016-06-17 14:16:27 +00:00
Ryan Cross c8f3760dbe refactor code dealing with interim materials path
- Legacy-Id: 11229
2016-05-23 22:58:45 +00:00
Ryan Cross 81fe596c95 change approval redirects
- Legacy-Id: 11228
2016-05-23 17:21:48 +00:00
Ryan Cross ed371396c1 add tests. fix form validations
- Legacy-Id: 11219
2016-05-20 22:49:27 +00:00
Ryan Cross 6ea92cc5a0 various bug fixes and tweaks
- Legacy-Id: 11204
2016-05-18 23:55:44 +00:00
Ryan Cross cecdea3d72 Add utility script to send interim meeting minutes reminder. Add ability to include comments with meeting cancellation
- Legacy-Id: 11199
2016-05-17 22:55:47 +00:00
Ryan Cross 8fef55dc31 add approval and cancel notifications
- Legacy-Id: 11196
2016-05-16 22:48:43 +00:00
Ryan Cross 3366006653 Refactoring. Implement iCalendar support
- Legacy-Id: 11178
2016-05-11 00:13:55 +00:00
Ryan Cross 3f3e6f0b14 add edit view. refactor to use modelforms
- Legacy-Id: 11176
2016-05-06 23:02:25 +00:00
Robert Sparks f34ae9c612 Reworked the pages that manage all the possible schedules for a meeting. Removed a lot of custom javascript. Fixes #1921. Commit ready for merge.
- Legacy-Id: 11137
2016-04-27 20:46:02 +00:00
Ryan Cross facead5d95 Add inteirm meeting request disapprove and cancel capabilities
- Legacy-Id: 11135
2016-04-26 23:05:53 +00:00
Ryan Cross ba75fad3b5 added send announcement view
- Legacy-Id: 11130
2016-04-22 23:14:35 +00:00
Ryan Cross f46fdcfa14 change main menu meeting->upcoming, add navigation tabs
- Legacy-Id: 11127
2016-04-22 18:07:27 +00:00
Ryan Cross bd96d89c85 implement preapproved, add new SessionStatusName, add announce views
- Legacy-Id: 11126
2016-04-22 16:48:20 +00:00
Ryan Cross be6e536769 add pending and detail views and tests.
- Legacy-Id: 11125
2016-04-20 23:57:52 +00:00
Ryan Cross 8f8e4df650 changes for demo
- Legacy-Id: 11121
2016-04-15 12:45:39 +00:00
Ben Campbell d3a14a7e15 Allow meetings/materials to be queried without an explicit meeting number. Fixes issue #1934. Commit ready for merge.
- Legacy-Id: 11075
2016-04-02 19:54:59 +00:00
Ryan Cross 7238fd9148 Add support for series request. Javascript tweaks
- Legacy-Id: 11028
2016-03-30 00:02:28 +00:00
Ryan Cross b85df63a4f use formset for interim sessions
- Legacy-Id: 10978
2016-03-25 23:15:05 +00:00
Ryan Cross 2cdd073a6c tweaks to request form ui
- Legacy-Id: 10898
2016-03-04 23:28:28 +00:00
Ryan Cross 3a1af7dc83 add basic interim request form
- Legacy-Id: 10883
2016-03-01 21:51:59 +00:00
Ryan Cross bc8e744388 add view views.upcoming
- Legacy-Id: 10860
2016-02-26 17:41:09 +00:00
Robert Sparks bd0b166ca0 Show which session the user is adding drafts to when there was more than one sesison at a meeting.
- Legacy-Id: 10854
2016-02-23 16:30:54 +00:00
Robert Sparks 114ba0ad13 winding up: added ability to add drafts to a session while looking at the session.
- Legacy-Id: 10853
2016-02-23 04:00:16 +00:00
Robert Sparks 776b95106f Added the ability to associate documents with sessions from the document main page.
Integrated the group meetings tab with the secretariat meeting request and meeting materials pages.
Made better use of bootstrap styling for the meetings tab and session details view.
Commit ready for merge.
 - Legacy-Id: 10779
2016-02-04 21:51:04 +00:00
Robert Sparks a91ab77dbc Provided navigation for managing materials from the group meeting and meeting session views
- Legacy-Id: 10760
2016-02-01 19:39:10 +00:00
Robert Sparks 2bae86397e Show session details for interims as well as ietf meetings. Commit ready for merge.
- Legacy-Id: 10733
2016-01-25 23:06:41 +00:00
Robert Sparks 7d43d3ada4 Adds a meetings tab to the group information page. Links to minutes, agendas, and materials for each session at each meeting. Improves the UI for the session materials page. Commit ready for merge.
- Legacy-Id: 10719
2016-01-20 22:59:14 +00:00
Robert Sparks 4a453281ea Simplified meeting.session_details. Shows all sessions for a meeting on one page instead of having a page per session. Removes the by-date, by-weekday, by-sequence mechanic.
- Legacy-Id: 10701
2016-01-15 17:09:08 +00:00
Henrik Levkowetz 39142ed63e Don't redirect to proceedings for future meetings which exist in the database but don't have a schedule yet. We want to show tne agenda (even if empty) for those.
- Legacy-Id: 10661
2016-01-13 10:16:31 +00:00
Henrik Levkowetz d8413d5d28 Changed a helper function meeting_updated() to a method on Meeting, and provided it as a synthetic attribute on the /api/v1/meeting/meeting/ endpoints of the JSON API.
- Legacy-Id: 10611
2015-12-19 01:52:13 +00:00
Henrik Levkowetz 143b8cc646 Fixed an issue with [10344], where the numberless /meeting/agenda/ would redirect to a non-existing proceedings URL.
- Legacy-Id: 10360
Note: SVN reference [10344] has been migrated to Git commit 893988e45e
2015-11-01 22:49:07 +00:00
Robert Sparks 893988e45e Return more sensible results for agendas for old meetings. Fixes #1062. Commit ready for merge.
- Legacy-Id: 10344
2015-10-31 07:32:47 +00:00
Henrik Levkowetz 71dec7a692 Moved forward to 6.7.2.dev0 the changes to rename class ScheduledSession to the more correct (but unfortunately also cumbersome) SchedTimeSessAssignment, and rename reverse relationships involving this class appropriately. Accompanying changes in javascript and templates. Migrations to match.
- Legacy-Id: 10297
2015-10-26 22:45:26 +00:00
Ole Laursen 873af386df Summary: Return a friendlier error in case the room view is accessed
before the meeting is properly defined, this also fixes a problem with
the crawler
 - Legacy-Id: 10124
2015-10-02 11:48:35 +00:00
Henrik Levkowetz a4c49e09df Merged in [10062] from olau@iola.dk:
Summary: Fixed problem with timeslot.location = None in agenda_csv.
 - Legacy-Id: 10070
Note: SVN reference [10062] has been migrated to Git commit 129cccb88f
2015-08-30 09:32:18 +00:00
Ole Laursen 129cccb88f Summary: Fixed problem with timeslot.location = None in agenda_csv.
Commit ready for merge.
 - Legacy-Id: 10062
2015-08-26 07:52:05 +00:00
Henrik Levkowetz fb66c1856f Merged in [9669] from olau@iola.dk:
Summary: Make the meeting agenda code use the historic info available
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.
Fixes #1088. Branch
 - Legacy-Id: 10005
Note: SVN reference [9669] has been migrated to Git commit acda84208d
2015-08-10 19:46:11 +00:00
Henrik Levkowetz 83bef1d160 Merged in [9813] from rjsparks@nostrum.com:
Add navigation to the new secretariat agenda tools. Change the buttons at the top of the agenda.html page to links.
 - Legacy-Id: 9825
Note: SVN reference [9813] has been migrated to Git commit 2b7f7dec52
2015-07-20 13:13:09 +00:00
Robert Sparks 2b7f7dec52 Add navigation to the new secretariat agenda tools. Change the buttons at the top of the agenda.html page to links. Commit ready to merge.
- Legacy-Id: 9813
2015-07-19 08:02:09 +00:00
Henrik Levkowetz eb522faa25 Merged in [9789] from lars@netapp.com:
HTML agendas need to be valid HTML5 document.
 - Legacy-Id: 9811
Note: SVN reference [9789] has been migrated to Git commit d633fdc924a0130da98a7dc79768886d95002938
2015-07-18 16:35:32 +00:00
Henrik Levkowetz c41a079d4f Merged in [9735] from lars@netapp.com:
More HTML fixes identified by test-crawl --vnu.
 - Legacy-Id: 9767
Note: SVN reference [9735] has been migrated to Git commit 08d958e7cd9cf4949a688e20046bd61855e00361
2015-07-18 09:18:54 +00:00
Henrik Levkowetz b49a452595 Merged in [9651] from rjsparks@nostrum.com:
Adds a graphical overview of each day by room for the secretariat to assist with scheduling additional meetings.
 - Legacy-Id: 9674
Note: SVN reference [9651] has been migrated to Git commit 06a0e2b6481fe909f6620ed951353eaf437321ec
2015-06-22 19:33:15 +00:00
Ole Laursen acda84208d Summary: Make the meeting agenda code use the historic info available
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.

Fixes #1088. Branch ready for merge.
 - Legacy-Id: 9669
2015-06-17 13:37:16 +00:00
Robert Sparks 4e1b3b2888 let the IAB see the new pages
- Legacy-Id: 9600
2015-05-04 15:10:34 +00:00
Robert Sparks 0ba095e229 remove some dead code
- Legacy-Id: 9598
2015-05-04 13:25:57 +00:00
Robert Sparks 17b928b94b checkpoint: added room functional description, backfilled ietf92 meeting data, repaired session material views, added tests
- Legacy-Id: 9596
2015-05-01 22:31:30 +00:00
Robert Sparks 72b85fc1c7 checkpoint: views by type working
- Legacy-Id: 9592
2015-04-30 21:44:45 +00:00
Robert Sparks 1e30120710 checkpoint. Model changes done and UI tweaked to match.
- Legacy-Id: 9588
2015-04-30 15:57:48 +00:00
Robert Sparks 65f0fed7a7 checkpointing some css/html noodling before tearing into models
- Legacy-Id: 9587
2015-04-29 14:39:17 +00:00
Robert Sparks b0ce25aa44 clean merge forward
- Legacy-Id: 9584
2015-04-27 20:24:40 +00:00
Henrik Levkowetz d59af2aa0f Adapt session_draft_list() code to handle the case when there is multiple agendas for a given group acronym. Fixes some server 500 results when trying to get pdf bundles for the plenary sessions for ietf 71.
- Legacy-Id: 9502
2015-04-15 12:58:44 +00:00
Henrik Levkowetz 625347cd2f Merged trunk@9354 to facelift copy
- Legacy-Id: 9357
2015-04-02 06:51:34 +00:00
Henrik Levkowetz 2f54511763 Changed all explicitly set HttpResponse content_types to specify charset.
Django sets charset if you don't specify a content_type; if you specify
one you also must add a charset specification (if you want one).  
Fixes issue #1647.
 - Legacy-Id: 9348
2015-03-26 21:35:21 +00:00