Change the cutoff-settings to match what's desired. Move CUTOFF_HOUR to settings. Change the submission page template to not show the form during the down period.

 - Legacy-Id: 3206

Author: levkowetz

ietf/proceedings/admin.py

@@ -65,6 +65,12 @@ class WgAgendaAdmin(admin.ModelAdmin):
     pass
 admin.site.register(WgAgenda, WgAgendaAdmin)
 
+class SessionStatusAdmin(admin.ModelAdmin):
+    list_display = ['id', 'name' ]
+#    list_filter = ['meeting', ]
+    pass
+admin.site.register(SessionStatus, SessionStatusAdmin)
+
 class WgMeetingSessionAdmin(admin.ModelAdmin):
     list_display = ['session_id', 'meeting', 'group_acronym_id', 'number_attendee', 'status', 'approval_ad', 'scheduled_date', 'last_modified_date', 'special_req', 'ad_comments']
     list_filter = ['meeting', ]

ietf/settings.py

@@ -207,8 +207,9 @@
 IDSUBMIT_ANNOUNCE_LIST_EMAIL = 'i-d-announce@ietf.org'
 
 # Days from meeting to cut off dates on submit
-FIRST_CUTOFF_DAYS = 5
-SECOND_CUTOFF_DAYS = 3
+FIRST_CUTOFF_DAYS = 20
+SECOND_CUTOFF_DAYS = 13
+CUTOFF_HOUR = 17
 
 IDSUBMIT_REPOSITORY_PATH = INTERNET_DRAFT_PATH
 IDSUBMIT_STAGING_PATH = '/a/www/www6s/staging/'

ietf/submit/forms.py

@@ -23,9 +23,6 @@
 from ietf.utils.draft import Draft
 
 
-CUTOFF_HOUR = 17
-
-
 class UploadForm(forms.Form):
 
     txt = forms.FileField(label=u'.txt format', required=True)
@@ -54,17 +51,20 @@ def __init__(self, *args, **kwargs):
     def read_dates(self):
         now = datetime.datetime.utcnow()
         first_cut_off = Meeting.get_first_cut_off()
+        print "first_cut_off:", first_cut_off
         second_cut_off = Meeting.get_second_cut_off()
+        print "second_cut_off:", second_cut_off
         ietf_monday = Meeting.get_ietf_monday()
+        print "ietf_monday:", ietf_monday
 
         if now.date() >= first_cut_off and now.date() < second_cut_off:  # We are in the first_cut_off
-            if now.date() == first_cut_off and now.hour < CUTOFF_HOUR:
+            if now.date() == first_cut_off and now.hour < settings.CUTOFF_HOUR:
                 self.cutoff_warning = 'The pre-meeting cutoff date for new documents (i.e., version -00 Internet-Drafts) is %s at 5 PM (PT). You will not be able to submit a new document after this time until %s, at midnight' % (first_cut_off, ietf_monday)
             else:  # No 00 version allowed
                 self.cutoff_warning = 'The pre-meeting cutoff date for new documents (i.e., version -00 Internet-Drafts) was %s at 5 PM (PT). You will not be able to submit a new document until %s, at midnight.<br>You can still submit a version -01 or higher Internet-Draft until 5 PM (PT), %s' % (first_cut_off, ietf_monday, second_cut_off)
                 self.in_first_cut_off = True
         elif now.date() >= second_cut_off and now.date() < ietf_monday:
-            if now.date() == second_cut_off and now.hour < CUTOFF_HOUR:  # We are in the first_cut_off yet
+            if now.date() == second_cut_off and now.hour < settings.CUTOFF_HOUR:  # We are in the first_cut_off yet
                 self.cutoff_warning = 'The pre-meeting cutoff date for new documents (i.e., version -00 Internet-Drafts) was %s at 5 PM (PT). You will not be able to submit a new document until %s, at midnight.<br>The I-D submission tool will be shut down at 5 PM (PT) today, and reopened at midnight (PT), %s' % (first_cut_off, ietf_monday, ietf_monday)
                 self.in_first_cut_off = True
             else:  # Completely shut down of the tool

ietf/templates/submit/submit_index.html

@@ -9,9 +9,11 @@
 <p>This page is used to submit IETF Internet-Drafts to the Internet-Draft repository. The list of current Internet-Drafts can be accessed at <a href="http://www.ietf.org/ietf/1id-abstracts.txt">http://www.ietf.org/ietf/1id-abstracts.txt</a></p>
 <p>Internet-Drafts are working documents of the Internet Engineering Task Force (IETF), its areas, and its working groups. Note that other groups may also distribute working documents as Internet-Drafts.</p>
 <p>Internet-Drafts are draft documents, and are valid for a maximum of six months. They may be updated, replaced, or obsoleted by other documents at any time.</p>
-<p>If you run into problems when submitting an Internet-Draft using this and the following pages, you may alternatively submit your draft by email to <a href="mailto:internet-drafts@ietf.org">internet-drafts@ietf.org</a>. However, be advised that manual processing always takes additional time.</p>
+{% if not form.shutdown %}
+    <p>If you run into problems when submitting an Internet-Draft using this and the following pages, you may alternatively submit your draft by email to <a href="mailto:internet-drafts@ietf.org">internet-drafts@ietf.org</a>. However, be advised that manual processing always takes additional time.</p>
 
-{{ form }}
+    {{ form }}
+{% endif %}
 
 <p>
 The IETF is an organized activity of the <a href="http://www.isoc.org">Internet Society</a>