Merge pull request #446 from appirio-tech/tom-dereg-1

Unregister button

Author: ajefts

src/css/challenge-detail-software.css

@@ -733,6 +733,14 @@ h1.center {
     display: block;
 }
 
+.challenge-detail .unregister {
+    background: #e66 !important;
+}
+
+.challenge-detail .unregister:hover {
+    background: #d66 !important;
+}
+
 .challenge-detail .btnAction:hover {
     background: #0096ff !important;
 }
@@ -750,6 +758,14 @@ h1.center {
     background: #46b314 !important;
 }
 
+.challenge-detail.develop .unregister {
+    background: #e66 !important;
+}
+
+.challenge-detail.develop .unregister:hover {
+    background: #d66 !important;
+}
+
 .challenge-detail .btnAction.disabled {
     pointer-events: none;
     background: #cccccc !important;
@@ -2878,4 +2894,4 @@ h1.center {
     padding: 0 10px 0 0;
     box-sizing: border-box; }
   .cd-wrapper .challenge-detail .rightSplit {
-    float: left; }
+    float: left; }

src/css/register-login.css

@@ -571,60 +571,51 @@ Thanks modal
     padding-bottom: 60px;
 }
 
-/*registerSuccess modal*/
-#registerSuccess{
+/*registerFailed, registerSuccess and unregisterSuccess modals*/
+#registerFailed,
+#registerSuccess,
+#unregisterSuccess{
     width: 534px;
 }
-#registerSuccess .btnClose{
+#registerFailed .btnClose,
+#registerSuccess .btnClose,
+#unregisterSuccess .btnClose{
     right: 20px;
 }
-#registerSuccess .content{
+#registerFailed    .content,
+#registerSuccess   .content,
+#unregisterSuccess .content{
     padding: 10px 20px 20px;
 }
-#registerSuccess .content h2{
+#registerFailed    .content h2,
+#registerSuccess   .content h2,
+#unregisterSuccess .content h2{
     font-size: 36px;
 }
-#registerSuccess .content p.success{
+#registerSuccess   .content p.success,
+#unregisterSuccess .content p.success {
     padding: 32px 30px 32px 80px;
     font-size: 14px;
     color: #666;
     line-height: 24px;
     background: url("../i/success-icon.png") no-repeat 0 34px;
 }
-#registerSuccess .content p.submitBtn{
-    border-top: 1px solid #e7e7e7;
-    padding-top: 20px;
-    text-align: center;
-}
-#registerSuccess .content p.submitBtn .btn{
-    width: 60px
-}
-
-/*registerFailed modal*/
-#registerFailed{
-    width: 534px;
-}
-#registerFailed .btnClose{
-    right: 20px;
-}
-#registerFailed .content{
-    padding: 10px 20px 20px;
-}
-#registerFailed .content h2{
-    font-size: 36px;
-}
 #registerFailed .content p.failedMessage{
     padding: 32px 30px 32px 80px;
     font-size: 14px;
     color: #666;
     line-height: 24px;
 }
-#registerFailed .content p.submitBtn{
+#registerFailed    .content p.submitBtn,
+#registerSuccess   .content p.submitBtn,
+#unregisterSuccess .content p.submitBtn{
     border-top: 1px solid #e7e7e7;
     padding-top: 20px;
     text-align: center;
 }
-#registerFailed .content p.submitBtn .btn{
+#registerFailed    .content p.submitBtn .btn,
+#registerSuccess   .content p.submitBtn .btn,
+#unregisterSuccess .content p.submitBtn .btn{
     width: 60px
 }
 

src/footer.html

@@ -55,6 +55,16 @@ <h2>Registered!</h2>
     </p>
   </div>
 </div><!-- END #registerSuccess -->
