End date and time added to forms and displayed

anitab-org · Dec 15, 2018 · b6cf5f2 · b6cf5f2
1 parent 79a4270
commit b6cf5f2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/systers_portal/meetup/forms.py b/systers_portal/meetup/forms.py
@@ -91,9 +91,11 @@ class AddMeetupForm(ModelFormWithHelper):
     """
     class Meta:
         model = Meetup
-        fields = ('title', 'slug', 'date', 'time', 'venue', 'description')
+        fields = ('title', 'slug', 'date', 'end_date', 'time', 'end_time', 'venue', 'description')
         widgets = {'date': forms.DateInput(attrs={'type': 'text', 'class': 'datepicker'}),
-                   'time': forms.TimeInput(attrs={'type': 'text', 'class': 'timepicker'})}
+                   'end_date': forms.DateInput(attrs={'type': 'text', 'class': 'datepicker'}),
+                   'time': forms.TimeInput(attrs={'type': 'text', 'class': 'timepicker'}),
+                   'end_time': forms.TimeInput(attrs={'type': 'text', 'class': 'timepicker'})}
         helper_class = SubmitCancelFormHelper
         helper_cancel_href = "{% url 'about_meetup_location' meetup_location.slug %}"
 

diff --git a/systers_portal/meetup/models.py b/systers_portal/meetup/models.py
@@ -92,9 +92,9 @@ class Meetup(models.Model):
     title = models.CharField(max_length=50, verbose_name="Title",)
     slug = models.SlugField(max_length=50, unique=True, verbose_name="Slug")
     date = models.DateField(verbose_name="Date")
-    end_date = models.DateField(verbose_name="End Date", null=True)
-    time = models.TimeField(verbose_name="Time", blank=True)
-    end_time = models.TimeField(verbose_name="End Time", null=True)
+    end_date = models.DateField(verbose_name="End Date", blank=True)
+    time = models.TimeField(verbose_name="Time")
+    end_time = models.TimeField(verbose_name="End Time", blank=True)
     venue = models.CharField(max_length=512, verbose_name="Venue", blank=True)
     description = models.TextField(verbose_name="Description")
     meetup_location = models.ForeignKey(MeetupLocation, verbose_name="Meetup Location")

diff --git a/systers_portal/templates/meetup/meetup.html b/systers_portal/templates/meetup/meetup.html
@@ -3,10 +3,16 @@
 {% block meetup_location_page_content %}
   <h2 id="meetup-title">{{ meetup.title }}</h2>
   <div class="box-container box-body pt25">
-    <p> 
+    <p>
       <b> Date: </b> {{ meetup.date }}
-      &nbsp; &nbsp; 
+      {% if meetup.end_date %}
+      <b> EndDate: </b> {{ meetup.end_date }}
+      {% endif %}
+      &nbsp; &nbsp;
       <b>Time: </b> {{ meetup.time|time:"H:i" }}
+      {% if meetup.end_time %}
+      <b>Time: </b> {{ meetup.end_time|time:"H:i" }}
+      {% endif %}
     </p>
     <p>
       <b> Venue: </b> {{ meetup.venue }}
@@ -27,7 +33,7 @@ <h2 id="meetup-title">{{ meetup.title }}</h2>
           <td>{{ not_coming_no }}</td>
         </tr>
       </tbody>
-    </table> 
+    </table>
     <hr>
     {% include 'meetup/snippets/share_buttons.html' %}
     <p>