Add notes field to Schedule.

OleLaursen · OleLaursen · commit ae515e6a27b7 · 2020-07-01T10:14:14.000Z
Rearrange schedules in schedule list and be more consistent in the
naming. Add edit properties link to the meeting schedule editor.

Reword the Schedule.visible and .public help texts to try to better
explain what setting the fields results in.
 - Legacy-Id: 18111
diff --git a/ietf/meeting/migrations/0030_schedule_notes.py b/ietf/meeting/migrations/0030_schedule_notes.py
@@ -0,0 +1,28 @@
+# Generated by Django 2.0.13 on 2020-07-01 02:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0029_session_tombstone_for'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='schedule',
+            name='notes',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='schedule',
+            name='public',
+            field=models.BooleanField(default=True, help_text='Allow others to see this agenda.'),
+        ),
+        migrations.AlterField(
+            model_name='schedule',
+            name='visible',
+            field=models.BooleanField(default=True, help_text='Show in the list of possible agendas for the meeting.', verbose_name='Show in agenda list'),
+        ),
+    ]
diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
@@ -622,9 +622,10 @@ class Schedule(models.Model):
     meeting  = ForeignKey(Meeting, null=True, related_name='schedule_set')
     name     = models.CharField(max_length=16, blank=False, help_text="Letters, numbers and -:_ allowed.", validators=[RegexValidator(r'^[A-Za-z0-9-:_]*$')])
     owner    = ForeignKey(Person)
-    visible  = models.BooleanField(default=True, help_text="Make this agenda available to those who know about it.")
-    public   = models.BooleanField(default=True, help_text="Make this agenda publically available.")
+    visible  = models.BooleanField("Show in agenda list", default=True, help_text="Show in the list of possible agendas for the meeting.")
+    public   = models.BooleanField(default=True, help_text="Allow others to see this agenda.")
     badness  = models.IntegerField(null=True, blank=True)
+    notes    = models.TextField(blank=True)
     # considering copiedFrom = ForeignKey('Schedule', blank=True, null=True)
 
     def __str__(self):
@@ -652,20 +653,6 @@ def owner_email(self):
         else:
             return "noemail"
 
-    @property
-    def visible_token(self):
-        if self.visible:
-            return "visible"
-        else:
-            return "hidden"
-
-    @property
-    def public_token(self):
-        if self.public:
-            return "public"
-        else:
-            return "private"
-
     @property
     def is_official(self):
         return (self.meeting.schedule == self)
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
@@ -51,7 +51,7 @@
 from ietf.group.models import Group
 from ietf.group.utils import can_manage_session_materials, can_manage_some_groups, can_manage_group
 from ietf.person.models import Person
-from ietf.ietfauth.utils import role_required, has_role
+from ietf.ietfauth.utils import role_required, has_role, user_is_person
 from ietf.mailtrigger.utils import gather_address_lists
 from ietf.meeting.models import Meeting, Session, Schedule, FloorPlan, SessionPresentation, TimeSlot, SlideSubmission
 from ietf.meeting.models import SessionStatusName, SchedulingEvent, SchedTimeSessAssignment
@@ -374,7 +374,7 @@ def __init__(self, schedule, new_owner, *args, **kwargs):
             counter += 1
 
         self.fields['name'].initial = name_suggestion
-        self.fields['name'].label = "Name of new schedule"
+        self.fields['name'].label = "Name of new agenda"
 
     def clean_name(self):
         name = self.cleaned_data.get('name')
@@ -697,6 +697,8 @@ def cubehelix(i, total, hue=1.2, start_angle=0.5):
         'meeting': meeting,
         'schedule': schedule,
         'can_edit': can_edit,
+        'can_edit_properties': can_edit or secretariat,
+        'secretariat': secretariat,
         'js_data': json.dumps(js_data, indent=2),
         'days': days,
         'room_labels': room_labels,
@@ -777,64 +779,86 @@ def edit_schedule(request, num=None, owner=None, name=None):
                                           "assignments": assignments,
                                           "show_inline": set(["txt","htm","html"]),
                                           "hide_menu": True,
