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
415927be
Commit
415927be
authored
Mar 08, 2022
by
Félicie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated
parent
fe16e7d5
Pipeline
#1881
failed with stage
in 1 minute 27 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
11 deletions
+15
-11
admin.py
members/admin.py
+1
-0
manage_attached.css
members/static/css/admin/manage_attached.css
+5
-1
manage_attached.js
members/static/js/admin/manage_attached.js
+1
-1
manage_attached_create_pair.html
templates/members/admin/manage_attached_create_pair.html
+8
-9
No files found.
members/admin.py
View file @
415927be
...
...
@@ -432,6 +432,7 @@ def get_member_info(request,coop_id):
'is_associated_people'
,
'parent_name'
,
'barcode_base'
,
"makeups_to_do"
]
member
=
api
.
search_read
(
'res.partner'
,
[[
'barcode_base'
,
'='
,
coop_id
]],
fields
)
...
...
members/static/css/admin/manage_attached.css
View file @
415927be
...
...
@@ -34,7 +34,7 @@
.create_pair_button
{
display
:
flex
;
justify-content
:
center
;
margin
:
1
00px
0
10
0px
0
;
margin
:
1
20px
0
12
0px
0
;
}
@media
screen
and
(
max-width
:
992px
)
{
...
...
@@ -68,6 +68,10 @@
font-weight
:
bold
;
}
.member_status_text_container
{
margin
:
1rem
;
}
/* -- Tiles */
.tiles_container
{
...
...
members/static/js/admin/manage_attached.js
View file @
415927be
...
...
@@ -62,7 +62,7 @@ function display_member_infos(divId, memberData) {
$
(
"#"
+
divId
).
find
(
".member_name"
).
text
(
memberData
.
name
)
$
(
"#"
+
divId
).
find
(
".member_status"
).
text
(
possible_cooperative_state
[
memberData
.
cooperative_state
])
$
(
"#"
+
divId
).
find
(
".member_shift_name"
).
text
(
memberData
.
current_template_name
);
$
(
"#"
+
divId
).
find
(
".member_
coop_number"
).
text
(
memberData
.
barcode_base
);
$
(
"#"
+
divId
).
find
(
".member_
makeups_to_do"
).
text
(
memberData
.
makeups_to_do
);
if
(
memberData
.
is_associated_people
===
false
)
{
$
(
"#"
+
divId
).
find
(
".member_associated_partner_area"
).
hide
();
...
...
templates/members/admin/manage_attached_create_pair.html
View file @
415927be
...
...
@@ -44,15 +44,14 @@
<div
class=
"member_status_text_container"
>
<span>
Mon statut :
</span>
<span
class=
"member_info member_status"
></span>
<br>
<span>
Nombre de rattrapage(s) :
</span>
<span
class=
"member_makeups_to_do member_info"
></span>
</div>
<div
class=
"member_shift_name_area"
>
<span>
Mon créneau :
</span>
<span
class=
"member_shift_name member_info"
></span>
</div>
<div
class=
"member_coop_number_area"
>
<span>
Mon numéro de coop :
</span>
<span
class=
"member_coop_number member_info"
></span>
</div>
<div
class=
"member_associated_partner_area"
>
<span>
Je suis déjà en binôme !
</span>
<span
class=
"member_associated_partner member_info"
></span>
...
...
@@ -70,7 +69,7 @@
<div
class=
"tile"
>
<div
class=
"search_member_form_area"
id=
"search_member_form_area"
>
<h4>
Rechercher le.a coopérateur.ice
co-titulair
e
</h4>
<h4>
Rechercher le.a coopérateur.ice
suppléant.
e
</h4>
<form
autocomplete=
"off"
id=
"search_member_form_child"
class=
"search_member_form"
action=
"javascript:;"
method=
"post"
>
<input
name=
"searchChild"
type=
"text"
id=
"search_child_input"
value=
""
placeholder=
"Nom ou numéro du coop..."
required
>
</form>
...
...
@@ -86,14 +85,14 @@
<span>
Mon statut :
</span>
<span
class=
"member_info member_status"
></span>
</div>
<div
class=
"member_makeups_to_do_area"
>
<span>
Nombre de rattrapage :
</span>
<span
class=
"member_makeups_to_do member_info"
></span>
</div>
<div
class=
"member_shift_name_area"
>
<span>
Mon créneau :
</span>
<span
class=
"member_shift_name member_info"
></span>
</div>
<div
class=
"member_coop_number_area"
>
<span>
Mon numéro de coop :
</span>
<span
class=
"member_coop_number member_info"
></span>
</div>
<div
class=
"member_associated_partner_area"
>
<span>
Je suis déjà en binôme !
</span>
<span
class=
"member_associated_partner member_info"
></span>
...
...
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