Merge branch 'release' into 'master'

[MR] From release into master See merge request s03-final/s03p31a303!286 Former-commit-id: fc9253ab87bf0599bfec9bc3b7995281f50ded81 [formerly ffbd6bc9ed77d1a51f6a360333ef2e94324a4970] [formerly e09360c3d4319a25ae202fdfadb2a842571673f8 [formerly ba1e7dbe938ff34e9e1394df94eedd6862d2ad06]] Former-commit-id: c0c58eb3d9328b1fba4621f59331f077560373c6 [formerly 9dbe1a7b72c8b6b32d72d9d0cd4fd60309b1d98a] Former-commit-id: 09aa98279207c09488c317c4dd8cace004444317
soo-ni · Nov 26, 2020 · 7bc9bf2 · 7bc9bf2
2 parents f9e638b + 631b1d1
commit 7bc9bf2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/backend/RunWithMe/gradle/wrapper/.gitattributes b/backend/RunWithMe/gradle/wrapper/.gitattributes
diff --git a/backend/RunWithMe/gradle/wrapper/gradle-wrapper.jar b/backend/RunWithMe/gradle/wrapper/gradle-wrapper.jar
diff --git a/doc/UCC/.gitattributes b/doc/UCC/.gitattributes
diff --git a/doc/UCC/RWM_Real_Final_83Mb_Best.mp4 b/doc/UCC/RWM_Real_Final_83Mb_Best.mp4
diff --git a/frontend/RunWithMe/src/views/app/dashboards/main.vue b/frontend/RunWithMe/src/views/app/dashboards/main.vue
@@ -416,7 +416,7 @@ export default {
                 obj.runningId = data.data.runnings[i].runningId;
                 obj.total_distance = data.data.runnings[i].accDistance.toFixed(2);
                 obj.accumulcated_time = data.data.runnings[i].accTime;
-                obj.running_avg_pace = data.data.runnings[i].accTime / data.data.runnings[i].accDistance;
+                obj.running_avg_pace = (data.data.runnings[i].accDistance<0.01 || data.data.runnings[i].accTime<1)? 0: (data.data.runnings[i].accDistance*1000) / data.data.runnings[i].accTime;
                 obj.mapImg = data.data.runnings[i].thumbnail;
               }
               obj.userId = data.data.friends[i].userId;
@@ -431,6 +431,7 @@ export default {
             if(this.friendsFeed.length == 0)
               this.haveFriends = false;
           }
+          this.friendsFeed.reverse();
         })
         .catch((error) => {
           console.log(error);

diff --git a/frontend/RunWithMe/src/views/app/runnings/friendsDetail.vue b/frontend/RunWithMe/src/views/app/runnings/friendsDetail.vue
@@ -162,10 +162,10 @@ export default {
       return runningTime;
     },
     convertToTime(origin) {
-      var time = "";
-      time += parseInt(origin / 60) + "'";
-      time += (origin % 60) + '"';
-      return time;
+        var time = "";
+        time += parseInt(origin/60) + "\'";
+        time += (origin%60).toFixed() + "\"";
+        return time;
     },
     isFollower() {
       // //console.log(this.friendInfo.userId);
@@ -201,7 +201,7 @@ export default {
                 obj.running_avg_pace = 0;
               } else {
                 obj.running_avg_pace = (
-                  element.accDistance / element.accTime
+                  (element.accDistance*1000) / element.accTime
                 ).toFixed(2);
               }
               obj.acc_time_min = parseInt(obj.accumulcated_time / 60);
@@ -213,7 +213,7 @@ export default {
               this.items.push(obj);
             });
           }
-          // //console.log(this.items);
+          console.log(this.items);
           if (this.items.length == 0) {
             this.isRunning = false;
           }