Merge pull request #44 from agoravoting/go

Go

Author: Findeton

Gruntfile.js

@@ -19,7 +19,7 @@
 'use strict';
 
 var pkg = require('./package.json');
-var AV_CONFIG_VERSION = '17.04';
+var AV_CONFIG_VERSION = '103111.1';
 
 //Using exclusion patterns slows down Grunt significantly
 //instead of creating a set of patterns like '**/*.js' and '!**/node_modules/**'
@@ -192,10 +192,10 @@ module.exports = function (grunt) {
         options: {
           remove: ['script[data-remove!="false"]','link[data-remove!="false"]'],
           append: [
-            {selector:'body',html:'<!--[if lte IE 8]><script src="/libcompat-v17.04.js"></script><![endif]--><!--[if gte IE 9]><script src="/libnocompat-v17.04.js"></script><![endif]--><!--[if !IE]><!--><script src="/libnocompat-v17.04.js"></script><!--<![endif]-->'},
+            {selector:'body',html:'<!--[if lte IE 8]><script src="/libcompat-v103111.1.js"></script><![endif]--><!--[if gte IE 9]><script src="/libnocompat-v103111.1.js"></script><![endif]--><!--[if !IE]><!--><script src="/libnocompat-v103111.1.js"></script><!--<![endif]-->'},
             {selector:'body',html:'<!--All the source code of this program under copyright. Take a look at the license details at https://github.com/agoravoting/agora-core-view/blob/master/README.md -->'},
-            {selector:'body',html:'<script src="/appCommon-v17.04.js"></script>'},
-            {selector:'body',html:'<script src="/avPlugins-v17.04.js"></script>'},
+            {selector:'body',html:'<script src="/appCommon-v103111.1.js"></script>'},
+            {selector:'body',html:'<script src="/avPlugins-v103111.1.js"></script>'},
             {selector:'head',html:'<link rel="stylesheet" id="theme" href="/themes/default/app.min.css">'}
           ]
         },
@@ -225,9 +225,9 @@ module.exports = function (grunt) {
           'temp/libnocompat.js': ['<%= dom_munger.data.libnocompatjs %>'],
           'temp/lib.js': ['<%= dom_munger.data.libjs %>'],
           'temp/app.js': ['<%= dom_munger.data.appjs %>','<%= ngtemplates.main.dest %>'],
-          'dist/avConfig-v17.04.js': ['avConfig.js'],
-          'dist/avThemes-v17.04.js': ['avThemes.js'],
-          'dist/avPlugins-v17.04.js': ['plugins/**/*.js']
+          'dist/avConfig-v103111.1.js': ['avConfig.js'],
+          'dist/avThemes-v103111.1.js': ['avThemes.js'],
+          'dist/avPlugins-v103111.1.js': ['plugins/**/*.js']
         }
       }
     },
@@ -259,10 +259,10 @@ module.exports = function (grunt) {
           beautify: true
         },
         files: {
-          'dist/appCommon-v17.04.js': 'temp/app.js',
-          'dist/libCommon-v17.04.js': 'temp/lib.js',
-          'dist/libnocompat-v17.04.js': 'temp/libnocompat.js',
-          'dist/libcompat-v17.04.js': 'temp/libcompat.js',
+          'dist/appCommon-v103111.1.js': 'temp/app.js',
+          'dist/libCommon-v103111.1.js': 'temp/lib.js',
+          'dist/libnocompat-v103111.1.js': 'temp/libnocompat.js',
+          'dist/libcompat-v103111.1.js': 'temp/libcompat.js',
           'dist/avWidgets.js': 'avWidgets.js',
 
           "dist/locales/moment/es.js": "bower_components/moment/lang/es.js",

avConfig.js

@@ -20,7 +20,7 @@
  * in this same file, which you might want to edit and tune if needed.
  */
 
-var AV_CONFIG_VERSION = '17.04';
+var AV_CONFIG_VERSION = '103111.1';
 
 var avConfigData = {
   // the base url path for ajax requests, for example for sending ballots or

avRegistration/auth-method-service.js

@@ -152,7 +152,7 @@ angular.module('avRegistration')
             }
           });
 
