Merge pull request #45 from reemodo/universityNameFixed

university name fixed

Author: Noor-n204

dist/models/ActivityController.js

@@ -16,6 +16,8 @@ class ActivityController {
           } else if(location != "" && from.is(":checked") ){
             activityType = "fromSchool"
           }
+          const universityName = await this.model.getUserUniversity(USER_ID)
+
             const filterData = {
                 transportationType: $('#transportationTypeFilter').val(),
                 specificGender: $('#genderFilter').is(':checked'),
@@ -24,9 +26,12 @@ class ActivityController {
                 activityType: activityType,
 
             }
+
+            filterData.universityName = universityName
+
             const allActivities = await this.model.getAllActivities(USER_ID, filtered,filterData)
             const activities = allActivities.map(activityData => new Activity(activityData))
-            const modalData = {transportation:["Bus","Car"], university:"Harvard"}
+            const modalData = {transportation:["Bus","Car"], university:universityName}
             this.view.renderPage(activities,modalData)
         } catch (error) {
             console.error('Error filtering or fetching activities:', error)
@@ -62,9 +67,11 @@ class ActivityController {
 
     async showMyActivities() {
         try {
+            const universityName = await this.model.getUserUniversity(USER_ID)
             const myActivities = await this.model.showMyActivities(USER_ID)
             const activities = myActivities.map(activityData => new Activity(activityData))
-            const modalData = {transportation:["Bus","Car"], university:"Harvard"}
+            console.log(universityName)
+            const modalData = {transportation:["Bus","Car"], university:universityName}
             this.view.renderMyPage(activities,modalData)
 
         } catch (error) {

dist/models/ActivityModel.js

@@ -1,8 +1,18 @@
 class ActivityModel {
+
+    async getUserUniversity(userId) {
+        try {
+            return await $.get(`activities/university/${userId}`)
+        } catch (error) {
+            throw error
+        }
+    }
+
     async getAllActivities(userId,filtered, filterData) {
         try {
-            
+            const universityName = await this.getUserUniversity(userId)
           if(filtered){
+            filterData.universityName = universityName
             return await $.get(`/activities/${userId}?${$.param(filterData)}` )
           }
           else {