branch develop updated (c58910b -> 50e1076)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from c58910b refs #23 remove vote summary notification as we cannot really determine the vote edition and deletion for a period new 739ccae fix validation du choix de fichier qui ne s'affichait pas sous Chrome new a2fde28 refs #23 remove forgotten method new 6bfa1b6 utilisation de la lib Object.values pour les navigateurs ne supportant pas encore cette function native js new 50e1076 correction de l'édition des dates dans le sondage The 4 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 50e107601197cda5030881523ad8bf41acbc305c Author: Kevin Morin <morin@codelutin.com> Date: Thu May 18 15:52:02 2017 +0200 correction de l'édition des dates dans le sondage commit 6bfa1b6d1ed1cea900fcb84fad6237a96d82beb4 Author: Kevin Morin <morin@codelutin.com> Date: Thu May 18 15:51:38 2017 +0200 utilisation de la lib Object.values pour les navigateurs ne supportant pas encore cette function native js commit a2fde28aa295a4daf6627ad42088b6c882123d6d Author: Kevin Morin <morin@codelutin.com> Date: Thu May 18 15:50:35 2017 +0200 refs #23 remove forgotten method commit 739ccaeaad0193ae5fa21be9033e812445c8ce69 Author: Kevin Morin <morin@codelutin.com> Date: Thu May 18 11:45:30 2017 +0200 fix validation du choix de fichier qui ne s'affichait pas sous Chrome Summary of changes: .../org/chorem/pollen/services/service/VoteService.java | 9 +++------ pollen-ui-riot-js/package.json | 1 + pollen-ui-riot-js/src/main/web/js/Error.js | 5 +++++ pollen-ui-riot-js/src/main/web/js/UIHelper.js | 8 +++++++- pollen-ui-riot-js/src/main/web/js/VoterListService.js | 4 ++++ pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html | 3 ++- .../src/main/web/tag/poll/Settings.tag.html | 16 ++++++++++------ 7 files changed, 32 insertions(+), 14 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 739ccaeaad0193ae5fa21be9033e812445c8ce69 Author: Kevin Morin <morin@codelutin.com> Date: Thu May 18 11:45:30 2017 +0200 fix validation du choix de fichier qui ne s'affichait pas sous Chrome --- pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html index b28146d..ceea93c 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html @@ -292,7 +292,8 @@ require("../components/time-picker.tag.html"); } .add-file input[type="file"] { - visibility: hidden; + width: 0px; + padding-left: 1px; } textarea { -- 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit a2fde28aa295a4daf6627ad42088b6c882123d6d Author: Kevin Morin <morin@codelutin.com> Date: Thu May 18 15:50:35 2017 +0200 refs #23 remove forgotten method --- .../java/org/chorem/pollen/services/service/VoteService.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index 349c227..442f575 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -60,6 +60,9 @@ public class VoteService extends PollenServiceSupport { private final Function<VoteBean, VoteBean> voteBeanFunction = input -> { if (isNotPermitted(PermissionVerb.editVote, input.getEntityId())) { input.setPermission(null); + if (input.isAnonymous()) { + input.setVoterName(null); + } } return input; }; @@ -109,12 +112,6 @@ public class VoteService extends PollenServiceSupport { } - public List<Vote> getVotesSinceLastNotification(String pollId) { - checkNotNull(pollId); - Poll poll = getPollService().getPoll0(pollId); - return getVoteDao().findAllSince(poll, poll.getLastVoteNotification()); - } - public VoteBean getVote(String pollId, String voteId) { checkNotNull(voteId); -- 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 6bfa1b6d1ed1cea900fcb84fad6237a96d82beb4 Author: Kevin Morin <morin@codelutin.com> Date: Thu May 18 15:51:38 2017 +0200 utilisation de la lib Object.values pour les navigateurs ne supportant pas encore cette function native js --- pollen-ui-riot-js/package.json | 1 + pollen-ui-riot-js/src/main/web/js/Error.js | 5 +++++ pollen-ui-riot-js/src/main/web/js/VoterListService.js | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/pollen-ui-riot-js/package.json b/pollen-ui-riot-js/package.json index 750102a..eccde60 100644 --- a/pollen-ui-riot-js/package.json +++ b/pollen-ui-riot-js/package.json @@ -46,6 +46,7 @@ "font-awesome": "4.7.0", "moment": "^2.17.1", "nprogress": "^0.2.0", + "object.values": "^1.0.4", "qrcode-generator": "^1.2.0", "remarkable": "^1.7.1", "riot": "3.3.2", diff --git a/pollen-ui-riot-js/src/main/web/js/Error.js b/pollen-ui-riot-js/src/main/web/js/Error.js index 775a6c2..4ac129e 100644 --- a/pollen-ui-riot-js/src/main/web/js/Error.js +++ b/pollen-ui-riot-js/src/main/web/js/Error.js @@ -18,6 +18,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ +let values = require('object.values'); +if (!Object.values) { + values.shim(); +} + class Error { constructor(e, timeout) { diff --git a/pollen-ui-riot-js/src/main/web/js/VoterListService.js b/pollen-ui-riot-js/src/main/web/js/VoterListService.js index 9d923ef..3eb36cf 100644 --- a/pollen-ui-riot-js/src/main/web/js/VoterListService.js +++ b/pollen-ui-riot-js/src/main/web/js/VoterListService.js @@ -1,5 +1,9 @@ let singleton = require("./Singleton"); let FetchService = require("./FetchService"); +let values = require('object.values'); +if (!Object.values) { + values.shim(); +} class VoterListService extends FetchService { -- 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 50e107601197cda5030881523ad8bf41acbc305c Author: Kevin Morin <morin@codelutin.com> Date: Thu May 18 15:52:02 2017 +0200 correction de l'édition des dates dans le sondage --- pollen-ui-riot-js/src/main/web/js/UIHelper.js | 8 +++++++- .../src/main/web/tag/poll/Settings.tag.html | 16 ++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/js/UIHelper.js b/pollen-ui-riot-js/src/main/web/js/UIHelper.js index c220b9e..30c41ff 100644 --- a/pollen-ui-riot-js/src/main/web/js/UIHelper.js +++ b/pollen-ui-riot-js/src/main/web/js/UIHelper.js @@ -47,5 +47,11 @@ module.exports = { return ""; }, - bus: require("./PollenBus.js") + formatDateForInput(date) { + return this.formatDate(date, "YYYY-MM-DDTHH:mm"); + }, + + bus: require("./PollenBus.js"), + + DATETIME_INPUT_PATTERN: "[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}" }; diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html index 8c35397..fbd7481 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html @@ -110,7 +110,8 @@ class="c-field" disabled={form.hasVotes} value={form.model.beginChoiceDate} - type="datetime-local"> + type="datetime-local" + pattern={DATETIME_INPUT_PATTERN}> </div> <div class="o-form-element"> <label class="c-label" for="endChoiceDate"> @@ -122,7 +123,8 @@ class="c-field" disabled={form.hasVotes} value={form.model.endChoiceDate} - type="datetime-local"> + type="datetime-local" + pattern={DATETIME_INPUT_PATTERN}> </div> </div> <div show="{canLimitNumberOfChoices}" class="o-form-element"> @@ -183,10 +185,11 @@ <input ref="beginDate" name="beginDate" id="beginDate" - disabled={form.hasVotes} - value={form.model.beginDate} + disabled={!form.hasVotes} + value={formatDateForInput(form.model.beginDate)} class="c-field" - type="datetime-local"> + type="datetime-local" + pattern={DATETIME_INPUT_PATTERN}> </div> <div class="o-form-element"> <label class="c-label" for="endDate"> @@ -195,9 +198,10 @@ <input ref="endDate" name="endDate" id="endDate" - value={form.model.endDate} + value={formatDateForInput(form.model.endDate)} class="c-field" type="datetime-local" + pattern={DATETIME_INPUT_PATTERN} onchange="{onEndDateChanged}"> </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm