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
7a54c6fc
Commit
7a54c6fc
authored
Nov 25, 2021
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
display Rattrapage status in red on welcoming board
parent
958c2ee4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
config_lacagette.py
coops_configurations/config_lacagette.py
+1
-2
members.js
members/static/js/members.js
+1
-1
config.md
outils/config.md
+2
-4
No files found.
coops_configurations/config_lacagette.py
View file @
7a54c6fc
...
@@ -125,7 +125,6 @@ RECEPTION_PB = "Ici, vous pouvez signaler toute anomalie lors d'une réception,
...
@@ -125,7 +125,6 @@ RECEPTION_PB = "Ici, vous pouvez signaler toute anomalie lors d'une réception,
Merci d'indiquer un maximum d'informations, le nom du produit et son code barre.
\
Merci d'indiquer un maximum d'informations, le nom du produit et son code barre.
\
Dans le cas de produits déteriorés, merci d'envoyer une photo avec votre téléphone à [Adresse_email]"
Dans le cas de produits déteriorés, merci d'envoyer une photo avec votre téléphone à [Adresse_email]"
AMNISTIE_DATE
=
"2021-11-24 00:00:00"
# display or not column "Autres" in reception process
# display or not column "Autres" in reception process
DISPLAY_COL_AUTRES
=
False
DISPLAY_COL_AUTRES
=
False
...
@@ -136,4 +135,4 @@ ORDERS_HELPER_METABASE_URL = "url_meta_base"
...
@@ -136,4 +135,4 @@ ORDERS_HELPER_METABASE_URL = "url_meta_base"
# New members space
# New members space
USE_NEW_MEMBERS_SPACE
=
True
USE_NEW_MEMBERS_SPACE
=
True
START_DATE_FOR_SHIFTS_HISTORY
=
"2018-01-01"
START_DATE_FOR_SHIFTS_HISTORY
=
"2018-01-01"
AMNISTIE_DATE
=
"2021-11-24 00:00:00"
members/static/js/members.js
View file @
7a54c6fc
...
@@ -91,7 +91,7 @@ function fill_member_slide(member) {
...
@@ -91,7 +91,7 @@ function fill_member_slide(member) {
}
}
html_elts
.
image_medium
.
html
(
'<img src="'
+
img_src
+
'" width="128" />'
);
html_elts
.
image_medium
.
html
(
'<img src="'
+
img_src
+
'" width="128" />'
);
html_elts
.
cooperative_state
.
html
(
member
.
cooperative_state
);
html_elts
.
cooperative_state
.
html
(
member
.
cooperative_state
);
if
(
member
.
cooperative_state
==
'Désinscrit(e)'
)
coop_info
.
addClass
(
'b_red'
);
if
(
member
.
cooperative_state
==
'Désinscrit(e)'
||
member
.
cooperative_state
==
'Rattrapage'
)
coop_info
.
addClass
(
'b_red'
);
else
if
(
member
.
cooperative_state
==
'En alerte'
||
member
.
cooperative_state
==
'Délai accordé'
)
coop_info
.
addClass
(
'b_orange'
);
else
if
(
member
.
cooperative_state
==
'En alerte'
||
member
.
cooperative_state
==
'Délai accordé'
)
coop_info
.
addClass
(
'b_orange'
);
if
(
member
.
shifts
.
length
>
0
)
{
if
(
member
.
shifts
.
length
>
0
)
{
...
...
outils/config.md
View file @
7a54c6fc
...
@@ -311,9 +311,6 @@
...
@@ -311,9 +311,6 @@
Message shown to people when they connect to the Member Space
Message shown to people when they connect to the Member Space
-
AMNISTIE_DATE = "2021-11-24 00:00:00"
In members_space history display a special activity about amnistie
### Reception
### Reception
-
RECEPTION_ADD_ADMIN_MODE = True
-
RECEPTION_ADD_ADMIN_MODE = True
...
@@ -366,7 +363,8 @@
...
@@ -366,7 +363,8 @@
-
START_DATE_FOR_SHIFTS_HISTORY = "2018-01-01"
-
START_DATE_FOR_SHIFTS_HISTORY = "2018-01-01"
-
AMNISTIE_DATE = "2021-11-24 00:00:00"
In members_space history display a special activity about amnistie
### Miscellious
### Miscellious
...
...
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