Merged widget_calendar branch to main

widget_princessgabi/widget_calendar/views.py

@@ -5,11 +5,19 @@ from .models import Location, Event
 # Create your views here.
 def index(request):
     events =  Event.objects.all()
+<<<<<<< HEAD
     welcomeMessage = 'Widget\’s Calendar of Activities <br><br>'
     activities = ''
     
     for event in events:
         activities += 'Date and Time: ' + event.target_datetime.strftime('%m/%d/%Y, %I:%M%p') + '<br>'
+=======
+    welcomeMessage = 'Widget\'s Calendar of Activities <br><br>'
+    activities = ''
+    
+    for event in events:
+        activities += 'Date and Time: ' + event.target_datetime.strftime('%m/%d/%Y, %I:%M %p') + '<br>'
+>>>>>>> widget_calendar
         activities += 'Activity: '+ event.activity + '<br>'
         activities += 'Estimated Hours: ' + str(event.estimated_hours) + '<br>'
         activities += 'Course/Section: ' + event.course.code + ' ' + event.course.title + '-' + event.course.section + '<br>'