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
6fdd55b7
Commit
6fdd55b7
authored
Nov 15, 2021
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
display Rattrapage instead of Suspendu
parent
4983a101
Pipeline
#1436
failed with stage
in 1 minute 36 seconds
Changes
8
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
22 additions
and
2 deletions
+22
-2
config_lacagette.py
coops_configurations/config_lacagette.py
+1
-0
config_lgds.py
coops_configurations/config_lgds.py
+1
-0
config_supercafoutch.py
coops_configurations/config_supercafoutch.py
+1
-0
models.py
members/models.py
+5
-0
members-space-home.js
members_space/static/js/members-space-home.js
+1
-1
members-space-shifts-exchange.js
members_space/static/js/members-space-shifts-exchange.js
+2
-0
config.md
outils/config.md
+4
-0
shifts_exchange.html
templates/members_space/shifts_exchange.html
+7
-1
No files found.
coops_configurations/config_lacagette.py
View file @
6fdd55b7
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
MAG_NAME
=
'Cleme'
MAG_NAME
=
'Cleme'
OFFICE_NAME
=
''
OFFICE_NAME
=
''
MAX_BEGIN_HOUR
=
'19:00'
MAX_BEGIN_HOUR
=
'19:00'
COMPANY_CODE
=
'lacagette'
COMPANY_NAME
=
'La Cagette'
COMPANY_NAME
=
'La Cagette'
WELCOME_ENTRANCE_MSG
=
'Bienvenue à La Cagette !'
WELCOME_ENTRANCE_MSG
=
'Bienvenue à La Cagette !'
WELCOME_MAIL_SUBJECT
=
'Dernière étape de votre inscription à la Cagette.'
WELCOME_MAIL_SUBJECT
=
'Dernière étape de votre inscription à la Cagette.'
...
...
coops_configurations/config_lgds.py
View file @
6fdd55b7
...
@@ -6,6 +6,7 @@ OPEN_ON_SUNDAY = True
...
@@ -6,6 +6,7 @@ OPEN_ON_SUNDAY = True
MAG_NAME
=
''
MAG_NAME
=
''
OFFICE_NAME
=
''
OFFICE_NAME
=
''
COMPANY_CODE
=
'lgds'
COMPANY_NAME
=
'Les Grains de Sel'
COMPANY_NAME
=
'Les Grains de Sel'
MAX_BEGIN_HOUR
=
'19:00'
MAX_BEGIN_HOUR
=
'19:00'
WELCOME_ENTRANCE_MSG
=
'Bienvenue aux Grains de Sel!'
WELCOME_ENTRANCE_MSG
=
'Bienvenue aux Grains de Sel!'
...
...
coops_configurations/config_supercafoutch.py
View file @
6fdd55b7
"""Company specific data values."""
"""Company specific data values."""
COMPANY_CODE
=
'supercafoutch'
"""Odoo coop specific constants ."""
"""Odoo coop specific constants ."""
EMAIL_DOMAIN
=
'supercafoutch.fr'
EMAIL_DOMAIN
=
'supercafoutch.fr'
...
...
members/models.py
View file @
6fdd55b7
...
@@ -617,11 +617,16 @@ class CagetteMember(models.Model):
...
@@ -617,11 +617,16 @@ class CagetteMember(models.Model):
@staticmethod
@staticmethod
def
get_state_fr
(
coop_state
):
def
get_state_fr
(
coop_state
):
"""Return french version of given coop_state."""
"""Return french version of given coop_state."""
company
=
getattr
(
settings
,
'COMPANY_CODE'
,
''
)
if
coop_state
==
'alert'
:
if
coop_state
==
'alert'
:
fr_state
=
'En alerte'
fr_state
=
'En alerte'
elif
coop_state
==
'delay'
:
elif
coop_state
==
'delay'
:
fr_state
=
'Délai accordé'
fr_state
=
'Délai accordé'
elif
coop_state
==
'suspended'
:
elif
coop_state
==
'suspended'
:
if
company
==
'lacagette'
:
fr_state
=
'Rattrapage'
else
:
fr_state
=
'Suspendu(e)'
fr_state
=
'Suspendu(e)'
elif
coop_state
==
'not_concerned'
:
elif
coop_state
==
'not_concerned'
:
fr_state
=
'Non concerné(e)'
fr_state
=
'Non concerné(e)'
...
...
members_space/static/js/members-space-home.js
View file @
6fdd55b7
const
possible_cooperative_state
=
{
const
possible_cooperative_state
=
{
suspended
:
"
Suspendu.
e"
,
suspended
:
"
Rattrapag
e"
,
exempted
:
"Exempté.e"
,
exempted
:
"Exempté.e"
,
alert
:
"En alerte"
,
alert
:
"En alerte"
,
up_to_date
:
"À jour"
,
up_to_date
:
"À jour"
,
...
...
members_space/static/js/members-space-shifts-exchange.js
View file @
6fdd55b7
...
@@ -359,6 +359,8 @@ function init_shifts_exchange() {
...
@@ -359,6 +359,8 @@ function init_shifts_exchange() {
});
});
}
else
if
(
partner_data
.
cooperative_state
===
'suspended'
}
else
if
(
partner_data
.
cooperative_state
===
'suspended'
&&
partner_data
.
date_delay_stop
===
'False'
)
{
&&
partner_data
.
date_delay_stop
===
'False'
)
{
$
(
"#suspended_content .makeups_nb"
).
text
(
partner_data
.
makeups_to_do
);
$
(
"#suspended_content"
).
show
();
$
(
"#suspended_content"
).
show
();
$
(
".select_makeups"
).
on
(
'click'
,
()
=>
{
$
(
".select_makeups"
).
on
(
'click'
,
()
=>
{
...
...
outils/config.md
View file @
6fdd55b7
...
@@ -22,6 +22,10 @@
...
@@ -22,6 +22,10 @@
Used to draw weeks planning
Used to draw weeks planning
-
COMPANY_NAME = 'lgds'
Used for company spesific code
-
COMPANY_NAME = 'Les Grains de Sel'
-
COMPANY_NAME = 'Les Grains de Sel'
-
ADMIN_IDS =
[
13
]
-
ADMIN_IDS =
[
13
]
...
...
templates/members_space/shifts_exchange.html
View file @
6fdd55b7
...
@@ -12,7 +12,13 @@
...
@@ -12,7 +12,13 @@
</a>
</a>
</div>
</div>
<div
id=
"suspended_content"
class=
"shifts_exchange_page_content"
>
<div
id=
"suspended_content"
class=
"shifts_exchange_page_content"
>
<h3>
Je suis suspendu.e, je dois sélectionner mes rattrapages pour pouvoir refaire mes courses.
</h3>
<h3>
J'ai
<span
class=
"makeups_nb"
></span>
rattrapages à effectuer, je dois les sélectionner pour pouvoir refaire mes courses.
J'ai 6 mois de délai pour les rattraper.
</h3>
<h3>
Si besoin, je peux contacter le Bureau des membres via la rubrique "J'ai une demande" pour expliquer ma situation.
</h3>
<button
type=
"button"
class=
"btn--danger select_makeups"
>
<button
type=
"button"
class=
"btn--danger select_makeups"
>
Je sélectionne mes rattrapages
Je sélectionne mes rattrapages
</button>
</button>
...
...
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