From garandel@users.chorem.org Mon May  5 17:39:11 2014
From: garandel@users.chorem.org
To: pollen-commits@list.chorem.org
Subject: [Pollen-commits] r3914 - in	trunk/pollen-ui-angular/src/main/webapp:
 . js/controllers partials
Date: Mon, 05 May 2014 17:39:11 +0200
Message-ID: <20140505153911.5BA4118112F@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3426562062329044818=="

--===============3426562062329044818==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: garandel
Date: 2014-05-05 17:39:10 +0200 (Mon, 05 May 2014)
New Revision: 3914

Url: http://forge.chorem.org/projects/pollen/repository/revisions/3914

Log:
Add popup setting


Added:
   trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupSettings.html
Modified:
   trunk/pollen-ui-angular/src/main/webapp/index.html
   trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
   trunk/pollen-ui-angular/src/main/webapp/partials/poll.html

Modified: trunk/pollen-ui-angular/src/main/webapp/index.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/index.html	2014-05-05 12:36:59 UT=
C (rev 3913)
+++ trunk/pollen-ui-angular/src/main/webapp/index.html	2014-05-05 15:39:10 UT=
C (rev 3914)
@@ -29,7 +29,7 @@
   <script src=3D"https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angu=
lar.min.js"></script>
   <script src=3D"https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angu=
lar-route.min.js"></script>
   <script src=3D"https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angu=
lar-resource.min.js"></script>
-  <script src=3D"http://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/=
0.10.0/ui-bootstrap-tpls.min.js"></script>
+  <script src=3D"http://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/=
0.11.0/ui-bootstrap-tpls.min.js"></script>
   <script src=3D"http://cdnjs.cloudflare.com/ajax/libs/restangular/1.4.0/res=
tangular.min.js"></script>
   <script src=3D"js/libs/ckeditor/ckeditor.js"></script>
=20

Modified: trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js	2014-0=
5-05 12:36:59 UTC (rev 3913)
+++ trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js	2014-0=
5-05 15:39:10 UTC (rev 3914)
@@ -122,6 +122,18 @@
     });
   }
=20
+  $scope.popupSettings =3D function () {
+    var modalInstance =3D $modal.open({
+      templateUrl : 'partials/poll-popupSettings.html',
+      controller : PollPopupSettingsCtrl,
+      size : 'lg',
+      resolve : { poll: function () {
+          return $scope.poll;
+        }
+      }
+    });
+  }
+
   $scope.reset =3D function () {
     $scope.poll =3D initPoll();
     $scope.voteChoice =3D $scope.poll.choice;
@@ -158,8 +170,36 @@
=20
   }
=20
+  var PollPopupSettingsCtrl =3D function ($scope, $filter, $modalInstance, p=
oll) {
+    $scope.poll =3D poll;
=20
+    if (!angular.isDefined($scope.poll.continuousResults)) {
+      $scope.poll.continuousResults =3D false;
+    }
=20
+    if (!angular.isDefined($scope.poll.resultVisibility)) {
+      $scope.poll.resultVisibility =3D 'EVERYBODY';
+    }
+
+    if (!angular.isDefined($scope.poll.choiceAddAllowed)) {
+      $scope.poll.choiceAddAllowed =3D false;
+    }
+
+    $scope.close =3D function () {
+      $modalInstance.dismiss();
+    }
+
+    $scope.printCheckbox=3D function (value) {
+      if (value) {
+        return 'Oui';
+      } else {
+        return 'Non';
+      }
+    }
+
+  }
+
+
 }])
