topcoder-archive · thabofletcher · Jun 9, 2015 · Jun 1, 2015 · Jun 1, 2015 · Jun 1, 2015
diff --git a/src/css/my-dashboard.css b/src/css/my-dashboard.css
@@ -111,6 +111,11 @@
   background-position: 50% 50%;
   color: #fff;
 }
+@media only screen and (min-width: 768px) {
+  .member-profile-header {
+    padding: 15px 0;
+  }
+}
 
 .member-profile {
 }

diff --git a/src/js/app/challenge-details/index.html b/src/js/app/challenge-details/index.html
@@ -269,7 +269,7 @@ <h2>Reliability Rating and Bonus</h2>
                   <th class="subDateColumn">
                     <div>Submission Date</div>
                   </th>
-                  <th class="successIconColumn">
+                  <th class="successIconColumn" ng-show="!CD.isPeerReviewed">
                     <div>Result</div>
                   </th>
                 </tr>
@@ -290,7 +290,7 @@ <h2>Reliability Rating and Bonus</h2>
                   <td ng-class="CD.challengeType == 'design' ? 'regDateColumnDesign' : 'regDateColumn'" ng-bind="registrant.registrationDate | formatDate:2"></td>
                   <td ng-class="CD.challengeType == 'design' ? 'subDateColumnDesign' : 'subDateColumn'" ng-bind="registrant.submissionDate | formatDate:2"></td>
                   <!--bugfix refactored-challenge-details-68: added missing icons -->
-                  <td class="successIconColumn">
+                  <td class="successIconColumn" ng-show="!CD.isPeerReviewed">
                     <i class="{{registrant.winner ? 'successIcon' : registrant.submissionStatus.match('Failed') ? 'failureIcon' : ''}}"
                        title="{{registrant.winner ? 'Pass' : registrant.submissionStatus.match('Failed') ? 'Fail' : ''}}"></i>
                   </td>

diff --git a/src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html b/src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html
@@ -291,6 +291,12 @@ <h3><small>$</small><span ng-bind="CD.challenge.prize[j]"></span></h3>
                   {{CD.challenge.submissionEndDate | formatDate:2}}
                 </span>
               </p>
+              <p ng-show="CD.inReview && CD.isPeerReviewed">
+                <label>Review By:</label>
+                <span>
+                  {{CD.challenge.currentPhaseEndDate | formatDate:2}}
+                </span>
+              </p>
 
               <p ng-if="CD.challenge.finalFixEndDate" class="{{CD.challenge.finalFixEndDate ? 'last' : ''"><label>Final Submission:</label>
                 <span>

diff --git a/src/js/app/challenge-details/partials/ng-page-challenge-result.tpl.html b/src/js/app/challenge-details/partials/ng-page-challenge-result.tpl.html
@@ -119,7 +119,7 @@ <h2>Round 2 (Final)</h2>
     <!--#/end competitionDetails-->
   </article>
 
-  <article ng-if="!CD.isDesign && CD.submissions.length > 0 && !CD.challenge.reviewType === 'PEER'">
+  <article ng-if="!CD.isDesign && CD.submissions.length > 0 && !(CD.challenge.reviewType === 'PEER')">
     <div ng-if="CD.challenge.challengeType != 'Code' && CD.firstPlaceSubmission" class="winnerRow">
       <div class="place first">1<span>st</span></div>
       <!-- #/end place-->

diff --git a/src/js/app/challenges/services/challengeService.js b/src/js/app/challenges/services/challengeService.js
@@ -186,6 +186,7 @@
             // Add My Challenges Filter and Improve Filters challenge -- different api endpoint
             return UserChallengesService.getUserChallenges(listType === 'user-past' ? 'past' : 'active', params);
           } else {
+            params.review = 'COMMUNITY,INTERNAL';
             return Restangular.one('challenges').getList(listType, params);
           }
         }

diff --git a/src/js/app/my-dashboard/head.html b/src/js/app/my-dashboard/head.html
@@ -1,3 +1,3 @@
-<html lang="en" itemscope itemtype="http://schema.org/Article" ng-app="myDashboard" ng-controller="MyDashboardCtrl as vm">
+<html lang="en" itemscope itemtype="http://schema.org/Article" ng-app="myDashboard" ng-controller="MyDashboardCtrl as db">
 <head>
-  <title ng-bind="vm.title"></title>
+  <title ng-bind="db.title"></title>
diff --git a/src/js/app/my-dashboard/index.html b/src/js/app/my-dashboard/index.html
@@ -1,6 +1,6 @@
 @@header
 