+                                          "can_edit_properties": can_edit or secretariat,
                                       })
 
 
-##############################################################################
-#  show the properties associated with a schedule (visible, public)
-#
-SchedulePropertiesForm = modelform_factory(Schedule, fields=('name','visible', 'public'))
-
-# The meeing urls.py won't allow empy num, owmer, or name values
+SchedulePropertiesForm = modelform_factory(Schedule, fields=['name', 'notes', 'visible', 'public'])
 
 @role_required('Area Director','Secretariat')
-def edit_schedule_properties(request, num=None, owner=None, name=None):
+def edit_schedule_properties(request, num, owner, name):
     meeting  = get_meeting(num)
     person   = get_person_by_email(owner)
     schedule = get_schedule_by_name(meeting, person, name)
     if schedule is None:
-        raise Http404("No meeting information for meeting %s owner %s schedule %s available" % (num, owner, name))
+        raise Http404("No agenda information for meeting %s owner %s schedule %s available" % (num, owner, name))
 
-    cansee, canedit, secretariat = schedule_permissions(meeting, schedule, request.user)
+    can_see, can_edit, secretariat = schedule_permissions(meeting, schedule, request.user)
 
-    if not (canedit or has_role(request.user,'Secretariat')):
+    can_edit_properties = can_edit or secretariat
+
+    if not can_edit_properties:
         return HttpResponseForbidden("You may not edit this schedule")
+
+    if request.method == 'POST':
+        form = SchedulePropertiesForm(instance=schedule, data=request.POST)
+        if form.is_valid():
+           form.save()
+           return redirect('ietf.meeting.views.edit_schedule', num=num, owner=owner, name=name)
     else:
-        if request.method == 'POST':
-            form = SchedulePropertiesForm(instance=schedule,data=request.POST)
-            if form.is_valid():
-               form.save()
-               return HttpResponseRedirect(reverse('ietf.meeting.views.list_schedules',kwargs={'num': num}))
-        else:
-            form = SchedulePropertiesForm(instance=schedule)
-        return render(request, "meeting/properties_edit.html",
-                                             {"schedule":schedule,
-                                              "form":form,
-                                              "meeting":meeting,
-                                          })
+        form = SchedulePropertiesForm(instance=schedule)
 
-##############################################################################
-# show list of schedules.
-#
+    return render(request, "meeting/properties_edit.html", {
+        "schedule": schedule,
+        "form": form,
+        "meeting": meeting,
+    })
 
-@role_required('Area Director','Secretariat')
-def list_schedules(request, num=None ):
 
+nat_sort_re = re.compile('([0-9]+)')
+def natural_sort_key(s): # from https://stackoverflow.com/questions/4836710/is-there-a-built-in-function-for-string-natural-sort
+    return [int(text) if text.isdecimal() else text.lower() for text in nat_sort_re.split(s)]
+
+@role_required('Area Director','Secretariat')
+def list_schedules(request, num):
     meeting = get_meeting(num)
-    user = request.user
 
-    schedules = meeting.schedule_set
-    if not has_role(user, 'Secretariat'):
-        schedules = schedules.filter(visible = True) | schedules.filter(owner = user.person)
+    schedules = Schedule.objects.filter(meeting=meeting).prefetch_related('owner').order_by('owner', '-name', '-public').distinct()
+    if not has_role(request.user, 'Secretariat'):
+        schedules = schedules.filter(Q(visible=True) | Q(owner=request.user.person))
+
+    official_schedules = []
+    own_schedules = []
+    other_public_schedules = []
+    other_private_schedules = []
 
-    schedules = schedules.order_by('owner', 'name')
+    is_secretariat = has_role(request.user, 'Secretariat')
 
-    schedules = sorted(list(schedules),key=lambda x:not x.is_official)
+    for s in schedules:
+        s.can_edit_properties = is_secretariat or user_is_person(request.user, s.owner)
 
