Merge pull request #523 from appirio-tech/feature/quick-fixes-after-ga-release

Feature/quick fixes after ga release

Author: parthshah

app/my-dashboard/subtrack-stats/subtrack-stats.controller.js

@@ -24,7 +24,7 @@
         // filtering is a separate step to allow multiple pre-processings and filter out in single call
         subtrackRanks = UserStatsService.filterStats(subtrackRanks);
         // sort subtrack ranks
-        subtrackRanks = $filter('orderBy')(subtrackRanks, 'mostRecentEventDate', true);
+        subtrackRanks = $filter('orderBy')(subtrackRanks, 'mostRecentSubmissionDate', true);
 
         vm.subtrackRanks = subtrackRanks;
         vm.hasRanks = !!vm.subtrackRanks.length;

app/profile/about/about.jade

@@ -67,13 +67,13 @@
             )
               .name {{subtrack.subTrack | track}}
 
-              .ranking(ng-if="subtrack.rating")
+              .ranking(ng-if="subtrack.statType == 'Rating'")
                 .number.rating(style="color: {{subtrack.rating | ratingColor}}")
                   | {{subtrack.rating}}
 
                 .tag Rating
 
-              .ranking(ng-if="subtrack.rank && !subtrack.rating")
+              .ranking(ng-if="subtrack.statType == 'Ranking'")
                 .number {{subtrack.rank | ordinal}}
 
                 .tag Ranking

app/profile/subtrack/design/design-statistics.jade

@@ -0,0 +1,33 @@
+.design(ng-if="vm.track == 'DESIGN'")
+
+  .bottom
+    h2.detailed Details
+
+    ul.vertical-stats
+      li.first
+        .left Win Percentage
+        .right {{vm.typeStats.winPercent | percentage | empty}}
+
+      li(ng-if="profileVm.isUser")
+        .left Inquiries
+        .right {{vm.typeStats.numInquiries | empty}}
+
+      li(ng-if="profileVm.isUser")
+        .left Submissions
+        .right {{vm.typeStats.submissions | empty}}
+
+      li
+        .left Submission Rate
+        .right {{vm.typeStats.submissionRate | percentage | empty}}
+
+      li.first(ng-if="profileVm.isUser")
+        .left Passed Screening
+        .right {{vm.typeStats.passedScreening | empty}}
+
+      li
+        .left Screening Success Rate
+        .right {{vm.typeStats.screeningSuccessRate | percentage | empty}}
+
+      li
+        .left Average Placement
+        .right {{vm.typeStats.avgPlacement | number: 2 | empty}}

app/profile/subtrack/subtrack.controller.js

@@ -27,10 +27,7 @@
 
     vm.pageName = vm.subTrack.toLowerCase().replace(/_/g, ' ');
 
-    vm.tabs = [];
-    if (vm.track !== 'DESIGN') {
-      vm.tabs.push('statistics');
-    }
+    vm.tabs = ['statistics'];
 
     if (vm.track !== 'COPILOT') {
       vm.tabs.push( vm.subTrack === 'SRM' ? 'Past srm': 'challenges');

app/profile/subtrack/subtrack.jade

@@ -20,11 +20,10 @@
                 p.label {{item.label}}
 
         include ./develop/develop-statistics.jade
-        //- yes, challenges :( this is confusing and needs refactoring
-        include ./design/design-challenges.jade
+        include ./design/design-statistics.jade
         include ./data/data-statistics.jade
 
-      tc-tab(heading="{{vm.tabs[1]}}", ng-if="vm.track === 'DATA_SCIENCE' || vm.track === 'DEVELOP'")
+      tc-tab(heading="{{vm.tabs[1]}}")
         .subtrack-stats
           responsive-carousel(data="vm.subTrackStats", handle="{{vm.handle}}")
             .carousel-elem
@@ -37,5 +36,6 @@
                 p.value(ng-hide="item.label === 'rating'") {{item.val | empty}}
 
                 p.label {{item.label}}
-        include ./develop/develop-challenges.jade        
+        include ./develop/develop-challenges.jade    
+        include ./design/design-challenges.jade    
         include ./data/data-challenges.jade

app/services/profile.service.js

@@ -108,7 +108,8 @@
             'rating': subTrack.rank.rating || 0,
             'wins': subTrack.wins,
             'submissions': (subTrack.submissions && subTrack.submissions.submissions) || 0,
-            'mostRecentEventDate': new Date(subTrack.mostRecentEventDate)
+            'mostRecentEventDate': new Date(subTrack.mostRecentEventDate),
+            'mostRecentSubmissionDate': new Date(subTrack.mostRecentSubmission)
           };
         }).filter(function(subTrack) {
           return !(subTrack.subTrack == 'COPILOT_POSTING' && subTrack.track == 'DEVELOP');
@@ -124,7 +125,8 @@
             'challenges': subTrack.challenges,
             'wins': subTrack.wins,
             'submissions': (subTrack.submissions) || 0,
-            'mostRecentEventDate': new Date(subTrack.mostRecentEventDate)
+            'mostRecentEventDate': new Date(subTrack.mostRecentEventDate),
+            'mostRecentSubmissionDate': new Date(subTrack.mostRecentSubmission)
           };
         });
       }
@@ -135,7 +137,8 @@
           'subTrack': 'SRM',
           'rank': srmStats.rank.rank,
           'rating': srmStats.rank.rating,
-          'mostRecentEventDate': new Date(srmStats.rank.mostRecentEventDate)
+          'mostRecentEventDate': new Date(srmStats.rank.mostRecentEventDate),
+          'mostRecentSubmissionDate': new Date(srmStats.mostRecentSubmission)
         });
       }
       if (stats.DATA_SCIENCE && stats.DATA_SCIENCE.MARATHON_MATCH && stats.DATA_SCIENCE.MARATHON_MATCH.rank) {
@@ -145,7 +148,8 @@
           'subTrack': 'MARATHON_MATCH',
           'rank': marathonStats.rank.rank,
           'rating': marathonStats.rank.rating,
-          'mostRecentEventDate': new Date(marathonStats.rank.mostRecentEventDate)
+          'mostRecentEventDate': new Date(marathonStats.rank.mostRecentEventDate),
+          'mostRecentSubmissionDate': new Date(marathonStats.mostRecentSubmission)
         });
       }
       if (stats.COPILOT) {

assets/css/profile/subtrack.scss

@@ -527,6 +527,13 @@
       }
 
     }
+
+    .design {
+      // override height of the statistics section for design track as we don't have limited stats for design
+      ul.vertical-stats {
+        height: 200px;
+      }
+    }
   }
   }
   .categoryNav {