[Pollen-commits] 02/02: add token and local in request REST

19 May 2014

This is an automated email from the git hooks/post-receive script.

unknown user pushed a commit to branch devel
in repository Pollen.

commit 55c108d670f2a6861ed71243eed55d7675019746
Author: Dralagen <dralagen@dralagen.fr>
Date:   Mon May 19 10:33:32 2014 +0200

    add token and local in request REST
---
 pollen-ui-angular/src/main/webapp/css/style.css    |    4 +-
 .../src/main/webapp/js/controllers/pollCtrl.js     |   16 ++++--
 pollen-ui-angular/src/main/webapp/js/services.js   |   22 +++++++-
 .../src/main/webapp/partials/inline-poll.html      |    7 ++-
 .../src/main/webapp/partials/poll-settings.html    |   50 ++++++++++----------
 .../src/main/webapp/partials/poll.html             |    2 +-
 6 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css
index 92ff93f..f2100ed 100644
--- a/pollen-ui-angular/src/main/webapp/css/style.css
+++ b/pollen-ui-angular/src/main/webapp/css/style.css
@@ -1,8 +1,8 @@
 /*
  * #%L
  * Pollen :: UI (JS)
- * $Id$
- * $HeadURL$
+ * $Id: style.css 3943 2014-05-15 10:23:42Z garandel $
+ * $HeadURL: https://svn.chorem.org/pollen/trunk/pollen-ui-angular/src/main/webapp/css/st... $
  * %%
  * Copyright (C) 2009 - 2013 CodeLutin
  * %%
diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
index 9968e5a..99b3134 100644
--- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
+++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
@@ -19,14 +19,16 @@
  * #L%
  */
 angular.module('pollControllers', [])
-.controller('HomeCtrl', ['$scope', function ($scope) {
+.controller('HomeCtrl', ['$scope', '$locale', '$cookieStore', function ($scope, $locale, $cookieStore) {
 
+  $scope.test = $cookieStore.get('locale');
 }])
 
-.controller('PollCtrl', ['$scope', '$sce', '$timeout', '$cookieStore', function ($scope, $sce, $timeout, $cookieStore) {
+.controller('PollCtrl', ['$scope', '$controller', '$sce', '$timeout', '$cookies', function ($scope, $controller, $sce, $timeout, $cookies) {
+
   if (!angular.isDefined($scope.globalVariables)) {
-    $scope.globalVariables = {saved : $cookieStore.get('saved')};
-    $cookieStore.put('saved', '');
+    $scope.globalVariables = {saved : $cookies.saved};
+    delete $cookies.saved
 
     $scope.$watch('globalVariables.saved', function() {
       $timeout(function () {
@@ -165,7 +167,7 @@ angular.module('pollControllers', [])
   }
 }])
 
-.controller('PollCreateCtrl', ['$scope', '$controller', '$location', 'Poll', '$cookieStore', function ($scope, $controller, $location, Poll, $cookieStore) {
+.controller('PollCreateCtrl', ['$scope', '$controller', '$location', 'Poll', '$cookies', function ($scope, $controller, $location, Poll, $cookies) {
   $controller('PollAdminCtrl', {$scope:$scope});
 
   $scope.globalVariables.create = true;
@@ -185,7 +187,7 @@ angular.module('pollControllers', [])
     var poll = angular.copy($scope.data.poll);
     poll.choice = angular.copy($scope.data.choices);
     Poll.add(poll, function (data) {
-      $cookieStore.put('saved', true);
+      $cookies.saved = true;
       $location.url('/poll/edit/'+data.id+'?token='+data.permission);
     }, function (error) {
       $scope.globalVariables.restError = true;
@@ -327,6 +329,8 @@ angular.module('pollControllers', [])
       $scope.data.votants.push(angular.copy($scope.data.vote));
       $scope.globalVariables.saved = true;
       initVote();
+    }, function (error) {
+      $scope.data.vote.restError = { voterName : error.data["voter.name"]};
     });
   }
 }])
diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js
index 62d45e4..f2d25fd 100644
--- a/pollen-ui-angular/src/main/webapp/js/services.js
+++ b/pollen-ui-angular/src/main/webapp/js/services.js
@@ -20,8 +20,24 @@
  */
 angular.module('pollenServices', ['ngResource'])
 
-.factory('Poll', ['$resource', function ($resource) {
+.factory('RestInfo', ['$cookies', '$locale', function ($cookies, $locale) {
+  var query = '';
 
+  if (!angular.isDefined($cookies.locale)) {
+    $cookies.locale = $locale.id;
+  }
+
+  if (angular.isDefined($cookies.token)) {
+    query += '&token='+$cookies.token;
+  }
+
+  query += '&locale='+$cookies.locale;
+
+  return query;
+
+}])
+
+.factory('Poll', ['$resource', 'RestInfo', function ($resource, RestInfo) {
   return $resource(conf.restURL+'/polls/:pollId/:cmd', {pollId:'@id'}, {
     'add' : {
       method : 'POST',
@@ -29,13 +45,13 @@ angular.module('pollenServices', ['ngResource'])
         var poll = angular.copy(data);
         delete poll.choice;
         var choices = angular.copy(data.choice);
-        return 'poll='+encodeURIComponent(JSON.stringify(poll))+'&choices='+encodeURIComponent(JSON.stringify(choices));
+        return 'poll='+encodeURIComponent(JSON.stringify(poll))+'&choices='+encodeURIComponent(JSON.stringify(choices))+RestInfo;
       }
     },
     'update' : {
       method : 'POST',
       transformRequest : function (data, headersGetter) {
-        return 'poll='+encodeURIComponent(JSON.stringify(data));
+        return 'poll='+encodeURIComponent(JSON.stringify(data))+RestInfo;
       }
     }
   });
diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html
index 909d96e..840a498 100644
--- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html
+++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html
@@ -29,7 +29,7 @@
           <div ng-if="choice.choiceType == 'TEXT'" edit-me="showEdit" >
             <div ng-hide="showEdit && !globalVariables.voted" class="fixe-input" title="{{choice.description}}">
               {{choice.name || 'click pour éditer'}}
-              <info-Error error="choice.restError.name[0]" data="choice.name"></info-Error>
+              <info-error error="choice.restError.name[0]" data="choice.name"></info-error>
               <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div>
             <div ng-show="showEdit && !globalVariables.voted">
               <input type="text" class="form-control" ng-model="choice.name" focus-me="showEdit" ng-exit="showEdit = false;" auto-save="saveChoice(choice)" required/>
@@ -50,7 +50,10 @@
 
 <!-- begin input vote -->
       <tr ng-show="!globalVariables.editMode">
-        <td class="pollChoice"> <input type="text" class="form-control" placeholder="votre nom" ng-model="data.vote.voterName" /> </td>
+        <td class="pollChoice">
+          <input type="text" class="form-control" placeholder="votre nom" ng-model="data.vote.voterName" />
+          <info-error error="data.vote.restError.voterName" data="data.vote.voteName"></info-error>
+        </td>
         <td ng-repeat="choice in data.vote.choice" class="pollChoice">
           <input type="checkbox" name="{{choice.choice.topiaId}}" ng-model="choice.voteValue" />
         </td>
diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html
index 923c79e..590a527 100644
--- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html
+++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html
@@ -23,8 +23,8 @@
     <h4>Confiuration global</h4>
 
     <div class="form-group">
-      <label class="col-lg-4 control-label" for="beginDate">Date de début : </label>
-      <div class="col-lg-8">
+      <label class="col-sm-4 control-label" for="beginDate">Date de début : </label>
+      <div class="col-sm-8">
         <input id="beginDate" class="form-control" type="text"
                datepicker-popup="dd/MM/yyyy"
                min-date="toDay"
@@ -36,8 +36,8 @@
     </div>
 
     <div class="form-group">
-      <label class="col-lg-4 control-label" for="endDate">Date de fin : </label>
-      <div class="col-lg-8">
+      <label class="col-sm-4 control-label" for="endDate">Date de fin : </label>
+      <div class="col-sm-8">
         <input id="endDate" class="form-control" type="text"
                datepicker-popup="dd/MM/yyyy"
                min-date="data.poll.beginDate"
@@ -48,14 +48,14 @@
     </div>
 
     <div class="form-group">
-      <label class="col-lg-4 control-label">Résultat : </label>
-      <div class="col-lg-8">
+      <label class="col-sm-4 control-label">Résultat : </label>
+      <div class="col-sm-8">
         <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="EVERYBODY" /> Public</label>
         <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="VOTER" /> Participants</label>
         <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="CREATOR" /> Créateur</label>
       </div>
       <!--
-      <div class="col-lg-8 btn-group">
+      <div class="col-sm-8 btn-group">
         <button type="button" class="btn btn-success" ng-model="data.poll.resultVisibility" btn-radio="'EVERYBODY'">Public</button>
         <button type="button" class="btn btn-success" ng-model="data.poll.resultVisibility" btn-radio="'VOTER'">Participants</button>
         <button type="button" class="btn btn-success" ng-model="data.poll.resultVisibility" btn-radio="'CREATOR'">Créateur</button>
@@ -64,8 +64,8 @@
     </div>
 
     <div class="form-group">
-      <label class="col-lg-4 control-label">Résultat continue : </label>
-      <div class="col-lg-8 btn-group">
+      <label class="col-sm-4 control-label">Résultat continue : </label>
+      <div class="col-sm-8 btn-group">
         <button class="btn btn-default" ng-model="data.poll.continuousResults" btn-radio="true">Oui</button>
         <button class="btn btn-default" ng-model="data.poll.continuousResults" btn-radio="false">Non</button>
       </div>
@@ -74,16 +74,16 @@
     <h4>Configuration des Choix</h4>
 
     <div class="form-group">
-      <label class="col-lg-4 control-label">Ajout de choix par les votants :</label>
-      <div class="col-lg-8 btn-group">
+      <label class="col-sm-4 control-label">Ajout de choix par les votants :</label>
+      <div class="col-sm-8 btn-group">
         <button class="btn btn-default" ng-model="data.poll.choiceAddAllowed" btn-radio="true">Oui</button>
         <button class="btn btn-default" ng-model="data.poll.choiceAddAllowed" btn-radio="false">Non</button>
       </div>
     </div>
 
     <div class="form-group" ng-show="data.poll.choiceAddAllowed">
-      <label class="col-lg-4 control-label" for="beginChoiceDate">Date de début : </label>
-      <div class="col-lg-8">
+      <label class="col-sm-4 control-label" for="beginChoiceDate">Date de début : </label>
+      <div class="col-sm-8">
         <input class="form-control" type="text" id="beginChoiceDate"
                datepicker-popup="dd/MM/yyyy"
                min-date="data.poll.beginDate"
@@ -94,8 +94,8 @@
       </div>
     </div>
     <div class="form-group" ng-if="data.poll.choiceAddAllowed" for="endChoiceDate">
-      <label class="col-lg-4 control-label">Date de fin : </label>
-      <div class="col-lg-8">
+      <label class="col-sm-4 control-label">Date de fin : </label>
+      <div class="col-sm-8">
         <input class="form-control" type="text" id="endChoiceDate"
                datepicker-popup="dd/MM/yyyy"
                min-date="data.poll.beginChoiceDate"
@@ -108,15 +108,15 @@
     </div>
 
     <div class="form-group">
-      <label class="col-lg-4 control-label">Limiter les votes :</label>
-      <div class="col-lg-8 btn-group">
+      <label class="col-sm-4 control-label">Limiter les votes :</label>
+      <div class="col-sm-8 btn-group">
         <button class="btn btn-default" ng-model="data.poll.limitedVote" btn-radio="true">Oui</button>
         <button class="btn btn-default" ng-model="data.poll.limitedVote" btn-radio="false">Non</button>
       </div>
     </div>
     <div class="form-group" ng-show="data.poll.limitedVote">
-      <label class="col-lg-4 control-label" for="popMaxChoiceNumber">Nombre de vote :</label>
-      <div class="col-lg-6">
+      <label class="col-sm-4 control-label" for="popMaxChoiceNumber">Nombre de vote :</label>
+      <div class="col-sm-6">
         <input type="text" class="form-control" id="popMaxChoiceNumber" ng-model="data.poll.maxChoiceNumber"/>
       </div>
     </div>
@@ -124,8 +124,8 @@
     <h4> Configuration des Réponses </h4>
 
     <div class="form-group">
-      <label class="col-lg-4 control-label">Type : </label>
-      <div class="col-lg-8">
+      <label class="col-sm-4 control-label">Type : </label>
+      <div class="col-sm-8">
         <div class="btn-group">
           <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="1">Normal</button>
           <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="2">Pourcentage</button>
@@ -140,8 +140,8 @@
     </div>
 
     <div class="form-group">
-      <label class="col-lg-4 control-label">Visibilité : </label>
-      <div class="col-lg-8 btn-group">
+      <label class="col-sm-4 control-label">Visibilité : </label>
+      <div class="col-sm-8 btn-group">
         <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" btn-radio="'EVERYBODY'">Public</button>
         <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" btn-radio="'VOTER'">Participants</button>
         <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" btn-radio="'CREATOR'">Créateur</button>
@@ -150,8 +150,8 @@
     </div>
 
   <div class="form-group">
-    <label class="col-lg-4 control-label">Autoriser les votes anonymes :</label>
-    <div class="col-lg-8 btn-group">
+    <label class="col-sm-4 control-label">Autoriser les votes anonymes :</label>
+    <div class="col-sm-8 btn-group">
       <button class="btn btn-default" ng-model="data.poll.anonymousVoteAllowed" btn-radio="true">Oui</button>
       <button class="btn btn-default" ng-model="data.poll.anonymousVoteAllowed" btn-radio="false">Non</button>
     </div>
diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html
index c17df1a..d6403df 100644
--- a/pollen-ui-angular/src/main/webapp/partials/poll.html
+++ b/pollen-ui-angular/src/main/webapp/partials/poll.html
@@ -35,7 +35,7 @@
   <div class="pollTitle" edit-me="showEditTitle">
     <h1 ng-hide="showEditTitle">
       {{data.poll.title || 'Click pour éditer'}}
-      <info-Error error="restError.title[0]" data="data.poll.title"></info-Error>
+      <info-error error="restError.title[0]" data="data.poll.title"></info-error>
     </h1>
 
     <h1 ng-show="showEditTitle">

-- 
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm@chorem.org>.

    

[Pollen-commits] 02/02: add token and local in request REST

Chorem.org scm