-          if (viewEventData.auth_method === "sms" && !found) {
+          if ((viewEventData.auth_method === "sms" || viewEventData.auth_method === "sms-otp") && !found) {
             fields.push({
               "name": "tlf",
               "type": "tlf",
@@ -181,7 +181,7 @@ angular.module('avRegistration')
             });
           }
 
-          // put captha the last
+          // put captcha the last
           for (var i=0; i<fields.length; i++) {
               if (fields[i]['type'] === "captcha") {
                   var captcha = fields.splice(i, 1);
@@ -194,13 +194,23 @@ angular.module('avRegistration')
 
         authmethod.getLoginFields = function (viewEventData) {
             var fields = authmethod.getRegisterFields(viewEventData);
-            if (viewEventData.auth_method === "sms" || viewEventData.auth_method === "email") {
+            if (viewEventData.auth_method === "sms" || viewEventData.auth_method === "email")
+            {
               fields.push({
                 "name": "code",
                 "type": "code",
                 "required": true,
                 "required_on_authentication": true
               });
+            } else if (viewEventData.auth_method === "sms-otp")
+            {
+              fields.push({
+                "name": "code",
+                "type": "code",
+                "required": true,
+                "steps": [1],
+                "required_on_authentication": true
+              });
             }
 
             fields = _.filter(fields, function (field) {return field.required_on_authentication;});

avRegistration/fields/tel-field-directive/tel-field-directive.html

@@ -14,6 +14,8 @@
             required />
         <p class="help-block" ng-i18next="avRegistration.telHelp">
         </p>
+        <p class="text-warning" ng-if="'sms-otp' === method" ng-i18next="avRegistration.otpHelp">
+        </p>
         <div class="input-error">
           <span class="error" ng-show="form.input{{index}}.$error.pattern" ng-i18next="avRegistration.telInvalid"></span>
         </div>

avRegistration/login-directive/login-directive.html

@@ -6,7 +6,7 @@ <h2 class="tex-center" ng-i18next="[i18next]({name: orgName})avRegistration.logi
 
     <div class="col-sm-6">
         <form name="form" id="loginForm" role="form" class="form-horizontal">
-            <div ng-repeat="field in login_fields" avr-field index="{{$index+1}}">
+            <div ng-repeat="field in login_fields" avr-field index="{{$index+1}}" ng-if="field.steps === undefined || field.steps.indexOf(currentFormStep) !== -1">
             </div>
 
           <div class="col-sm-offset-4 col-sm-8 button-group">

avRegistration/login-directive/login-directive.js

@@ -39,6 +39,8 @@ angular.module('avRegistration')
         }
         scope.sendingData = false;
 
+        scope.currentFormStep = 0;
+
         scope.stateData = StateDataService.getData();
 
         scope.code = null;
@@ -56,7 +58,7 @@ angular.module('avRegistration')
         }
 
         scope.resendAuthCode = function(field) {
-          if (scope.sendingData || scope.method !== "sms") {
+          if (scope.sendingData || !_.contains(["sms", "sms-otp"], scope.method)) {
               return;
           }
 
@@ -69,14 +71,18 @@ angular.module('avRegistration')
           }
 
           // reset code field, as we are going to send a new one
-          field.value = "";
+          if (!!field) {
+            field.value = "";
+          }
 
           var data = {};
           data['tlf'] = scope.telField.value;
 
           scope.sendingData = true;
           Authmethod.resendAuthCode(data, autheventid)
             .success(function(rcvData) {
+              scope.telField.disabled = true;
+              scope.currentFormStep = 1;
               $timeout(scope.sendingDataTimeout, 3000);
             })
             .error(function(error) {
@@ -96,6 +102,12 @@ angular.module('avRegistration')
             if (scope.sendingData) {
                 return;
             }
+
+            // loginUser
+            if (scope.method === 'sms-otp' && scope.currentFormStep === 0) {
+                scope.resendAuthCode();
+                return;
+            }
             var data = {
                 'captcha_code': Authmethod.captcha_code,
             };
@@ -188,6 +200,14 @@ angular.module('avRegistration')
                   }
                   scope.telIndex = index+1;
                   scope.telField = el;
+                } else if (el.type === "tlf" && scope.method === "sms-otp") {
+                  if (scope.email !== null && scope.email.indexOf('@') === -1) {
+                    el.value = scope.email;
+                    el.disabled = true;
+                    scope.currentFormStep = 1;
+                  }
+                  scope.telIndex = index+1;
+                  scope.telField = el;
                 }
                 return el;
               });

avRegistration/register-directive/register-directive.js

@@ -38,7 +38,7 @@ angular.module('avRegistration')
           if (!scope.admin) {
               return {path: 'election.public.show.login', data: {id: eventId}};
           } else {
-              return {path: 'admin.login', data:{}};
+              return {path: 'admin.login_email', data:{email: scope.email}};
           }
         };
 
@@ -52,7 +52,13 @@ angular.module('avRegistration')
             };
             _.each(scope.register_fields, function (field) {
               data[field.name] = field.value;
-              if (field.name === 'email') {
+              if (field.name === 'email' && scope.method === 'email')
+              {
+                scope.email = field.value;
+              }
+              else if (field.name === 'tlf' &&
+                _.contains(['sms', 'sms-otp'], scope.method))
+              {
                 scope.email = field.value;
               }
             });

avUi/checker-service.js

@@ -125,7 +125,6 @@ angular.module('avUi')
           if (!pass) {
             error(item.check, {key: item.key}, item.postfix);
           }
-
         } else if (item.check === "lambda") {
           if (!item.validator(d.data[item.key])) {
             var errorData = {key: item.key};
@@ -135,6 +134,38 @@ angular.module('avUi')
             error(item.check, errorData, item.postfix);
           }
 
+        } else if (item.check === "is-string-if-defined") {
+          pass = angular.isUndefined(d.data[item.key]) ||
+                   angular.isString(d.data[item.key], item.postfix);
+          if (!pass) {
+            error(item.check, {key: item.key}, item.postfix);
+          }
+
+        } else if (item.check === "array-length-if-defined") {
+          if (angular.isDefined(d.data[item.key])) {
+            itemMin = evalValue(item.min, d.data);
+            itemMax = evalValue(item.max, d.data);
+
+            if (angular.isArray(d.data[item.key]) || angular.isString(d.data[item.key]))
+            {
+              min = angular.isUndefined(item.min) || d.data[item.key].length >= itemMin;
+              max = angular.isUndefined(item.max) || d.data[item.key].length <= itemMax;
+              pass = min && max;
+              if (!min) {
+                error(
+                  "array-length-min",
+                  {key: item.key, min: itemMin, num: d.data[item.key].length},
+                  item.postfix);
+              }
+              if (!max) {
+                var itemErrorData0 = {key: item.key, max: itemMax, num: d.data[item.key].length};
+                error(
+                  "array-length-max",
+                  itemErrorData0,
+                  item.postfix);
+              }
+            }
+          }
         } else if (item.check === "is-string") {
           pass = angular.isString(d.data[item.key], item.postfix);
           if (!pass) {
@@ -247,6 +278,31 @@ angular.module('avUi')
                 });
               }),
             true);
