From 75c0b15179e95d8028741e1df950f6b28aefbc08 Mon Sep 17 00:00:00 2001
From: Sylvain Lehmann <sylvain@lehmann.dev>
Date: Tue, 1 Jun 2021 17:00:42 +0200
Subject: [PATCH 1/6] feature: add displayStartEndDates poll option
---
README.md | 7 +++++++
src/dependencies.pug | 2 +-
src/views/page-polls.pug | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b0c05a16..f0428700 100644
--- a/README.md
+++ b/README.md
@@ -548,10 +548,17 @@ On `config.json`:
"pollRangeTags": "http://server.url/tags/",
"pollRangeCircles": "http://server.url/circles/",
"uploads": "http://server.url/upload/"
+ },
+ "parameters": {
+ "displayStartEndDates": false
}
}
```
+Where:
+
+* `parameters.displayStartEndDates` display or not the start and the end date of polls
+
### Project
Project are a private group chat including Customer and Business Provider management.
diff --git a/src/dependencies.pug b/src/dependencies.pug
index 1bd79fb3..64f03fcd 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -48,7 +48,7 @@ if componentSet.has("notification")
//- script(type="module" src="/lib/sib-notifications/index.js" defer)
if componentSet.has("polls")
- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@3.0" defer)
+ script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@3.1" defer)
//- script(type="module" src="/lib/solid-poll/index.js" defer)
if componentSet.has("profileDirectory")
diff --git a/src/views/page-polls.pug b/src/views/page-polls.pug
index 1a4ef23d..f288a095 100644
--- a/src/views/page-polls.pug
+++ b/src/views/page-polls.pug
@@ -4,5 +4,6 @@ solid-poll(
range-tags=component.endpoints.pollRangeTags
range-circles=component.endpoints.pollRangeCircles
upload-dir=component.endpoints.uploads
+ display-start-end-date=component.parameters.displayStartEndDates
uniq=component.uniq
)
--
GitLab
From 3127336a9f1539bc5b4c216a0d6ea983a18f13af Mon Sep 17 00:00:00 2001
From: Sylvain Lehmann <sylvain@lehmann.dev>
Date: Tue, 1 Jun 2021 17:00:42 +0200
Subject: [PATCH 2/6] feature: add displayStartEndDates poll option
---
README.md | 7 +++++++
src/dependencies.pug | 2 +-
src/views/page-polls.pug | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b0c05a16..f0428700 100644
--- a/README.md
+++ b/README.md
@@ -548,10 +548,17 @@ On `config.json`:
"pollRangeTags": "http://server.url/tags/",
"pollRangeCircles": "http://server.url/circles/",
"uploads": "http://server.url/upload/"
+ },
+ "parameters": {
+ "displayStartEndDates": false
}
}
```
+Where:
+
+* `parameters.displayStartEndDates` display or not the start and the end date of polls
+
### Project
Project are a private group chat including Customer and Business Provider management.
diff --git a/src/dependencies.pug b/src/dependencies.pug
index 1bd79fb3..64f03fcd 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -48,7 +48,7 @@ if componentSet.has("notification")
//- script(type="module" src="/lib/sib-notifications/index.js" defer)
if componentSet.has("polls")
- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@3.0" defer)
+ script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@3.1" defer)
//- script(type="module" src="/lib/solid-poll/index.js" defer)
if componentSet.has("profileDirectory")
diff --git a/src/views/page-polls.pug b/src/views/page-polls.pug
index 1a4ef23d..f288a095 100644
--- a/src/views/page-polls.pug
+++ b/src/views/page-polls.pug
@@ -4,5 +4,6 @@ solid-poll(
range-tags=component.endpoints.pollRangeTags
range-circles=component.endpoints.pollRangeCircles
upload-dir=component.endpoints.uploads
+ display-start-end-date=component.parameters.displayStartEndDates
uniq=component.uniq
)
--
GitLab
From 2929a618555504da03070a4bfe45fd5ac6592f34 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Mon, 14 Jun 2021 13:02:51 +0000
Subject: [PATCH 3/6] fix: attributes
---
src/views/page-polls.pug | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/views/page-polls.pug b/src/views/page-polls.pug
index f288a095..89ec73d2 100644
--- a/src/views/page-polls.pug
+++ b/src/views/page-polls.pug
@@ -1,9 +1,10 @@
-solid-poll(
- data-src=component.endpoints.get
- data-dest=component.endpoints.post
- range-tags=component.endpoints.pollRangeTags
- range-circles=component.endpoints.pollRangeCircles
- upload-dir=component.endpoints.uploads
- display-start-end-date=component.parameters.displayStartEndDates
- uniq=component.uniq
-)
+solid-poll(
+ data-src=component.endpoints.get
+ data-dest=component.endpoints.post
+ range-tags=component.endpoints.pollRangeTags
+ range-circles=component.endpoints.pollRangeCircles
+ upload-dir=component.endpoints.uploads
+ uniq=component.uniq
+)&attributes({
+ "display-start-end-date": component.parameters ? component.parameters.displayStartEndDates : false
+})
--
GitLab
From a57a4a5461b90d8f2704296da9f9877d4225d920 Mon Sep 17 00:00:00 2001
From: Sylvain Lehmann <sylvain@lehmann.dev>
Date: Mon, 14 Jun 2021 15:09:59 +0200
Subject: [PATCH 4/6] fix: use on page-circle-polls
---
src/views/partials/circle/page-circle-polls.pug | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/views/partials/circle/page-circle-polls.pug b/src/views/partials/circle/page-circle-polls.pug
index e73dedc5..4c643ba4 100644
--- a/src/views/partials/circle/page-circle-polls.pug
+++ b/src/views/partials/circle/page-circle-polls.pug
@@ -6,4 +6,6 @@ solid-poll(
range-circles=extension.endpoints.pollRangeCircles
upload-dir=extension.endpoints.uploads
uniq=extension.uniq
-)
+)&attributes({
+ "display-start-end-date": component.parameters ? component.parameters.displayStartEndDates : false
+})
--
GitLab
From 1d4eb8cf863902662dc56e7cf677dcda47de6c83 Mon Sep 17 00:00:00 2001
From: Sylvain Lehmann <sylvain@lehmann.dev>
Date: Mon, 14 Jun 2021 15:16:59 +0200
Subject: [PATCH 5/6] fix: typo
---
src/views/page-polls.pug | 2 +-
src/views/partials/circle/page-circle-polls.pug | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/page-polls.pug b/src/views/page-polls.pug
index 89ec73d2..a1691313 100644
--- a/src/views/page-polls.pug
+++ b/src/views/page-polls.pug
@@ -6,5 +6,5 @@ solid-poll(
upload-dir=component.endpoints.uploads
uniq=component.uniq
)&attributes({
- "display-start-end-date": component.parameters ? component.parameters.displayStartEndDates : false
+ "display-start-end-dates": component.parameters ? component.parameters.displayStartEndDates : false
})
diff --git a/src/views/partials/circle/page-circle-polls.pug b/src/views/partials/circle/page-circle-polls.pug
index 4c643ba4..8635df2e 100644
--- a/src/views/partials/circle/page-circle-polls.pug
+++ b/src/views/partials/circle/page-circle-polls.pug
@@ -7,5 +7,5 @@ solid-poll(
upload-dir=extension.endpoints.uploads
uniq=extension.uniq
)&attributes({
- "display-start-end-date": component.parameters ? component.parameters.displayStartEndDates : false
+ "display-start-end-dates": component.parameters ? component.parameters.displayStartEndDates : false
})
--
GitLab
From 5932d8306ca1024c24fe57ccf4b59b16532950df Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Mon, 14 Jun 2021 13:19:36 +0000
Subject: [PATCH 6/6] fix: extension
---
src/views/partials/circle/page-circle-polls.pug | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/partials/circle/page-circle-polls.pug b/src/views/partials/circle/page-circle-polls.pug
index 8635df2e..ae4f8d8d 100644
--- a/src/views/partials/circle/page-circle-polls.pug
+++ b/src/views/partials/circle/page-circle-polls.pug
@@ -7,5 +7,5 @@ solid-poll(
upload-dir=extension.endpoints.uploads
uniq=extension.uniq
)&attributes({
- "display-start-end-dates": component.parameters ? component.parameters.displayStartEndDates : false
+ "display-start-end-dates": extension.parameters ? extension.parameters.displayStartEndDates : false
})
--
GitLab