Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cooperatic-foodcoops
third-party
Commits
e1bc64f5
Commit
e1bc64f5
authored
Nov 18, 2021
by
François
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change post presence validation message
parent
50e13334
Pipeline
#1459
passed with stage
in 1 minute 28 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
2 deletions
+19
-2
views.py
members/views.py
+2
-1
config.md
outils/config.md
+9
-0
context_processors.py
outils/context_processors.py
+4
-1
index.html
templates/members/index.html
+4
-0
No files found.
members/views.py
View file @
e1bc64f5
...
@@ -29,7 +29,8 @@ def index(request):
...
@@ -29,7 +29,8 @@ def index(request):
'ENTRANCE_EASY_SHIFT_VALIDATE_MSG'
:
getattr
(
settings
,
'ENTRANCE_EASY_SHIFT_VALIDATE_MSG'
,
'ENTRANCE_EASY_SHIFT_VALIDATE_MSG'
:
getattr
(
settings
,
'ENTRANCE_EASY_SHIFT_VALIDATE_MSG'
,
'Je valide mon service "Comité"'
),
'Je valide mon service "Comité"'
),
'CONFIRME_PRESENT_BTN'
:
getattr
(
settings
,
'CONFIRME_PRESENT_BTN'
,
'Présent.e'
),
'CONFIRME_PRESENT_BTN'
:
getattr
(
settings
,
'CONFIRME_PRESENT_BTN'
,
'Présent.e'
),
'LATE_MODE'
:
getattr
(
settings
,
'ENTRANCE_WITH_LATE_MODE'
,
False
)
'LATE_MODE'
:
getattr
(
settings
,
'ENTRANCE_WITH_LATE_MODE'
,
False
),
'ENTRANCE_VALIDATE_PRESENCE_MESSAGE'
:
getattr
(
settings
,
'ENTRANCE_VALIDATE_PRESENCE_MESSAGE'
,
''
)
}
}
for_shoping_msg
=
getattr
(
settings
,
'ENTRANCE_COME_FOR_SHOPING_MSG'
,
''
)
for_shoping_msg
=
getattr
(
settings
,
'ENTRANCE_COME_FOR_SHOPING_MSG'
,
''
)
...
...
outils/config.md
View file @
e1bc64f5
...
@@ -264,6 +264,15 @@
...
@@ -264,6 +264,15 @@
(if not set, 60 minutes is the default)
(if not set, 60 minutes is the default)
-
ENTRANCE_VALIDATE_PRESENCE_MESSAGE = """
<div
class=
"explanations"
>
Ta présence a bien été validée ! Merci de te diriger au fond du magasin pour le lancement du créneau !
</div>
Ton prochain service
<span
class=
"service_verb"
>
est prévu
</span>
le
<span
class=
"next_shift"
></span>
"""
(La Cagette message, where no point data is displayed)
### Member space
### Member space
-
EM_URL = ''
-
EM_URL = ''
...
...
outils/context_processors.py
View file @
e1bc64f5
...
@@ -21,5 +21,7 @@ def custom_css(request):
...
@@ -21,5 +21,7 @@ def custom_css(request):
def
context_setting
(
request
):
def
context_setting
(
request
):
"""adding settings variable to context (can be overloaded in views)."""
"""adding settings variable to context (can be overloaded in views)."""
context
=
{
'odoo'
:
settings
.
ODOO
[
'url'
],
'app_env'
:
getattr
(
settings
,
'APP_ENV'
,
"prod"
)
}
context
=
{
'odoo'
:
settings
.
ODOO
[
'url'
],
'app_env'
:
getattr
(
settings
,
'APP_ENV'
,
"prod"
),
'company_code'
:
getattr
(
settings
,
'COMPANY_CODE'
,
''
)}
return
context
return
context
\ No newline at end of file
templates/members/index.html
View file @
e1bc64f5
...
@@ -188,6 +188,9 @@
...
@@ -188,6 +188,9 @@
<h1
class=
"col-6 txtcenter"
>
Bon service !
</h1>
<h1
class=
"col-6 txtcenter"
>
Bon service !
</h1>
<section
class=
"col-6 txtcenter"
>
<section
class=
"col-6 txtcenter"
>
<span
class=
"member_name"
></span><br
/>
<span
class=
"member_name"
></span><br
/>
{% if ENTRANCE_VALIDATE_PRESENCE_MESSAGE != '' %}
{{ENTRANCE_VALIDATE_PRESENCE_MESSAGE|safe}}
{% else %}
Votre présence est bien enregistrée !
<br
/>
Votre présence est bien enregistrée !
<br
/>
<div
class=
"compteur"
>
<div
class=
"compteur"
>
Votre compteur est dorénavant à
<span
class=
"points"
></span>
point(s).
<br
/>
Votre compteur est dorénavant à
<span
class=
"points"
></span>
point(s).
<br
/>
...
@@ -200,6 +203,7 @@
...
@@ -200,6 +203,7 @@
</div>
</div>
</div>
</div>
Votre prochain service
<span
class=
"service_verb"
>
est prévu
</span>
le
<span
class=
"next_shift"
></span>
Votre prochain service
<span
class=
"service_verb"
>
est prévu
</span>
le
<span
class=
"next_shift"
></span>
{% endif %}
</section>
</section>
<div
class=
"col-2"
></div>
<div
class=
"col-2"
></div>
<a
class=
"btn col-2"
data-next=
"first_page"
>
Coopérateur suivant
</a>
<a
class=
"btn col-2"
data-next=
"first_page"
>
Coopérateur suivant
</a>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment