From 81ff7a58445d6c78bfa9c629c35514c4420b6750 Mon Sep 17 00:00:00 2001
From: Phuong H <phuonghqh@gmail.com>
Date: Fri, 6 Nov 2015 15:46:29 +0700
Subject: [PATCH 1/4] Fix default funciton

---
 src/main/java/com/techlooper/util/DataUtils.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/techlooper/util/DataUtils.java b/src/main/java/com/techlooper/util/DataUtils.java
index 49e489462..b914cffb2 100644
--- a/src/main/java/com/techlooper/util/DataUtils.java
+++ b/src/main/java/com/techlooper/util/DataUtils.java
@@ -34,15 +34,15 @@ public static Set<ChallengeCriteria> defaultChallengeCriterias(Language lang) {
     Set<ChallengeCriteria> defaultCriterias = new HashSet<>();
     if (lang == Language.en) {
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
-        .withName("default.uiuxIpml").withWeight(20L).build());
+        .withName("UI/UX implemented solution").withWeight(20L).build());
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
-        .withName("default.creativeSolution").withWeight(20L).build());
+        .withName("Creativity on the proposed solution").withWeight(20L).build());
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
-        .withName("default.srcQuality").withWeight(20L).build());
+        .withName("Source code quality").withWeight(20L).build());
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
-        .withName("default.topEdgeTech").withWeight(20L).build());
+        .withName("Usage of top edge technology").withWeight(20L).build());
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
-        .withName("default.appFunction").withWeight(20L).build());
+        .withName("Application functionality").withWeight(20L).build());
     }
     else {
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()

From 4e97db3086866fac13d67fcfef6f0391e6592cfe Mon Sep 17 00:00:00 2001
From: Phuong H <phuonghqh@gmail.com>
Date: Fri, 6 Nov 2015 16:01:44 +0700
Subject: [PATCH 2/4] Fix selectize version

---
 bower.json                                                   | 5 ++++-
 .../webapp/assets/modules/common/model/challengeDetail.js    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 12bc2897f..fe88174a5 100644
--- a/bower.json
+++ b/bower.json
@@ -19,7 +19,7 @@
     "highcharts-release": "latest",
     "ngInfiniteScroll": "latest",
     "selectize": "latest",
-    "angular-selectize2": "1.2.3",
+    "angular-selectize2": "latest",
     "perfect-scrollbar": "latest",
     "mousetrap": "latest",
     "JSONPath": "latest",
@@ -95,6 +95,9 @@
     "selectize": {
       "main": "dist/js/standalone/selectize.min.js"
     },
+    "angular-selectize2": {
+      "main": "dist/selectize.js"
+    },
     "perfect-scrollbar": {
       "main": "js/perfect-scrollbar.js"
     },
diff --git a/src/main/webapp/assets/modules/common/model/challengeDetail.js b/src/main/webapp/assets/modules/common/model/challengeDetail.js
index 21bea485e..33ae19e65 100644
--- a/src/main/webapp/assets/modules/common/model/challengeDetail.js
+++ b/src/main/webapp/assets/modules/common/model/challengeDetail.js
@@ -32,7 +32,7 @@ techlooper.filter("challengeDetail", function (apiService, $rootScope, jsonValue
 
     challengeDetail.addCriteria = function () {
       challengeDetail.criteria = challengeDetail.criteria || [];
-      challengeDetail.criteria.push({index: challengeDetail.criteria.length++});
+      challengeDetail.criteria.push({index: challengeDetail.criteria.length + 1});
     }
 
     challengeDetail.removeCriteria = function (cri) {

From bbd529c7a158e965c6d17d80f74533aa76c9c3de Mon Sep 17 00:00:00 2001
From: Phuong H <phuonghqh@gmail.com>
Date: Fri, 6 Nov 2015 16:19:26 +0700
Subject: [PATCH 3/4] Revert selectize version

---
 bower.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bower.json b/bower.json
index fe88174a5..12bc2897f 100644
--- a/bower.json
+++ b/bower.json
@@ -19,7 +19,7 @@
     "highcharts-release": "latest",
     "ngInfiniteScroll": "latest",
     "selectize": "latest",
-    "angular-selectize2": "latest",
+    "angular-selectize2": "1.2.3",
     "perfect-scrollbar": "latest",
     "mousetrap": "latest",
     "JSONPath": "latest",
@@ -95,9 +95,6 @@
     "selectize": {
       "main": "dist/js/standalone/selectize.min.js"
     },
-    "angular-selectize2": {
-      "main": "dist/selectize.js"
-    },
     "perfect-scrollbar": {
       "main": "js/perfect-scrollbar.js"
     },

From 0c8a0c524cdbb75a6dc516ed08a5a02724f51cb8 Mon Sep 17 00:00:00 2001
From: Phuong H <phuonghqh@gmail.com>
Date: Fri, 6 Nov 2015 16:24:39 +0700
Subject: [PATCH 4/4] Fix in-digest error

---
 .../webapp/assets/modules/common/feedback/feedback.html     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/assets/modules/common/feedback/feedback.html b/src/main/webapp/assets/modules/common/feedback/feedback.html
index f091a3580..c34ef49f2 100644
--- a/src/main/webapp/assets/modules/common/feedback/feedback.html
+++ b/src/main/webapp/assets/modules/common/feedback/feedback.html
@@ -16,10 +16,10 @@
           <label class="col-sm-2 control-label" translate="template"></label>
 
           <div class="col-sm-10">
-            <select ng-model="composeEmail.templateId"
+            <selectize ng-model="composeEmail.templateId"
                     config="{maxItems: 1, placeholder: ('exChooseATemplate' | translate)}"
-                    ng-change="loadEmailTemplate()" options="emailTemplates" selectize>
-            </select>
+                    ng-change="loadEmailTemplate()" options="emailTemplates">
+            </selectize>
           </div>
         </div>
         <div class="form-group">