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
b06fceda
Commit
b06fceda
authored
Oct 06, 2022
by
Félicie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
1c643c93
Pipeline
#2413
passed with stage
in 1 minute 25 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
+6
-1
models.py
members/models.py
+5
-0
members.js
members/static/js/members.js
+1
-1
No files found.
members/models.py
View file @
b06fceda
...
@@ -724,6 +724,10 @@ class CagetteMember(models.Model):
...
@@ -724,6 +724,10 @@ class CagetteMember(models.Model):
fr_state
=
'A jour'
fr_state
=
'A jour'
elif
coop_state
==
'exempted'
:
elif
coop_state
==
'exempted'
:
fr_state
=
'Exempté(e)'
fr_state
=
'Exempté(e)'
elif
coop_state
==
'associated'
:
fr_state
=
'En binôme'
elif
coop_state
==
'gone'
:
fr_state
=
'Parti(e)'
else
:
else
:
fr_state
=
'Inconnu'
fr_state
=
'Inconnu'
return
fr_state
return
fr_state
...
@@ -793,6 +797,7 @@ class CagetteMember(models.Model):
...
@@ -793,6 +797,7 @@ class CagetteMember(models.Model):
cond
.
append
([
'is_associated_people'
,
'='
,
True
])
cond
.
append
([
'is_associated_people'
,
'='
,
True
])
else
:
else
:
cond
.
append
([
'is_associated_people'
,
'='
,
False
])
cond
.
append
([
'is_associated_people'
,
'='
,
False
])
cond
.
append
([
'cooperative_state'
,
'!='
,
'associated'
])
# cond.append(['cooperative_state', '!=', 'unsubscribed'])
# cond.append(['cooperative_state', '!=', 'unsubscribed'])
if
search_type
==
"full"
or
search_type
==
'members'
or
search_type
==
"manage_shift_registrations"
:
if
search_type
==
"full"
or
search_type
==
'members'
or
search_type
==
"manage_shift_registrations"
:
fields
=
CagetteMember
.
m_default_fields
fields
=
CagetteMember
.
m_default_fields
...
...
members/static/js/members.js
View file @
b06fceda
...
@@ -106,7 +106,7 @@ function fill_member_slide(member) {
...
@@ -106,7 +106,7 @@ function fill_member_slide(member) {
html_elts
.
status_explanation
.
html
(
explanation
);
html_elts
.
status_explanation
.
html
(
explanation
);
}
}
if
(
member
.
cooperative_state
==
'Désinscrit(e)'
)
coop_info
.
addClass
(
'b_red'
);
if
(
member
.
cooperative_state
==
'Désinscrit(e)'
||
member
.
cooperative_state
==
'Parti(e)'
)
coop_info
.
addClass
(
'b_red'
);
else
if
(
member
.
cooperative_state
==
'En alerte'
||
member
.
cooperative_state
==
'Délai accordé'
||
member
.
cooperative_state
==
'Rattrapage'
)
coop_info
.
addClass
(
'b_orange'
);
else
if
(
member
.
cooperative_state
==
'En alerte'
||
member
.
cooperative_state
==
'Délai accordé'
||
member
.
cooperative_state
==
'Rattrapage'
)
coop_info
.
addClass
(
'b_orange'
);
if
(
member
.
shifts
.
length
>
0
)
{
if
(
member
.
shifts
.
length
>
0
)
{
...
...
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