+        } else if (item.check === "object-key-chain") {
+          pass = _.isString(item.key) && _.isObject(d.data[item.key]);
+          if (!!pass) {
+            var data = d.data[item.key];
+            var extra = {};
+            extra[item.append.key] = evalValue(item.append.value, data);
+            var prefix = "";
+            if (angular.isString(d.prefix)) {
+              prefix += d.prefix;
+            }
+            if (angular.isString(item.prefix)) {
+              prefix += item.prefix;
+            }
+            pass = _.every(
+              item.checks,
+              function (check, index) {
+                return checker({
+                  data: data,
+                  errorData: angular.extend({}, d.errorData, extra),
+                  onError: d.onError,
+                  checks: [check],
+                  prefix: prefix,
+                });
+              });
+          }
         }
         if (!pass && d.data.groupType === 'chain') {
           return false;

avUi/documentation-directive/documentation-directive.html

@@ -47,6 +47,7 @@ <h2 class="text-center text-av-secondary" ng-i18next="avDocumentation.documentat
   </ul>
   <div
     class="documentation-html-include"
-    ng-bind-html="documentation_html_include | addTargetBlank">
+    av-plugin-html
+    ng-bind-html="documentation_html_include">
   </div>
 </div> 

avUi/documentation-directive/documentation-directive.js

@@ -20,11 +20,11 @@
  * loading config, showing results, showing error if needed.
  */
 angular.module('avUi').controller('DocumentationUiController',
-  function($state, $stateParams, $http, $scope,$i18next, ConfigService, InsideIframeService, Authmethod) {
+  function($state, $stateParams, $http, $scope, $sce, $i18next, ConfigService, InsideIframeService, Authmethod) {
     $scope.inside_iframe = InsideIframeService();
     $scope.documentation = ConfigService.documentation;
     $scope.documentation.security_contact = ConfigService.legal.security_contact;
-    $scope.documentation_html_include = ConfigService.documentation_html_include;
+    $scope.documentation_html_include = $sce.trustAsHtml(ConfigService.documentation_html_include);
     $scope.auths_url = '/election/' + $stateParams.id + '/public/authorities';
     $scope.legal_url = '/election/' + $stateParams.id + '/public/legal';
 
@@ -41,6 +41,9 @@ angular.module('avUi')
   .directive('documentationDirective', function() {
     return {
       restrict: 'AE',
+      scope: {
+        extra: '='
+      },
       templateUrl: 'avUi/documentation-directive/documentation-directive.html',
       controller: 'DocumentationUiController'
     };

avUi/percent-votes-service.js

@@ -44,9 +44,13 @@ angular.module('avUi')
       if (over === undefined || over === null) {
         over = question.answer_total_votes_percentage;
       }
-      if (over === "over-valid-votes") {
+      if ("over-valid-votes" === over || "over-total-valid-votes" === over) {
         base = question.totals.valid_votes;
       }
+      else if ("over-total-valid-points" === over &&
+        undefined !== question.totals.valid_points) {
+        base = question.totals.valid_points;
+      }
 
       return print(100*total_votes / base);
     };

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "avCommon",
-  "version" : "17.04",
+  "version" : "103111.1",
   "main": "index.html",
   "ignore": [
     "tests",