branch feature/253-tuiles updated (adb64a9b -> cd26dde1)
This is an automated email from the git hooks/post-receive script. New change to branch feature/253-tuiles in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from adb64a9b ref #253 Rechargement de la liste des sondages uniquement quand on clique sur les liens de filtre new cd26dde1 ref #253 Code style The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit cd26dde19a181051b66d98d5eec34185938383d5 Author: Cécilia Bossard <bossard@codelutin.com> Date: Wed Mar 4 11:49:23 2020 +0100 ref #253 Code style Summary of changes: .../src/main/web/tag/components/MenuItem.tag.html | 6 +---- .../src/main/web/tag/poll/MyPollsHeader.tag.html | 8 +++---- .../src/main/web/tag/poll/PollCardReboot.tag.html | 6 ++--- .../src/main/web/tag/poll/Polls.tag.html | 27 +++++++++++----------- 4 files changed, 21 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/253-tuiles in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit cd26dde19a181051b66d98d5eec34185938383d5 Author: Cécilia Bossard <bossard@codelutin.com> Date: Wed Mar 4 11:49:23 2020 +0100 ref #253 Code style --- .../src/main/web/tag/components/MenuItem.tag.html | 6 +---- .../src/main/web/tag/poll/MyPollsHeader.tag.html | 8 +++---- .../src/main/web/tag/poll/PollCardReboot.tag.html | 6 ++--- .../src/main/web/tag/poll/Polls.tag.html | 27 +++++++++++----------- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/components/MenuItem.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/MenuItem.tag.html index 53fecaf5..21885295 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/MenuItem.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/MenuItem.tag.html @@ -21,7 +21,7 @@ <MenuItem> <div class="{opts.isactive ? 'active' : ''}"> - <a href="{opts.href}" class="{activeClassName}"> + <a href="{opts.href}" class="{opts.isactive ? 'active' : ''}"> <span>{opts.label}</span> <div class="selector {visibleSelector}"/> </a> @@ -29,12 +29,8 @@ <script type="es6"> - this.activeClassName = ""; this.visibleSelector = "hidden"; - var currentPage = this.opts.currentPage; - var ref = this.opts.ref; - this.mainClassName = "visible"; if (this.opts.mainclassname) { this.mainClassName = this.opts.mainclassname; diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/MyPollsHeader.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/MyPollsHeader.tag.html index 3c1d747f..85670db0 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/MyPollsHeader.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/MyPollsHeader.tag.html @@ -99,22 +99,22 @@ import "../popup/ModalReboot.tag.html"; this.participatedPolls = () => { this.parent.currentPage = this.parent.pages.PARTICIPATED; - this.parent.refresh(); + this.parent.refresh(); }; this.pastPolls = () => { this.parent.currentPage = this.parent.pages.PAST; - this.parent.refresh(); + this.parent.refresh(); }; this.currentPolls = () => { this.parent.currentPage = this.parent.pages.CURRENT; - this.parent.refresh(); + this.parent.refresh(); }; this.upcommingPolls = () => { this.parent.currentPage = this.parent.pages.UPCOMMING; - this.parent.refresh(); + this.parent.refresh(); }; this.assignPoll = () => { diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html index d1f55611..46f28ae4 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html @@ -84,7 +84,7 @@ import "../components/Avatar.tag.html"; this.installBundle(session, "poll"); - var moment = require('moment'); + var moment = require("moment"); this.startDate = moment(this.opts.poll.beginDate).format("DD MMM YYYY"); if (this.opts.poll.endDate) { this.endDate = moment(this.opts.poll.endDate).format("DD MMM YYYY"); @@ -94,8 +94,8 @@ import "../components/Avatar.tag.html"; var now = new Date(); this.ended = this.opts.poll.endDate && this.opts.poll.endDate < now; - this.running = this.opts.poll.beginDate < now && opts.poll.endDate>now; - this.started = this.opts.poll.beginDate < now && !opts.poll.endDate; + this.running = this.opts.poll.beginDate < now && this.opts.poll.endDate > now; + this.started = this.opts.poll.beginDate < now && !this.opts.poll.endDate; this.starting = this.opts.poll.beginDate > now; // si le sondage est non terminé, on redirige vers la liste des votes diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html index 44ce1afa..1f4a1e05 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html @@ -52,24 +52,23 @@ import "./NoPoll.tag.html"; <script type="es6"> import session from "../../js/Session"; - import Message from "../../js/Message"; import pollService from "../../js/PollService"; this.pageStates = { - LOADING: 'loading', - NO_POLL: 'no_poll', - DISPLAY_POLLS: 'display_polls', - POLL_SELECTED: 'poll_selected' + LOADING: "loading", + NO_POLL: "no_poll", + DISPLAY_POLLS: "display_polls", + POLL_SELECTED: "poll_selected" }; this.pages = { - ALL: 'allPolls', - CREATED: 'createdPolls', - INVITED: 'invitedPolls', - PARTICIPATED: 'participatedPolls', - PAST: 'pastPolls', - CURRENT: 'currentPolls', - UPCOMMING: 'upcommingPolls' + ALL: "allPolls", + CREATED: "createdPolls", + INVITED: "invitedPolls", + PARTICIPATED: "participatedPolls", + PAST: "pastPolls", + CURRENT: "currentPolls", + UPCOMMING: "upcommingPolls" }; this.installBundle(session, "polls"); @@ -105,7 +104,7 @@ import "./NoPoll.tag.html"; this.count = result.pagination.count; this.currentState = this.pageStates.DISPLAY_POLLS; - if(this.count == 0){ + if (this.count === 0) { this.currentState = this.pageStates.NO_POLL; } @@ -120,7 +119,7 @@ import "./NoPoll.tag.html"; this.checkedBoxes.push(checkbox.parent); } else { var filtered = this.checkedBoxes.filter(function(value) { - return value.opts.poll.id !== checkbox.parent.opts.poll.id; + return value.opts.poll.id !== checkbox.parent.opts.poll.id; }); this.checkedBoxes = filtered; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm