Merge pull request #477 from khoa-nd/master

Merged
chrisshayan · Dec 30, 2015 · e276da2 · e276da2
2 parents f3cf5ee + 027bcae
commit e276da2
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 42 deletions.
diff --git a/src/main/resources/template/CHALLENGE_CONFIRM_ON_JOIN_INTERNAL_CHALLENGE_VI.ftl b/src/main/resources/template/CHALLENGE_CONFIRM_ON_JOIN_INTERNAL_CHALLENGE_VI.ftl
@@ -311,7 +311,7 @@
                                             </tr>
                                             <tr>
                                               <td>
-                                                <img src="${webBaseUrl}images/join-internal-challenge.png" alt="" style="width:100%">
+                                                <img src="${webBaseUrl}images/join-internal-challenge-vi.png" alt="" style="width:100%">
                                               </td>
                                             </tr>
                                             <tr>
@@ -336,7 +336,7 @@
                                             </tr>
                                             <tr>
                                               <td>
-                                                <img src="${webBaseUrl}images/submission-form.png" alt="" style="width:100%">
+                                                <img src="${webBaseUrl}images/submission-form-vi.png" alt="" style="width:100%">
                                               </td>
                                             </tr>
                                           </table>

diff --git a/src/main/webapp/assets/images/join-internal-challenge-vi.png b/src/main/webapp/assets/images/join-internal-challenge-vi.png
diff --git a/src/main/webapp/assets/images/submission-form-vi.png b/src/main/webapp/assets/images/submission-form-vi.png
diff --git a/src/main/webapp/assets/modules/common/arrayModelDirective.js b/src/main/webapp/assets/modules/common/arrayModelDirective.js
@@ -5,7 +5,7 @@ techlooper
       restrict: 'A',
       link: function (scope, element, attrs, ngModelCtrl) {
         scope.$watch(attrs.ngModel, function (newValue, oldValue) {
-          var array = $parse(attrs.ngModel)(scope);
+          var array = $parse(attrs.ngModel)(scope) || [];
           ngModelCtrl.$setValidity("required", array.length > 0);
         }, true);
       }

diff --git a/src/main/webapp/assets/modules/common/challenge/joinInternalChallenge.html b/src/main/webapp/assets/modules/common/challenge/joinInternalChallenge.html
@@ -1,5 +1,11 @@
 <div class="row join-internal-challenge">
   <ng-form name="joinInternalForm" autocomplete="off" role="form" class="form-horizontal">
+    <p ng-if="challenge.$isInternal && challenge.companyDomains.length" class="text-center">
+      {{'joinInternalChallengeWith' | translate}}
+      <span ng-repeat="domain in challenge.companyDomains">
+        <strong>{{domain}}</strong>&nbsp;<span ng-if="!$last" translate="or"></span>&nbsp;
+      </span>
+    </p>
     <div class="form-group">
       <div class="col-sm-6">
         <label for="ic-firstName"><span translate="firstName"></span>: <strong>*</strong></label>

diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.html b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.html
@@ -1,12 +1,5 @@
 <div class="submit-phase-contest show" ng-show="visibleSubmitForm">
   <ng-form name="submissionForm" autocomplete="off">
-    <p ng-if="challenge.$isInternal && challenge.companyDomains.length" class="text-center">
-      {{'joinInternalChallengeWith' | translate}}
-      <span ng-repeat="domain in challenge.companyDomains">
-        <strong>{{domain}}</strong>&nbsp;<span ng-if="!$last" translate="or"></span>&nbsp;
-      </span>
-    </p>
-
     <div class="error-messages"
          ng-show="submissionForm.submissionPassCode.$error.credential && (submissionForm.submissionPassCode.$dirty || submissionForm.$submitted)"
          translate="invalidCredential" />

diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js
@@ -47,32 +47,32 @@ techlooper.directive("submissionChallenge", function (localStorageService, apiSe
             });
 
           scope.visibleSubmitForm = true;
-        }
 
-        if (scope.challenge.$isPublic) {
-          scope.submission = {
-            name: localStorageService.get("firstName") + " " + localStorageService.get("lastName"),
-            registrantEmail: localStorageService.get("email"),
-            registrantFirstName: localStorageService.get("firstName"),
-            registrantLastName: localStorageService.get("lastName")
+          if (scope.challenge.$isPublic) {
+            scope.submission = {
+              name: localStorageService.get("firstName") + " " + localStorageService.get("lastName"),
+              registrantEmail: localStorageService.get("email"),
+              registrantFirstName: localStorageService.get("firstName"),
+              registrantLastName: localStorageService.get("lastName")
+            }
+          }
+          else {
+            scope.submission = {};
           }
-        }
-        else {
-          scope.submission = {};
-        }
 
-        if (scope.challenge.$isInternal && scope.submissionForm && scope.submissionForm.internalEmail) {
-          scope.submissionForm.internalEmail.$validators.domainMatch = function (modelValue, viewValue) {
-            if (!modelValue) return true;
-            if (modelValue.length == 0) return true;
-            if (scope.submissionForm.internalEmail.$error.email) return true;
+          if (scope.challenge.$isInternal && scope.submissionForm && scope.submissionForm.internalEmail) {
+            scope.submissionForm.internalEmail.$validators.domainMatch = function (modelValue, viewValue) {
+              if (!modelValue) return true;
+              if (modelValue.length == 0) return true;
+              if (scope.submissionForm.internalEmail.$error.email) return true;
 
-            var valid = false;
-            $.each(scope.challenge.companyDomains, function (i, companyDomain) {
-              return !(valid = new RegExp("( |^)[^ ]*@[a-zA-Z0-9.]*" + companyDomain + "( |$)").test(modelValue));
-            });
-            return valid;
-          };
+              var valid = false;
+              $.each(scope.challenge.companyDomains, function (i, companyDomain) {
+                return !(valid = new RegExp("( |^)[^ ]*@[a-zA-Z0-9.]*" + companyDomain + "( |$)").test(modelValue));
+              });
+              return valid;
+            };
+          }
         }
       }
       scope.$watch("challenge", function () {

diff --git a/src/main/webapp/assets/modules/common/model/challengeDetail.js b/src/main/webapp/assets/modules/common/model/challengeDetail.js
@@ -166,7 +166,7 @@ techlooper.filter("challengeDetail", function (apiService, $rootScope, jsonValue
       if (!criteria) return [];
       challengeDetail.totalWeight = 0;
       return criteria.map(function (cri) {
-        var weight = _.isNumber(cri.weight) ? cri.weight : 0;
+        var weight = $.isNumeric(cri.weight) ? parseInt(cri.weight) : 0;
         challengeDetail.totalWeight += weight;
         return cri;
       });
@@ -356,7 +356,7 @@ techlooper.filter("challengeDetail", function (apiService, $rootScope, jsonValue
       _.each(finalRegistrants, function (registrant) {
         if (registrant.disqualified == true) return;
         var count = _.countBy(registrant.criteria, function (cri) {
-          return _.isNumber(cri.score) ? "hasScore" : "notHasScore";
+          return $.isNumeric(cri.score) ? "hasScore" : "notHasScore";
         });
         countWinnerPaticipants += (count.hasScore > 0) ? 1 : 0;
       });

diff --git a/src/main/webapp/assets/modules/common/model/challengeRegistrant.js b/src/main/webapp/assets/modules/common/model/challengeRegistrant.js
@@ -56,7 +56,7 @@ techlooper.filter("challengeRegistrant", function (apiService, $rootScope, jsonV
       }
       //delete registrant.$savedCriteria;
 
-      _.each(registrant.criteria, function (cri) {(!_.isNumber(cri.score)) && (cri.score = 0);});
+      _.each(registrant.criteria, function (cri) {(!$.isNumeric(cri.score)) && (cri.score = 0);});
 
       apiService.saveChallengeRegistrantCriteria(criteria)
         .success(function (data) {

diff --git a/src/main/webapp/assets/modules/home-page/home.html b/src/main/webapp/assets/modules/home-page/home.html
@@ -98,7 +98,7 @@ <h4 translate="sendMeJobs"></h4>
         <h3 translate="whatCurrentTrend"></h3>
         <div class="box-content">
           <div class="box-header">
-            <h4>{{homePage.termStatistic.term}}</h4>
+            <h4>{{homePage.termStatistic.label}}</h4>
             <a href="#/analytics/skill/{{homePage.termStatistic.term}}" translate="viewDetails"></a>
           </div>
           <div class="box-content-detail">

diff --git a/src/main/webapp/assets/modules/post-contest/postContestReward.html b/src/main/webapp/assets/modules/post-contest/postContestReward.html
@@ -96,10 +96,10 @@ <h3 class="none-capitalize" translate="challengeTypeSelection"></h3>
           <div ng-if="contest.challengeType == 'INTERNAL'">
             <tagbox name="companyDomains" tags="contest.companyDomains"
                     type="text" placeholder="{{'companyDomainEx' | translate}}" list-max-length="3"
-                    ng-model="contest.companyDomain" array-model touchable enable-validators="domainName"></tagbox>
+                    ng-model="contest.companyDomains" array-model touchable enable-validators="domainName"></tagbox>
 
             <div class="error-messages"
-                 ng-show="challengeForm.companyDomain.$error.required && (challengeForm.companyDomain.$edited || challengeForm.$submitted)"
+                 ng-show="rewardForm.companyDomains.$error.required && (rewardForm.companyDomains.$edited || rewardForm.$submitted)"
                  translate="listRequire1Item"></div>
           </div>
         </div>

diff --git a/src/main/webapp/assets/modules/translation/messages_en.json b/src/main/webapp/assets/modules/translation/messages_en.json
@@ -881,15 +881,15 @@
   "SearchChallengePlaceholder": "Enter challenge name or company domain to search challenge",
   "allChallengesSearch": "All Challenges",
   "invalidDomainName": "Invalid domain name format",
-  "emailDomainNotMatch": "Email domain invalid",
+  "emailDomainNotMatch": "Email domain is invalid",
   "joinInternalChallengeWith": "Join with your email from:",
   "enterYourPassword": "Enter your password",
   "enterYourEmail": "Enter your email",
   "signInInternalChallengeTitle": "First, Let Us Know Who You Are",
   "emailChallengeFormat": "Sign in using your registered email address and password for this challenge.",
   "passCode": "Pass Code: <strong>*</strong>",
   "enterYourPassCode": "Enter your pass code",
-  "domainLabel": "Domain:",
+  "domainLabel": "Domains:",
   "invalidCredential": "Invalid credential",
   "invalidMinlengthDigits": "This field can not less than {{length}} digits"
 }
diff --git a/src/main/webapp/assets/modules/translation/messages_vi.json b/src/main/webapp/assets/modules/translation/messages_vi.json
@@ -885,7 +885,7 @@
   "SearchChallengePlaceholder": "Điền tên thử thách hay tên miền để tìm kiếm",
   "allChallengesSearch": "Mọi Thử Thách",
   "invalidDomainName": "Tên miền không đúng định dạng",
-  "emailDomainNotMatch": "Tên miền mail không hợp lệ",
+  "emailDomainNotMatch": "Tên miền email không hợp lệ",
   "joinInternalChallengeWith": "Tham gia bằng email với tên miền:",
   "enterYourPassword": "Nhập mật khẩu",
   "enterYourEmail": "Nhập email",

diff --git a/src/main/webapp/assets/sass/contest-detail.sass b/src/main/webapp/assets/sass/contest-detail.sass
@@ -1011,6 +1011,9 @@
             color: red
             font-size: 12px
             font-style: italic
+          p
+            span
+              text-transform: lowercase
       .col-md-12
         padding: 0
       .contest-content-item

diff --git a/src/main/webapp/assets/sass/contests.sass b/src/main/webapp/assets/sass/contests.sass
@@ -303,6 +303,9 @@
           color: red
           font-size: 12px
           font-style: italic
+        p
+          span
+            text-transform: lowercase
       .contest-item-row.internal
         background-color: #fffef5
         .challenge-name-col

diff --git a/src/main/webapp/assets/sass/home.sass b/src/main/webapp/assets/sass/home.sass
@@ -1062,4 +1062,8 @@
         padding: 20px 20px 10px 20px
 .tooltip-inner
     color: #919191 !important
-    text-align: left !important
+    text-align: left !important
+    padding: 15px
+    font-size: 12px
+    line-height: 14px
+    font-weight: 300