Merge branch 'dev' into appeals-buttons-in-details

controller.js

Author: birdofpreyru

src/js/app/challenge-details/js/controllers/challenge-details-controller.js

@@ -47,6 +47,10 @@
     challengeType = $location.search().type || 'develop';
 
     var vm = this;
+
+    //Set mockUserRole to array ['value'] to mock a user role, undefined will set userRole value via challenge API
+    //you can test for a user role using checkRole('role') function for true/false value.
+    vm.mockUserRole = undefined;
     // default review style
     vm.reviewStyle = "";
     vm.reviewStyleTooltip = "";
@@ -66,7 +70,7 @@
     vm.activeTab = 'details';
     vm.domain = tcconfig.domain;
     vm.reviewAppURL = tcconfig.reviewAppURL;
-    
+
     if (window.location.hash == '#viewRegistrant' || window.location.hash == '#/viewRegistrant') vm.activeTab = 'registrants';
     else if (window.location.hash == '#winner' || window.location.hash == '#/winner') vm.activeTab = 'results';
     else if (window.location.hash == '#submissions' || window.location.hash == '#/submissions') vm.activeTab = 'submissions';
@@ -82,6 +86,9 @@
     vm.checkpointPassedScreeningSubmissionPercentage = 0;
     vm.phaseProgram = null;
     vm.termsList = [];
+    vm.challengeApiParams = {
+      filter: 'id=' + challengeId
+    }
 
     $interval(function () {
       if (vm.challenge && vm.challenge.currentPhaseRemainingTime) {
@@ -92,7 +99,7 @@
     // Methods
     vm.registerToChallenge = registerToChallenge;
     vm.unregisterFromChallenge = unregisterFromChallenge;
-
+    vm.checkRole = checkRole;
     // functions
     $scope.round = Math.round;
     $scope.range = rangeFunction;
@@ -132,7 +139,16 @@
           initChallengeDetail(handle, vm, ChallengeService);
         }
     );
-
+    /**
+     *
+     * @param checkRole
+     * @returns {true|false}
+     */
+    function checkRole(checkRole) {
+      return _.some(vm.userRole, function(role) {
+        return role === checkRole;
+      })
+    }
     /**
      *
      * @param x
@@ -167,6 +183,18 @@
       ChallengeService.getChallengeTerms(challengeId).then(function(termsList) {
         vm.termsList = termsList;
       });
+      ChallengeService
+          .getUserChallenges(vm.handle, vm.challengeApiParams)
+          .then(function (challenge) {
+            if (challenge[0] && challenge[0].result.content.length) {
+              challenge = challenge[0].result.content[0];
+              vm.userRole = challenge.userDetails ? challenge.userDetails.roles : [];
+            } else {
+              vm.userRole = [];
+            }
+            //Set to test value if defined
+            vm.userRole = vm.mockUserRole ? vm.mockUserRole : vm.userRole;
+          });
       ChallengeService
           .getChallenge(challengeId)
           .then(function (challenge) {
@@ -177,7 +205,6 @@
             }, 100);
             $('#cdNgMain').show();
           });
-
     }
 
     function updateChallengeDetail() {

src/js/app/challenge-details/js/services/challenge-details-services.js

@@ -303,6 +303,10 @@
       return defer.promise;
     };
 
+    service.getUserChallenges = function(handle, params) {
+      return servicev3.one('members', handle.toLowerCase()).all('challenges/').getList(params)
+    }
+
     return service;
   }
 

src/js/app/submission-upload/js/controllers/controller.js

@@ -68,6 +68,10 @@
         vm.viewSubmission = false;
       }
 
+      vm.back = function() {
+        window.location = '/challenge-details/'+challengeId+'/?type='+ challengeType
+      }
+
       function addFont() {
         vm.fonts.push({
           site: '',

src/js/app/submission-upload/partials/base.tpl.html

@@ -1,7 +1,7 @@
 <div class="container" ng-class="{uploading : uCtrl.uploadState === 'uploading'}">
     <span class="competitionType" ng-class="{ develop : uCtrl.challengeType === 'develop' }"></span>
     <!-- /#end competition type-->
-    <a ng-href="/challenge-details/{{uCtrl.challengeId}}/?type={{uCtrl.challengeType}}" class="back" href>Back to Active Challenge</a>
+    <a ng-click="uCtrl.back()" ng-href="/challenge-details/{{uCtrl.challengeId}}/?type={{uCtrl.challengeType}}" class="back" href>Back to Active Challenge</a>
     <h2 class="pageTitle" ng-bind="uCtrl.challenge.challengeName"></h2>
     <!-- /#end page title-->