+<div id="unregisterSuccess" class="modal">
+  <a href="javascript:;" class="btnClose closeModal"></a>
+  <div class="content">
+    <h2>Unregistered!</h2>
+    <p class="success">You have unregistered from this challenge.</p>
+    <p class="submitBtn">
+      <a class="btn closeModalReg" href="javascript:;">OK</a>
+    </p>
+  </div>
+</div><!-- END #unregisterSuccess -->
 <div id="registerFailed" class="modal">
   <a href="javascript:;" class="btnClose closeModal"></a>
   <div class="content">

src/js/app/challenge-details/index.html

@@ -11,15 +11,27 @@
         <div class="container rightSplit  grid-3-3">
 
           <div class="leftColumn">
-            <a ng-show="!CD.isDesign" ng-click="CD.registerToChallenge()" ng-class="{disabled:CD.challenge.registrationDisabled || !CD.callComplete, disabledNOT:!CD.challenge.registrationDisabled}" class="btn btnAction challengeRegisterBtn" href="javascript:;">
-                <span>1</span><strong>Register For This Challenge</strong>
+            <a ng-show="!CD.isDesign" ng-click="CD.challenge.allowToUnregister?CD.unregisterFromChallenge():CD.registerToChallenge()" ng-class="{disabled:!CD.challenge.allowToUnregister && (CD.challenge.registrationDisabled || !CD.callComplete), disabledNOT:!CD.challenge.registrationDisabled, unregister: CD.challenge.allowToUnregister}" class="btn btnAction challengeRegisterBtn" href="javascript:;">
+                <span>1</span>
+                <strong ng-hide="CD.isRegistered">
+                    Register For This Challenge
+                </strong>
+                <strong ng-show="CD.isRegistered">
+                    Unregister From This Challenge
+                </strong>
             </a>
             <a ng-show="!CD.isDesign" ng-class="{disabled:CD.challenge.submissionDisabled || !CD.callComplete, disabledNOT:!CD.challenge.submissionDisabled}" class="btn btnAction" target="_blank"
               ng-href="/challenge-details/{{CD.challenge.challengeId}}/submit/?type=develop">
                 <span>2</span><strong>Submit Your Entries</strong>
             </a>
-            <a ng-show="CD.isDesign" ng-click="CD.registerToChallenge()" ng-class="{disabled:CD.challenge.registrationDisabled || !CD.callComplete, disabledNOT:!CD.challenge.registrationDisabled}" class="btn btnAction challengeRegisterBtn" href="javascript:;">
-                <span>1</span> <strong>Register For This Challenge</strong>
+            <a ng-show="CD.isDesign" ng-click="CD.challenge.allowToUnregister?CD.unregisterFromChallenge():CD.registerToChallenge()" ng-class="{disabled:!CD.challenge.allowToUnregister && (CD.challenge.registrationDisabled || !CD.callComplete), disabledNOT:!CD.challenge.registrationDisabled, unregister: CD.challenge.allowToUnregister}" class="btn btnAction challengeRegisterBtn" href="javascript:;">
+                <span>1</span>
+                <strong ng-hide="CD.isRegistered">
+                    Register For This Challenge
+                </strong>
+                <strong ng-show="CD.isRegistered">
+                    Unregister From This Challenge
+                </strong>
             </a>
             <a ng-show="CD.isDesign" ng-class="{disabled:CD.challenge.submissionDisabled || !CD.callComplete, disabledNOT:!CD.challenge.submissionDisabled}" class="btn btnAction" target="_blank"
                ng-href="/challenges/{{CD.challenge.challengeId}}/submit/file">

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

@@ -90,6 +90,7 @@
 
     // Methods
     vm.registerToChallenge = registerToChallenge;
+    vm.unregisterFromChallenge = unregisterFromChallenge;
 
     // functions
     $scope.round = Math.round;
@@ -224,10 +225,32 @@
         });
         $('.tc-header-login').click();
       }
-
-
     };
 