-    return render(request, "meeting/schedule_list.html",
-                                         {"meeting":   meeting,
-                                          "schedules": schedules,
-                                          })
+        if s.pk == meeting.schedule_id:
+            official_schedules.append(s)
+        elif user_is_person(request.user, s.owner):
+            own_schedules.append(s)
+        elif s.public:
+            other_public_schedules.append(s)
+        else:
+            other_private_schedules.append(s)
+
+    schedule_groups = [
+        ("Official Agenda", official_schedules),
+        ("Own Draft Agendas", own_schedules),
+        ("Other Draft Agendas", other_public_schedules),
+        ("Other Private Draft Agendas", other_private_schedules),
+    ]
+
+    schedule_groups = [(label, sorted(l, reverse=True, key=lambda s: natural_sort_key(s.name))) for label, l in schedule_groups if l]
+
+    return render(request, "meeting/schedule_list.html", {
+        'meeting': meeting,
+        'schedule_groups': schedule_groups,
+    })
 
 @ensure_csrf_cookie
 def agenda(request, num=None, name=None, base=None, ext=None, owner=None, utc=""):
diff --git a/ietf/static/ietf/css/ietf.css b/ietf/static/ietf/css/ietf.css
@@ -1003,6 +1003,14 @@ a.fc-event, .fc-event, .fc-content, .fc-title, .fc-event-container {
   border-top: 1px solid #ddd;
 }
 
+/* === List Meeting Schedules ====================================== */
+
+.table a.edit-schedule-properties {
+  display: inline-block;
+  margin-left: 0.2em;
+}
+
+
 /* === Edit Meeting Schedule ====================================== */
 
 .edit-meeting-schedule .edit-grid {
diff --git a/ietf/templates/meeting/copy_meeting_schedule.html b/ietf/templates/meeting/copy_meeting_schedule.html
@@ -7,14 +7,14 @@
 
 {% block content %}
   {% origin %}
-  <h1>{% block title %}Copy schedule {{ schedule.name }}{% endblock %}</h1>
+  <h1>{% block title %}Copy agenda {{ schedule.name }}{% endblock %}</h1>
 
-  <form class="form-horizontal" method="post">
+  <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
 
     {% buttons %}
-      <button type="submit" class="btn btn-default">Copy schedule</button>
+    <button type="submit" class="btn btn-default">Copy agenda</button>
     {% endbuttons %}
   </form>
 {% endblock %}
diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html
@@ -12,7 +12,7 @@
   {% endfor %}
 {% endblock morecss %}
 
-{% block title %}{{ schedule.name }}: IETF {{ meeting.number }} meeting schedule{% endblock %}
+{% block title %}{{ schedule.name }}: IETF {{ meeting.number }} meeting agenda{% endblock %}
 
 {% block js %}
   <script type='text/javascript'>
@@ -27,14 +27,20 @@
   <div class="edit-meeting-schedule">
 
     <p class="pull-right">
-      <a href="{% url "ietf.meeting.views.copy_meeting_schedule" num=meeting.number owner=schedule.owner_email name=schedule.name %}">Copy schedule</a>
+      {% if can_edit_properties %}
+        <a href="{% url "ietf.meeting.views.edit_schedule_properties" schedule.meeting.number schedule.owner_email schedule.name %}">Edit properties</a>
+        
+        &middot;
+      {% endif %}
+
+      <a href="{% url "ietf.meeting.views.copy_meeting_schedule" num=meeting.number owner=schedule.owner_email name=schedule.name %}">Copy agenda</a>
       &middot;
 
-      <a href="{% url "ietf.meeting.views.list_schedules" num=meeting.number %}">All schedules for meeting</a>
+      <a href="{% url "ietf.meeting.views.list_schedules" num=meeting.number %}">Other Agendas</a>
     </p>
 
     <p>
-      Schedule name: {{ schedule.name }}
+      Agenda name: {{ schedule.name }}
 
       &middot;
 
@@ -43,7 +49,7 @@
       {% if not can_edit %}
         &middot;
 
-        <em>You can't edit this schedule. Take a copy first.</em>
+        <strong><em>You can't edit this schedule. Take a copy first.</em></strong>
       {% endif %}
     </p>
 
diff --git a/ietf/templates/meeting/landscape_edit.html b/ietf/templates/meeting/landscape_edit.html
@@ -367,6 +367,9 @@
   <div class="agenda_save_box">
 
     <div id="agenda_title"><b>Agenda name: </b><span>{{schedule.name}}</span></div>
+    {% if can_edit_properties %}
+      <div><b>Properties</b> <a href="{% url "ietf.meeting.views.edit_schedule_properties" schedule.meeting.number schedule.owner_email schedule.name %}">Edit</a></div>
+    {% endif %}
     <div id="agenda_saveas">
       <form action="{{saveasurl}}" method="post">{% csrf_token %}
         {{ saveas.as_p }}
diff --git a/ietf/templates/meeting/schedule_list.html b/ietf/templates/meeting/schedule_list.html
@@ -1,14 +1,11 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
 {% load ietf_filters %}
 
-{% block title %}IETF {{ meeting.number }} Meeting Agenda List{% endblock %}
-
 {% block content %}
   {% origin %}
-  <h1>IETF {{meeting.number}} Agenda List</h1>
+  <h1>{% block title %}Possible Meeting Agendas for IETF {{ meeting.number }}{% endblock %}</h1>
 
 {% comment %}
   <div> 
@@ -17,29 +14,45 @@ <h1>IETF {{meeting.number}} Agenda List</h1>
 {% endcomment %}
 
   <div>
-  {% regroup schedules by is_official as classed_schedules %}
-    {% for class in classed_schedules %}
+    {% for label, schedules in schedule_groups %}
       <div class="panel panel-default">
-        <div class="panel-heading">{{class.grouper|yesno:"Official,Unofficial"}} Schedule{{class.list|length|pluralize}}</div>
+        <div class="panel-heading">{{ label }}</div>
         <div class="panel-body">
           <table class="table table-condensed table-striped">
             <tr>
-              <th class="col-md-4">Name</th>
-              <th class="col-md-4">Owner</th>
+              <th class="col-md-2">Name</th>
+              <th class="col-md-2">Owner</th>
+              <th class="col-md-5">Notes</th>
               <th class="col-md-1">Visible</th>
               <th class="col-md-1">Public</th>
-              <th class="col-md-1"></th>
             </tr>
-            {% for schedule in class.list %}
+            {% for schedule in schedules %}
             <tr>
-              <td><a href="{% url "ietf.meeting.views.edit_schedule" schedule.meeting.number schedule.owner_email schedule.name %}">
-                    {{ schedule.name }}</a></td>
+              <td>
+                <a href="{% url "ietf.meeting.views.edit_schedule" schedule.meeting.number schedule.owner_email schedule.name %}">{{ schedule.name }}</a>
+                {% if schedule.can_edit_properties %}
+                  <a class="edit-schedule-properties" href="{% url "ietf.meeting.views.edit_schedule_properties" schedule.meeting.number schedule.owner_email schedule.name %}">
+                    <i title="Edit agenda properties" class="fa fa-edit"></i>
+                  </a>
+                {% endif %}
+              </td>
               <td>{{ schedule.owner }}</td>
-              <td>{{ schedule.visible_token }}</td>
-              <td>{{ schedule.public_token }}</td>
-              <td><a class="btn btn-default" href="{% url "ietf.meeting.views.edit_schedule_properties" schedule.meeting.number schedule.owner_email schedule.name %}">
-                  EDIT</a></td>
-          </tr>
+              <td>{{ schedule.notes|linebreaksbr }}</td>
+              <td>
+                {% if schedule.visible %}
+                  <div class="label label-success">visible</div>
+                {% else %}
+                  <div class="label label-danger">hidden</div>
+                {% endif %}
+              </td>
+              <td>
+                {% if schedule.public %}
+                  <div class="label label-success">public</div>
+                {% else %}
+                  <div class="label label-danger">private</div>
+                {% endif %}
+              </td>
+            </tr>
           {% endfor %}
         </table>
       </div>