-<div ng-show="vm.loggedIn && vm.user" class="content">
+<div ng-show="db.loggedIn && db.user" class="content">
   <style>
     /* CSS to override bootstrap and existing css conflicts*/
     body {
@@ -32,7 +32,7 @@
   </style>
   <div class="jumbotron my-dashboard-container member-profile-header">
     <div class="container">
-      <div class="welcome-back" ng-include="vm.getTemplateURL('welcome-back.html')">
+      <div class="welcome-back" ng-include="db.getTemplateURL('welcome-back.html')">
     </div>
     </div>
   </div>
@@ -41,21 +41,21 @@
     <div class="clearfix visible-md-block visible-lg-block"></div>
     <div class="row">
       <div class="col-xs-12 col-sm-8 col-sm-push-4 col-md-9 col-md-push-3">
-        <!--<div class="my-dashboard-widget marketing-message" ng-include="vm.getTemplateURL('marketing-message.html')">
+        <!--<div class="my-dashboard-widget marketing-message" ng-include="db.getTemplateURL('marketing-message.html')">
         </div>-->
-        <div class="my-dashboard-widget my-challenges" ng-include="vm.getTemplateURL('my-challenges.html')">
+        <div class="my-dashboard-widget my-challenges" ng-include="db.getTemplateURL('my-challenges.html')" ng-controller="MyChallengesCtrl as vm" ng-show="vm.renderWidget">
         </div>
-        <div class="my-dashboard-widget srm-gadget" ng-include="vm.getTemplateURL('upcaming-srms.html')">
+        <div class="my-dashboard-widget srm-gadget" ng-include="db.getTemplateURL('upcaming-srms.html')">
         </div>
       </div>
       <div class="col-xs-12 col-sm-4 col-sm-pull-8 col-md-3 col-md-pull-9">
-        <div class="my-dashboard-widget member-program" ng-include="vm.getTemplateURL('member-program.html')">
+        <div class="my-dashboard-widget member-program" ng-include="db.getTemplateURL('member-program.html')">
         </div>
-        <div class="my-dashboard-widget helpful-links" ng-include="vm.getTemplateURL('helpful-links.html')">
+        <div class="my-dashboard-widget helpful-links" ng-include="db.getTemplateURL('helpful-links.html')">
         </div>
-        <div class="my-dashboard-widget subscribe-updates" ng-include="vm.getTemplateURL('subscribe-updates.html')">
+        <div class="my-dashboard-widget subscribe-updates" ng-include="db.getTemplateURL('subscribe-updates.html')">
         </div>
-        <div class="my-dashboard-widget blog-post" ng-include="vm.getTemplateURL('blog-feed.html')">
+        <div class="my-dashboard-widget blog-post" ng-include="db.getTemplateURL('blog-feed.html')">
         </div>
       </div>
     </div>

diff --git a/src/js/app/my-dashboard/js/controllers/member-program-controller.js b/src/js/app/my-dashboard/js/controllers/member-program-controller.js
@@ -46,7 +46,7 @@
     vm.registerUser = registerUser;
 
     // parent dashboard controller
-    var db = $scope.$parent.vm;
+    var db = $scope.$parent.db;
 
     // activate controller
     if (AuthService.isLoggedIn === true) {

diff --git a/src/js/app/my-dashboard/js/controllers/my-challenges-controller.js b/src/js/app/my-dashboard/js/controllers/my-challenges-controller.js
@@ -48,6 +48,7 @@
     vm.isCurrentPage = isCurrentPage;
     vm.getCurrentPageClass = getCurrentPageClass;
     vm.sort = sort;
+    vm.renderWidget = false;
 
     // getChallenges controller
     if (AuthService.isLoggedIn === true) {
@@ -71,19 +72,13 @@
       };
       // show loading icon
       vm.loading = true;
-      // remove following if block when API supports paging
-      if (vm.pageIndex > 1) {
-        processChallengesResponse(vm.myChallenges);
-        vm.loading = false;
-        return;
-      }
       // Fetch my active
       return ChallengeService.getMyActiveChallenges(searchRequest)
         .then(function(data) {
           processChallengesResponse(data);
           // stop loading icon
           vm.loading = false;
-
+          vm.renderWidget = vm.myChallenges && vm.myChallenges.length > 0;
       });
     }
 

diff --git a/src/js/app/my-dashboard/js/controllers/welcome-back-controller.js b/src/js/app/my-dashboard/js/controllers/welcome-back-controller.js
@@ -45,7 +45,7 @@
     vm.statsToShow = 2;
 
     // parent dashboard controller
-    var db = $scope.$parent.vm;
+    var db = $scope.$parent.db;
 
     // activate controller
     if (AuthService.isLoggedIn === true) {

diff --git a/src/js/app/my-dashboard/partials/my-challenges.html b/src/js/app/my-dashboard/partials/my-challenges.html
@@ -1,4 +1,4 @@
-<div ng-controller="MyChallengesCtrl as vm" >
+<div>
   <div class="widget-content">
     <div class="challenges-header clearfix">
       <div class="pull-left"><strong>My Challenges</strong></div>