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
3c23bcc9
Commit
3c23bcc9
authored
Feb 04, 2022
by
Félicie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
coop number added
parent
58b1daa9
Pipeline
#1756
failed with stage
in 1 minute 35 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
models.py
members/models.py
+2
-2
member.css
members/static/css/member.css
+3
-0
members.js
members/static/js/members.js
+6
-4
No files found.
members/models.py
View file @
3c23bcc9
...
@@ -765,7 +765,7 @@ class CagetteMember(models.Model):
...
@@ -765,7 +765,7 @@ class CagetteMember(models.Model):
# member = CagetteMember(m['id'], m['email'])
# member = CagetteMember(m['id'], m['email'])
# m['next_shifts'] = member.get_next_shift()
# m['next_shifts'] = member.get_next_shift()
if
not
m
[
'parent_name'
]
is
False
:
if
not
m
[
'parent_name'
]
is
False
:
m
[
'name'
]
+=
'
/
'
+
m
[
'parent_name'
]
m
[
'name'
]
+=
'
en binôme avec
'
+
m
[
'parent_name'
]
del
m
[
'parent_name'
]
del
m
[
'parent_name'
]
members
.
append
(
m
)
members
.
append
(
m
)
...
@@ -1205,7 +1205,7 @@ class CagetteServices(models.Model):
...
@@ -1205,7 +1205,7 @@ class CagetteServices(models.Model):
for
m
in
s
[
'members'
]:
for
m
in
s
[
'members'
]:
for
a
in
associated
:
for
a
in
associated
:
if
int
(
a
[
'parent_id'
][
0
])
==
int
(
m
[
'partner_id'
][
0
]):
if
int
(
a
[
'parent_id'
][
0
])
==
int
(
m
[
'partner_id'
][
0
]):
m
[
'partner_id'
][
1
]
+=
'
/
'
+
a
[
'name'
]
m
[
'partner_id'
][
1
]
+=
'
en binôme avec
'
+
a
[
'name'
]
return
services
return
services
...
...
members/static/css/member.css
View file @
3c23bcc9
...
@@ -72,3 +72,6 @@ h1 .member_name {font-weight: bold;}
...
@@ -72,3 +72,6 @@ h1 .member_name {font-weight: bold;}
#member_advice
{
background
:
#FFF
;
color
:
red
;}
#member_advice
{
background
:
#FFF
;
color
:
red
;}
.easy_shift_validate
{
text-align
:
center
;
margin-top
:
3em
;}
.easy_shift_validate
{
text-align
:
center
;
margin-top
:
3em
;}
.button_is_member
{
background-color
:
#00A573
;}
.button_is_associated_people
{
background
:
#0275D8
;}
members/static/js/members.js
View file @
3c23bcc9
...
@@ -147,14 +147,16 @@ function preview_results() {
...
@@ -147,14 +147,16 @@ function preview_results() {
for
(
i
in
results
)
{
for
(
i
in
results
)
{
if
(
results
[
i
].
is_member
!=
false
)
{
if
(
results
[
i
].
is_member
!=
false
)
{
var
m
=
$
(
'<button
style="background-color: #00A573;
">'
).
attr
(
'data-i'
,
i
)
var
m
=
$
(
'<button
class="button_is_member
">'
).
attr
(
'data-i'
,
i
)
.
text
(
results
[
i
].
name
);
.
text
(
results
[
i
].
barcode_base
+
' - '
+
results
[
i
].
name
);
html_elts
.
multi_results
.
append
(
m
);
html_elts
.
multi_results
.
append
(
m
);
}
}
if
(
results
[
i
].
is_associated_people
!=
false
)
{
if
(
results
[
i
].
is_associated_people
!=
false
)
{
var
m
=
$
(
'<button style="background: #0275D8;">'
).
attr
(
'data-i'
,
i
)
var
m
=
$
(
'<button class="button_is_associated_people"></button_is_member>'
).
attr
(
'data-i'
,
i
)
.
text
(
results
[
i
].
name
);
.
text
(
'B '
+
results
[
i
].
barcode_base
+
' - '
+
results
[
i
].
name
);
html_elts
.
multi_results
.
append
(
m
);
html_elts
.
multi_results
.
append
(
m
);
}
}
...
...
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