topcoder-archive · vikasrohit · Dec 29, 2015 · Dec 16, 2015 · Dec 17, 2015 · Dec 17, 2015
diff --git a/.version b/.version
@@ -1 +1 @@
-v1.0.17
+v1.0.18
diff --git a/app/community/members.jade b/app/community/members.jade
@@ -28,8 +28,9 @@
           small {{ctrl.currentMonth}}
         .members-wrapper
           .user-tile(ng-repeat="item in ctrl.memberLeaderboard")
-            .avatar-wrapper: img(ng-src="{{item.avatar}}")
-            .user-name {{item.name}}
+            a.avatar-wrapper(ui-sref="profile.about({userHandle: item.name})")
+              img(ng-src="{{item.avatar}}")
+            a.user-name(ui-sref="profile.about({userHandle: item.name})") {{item.name}}
             .user-tag(class="{{item.class}}") {{item.contestType}}
             p.user-desc {{item.description}}
             a(ng-href="//www.{{ctrl.domain}}/community/member-programs/topcoder-member-of-the-month/", target="_blank").user-more Read the story

diff --git a/app/directives/challenge-user-place/challenge-user-place.directive.js b/app/directives/challenge-user-place/challenge-user-place.directive.js
@@ -59,7 +59,9 @@
             $scope.imageURL = $scope.challenge.userDetails.submissions[0].submissionImage && $scope.challenge.userDetails.submissions[0].submissionImage.full;
             $scope.selectedImage = $scope.imageURL;
 
-            $scope.challenge.highestPlacement = _.max($scope.challenge.userDetails.submissions, 'placement').placement;
+            $scope.challenge.highestPlacement = _.min($scope.challenge.userDetails.submissions.filter(function(submission) {
+              return submission.type === CONSTANTS.SUBMISSION_TYPE_CONTEST && submission.placement;
+            }), 'placement').placement;
 
             if ($scope.challenge.highestPlacement == 1) {
               $scope.challenge.wonFirst = true;

diff --git a/app/directives/external-account/external-web-links.directive.js b/app/directives/external-account/external-web-links.directive.js
@@ -38,6 +38,9 @@
             $log.debug("Web link added: " + JSON.stringify(data));
             data.data.provider = data.provider;
             $scope.linkedAccounts.push(data.data);
+            // reset the form when it is successfully added
+            $scope.addWebLinkFrm.$setPristine();
+            $scope.url = null;
             toaster.pop('success', "Success", "Your link has been added. Data from your link will be visible on your profile shortly.");
           })
           .catch(function(resp) {

diff --git a/app/directives/external-account/external-web-links.directive.spec.js b/app/directives/external-account/external-web-links.directive.spec.js
@@ -90,24 +90,29 @@ describe('ExternalWebLinks Directive', function() {
       });
       expect(topcoderLink).to.exist;
       expect(topcoderLink.status).to.exist.to.equal('PENDING');
+      expect(element.isolateScope().url).not.to.exist;
       expect(toasterSvc.pop).to.have.been.calledWith('success').calledOnce;
     });
 
     it('should NOT add new weblink to linkedAccounts', function() {
+      var urlToAdd = 'https://www.topcoder.com';
       element.isolateScope().userHandle = 'throwError';
-      element.isolateScope().url = 'https://www.topcoder.com';
+      element.isolateScope().url = urlToAdd;
       element.isolateScope().addWebLink();
       scope.$digest();
       expect(scope.linkedAccounts).to.have.length(1);
+      expect(element.isolateScope().url).to.exist.to.equal(urlToAdd);
       expect(toasterSvc.pop).to.have.been.calledWith('error').calledOnce;
     });
 
     it('should NOT add new weblink to linkedAccounts', function() {
+      var urlToAdd = 'https://www.topcoder.com';
       element.isolateScope().userHandle = 'alreadyExistsError';
-      element.isolateScope().url = 'https://www.topcoder.com';
+      element.isolateScope().url = urlToAdd;
       element.isolateScope().addWebLink();
       scope.$digest();
       expect(scope.linkedAccounts).to.have.length(1);
+      expect(element.isolateScope().url).to.exist.to.equal(urlToAdd);
       expect(toasterSvc.pop).to.have.been.calledWith('error').calledOnce;
     });
 

