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
a9a912d2
Commit
a9a912d2
authored
Apr 19, 2022
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
INS: display button to go to prepa odoo
parent
86e0f826
Pipeline
#2137
passed with stage
in 1 minute 29 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
7 deletions
+34
-7
config_lacagette.py
coops_configurations/config_lacagette.py
+1
-0
inscriptions.css
members/static/css/inscriptions.css
+15
-0
views.py
members/views.py
+2
-1
config.md
outils/config.md
+3
-0
inscriptions.html
templates/members/inscriptions.html
+13
-6
No files found.
coops_configurations/config_lacagette.py
View file @
a9a912d2
...
...
@@ -115,6 +115,7 @@ ENTRANCE_EASY_SHIFT_VALIDATE_MSG = """Si vous faites un service dans un comité,
valider votre présence en cherchant<br/>
votre nom ou numéro ci-dessous
"""
PREPA_ODOO_URL
=
'[...]'
# Members space / shifts
UNSUBSCRIBED_FORM_LINK
=
'https://docs.google.com/forms/d/e/1FAIpQLScWcpls-ruYIp7HdrjRF1B1TyuzdqhvlUIcUWynbEujfj3dTg/viewform'
...
...
members/static/css/inscriptions.css
View file @
a9a912d2
.nav
.fr
{
margin-left
:
10px
;}
.nav
.fl
{
margin-right
:
10px
;}
.nav
#process_state_container
{
min-height
:
36px
;
}
.nav
#process_state
{
min-height
:
36px
;
display
:
flex
;
align-items
:
center
;
gap
:
3px
;
}
.nav
#goto_prepa_odoo_button
,
.nav
#goto_prepa_odoo_button
:hover
{
text-decoration
:
none
;
}
#shift_choice
>
div
,
#new_coop
,
#coop_list_view
,
#coop_registration_details
{
display
:
none
;}
...
...
members/views.py
View file @
a9a912d2
...
...
@@ -102,7 +102,8 @@ def inscriptions(request, type=1):
'max_chq_nb'
:
getattr
(
settings
,
'MAX_CHQ_NB'
,
12
),
'show_ftop_button'
:
getattr
(
settings
,
'SHOW_FTOP_BUTTON'
,
True
),
'db'
:
settings
.
COUCHDB
[
'dbs'
][
'member'
],
'ASSOCIATE_MEMBER_SHIFT'
:
getattr
(
settings
,
'ASSOCIATE_MEMBER_SHIFT'
,
''
)
'ASSOCIATE_MEMBER_SHIFT'
:
getattr
(
settings
,
'ASSOCIATE_MEMBER_SHIFT'
,
''
),
'prepa_odoo_url'
:
getattr
(
settings
,
'PREPA_ODOO_URL'
,
''
),
}
response
=
HttpResponse
(
template
.
render
(
context
,
request
))
...
...
outils/config.md
View file @
a9a912d2
...
...
@@ -135,6 +135,9 @@
Id number of the associate shift template
-
PREPA_ODOO_URL = ''
URL of the "prepa_odoo" page
### Scales and labels files generation
-
DAV_PATH = '/data/dav/cagette'
...
...
templates/members/inscriptions.html
View file @
a9a912d2
...
...
@@ -26,13 +26,20 @@
{% endblock %}
{% block content %}
<nav
class=
"col-6 clearfix nav"
>
<div
id=
"process_state"
class=
"fl"
></div>
<button
id=
"create_new_coop"
class=
"btn--primary fr"
>
Nouvelle inscription
</button>
<button
id=
"coop_list_btn"
class=
"btn--info fr"
style=
"display:none;"
>
Liste
</button>
<button
id=
"shift_calendar"
class=
"btn--inverse fr"
>
Vue créneaux
</button>
<div
class=
"left-nav"
>
{% if prepa_odoo_url != '' %}
<div
id=
"goto_prepa_odoo"
class=
"fl"
>
<a
class=
"btn--info"
id=
"goto_prepa_odoo_button"
href=
'{{prepa_odoo_url}}'
target=
'_blank'
>
Prepa Odoo
</a>
</div>
{% endif %}
<div
id=
"process_state_container"
class=
"fl"
>
<div
id=
"process_state"
></div>
</div>
</div>
<button
id=
"create_new_coop"
class=
"btn--primary fr"
>
Nouvelle inscription
</button>
<button
id=
"coop_list_btn"
class=
"btn--info fr"
style=
"display:none;"
>
Liste
</button>
<button
id=
"shift_calendar"
class=
"btn--inverse fr"
>
Vue créneaux
</button>
</nav>
<section
class=
"center"
id=
"new_coop"
>
...
...
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