Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Ecolyo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
LLLE_Project
Ecolyo
Commits
8c6e3c1c
Commit
8c6e3c1c
authored
3 years ago
by
Bastien DUMONT
Browse files
Options
Downloads
Patches
Plain Diff
water alert
parent
773dd8dd
No related branches found
No related tags found
1 merge request
!598
Feat/us754 water alert consumption
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/notifications/consumptionLimit.hbs
+7
-5
7 additions, 5 deletions
src/notifications/consumptionLimit.hbs
src/targets/services/consumptionAlert.ts
+1
-0
1 addition, 0 deletions
src/targets/services/consumptionAlert.ts
with
8 additions
and
5 deletions
src/notifications/consumptionLimit.hbs
+
7
−
5
View file @
8c6e3c1c
...
@@ -7,16 +7,18 @@
...
@@ -7,16 +7,18 @@
{{#
>
base
/
header
}}
{{#
>
base
/
header
}}
{{/
base
/
header
}}
{{/
base
/
header
}}
<mj-section
background-color=
"#121212"
>
<mj-section
background-color=
"#121212"
>
<mj-column
width=
"60%"
vertical-align=
"middle"
>
<mj-column
width=
"60%"
vertical-align=
"middle"
>
<mj-text
color=
"white"
font-weight=
"900"
font-size=
"24px"
>
<mj-text
color=
"white"
font-weight=
"900"
font-size=
"24px"
>
Bonjour
{{
username
}}
,
Bonjour
{{
username
}}
,
</mj-text>
</mj-text>
<mj-text
color=
"white"
font-weight=
"400"
font-size=
"18px"
>
<mj-text
color=
"white"
font-weight=
"400"
font-size=
"18px"
>
La limite de consommation d'eau journalière que vous avez fixée à
{{
userLimit
}}
L a été dépassée le
{{
limitDate
}}
.
<br
/>
La limite de consommation d'eau journalière que vous avez fixée à
{{
userLimit
}}
L a été dépassée.
<br
/>
Pour comprendre ce qu’il s’est passé, rendez-vous dans Ecolyo.
Le
<span
style=
"color: #E3B82A; font-weight: 700;"
>
{{
limitDate
}}
</span>
, vous avez consommé
<span
style=
"color: #3a98ec; font-weight:700;"
>
{{
consumption
}}
</span>
.
<br
/>
</mj-text>
</mj-text>
<mj-text
color=
"white"
font-weight=
"400"
font-size=
"18px"
>
Pour comprendre ce qu’il s’est passé, rendez-vous dans Ecolyo.
</mj-text>
</mj-column>
</mj-column>
<mj-column
width=
"40%"
vertical-align=
"middle"
>
<mj-column
width=
"40%"
vertical-align=
"middle"
>
<mj-image
src=
"
{{
baseUrl
}}
/assets/baignoire.png"
width=
"132px"
align=
"center"
></mj-image>
<mj-image
src=
"
{{
baseUrl
}}
/assets/baignoire.png"
width=
"132px"
align=
"center"
></mj-image>
...
...
This diff is collapsed.
Click to expand it.
src/targets/services/consumptionAlert.ts
+
1
−
0
View file @
8c6e3c1c
...
@@ -89,6 +89,7 @@ const consumptionAlert = async ({ client }: ConsumptionAlertProps) => {
...
@@ -89,6 +89,7 @@ const consumptionAlert = async ({ client }: ConsumptionAlertProps) => {
unsubscribeUrl
:
`
${
appLink
}
/#/options`
,
unsubscribeUrl
:
`
${
appLink
}
/#/options`
,
userLimit
:
userProfil
.
waterDailyConsumptionLimit
,
userLimit
:
userProfil
.
waterDailyConsumptionLimit
,
limitDate
:
`
${
alertDay
.
day
}
${
getPreviousMonthName
(
alertDay
)}
`
,
limitDate
:
`
${
alertDay
.
day
}
${
getPreviousMonthName
(
alertDay
)}
`
,
consumption
:
lastDayValue
,
})
})
const
mailData
=
{
const
mailData
=
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment