Merge branch 'rafael' of gitlab.com:participa/discussion-app into rafael

Leonardo Merlin
2 parents c284597b 7346ee7f
Showing 2 changed files with 84 additions and 62 deletions Show diff stats
src/app/components/proposal-list/proposal-list.directive.js
src/app/components/proposal-list/proposal-list.html
@@ -2,8 +2,8 @@
   'use strict';
   angular
-    .module('dialoga')
-    .directive('proposalList', proposalList);
+  .module('dialoga')
+  .directive('proposalList', proposalList);
   /** @ngInject */
   function proposalList() {
@@ -36,9 +36,21 @@
         vm.per_page = 5;
       }
+      vm.currentPageIndex = 0;
+
       vm.proposalsPerPage = vm.getProposalsPerPage(0);
       vm.proposalsLength = vm.proposals.length;
+
+
+      if ((vm.proposalsLength % vm.per_page) == 0) {
+        vm.pages =  vm.proposalsLength / vm.per_page;
+      } else{
+        vm.pages =  (vm.proposalsLength / vm.per_page) +1;
+      };
+
+      vm.arraypages = new Array(vm.pages);
+
     };
     ProposalListController.prototype.loadData = function () {
@@ -62,7 +74,17 @@
     ProposalListController.prototype.showPage = function (pageIndex) {
       var vm = this;
+
+      if (pageIndex < 0) {
+        pageIndex = 0;
+      }
+
+      if (pageIndex > (vm.arraypages.length-1)) {
+        pageIndex = vm.arraypages.length-1;
+      }
+
       vm.proposalsPerPage = vm.getProposalsPerPage(pageIndex);
+      vm.currentPageIndex = pageIndex;
     };
     function attachPopover(){
 <div class="proposal-list">
-  <div class="table-responsive" ng-if="vm.loading">
-    <div class="table-responsive">Carregando...</div>
-  </div>
-  <div class="table-responsive" ng-if="!vm.loading && vm.proposalsPerPage">
-    <table class="table table-striped">
-      <thead>
-        <tr>
-          <th>
-            Colocação
-            <a tabindex="0" class="btn btn-link btn-question" role="button" data-toggle="popover" data-trigger="focus">?</a>
-          </th>
-          <th>{{vm.proposals.length}} PROPOSTAS</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr ng-repeat="proposal in vm.proposalsPerPage">
-          <td class="color-theme-fg">
-            <span class="position">{{::($index+1)}}º</span>
-          </td>
-          <td>
-            <div class="row">
-              <div class="col-xs-12">
-                <div class="abstract" ng-bind-html="proposal.abstract"></div>
-              </div>
-            </div>
-            <div class="row row-actions">
-              <div class="col-md-9">
-                <button type="button" class="btn btn-link btn-rate color-theme-common-fg">
-                  Avalie esta proposta
-                  <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
-                </button>
-              </div>
-              <div class="col-md-3">
-                <proposal-stats views="{{::proposal.hits}}" up="{{::proposal.votes_for}}" down="{{::proposal.votes_against}}"></proposal-stats>
-              </div>
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <nav>
-      <ul class="pagination">
-        <li>
-          <a href="#" aria-label="Previous">
-            <span aria-hidden="true">&laquo;</span>
-          </a>
-        </li>
-        <li><a href="#" ng-click="vm.showPage(1)">1</a></li>
-        <li><a href="#" ng-click="vm.showPage(2)">2</a></li>
-        <li><a href="#" ng-click="vm.showPage(3)">3</a></li>
-        <li><a href="#" ng-click="vm.showPage(4)">4</a></li>
-        <li><a href="#" ng-click="vm.showPage(5)">5</a></li>
-        <li>
-          <a href="#" aria-label="Next">
-            <span aria-hidden="true">&raquo;</span>
-          </a>
-        </li>
-      </ul>
-    </nav>
-  </div>
+	<div class="table-responsive" ng-if="vm.loading">
+		<div class="table-responsive">Carregando...</div>
+	</div>
+	<div class="table-responsive" ng-if="!vm.loading && vm.proposalsPerPage">
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th>
+						Colocação
+						<a tabindex="0" class="btn btn-link btn-question" role="button" data-toggle="popover" data-trigger="focus">?</a>
+					</th>
+					<th>{{vm.proposals.length}} PROPOSTAS</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr ng-repeat="proposal in vm.proposalsPerPage">
+					<td class="color-theme-fg">
+						<span class="position">{{::($index+1)}}º</span>
+					</td>
+					<td>
+						<div class="row">
+							<div class="col-xs-12">
+								<div class="abstract" ng-bind-html="proposal.abstract"></div>
+							</div>
+						</div>
+						<div class="row row-actions">
+							<div class="col-md-9">
+								<button type="button" class="btn btn-link btn-rate color-theme-common-fg">
+									Avalie esta proposta
+									<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+								</button>
+							</div>
+							<div class="col-md-3">
+								<proposal-stats views="{{::proposal.hits}}" up="{{::proposal.votes_for}}" down="{{::proposal.votes_against}}"></proposal-stats>
+							</div>
+						</div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+		<nav>
+			<ul class="pagination">
+
+				<li ng-class="{ 'disabled' : vm.currentPageIndex == 0}">
+					<a href="#" aria-label="Previous" ng-click="vm.showPage(vm.currentPageIndex-1)">
+						<span aria-hidden="true">&laquo;</span>
+					</a>
+				</li>
+				<li ng-repeat="paginas in vm.arraypages track by $index" ng-class="{ 'active' : ($index) == vm.currentPageIndex }" >
+					<a href="#" ng-click="vm.showPage($index)">{{::($index)+1}}</a>
+				</li>
+				<li  ng-class="{ 'disabled' : vm.currentPageIndex == (vm.arraypages.length -1)}">
+					<a href="#" aria-label="Next" ng-click="vm.showPage(vm.currentPageIndex+1)">
+						<span aria-hidden="true">&raquo;</span>
+					</a>
+				</li>
+
+			</ul>
+		</nav>
+	</div>
 </div>
	@@ -2,8 +2,8 @@		@@ -2,8 +2,8 @@
2	'use strict';	2	'use strict';
3		3
4	angular	4	angular
5	- .module('dialoga')
6	- .directive('proposalList', proposalList);	5	+ .module('dialoga')
		6	+ .directive('proposalList', proposalList);
7		7
8	/** @ngInject */	8	/** @ngInject */
9	function proposalList() {	9	function proposalList() {
	@@ -36,9 +36,21 @@		@@ -36,9 +36,21 @@
36	vm.per_page = 5;	36	vm.per_page = 5;
37	}	37	}
38		38
		39	+ vm.currentPageIndex = 0;
		40	+
39	vm.proposalsPerPage = vm.getProposalsPerPage(0);	41	vm.proposalsPerPage = vm.getProposalsPerPage(0);
40		42
41	vm.proposalsLength = vm.proposals.length;	43	vm.proposalsLength = vm.proposals.length;
		44	+
		45	+
		46	+ if ((vm.proposalsLength % vm.per_page) == 0) {
		47	+ vm.pages = vm.proposalsLength / vm.per_page;
		48	+ } else{
		49	+ vm.pages = (vm.proposalsLength / vm.per_page) +1;
		50	+ };
		51	+
		52	+ vm.arraypages = new Array(vm.pages);
		53	+
42	};	54	};
43		55
44	ProposalListController.prototype.loadData = function () {	56	ProposalListController.prototype.loadData = function () {
	@@ -62,7 +74,17 @@		@@ -62,7 +74,17 @@
62		74
63	ProposalListController.prototype.showPage = function (pageIndex) {	75	ProposalListController.prototype.showPage = function (pageIndex) {
64	var vm = this;	76	var vm = this;
		77	+
		78	+ if (pageIndex < 0) {
		79	+ pageIndex = 0;
		80	+ }
		81	+
		82	+ if (pageIndex > (vm.arraypages.length-1)) {
		83	+ pageIndex = vm.arraypages.length-1;
		84	+ }
		85	+
65	vm.proposalsPerPage = vm.getProposalsPerPage(pageIndex);	86	vm.proposalsPerPage = vm.getProposalsPerPage(pageIndex);
		87	+ vm.currentPageIndex = pageIndex;
66	};	88	};
67		89
68	function attachPopover(){	90	function attachPopover(){