Changed faculty and course labels and made the course name to also show the course number

app/logic/serviceLearningCourses.py

@@ -20,6 +20,7 @@
 from app.logic.createLogs import createAdminLog
 from app.logic.fileHandler import FileHandler
 from app.logic.term import addPastTerm
+from app.models.courseNameAndNumber import nameNumCombo
 
 def getSLProposalInfoForUser(user: User) -> Dict[int, Dict[str, Any]]:
     """
@@ -43,7 +44,7 @@ def getSLProposalInfoForUser(user: User) -> Dict[int, Dict[str, Any]]:
 
         courseDict[course.id] = {"id":course.id,
                                  "creator":f"{course.createdBy.firstName} {course.createdBy.lastName}",
-                                 "name":course.courseName if course.courseName else course.courseAbbreviation,
+                                 "coursename": nameNumCombo(course.courseName, course.courseAbbreviation),                               
                                  "faculty": faculty,
                                  "term": course.term,
                                  "status": course.status.status}

app/models/courseNameAndNumber.py

@@ -0,0 +1,17 @@
+from app.models import * 
+
+def nameNumCombo(name, abbreviation):
+        '''
+        This function combines course name and numbers with conditions
+        inputs: course name, course abbreviation
+        '''
+        if name and abbreviation:
+            return f"{abbreviation} - {name}"
+        elif not name and not abbreviation:
+            return ''
+        elif not name:
+            return abbreviation
+        elif not abbreviation:
+            return name
+
+

app/templates/serviceLearning/slcManagement.html

@@ -29,7 +29,7 @@ <h1 class="text-center mb-2">{{user.firstName}} {{user.lastName}}'s SLC Proposal
     <tbody>
       {% for course in courseDict %}
         <tr>
-          <td id="name-{{courseDict[course]['id']}}">{{courseDict[course]['name']}}</td>
+          <td id="name-{{ courseDict[course]['id'] }}">{{courseDict[course]['coursename']}}</td>
           <td id="creator-{{courseDict[course]['id']}}">{{courseDict[course]['creator']}}</td>
           <td id="faculty-{{courseDict[course]['id']}}">{{courseDict[course]['faculty']|join(", ")}}</td>
           <td id="term-{{courseDict[course]['id']}}">{{courseDict[course]['term'].description}}</td>

tests/code/test_serviceLearningCourses.py

@@ -11,6 +11,7 @@
 from app.models.courseParticipant import CourseParticipant
 
 from app.logic.serviceLearningCourses import *
+from app.models.courseNameAndNumber import nameNumCombo
 
 @pytest.mark.integration
 def test_getServiceLearningCoursesData():
@@ -23,6 +24,7 @@ def test_getServiceLearningCoursesData():
     assert 'Spring 2021' in courseDict[2]['term'].description
     assert "Scott Heggen"  == courseDict[2]['creator']
 
+
     courseDict = getSLProposalInfoForUser('heggens')
     assert 3 in courseDict
     assert 'Scott Heggen' in courseDict[3]['faculty']
@@ -31,6 +33,7 @@ def test_getServiceLearningCoursesData():
     assert 'Summer 2021' in courseDict[3]['term'].description
     assert "Brian Ramsay"  == courseDict[3]['creator']
 
+
     courseDict = getSLProposalInfoForUser('heggens')
     assert 4 in courseDict
     assert 'Scott Heggen' not in courseDict[4]['faculty']
@@ -39,6 +42,20 @@ def test_getServiceLearningCoursesData():
     assert 'Spring 2021' in courseDict[4]['term'].description
     assert "Scott Heggen"  == courseDict[4]['creator']
 
+
+
+@pytest.mark.integration
+def test_courseNameandNumber():
+    '''tests for the successful implementation of combining course name and number to proper format'''
+
+    assert 'Databases' == nameNumCombo("Databases", '')
+    assert 'Databases' == nameNumCombo("Databases", "")
+    assert 'FRN 103 - Frenchy Help' == nameNumCombo("Frenchy Help", 'FRN 103')
+    assert 'FRN 103' == nameNumCombo("", 'FRN 103')
+    assert '' == nameNumCombo("", '')
+
+
+
 @pytest.mark.integration
 def test_getInstructorCourses():
     """