=20
 .controller('PollCreateCtrl', ['$scope', '$controller', 'Restangular', '$htt=
p', function ($scope, $controller, Restangular, $http) {

Added: trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupSettings.ht=
ml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupSettings.html	=
                        (rev 0)
+++ trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupSettings.html	=
2014-05-05 15:39:10 UTC (rev 3914)
@@ -0,0 +1,156 @@
+<!--
+  #%L
+  Pollen :: UI (Angular)
+  %%
+  Copyright (C) 2009 - 2014 CodeLutin
+  %%
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  #L%
+  -->
+
+
+
+<form class=3D"form-horizontal">
+  <div class=3D"modal-header">
+    <h3 class=3D"modal-title">Configuration</h3>
+  </div>
+
+  <div class=3D"modal-body">
+
+    <h4>Confiuration global</h4>
+
+    <div class=3D"form-group">
+      <label class=3D"col-lg-4 control-label" for=3D"popBeginDate">Date de d=
=C3=A9but : </label>
+      <div class=3D"col-lg-8">
+        <input id=3D"popBeginDate" class=3D"form-control" type=3D"text"
+               datepicker-popup=3D"dd/MM/yyyy"
+               ng-model=3D"poll.beginDate"
+               is-open=3D"beginDateOpened"/>
+      </div>
+    </div>
+
+    <div class=3D"form-group">
+      <label class=3D"col-lg-4 control-label" for=3D"popEndDate">Date de fin=
 : </label>
+      <div class=3D"col-lg-8">
+        <input id=3D"popEndDate" class=3D"form-control" type=3D"text"
+               datepicker-popup=3D"dd/MM/yyyy"
+               ng-model=3D"poll.endDate"
+               is-open=3D"endDateOpened"/>
+      </div>
+    </div>
+
+    <div class=3D"form-group">
+      <label class=3D"col-lg-4 control-label">R=C3=A9sultat : </label>
+      <div class=3D"col-lg-8 btn-group">
+        <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll.r=
esultVisibility" btn-radio=3D"'EVERYBODY'">Public</button>
+        <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll.r=
esultVisibility" btn-radio=3D"'VOTER'">Participants</button>
+        <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll.r=
esultVisibility" btn-radio=3D"'CREATOR'">Cr=C3=A9ateur</button>
+      </div>
+    </div>
+
+    <div class=3D"form-group">
+      <label class=3D"col-lg-4 control-label" for=3D"popContinuousResults">R=
=C3=A9sultat continue : </label>
+      <div class=3D"col-lg-8">
+        <button class=3D"btn btn-default" id=3D"popContinuousResults" ng-mod=
el=3D"poll.continuousResults" btn-checkbox>{{printCheckbox(poll.continuousRes=
ults)}}</button>
+      </div>
+    </div>
+
+    <h4>Configuration des Choix</h4>
+
+    <div class=3D"form-group">
+      <label class=3D"col-lg-4 control-label" for=3D"popChoiceAddAllowed">Aj=
out de choix par les votants :</label>
+      <div class=3D"col-lg-8">
+        <button class=3D"btn btn-default" id=3D"popChoiceAddAllowed" ng-mode=
l=3D"poll.choiceAddAllowed" btn-checkbox >{{printCheckbox(poll.choiceAddAllow=
ed)}}</button>
+      </div>
+    </div>
+    <div class=3D"form-group" ng-show=3D"poll.choiceAddAllowed">
+      <label class=3D"col-lg-4 control-label" for=3D"popBeginChoiceDate">Dat=
e de d=C3=A9but : </label>
+      <div class=3D"col-lg-8">
+        <input class=3D"form-control" type=3D"text" id=3D"popBeginChoiceDate"
+               datepicker-popup=3D"dd/MM/yyyy"
+               min-date=3D"poll.beginDate"
+               max-date=3D"poll.endDate"
+               ng-model=3D"poll.beginChoiceDate"
+               is-open=3D"beginChoiceDateOpened"/>
+      </div>
+    </div>
+    <div class=3D"form-group" ng-show=3D"poll.choiceAddAllowed" for=3D"popEn=
dChoiceDate">
+      <label class=3D"col-lg-4 control-label">Date de fin : </label>
+      <div class=3D"col-lg-8">
+        <input class=3D"form-control" type=3D"text" id=3D"popEndChoiceDate"
+               datepicker-popup=3D"dd/MM/yyyy"
+               min-date=3D"poll.beginDate"
+               max-date=3D"poll.endDate"
+               ng-model=3D"poll.endChoiceDate"
+               is-open=3D"endChoiceDateOpened"/>
+      </div>
+    </div>
+
+    <div class=3D"form-group">
+      <label class=3D"col-lg-4 control-label" for=3D"popLimitedVote">Limiter=
 les votes :</label>
+      <div class=3D"col-lg-8">
+        <button class=3D"btn btn-default" id=3D"popLimitedVote" ng-model=3D"=
poll.limitedVote" btn-checkbox >{{printCheckbox(poll.limitedVote)}}</button>
+      </div>
+    </div>
+    <div class=3D"form-group" ng-show=3D"poll.limitedVote">
+      <label class=3D"col-lg-4 control-label" for=3D"popMaxChoiceNumber">Nom=
bre de vote :</label>
+      <div class=3D"col-lg-6">
+        <input type=3D"text" class=3D"form-control" id=3D"popMaxChoiceNumber=
" ng-model=3D"poll.maxChoiceNumber"/>
+      </div>
+    </div>
+
+    <h4> Configuration des R=C3=A9ponses </h4>
+
+    <div class=3D"form-group">
+      <label class=3D"col-lg-4 control-label">Type : </label>
+      <div class=3D"col-lg-8">
+        <div class=3D"btn-group">
+          <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll=
.voteCountingType" btn-radio=3D"1">Normal</button>
+          <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll=
.voteCountingType" btn-radio=3D"2">Pourcentage</button>
+          <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll=
.voteCountingType" btn-radio=3D"3">Condorcet</button>
+          <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll=
.voteCountingType" btn-radio=3D"4">Nombre</button>
+        </div>
+        <div class=3D"btn-group">
+          <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll=
.voteCountingType" btn-radio=3D"5">Borda</button>
+          <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll=
.voteCountingType" btn-radio=3D"6">Vote alternatif</button>
+          <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll=
.voteCountingType" btn-radio=3D"7">Coombs</button>
+        </div>
+        <p>description type...</p>
+      </div>
+    </div>
+  </div>
+
+    <div class=3D"form-group">
+      <label class=3D"col-lg-4 control-label">Visibilit=C3=A9 : </label>
+      <div class=3D"col-lg-8 btn-group">
+        <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll.v=
oteVisibility" btn-radio=3D"'EVERYBODY'">Public</button>
+        <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll.v=
oteVisibility" btn-radio=3D"'VOTER'">Participants</button>
+        <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll.v=
oteVisibility" btn-radio=3D"'CREATOR'">Cr=C3=A9ateur</button>
+        <button type=3D"button" class=3D"btn btn-success" ng-model=3D"poll.v=
oteVisibility" btn-radio=3D"'ANONYMOUS'">Anonyme</button>
+      </div>
+    </div>
+  </div>
+
+  <div class=3D"form-group">
+    <label class=3D"col-lg-4 control-label">Autoriser les votes anonymes :</=
label>
+    <div class=3D"col-lg-8">
+      <button class=3D"btn btn-default" ng-model=3D"poll.anonymousVoteAllowe=
d" btn-checkbox >{{printCheckbox(poll.anonymousVoteAllowed)}}</button>
+    </div>
+  </div>
+
+
+  <div class=3D"modal-footer">
+    <button type=3D"button" class=3D"btn btn-primary" ng-click=3D"close()">c=
lose</button>
+  </div>
+</form>
\ No newline at end of file

Modified: trunk/pollen-ui-angular/src/main/webapp/partials/poll.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pollen-ui-angular/src/main/webapp/partials/poll.html	2014-05-05 12:=
36:59 UTC (rev 3913)
+++ trunk/pollen-ui-angular/src/main/webapp/partials/poll.html	2014-05-05 15:=
39:10 UTC (rev 3914)
@@ -54,6 +54,7 @@
     <button class=3D"btn btn-primary" ng-click=3D"save()">Save</button>
     <button class=3D"btn btn-warning" ng-click=3D"reset();" ng-if=3D"!global=
Variables.voted">Reset</button>
     <button class=3D"btn btn-danger" ng-click=3D"delete();">Delete</button>
+    <button class=3D"btn btn-default" ng-click=3D"popupSettings()">Settings<=
/button>
   </div>
=20
 </form>
\ No newline at end of file


--===============3426562062329044818==--