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
fe24e4b4
Commit
fe24e4b4
authored
Feb 04, 2022
by
Félicie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
borne
parent
79d992f1
Pipeline
#1763
passed with stage
in 1 minute 37 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
+14
-9
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
index.html
templates/members/index.html
+3
-3
No files found.
members/models.py
View file @
fe24e4b4
...
...
@@ -766,7 +766,7 @@ class CagetteMember(models.Model):
# member = CagetteMember(m['id'], m['email'])
# m['next_shifts'] = member.get_next_shift()
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'
]
members
.
append
(
m
)
...
...
@@ -1206,7 +1206,7 @@ class CagetteServices(models.Model):
for
m
in
s
[
'members'
]:
for
a
in
associated
:
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
...
...
members/static/css/member.css
View file @
fe24e4b4
...
...
@@ -72,3 +72,6 @@ h1 .member_name {font-weight: bold;}
#member_advice
{
background
:
#FFF
;
color
:
red
;}
.easy_shift_validate
{
text-align
:
center
;
margin-top
:
3em
;}
.button_is_member
{
background-color
:
#439D44
;}
.button_is_associated_people
{
background
:
#0275D8
;}
members/static/js/members.js
View file @
fe24e4b4
...
...
@@ -147,14 +147,16 @@ function preview_results() {
for
(
i
in
results
)
{
if
(
results
[
i
].
is_member
!=
false
)
{
var
m
=
$
(
'<button
style="background-color: #00A573;
">'
).
attr
(
'data-i'
,
i
)
.
text
(
results
[
i
].
name
);
var
m
=
$
(
'<button
class="button_is_member
">'
).
attr
(
'data-i'
,
i
)
.
text
(
results
[
i
].
barcode_base
+
' - '
+
results
[
i
].
name
);
html_elts
.
multi_results
.
append
(
m
);
}
if
(
results
[
i
].
is_associated_people
!=
false
)
{
var
m
=
$
(
'<button style="background: #0275D8;">'
).
attr
(
'data-i'
,
i
)
.
text
(
results
[
i
].
name
);
m
=
$
(
'<button class="button_is_associated_people"></button_is_member>'
).
attr
(
'data-i'
,
i
)
.
text
(
'B '
+
results
[
i
].
barcode_base
+
' - '
+
results
[
i
].
name
);
html_elts
.
multi_results
.
append
(
m
);
}
...
...
templates/members/index.html
View file @
fe24e4b4
...
...
@@ -52,7 +52,7 @@
<div
class=
"row-1 grid-2"
>
<div
class=
"col-1"
>
<div
class=
"label"
>
Biper le badge, ou saisi
ssez
le n° de coop. ou le nom
Biper le badge, ou saisi
r
le n° de coop. ou le nom
</div>
Recherche :
<input
type=
"text"
name=
"search_string"
autocomplete=
"off"
/>
...
...
@@ -112,7 +112,7 @@
<div
id=
"next_shifts"
>
</div>
</div>
<a
class=
"btn"
data-next=
"first_page"
>
Coopérateur suivant
</a>
<a
class=
"btn"
data-next=
"first_page"
>
coopérateur.rice suivant.e
</a>
</div>
<div
class=
"col-1"
>
<section
id=
"member_advice"
>
...
...
@@ -208,7 +208,7 @@
{% endif %}
</section>
<div
class=
"col-2"
></div>
<a
class=
"btn col-2"
data-next=
"first_page"
>
Coopérateur
suivant
</a>
<a
class=
"btn col-2"
data-next=
"first_page"
>
Coopérateur
.ice suivant.e
</a>
<div
class=
"col-2"
></div>
</section>
<section
class=
"grid-6 has-gutter"
id=
"rattrapage_1"
>
...
...
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