Merge branch 'dev' into add-raymond-logo

Author: mmcinnestaylor

src/contestadmin/templates/contestadmin/statistics_dashboard.html

@@ -151,7 +151,7 @@ <h1 class="text-center">Contest Statistics</h1>
 										<tr>
 											<td>{{ course.code }}</td>
 											<td>{{ course.name }}</td>
-											<td>{{ course.instructor.last_name }}</td>
+											<td>{{ course.instructor.get_first_initial }}. {{ course.instructor.last_name }}</td>
 											<td class="text-center">{{ course.num_registered }}</td>
 										</tr>
 										{% endfor %}

src/core/templates/core/index.html

@@ -296,7 +296,7 @@ <h5>Faculty Division</h5>
         <div class="card-body">
           {% for course in courses|slice:"5" %}
             <p class="card-text mb-1">
-              <span class="font-weight-bold">{{ course.code }} </span><i>{{ course.name }}</i> - {{course.instructor.last_name }}
+              <span class="font-weight-bold">{{ course.code }} </span><i>{{ course.name }}</i> - {{ course.instructor.get_first_initial }}. {{ course.instructor.last_name }}
             </p>
           {% empty %}
             <p class="card-text">No courses have been confirmed at this time.</p>
@@ -361,7 +361,7 @@ <h6 class="modal-title" id="displayCoursesModalLongTitle">Extra Credit Courses</
             <div class="col-lg-10">
               <ul class="list-group list-group-flush">
               {% for course in courses %}
-              <li class="list-group-item"><span class="font-weight-bold">{{ course.code }} </span><i>{{ course.name }}</i> - {{ course.instructor.last_name }}</li>
+              <li class="list-group-item"><span class="font-weight-bold">{{ course.code }} </span><i>{{ course.name }}</i> -  {{ course.instructor.get_first_initial }}. {{ course.instructor.last_name }}</li>
               {% empty %}
               <li class="list-group-item">No courses have been confirmed at this time.</li>
               {% endfor %}

src/manager/models.py

@@ -21,9 +21,12 @@ class Faculty(models.Model):
     email = models.EmailField(max_length=50, primary_key=True)
     first_name = models.CharField(max_length=50)
     last_name = models.CharField(max_length=50)
-        
+
     def __str__(self):
         return (str(self.first_name) + ' ' + str(self.last_name))
+    
+    def get_first_initial(self):
+        return(self.first_name[0])
 
 
 class Course(models.Model):
@@ -45,7 +48,7 @@ class Meta:
         ordering = ['code']
 
     def __str__(self):
-        return (str(self.code) + ' : ' + str(self.name) + ' - ' + str(self.instructor.last_name) + ', ' + str(self.instructor.first_name)[0])
+        return (str(self.code) + ' : ' + str(self.name) + ' - ' + str(self.instructor.last_name) + ', ' + str(self.instructor.get_first_initial()))
 
     def num_checkedin(self):
         """

src/manager/templates/manager/dashboard.html

@@ -106,7 +106,7 @@ <h4 class="card-title mb-0">{{ announcement.title }}</h4>
 							<tr>
 								<td><small class="font-weight-bold">{{ course.code }}</small></td>
 								<td><small><i>{{ course.name }}</i></small></td>
-								<td><small>{{ course.instructor.last_name }}</small></td>
+								<td><small>{{ course.instructor.get_first_initial }}. {{ course.instructor.last_name }}</small></td>
 							</tr>
 							{% endfor %}
 						</tbody>