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
9a8d369b
Commit
9a8d369b
authored
Nov 17, 2021
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
display partner name in home & my info + style fixes
parent
46c72a44
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
13 deletions
+33
-13
members-space-my-info.css
members_space/static/css/members-space-my-info.css
+1
-0
members-space.css
members_space/static/css/members-space.css
+17
-8
members-space-my-info.js
members_space/static/js/members-space-my-info.js
+2
-2
members-space.js
members_space/static/js/members-space.js
+5
-0
home.html
templates/members_space/home.html
+3
-2
my_info.html
templates/members_space/my_info.html
+4
-0
my_shifts.html
templates/members_space/my_shifts.html
+1
-1
No files found.
members_space/static/css/members-space-my-info.css
View file @
9a8d369b
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
#my_info_content
{
#my_info_content
{
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
margin
:
2rem
0
;
}
}
.my_info_line
{
.my_info_line
{
...
...
members_space/static/css/members-space.css
View file @
9a8d369b
...
@@ -13,6 +13,12 @@ body {
...
@@ -13,6 +13,12 @@ body {
flex-wrap
:
wrap
;
flex-wrap
:
wrap
;
}
}
@media
screen
and
(
max-width
:
768px
)
{
.tiles_container
{
flex-direction
:
column
;
}
}
.tile
{
.tile
{
flex
:
1
0
45%
;
flex
:
1
0
45%
;
display
:
flex
;
display
:
flex
;
...
@@ -39,15 +45,10 @@ body {
...
@@ -39,15 +45,10 @@ body {
justify-content
:
center
;
justify-content
:
center
;
align-items
:
center
;
align-items
:
center
;
border-bottom
:
1px
solid
#e7e9ed
;
border-bottom
:
1px
solid
#e7e9ed
;
font-size
:
2.
7
rem
;
font-size
:
2.
4
rem
;
padding
:
2rem
0
;
padding
:
2rem
0
;
width
:
80%
;
width
:
80%
;
}
}
@media
screen
and
(
max-width
:
768px
)
{
.tile_title
{
font-size
:
2.5rem
;
}
}
.tile_content
{
.tile_content
{
position
:
relative
;
position
:
relative
;
...
@@ -109,6 +110,10 @@ body {
...
@@ -109,6 +110,10 @@ body {
position
:
relative
;
position
:
relative
;
}
}
#home_tile_my_info
.tile_content
{
margin
:
2rem
0
;
}
.tile_icon
{
.tile_icon
{
margin-right
:
15px
;
margin-right
:
15px
;
color
:
#00a573
;
color
:
#00a573
;
...
@@ -118,11 +123,11 @@ body {
...
@@ -118,11 +123,11 @@ body {
height
:
100%
;
height
:
100%
;
flex-direction
:
column
;
flex-direction
:
column
;
align-items
:
center
;
align-items
:
center
;
font-size
:
2
.2
rem
;
font-size
:
2rem
;
}
}
@media
screen
and
(
max-width
:
768px
)
{
@media
screen
and
(
max-width
:
768px
)
{
#home_tile_my_info
.tile_content
{
#home_tile_my_info
.tile_content
{
font-size
:
1.
9
rem
;
font-size
:
1.
7
rem
;
}
}
}
}
...
@@ -130,6 +135,10 @@ body {
...
@@ -130,6 +135,10 @@ body {
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.member_status_text_container
{
margin-bottom
:
5px
;
}
#member_status_action
{
#member_status_action
{
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
...
...
members_space/static/js/members-space-my-info.js
View file @
9a8d369b
...
@@ -23,14 +23,14 @@ function init_my_info() {
...
@@ -23,14 +23,14 @@ function init_my_info() {
}
}
if
(
partner_data
.
mobile
!==
""
&&
partner_data
.
mobile
!==
false
&&
partner_data
.
mobile
!==
null
)
{
if
(
partner_data
.
mobile
!==
""
&&
partner_data
.
mobile
!==
"False"
&&
partner_data
.
mobile
!==
false
&&
partner_data
.
mobile
!==
null
)
{
$
(
".member_mobile"
)
$
(
".member_mobile"
)
.
append
(
partner_data
.
mobile
);
.
append
(
partner_data
.
mobile
);
}
else
{
}
else
{
$
(
".member_mobile"
).
hide
();
$
(
".member_mobile"
).
hide
();
}
}
if
(
partner_data
.
phone
!==
""
&&
partner_data
.
phone
!==
false
&&
partner_data
.
phone
!==
null
)
{
if
(
partner_data
.
phone
!==
""
&&
partner_data
.
phone
!==
"False"
&&
partner_data
.
phone
!==
false
&&
partner_data
.
phone
!==
null
)
{
$
(
".member_phone"
)
$
(
".member_phone"
)
.
append
(
partner_data
.
phone
);
.
append
(
partner_data
.
phone
);
}
else
{
}
else
{
...
...
members_space/static/js/members-space.js
View file @
9a8d369b
...
@@ -147,10 +147,15 @@ function prepare_shift_line_template(date_begin) {
...
@@ -147,10 +147,15 @@ function prepare_shift_line_template(date_begin) {
function
init_my_info_data
()
{
function
init_my_info_data
()
{
$
(
".choose_makeups"
).
off
();
$
(
".choose_makeups"
).
off
();
$
(
".unsuscribed_form_link"
).
off
();
$
(
".unsuscribed_form_link"
).
off
();
console
.
log
(
partner_data
);
$
(
".member_shift_name"
).
text
(
partner_data
.
regular_shift_name
);
$
(
".member_shift_name"
).
text
(
partner_data
.
regular_shift_name
);
console
.
log
(
partner_data
);
let
pns
=
partner_data
.
name
.
split
(
" - "
);
let
name
=
pns
.
length
>
1
?
pns
[
1
]
:
pns
[
0
];
// Status related
// Status related
$
(
".member_name"
).
text
(
name
);
$
(
".member_status"
)
$
(
".member_status"
)
.
text
(
possible_cooperative_state
[
partner_data
.
cooperative_state
])
.
text
(
possible_cooperative_state
[
partner_data
.
cooperative_state
])
.
addClass
(
"member_status_"
+
partner_data
.
cooperative_state
);
.
addClass
(
"member_status_"
+
partner_data
.
cooperative_state
);
...
...
templates/members_space/home.html
View file @
9a8d369b
...
@@ -6,10 +6,11 @@
...
@@ -6,10 +6,11 @@
<div
class=
"tile high_tile"
id=
"home_tile_my_info"
>
<div
class=
"tile high_tile"
id=
"home_tile_my_info"
>
<div
class=
"tile_title"
>
<div
class=
"tile_title"
>
<i
class=
"fas fa-user tile_icon"
></i>
<i
class=
"fas fa-user tile_icon"
></i>
Mes Infos
<span
class=
"member_info member_name"
></span>
</div>
</div>
<div
class=
"tile_content"
>
<div
class=
"tile_content"
>
<p>
Mon statut :
<span
class=
"member_info member_status"
></span></p>
{#
<p><span
class=
"member_info member_name"
></span></p>
#}
<p
class=
"member_status_text_container"
>
Mon statut :
<span
class=
"member_info member_status"
></span></p>
<div
class=
"delay_date_stop_container"
>
<div
class=
"delay_date_stop_container"
>
( jusqu'au
<span
class=
"delay_date_stop"
></span>
)
( jusqu'au
<span
class=
"delay_date_stop"
></span>
)
</div>
</div>
...
...
templates/members_space/my_info.html
View file @
9a8d369b
...
@@ -4,6 +4,10 @@
...
@@ -4,6 +4,10 @@
</div>
</div>
<div
class=
"tiles_container"
>
<div
class=
"tiles_container"
>
<div
class=
"tile full_width_tile"
id=
"my_info_area"
>
<div
class=
"tile full_width_tile"
id=
"my_info_area"
>
<div
class=
"tile_title"
>
<i
class=
"fas fa-user tile_icon"
></i>
<span
class=
"member_info member_name"
></span>
</div>
<div
class=
"tile_content"
id=
"my_info_content"
>
<div
class=
"tile_content"
id=
"my_info_content"
>
<div
class=
"my_info_line"
>
<div
class=
"my_info_line"
>
<div
class=
"my_info_line_left"
>
<div
class=
"my_info_line_left"
>
...
...
templates/members_space/my_shifts.html
View file @
9a8d369b
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
</div>
</div>
<div
class=
"tile full_width_tile"
id=
"history_area"
>
<div
class=
"tile full_width_tile"
id=
"history_area"
>
<div
class=
"tile_title"
>
<div
class=
"tile_title"
>
Historique de
s mouvements de point
s
Historique de
mes service
s
</div>
</div>
<div
class=
"loading-history"
>
<div
class=
"loading-history"
>
<i
class=
"fas fa-spinner fa-spin fa-lg"
></i>
<i
class=
"fas fa-spinner fa-spin fa-lg"
></i>
...
...
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