diff --git a/app/directives/srm-tile/srm-tile.directive.jade b/app/directives/srm-tile/srm-tile.directive.jade
@@ -3,7 +3,7 @@
     .challenge-track
 
     header
-      a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
+      a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{roundId}}") {{srm.name}}
 
     .srm-details
       p.starts-in Starts in #[span {{srm.codingStartAt | timeDiff:"quantity"}} {{srm.codingStartAt | timeDiff:'unit'}}]
@@ -17,22 +17,22 @@
     .phase-status
       .registered(ng-show="srm.userStatus === CONSTANTS.REGISTERED") Registered
       .unregistered(ng-hide="srm.currentPhase !== CONSTANTS.REGISTRATION || srm.userStatus === CONSTANTS.REGISTERED")
-        a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") Register
+        a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{roundId}}") Register
 
   .past-srm(ng-show="srm.status === 'PAST'")
     .challenge-track
 
     header
-      a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
+      a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{roundId}}") {{srm.name}}
       .ended-on #[span {{srm.codingEndAt | localTime:"MMM DD, YYYY" }}]
 
     .member-stats
       p.points #[span {{srm.result.finalPoints }}] #[span Points]
       .ranks
-        .division
+        a.division(href="https://community.{{DOMAIN}}/stat?c=round_stats&rd={{roundId}}&dn={{division}}")
           p.rank {{srm.result.divisionPlacement}}
           p.label  #[span Division {{srm.result.division}}]
-        .room
+        a.room(href="https://community.{{DOMAIN}}/stat?c=coder_room_stats&cr={{userId}}&rd={{roundId}}")
           p.rank #[span {{srm.result.roomPlacement}}]
           p.label #[span Room] 
       p.placement Placement
@@ -42,21 +42,21 @@
     .challenge-track
     header
       .srm-name
-        a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
+        a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{roundId}}") {{srm.name}}
 
     .srm-details
       p.starts-in Starts in #[span {{srm.codingStartAt | timeDiff:"quantity"}} {{srm.codingStartAt | timeDiff:'unit'}}]
 
     .phase-status
       .registered(ng-show="srm.userStatus === CONSTANTS.REGISTERED") Registered
       .unregistered(ng-hide="srm.currentPhase !== CONSTANTS.REGISTRATION || srm.userStatus === CONSTANTS.REGISTERED")
-        a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") Register
+        a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{roundId}}") Register
 
   .past-srm(ng-show="srm.status === 'PAST'")
     .challenge-track
     header
       .srm-name
-        a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
+        a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{roundId}}") {{srm.name}}
 
     .srm-details
       p.ended-on Ended {{srm.codingEndAt | timeDiff:"quantity"}} {{srm.codingEndAt | timeDiff:'unit'}} ago
@@ -65,10 +65,10 @@
       p.points #[span {{srm.result.finalPoints }}] Points
 
       .ranks
-        .division
+        a.division(ng-class="{noclick: !srm.result.divisionPlacement}", href="https://community.{{DOMAIN}}/stat?c=round_stats&rd={{roundId}}&dn={{division}}")
           p.rank {{srm.result.divisionPlacement}}
           p.label #[span Div {{srm.result.division}}] #[span Placement]
-        .room
+        a.room(ng-class="{noclick: !srm.result.roomPlacement}", href="https://community.{{DOMAIN}}/stat?c=coder_room_stats&cr={{userId}}&rd={{roundId}}")
           p.rank #[span {{srm.result.roomPlacement}}]
           p.label #[span Room] #[span Placement]
 

diff --git a/app/directives/srm-tile/srm-tile.directive.js b/app/directives/srm-tile/srm-tile.directive.js
@@ -8,14 +8,17 @@
         srm: '=srm',
         view: '=',
         showResults: '=',
-        showFooter: '='
+        showFooter: '=',
+        userId: '='
       },
       controller: ['$scope', '$filter', 'CONSTANTS', 'SRMService',
         function($scope, $filter, CONSTANTS, SRMService) {
-        $scope.DOMAIN = CONSTANTS.domain;
-        $scope.CONSTANTS = CONSTANTS;
-        $scope.srm.userStatus = _.get($scope.srm, 'userStatus', null);
-        SRMService.processSRM($scope.srm);
+          $scope.DOMAIN = CONSTANTS.domain;
+          $scope.CONSTANTS = CONSTANTS;
+          $scope.srm.userStatus = _.get($scope.srm, 'userStatus', null);
+          SRMService.processSRM($scope.srm);
+          $scope.roundId = $scope.srm.rounds.length && $scope.srm.rounds[0].id;
+          $scope.division = $scope.srm.result && $scope.srm.result.division;
       }]
     };
   });

diff --git a/app/my-dashboard/srms/srms.controller.js b/app/my-dashboard/srms/srms.controller.js
@@ -12,6 +12,7 @@
 
     var userId = UserService.getUserIdentity().userId;
     var handle = UserService.getUserIdentity().handle;
+    vm.userId = userId;
 
     activate();
 

diff --git a/app/my-dashboard/srms/srms.jade b/app/my-dashboard/srms/srms.jade
@@ -6,7 +6,7 @@ header
 
 tc-section(state="vm.state")
   .srm-tiles
-    srm-tile(ng-repeat="srm in vm.srms", srm="srm", view="'tile'", ng-class="'tile-view'")
+    srm-tile(ng-repeat="srm in vm.srms", srm="srm", view="'tile'", ng-class="'tile-view'", user-id="vm.userId")
 
     .srm-links-card
       .flex-wrapper

diff --git a/app/my-srms/my-srms.controller.js b/app/my-srms/my-srms.controller.js
@@ -28,6 +28,7 @@
 
     var userId = UserService.getUserIdentity().userId;
     var userHandle = UserService.getUserIdentity().handle;
+    vm.userId = userId;
     vm.handle = userHandle;
 
     activate();

diff --git a/app/my-srms/my-srms.jade b/app/my-srms/my-srms.jade
@@ -23,6 +23,6 @@
         .data(ng-class="vm.view + '-view'")
           srm-tile.srm-tile(
             ng-repeat="srm in vm.srms | orderBy:vm.orderBy:vm.reverseOrder", 
-            srm="srm", view="vm.view", ng-class="vm.view + '-view'", show-results="vm.statusFilter === 'past'")
+            srm="srm", view="vm.view", ng-class="vm.view + '-view'", show-results="vm.statusFilter === 'past'", user-id="vm.userId")
 
         tc-endless-paginator(state="vm.loading", page-params="vm.pageParams")
diff --git a/app/profile/subtrack/data/data-challenges.jade b/app/profile/subtrack/data/data-challenges.jade
@@ -10,7 +10,7 @@
 
     .challenges(ng-show="vm.subTrack == 'SRM'")
       .challenge.tile(ng-repeat="challenge in vm.challenges")
-        srm-tile(srm="challenge", domain="vm.domain", view="'tile'")
+        srm-tile(srm="challenge", domain="vm.domain", view="'tile'", user-id="profileVm.profile.userId")
 
       .no-challenges(ng-show="!vm.challenges || vm.challenges.length == 0")
         | Sorry, no rated SRMs found.

diff --git a/app/services/challenge.service.js b/app/services/challenge.service.js
@@ -190,7 +190,7 @@
             challenge.thumbnailId = challenge.userDetails.submissions[0].id;
 
             challenge.highestPlacement = _.min(challenge.userDetails.submissions.filter(function(submission) {
-              return submission.placement;
+              return submission.type === CONSTANTS.SUBMISSION_TYPE_CONTEST && submission.placement;
             }), 'placement').placement;
 
             if (challenge.highestPlacement == 1) {