+    /**
+     * Unregister from challenge
+     */
+    function unregisterFromChallenge() {
+      if (app.isLoggedIn()) {
+        ChallengeService
+            .unregisterFromChallenge(challengeId)
+            .then(
+            function (data) {
+              if (data["message"] === "ok") {
+                showModal("#unregisterSuccess");
+                //delete cookie
+                document.cookie = 'tcDelayChallengeAction=; path=/; domain=.' + tcconfig.domain + '; expires=' + new Date(0).toUTCString();
+                updateChallengeDetail();
+              }
+            }, function (reason) {
+              if (reason["error"]["details"]) {
+                showError(reason["error"]["details"]);
+              }
+            }
+        );
+      }
+    }
+
     /**
      *
      * @param template
@@ -298,23 +321,35 @@
     }).length;
     var submissionMap = challenge.submissions.map(function(x) { return x.handle; });
 
-    // this are the buttons for registration and submission
+    // these are the buttons for registration, and submission
     vm.challenge.registrationDisabled = true;
     vm.challenge.submissionDisabled   = true;
+    // true when to unregister is the valid option
+    vm.challenge.allowToUnregister    = false;
     // button for peer review for challenges with reviewType === PEER
     vm.challenge.peerReviewDisabled   = true;
 
     vm.challenge.url = window.location.href;
 
-    // If is not registered, then enable registration
-    if (((moment(challenge.phases[0].scheduledStartTime)) < moment() && (moment(challenge.registrationEndDate)) > moment()) && regList.indexOf(handle) == -1 && challenge.currentStatus == 'Active') {
-      vm.challenge.registrationDisabled = false;
-    }
-
     vm.isRegistered = true;
     if (regList.indexOf(handle) == -1) {
       vm.isRegistered = false;
     }
+    
+    var hasSubmitted = false;
+    if (submissionMap.indexOf(handle) >= 0) {
+      hasSubmitted = true;
+    }
+
+    // If the challenge is active and in the registration phase we allow either
+    // registration, or unregistration.
+    if (((moment(challenge.phases[0].scheduledStartTime)) < moment() && (moment(challenge.registrationEndDate)) > moment()) && challenge.currentStatus == 'Active') {
+      if (vm.isRegistered && !hasSubmitted) {
+        vm.challenge.allowToUnregister = true;
+      } else {
+        vm.challenge.registrationDisabled = false;
+      }
+    }
 
     //check autoRegister (terms link register) and DelayAction cookie status
     if (autoRegister) {

src/js/app/challenge-details/js/ng-challenge-detail-software.js

@@ -188,6 +188,9 @@ $(function () {
     closeModal();
   });
 
+  $("#unregisterSuccess .closeModalReg").click(function () {
+    closeModal();
+  });
 });
 
 /* checkpoint contest css*/

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

@@ -233,11 +233,13 @@
     };
 
     /**
-     *
-     * @param id
-     * @returns {promise}
+     * Registers or unregisters the user for challenge.
+     * @param {String} challengeId Challenge ID.
+     * @param {String} action The action, MUST be either 'register' or
+     *    'unregister'.
+     * @returns {Promise}
      */
-    service.registerToChallenge = function(id) {
+    function _challengeRegistrationAction(challengeId, action) {
       var defer = $q.defer();
 
       var tcjwt = getCookie('tcjwt');
@@ -246,15 +248,33 @@
       }
 
       service
-        .one('challenges', id)
-        .post('register')
+        .one('challenges', challengeId)
+        .post(action)
         .then(function(response) {
           defer.resolve(response);
         }, function(reason) {
           defer.reject(reason['data']);
         });
 
       return defer.promise;
+    }
+
+    /**
+     *
+     * @param id
+     * @returns {promise}
+     */
+    service.registerToChallenge = function(id) {
+      return _challengeRegistrationAction(id, 'register');
+    };
+
+    /**
+     * Unregisters from challenge.
+     * @param id Challenge ID.
+     * @returns {promise}
+     */
+    service.unregisterFromChallenge = function(id) {
+      return _challengeRegistrationAction(id, 'unregister');
     };
 
     /**