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
b35a7800
Commit
b35a7800
authored
Nov 17, 2021
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
linting
parent
e43ee267
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
members-space-my-info.js
members_space/static/js/members-space-my-info.js
+5
-5
members-space-my-shifts.js
members_space/static/js/members-space-my-shifts.js
+2
-2
members-space.js
members_space/static/js/members-space.js
+3
-1
No files found.
members_space/static/js/members-space-my-info.js
View file @
b35a7800
...
...
@@ -5,7 +5,7 @@ function init_my_info() {
if
(
partner_data
.
is_in_association
===
false
)
{
$
(
"#attached_info_area"
).
hide
();
}
}
if
(
partner_data
.
is_associated_people
===
"True"
)
{
$
(
".attached_partner_name"
).
text
(
partner_data
.
parent_name
);
...
...
@@ -26,17 +26,17 @@ function init_my_info() {
$
(
".member_address_line"
).
hide
();
}
if
(
partner_data
.
mobile
!==
""
&&
partner_data
.
mobile
!==
"False"
&&
partner_data
.
mobile
!==
false
&&
partner_data
.
mobile
!==
null
)
{
$
(
".member_mobile"
)
.
append
(
partner_data
.
mobile
);
}
else
{
$
(
".member_mobile"
).
hide
();
}
if
(
partner_data
.
phone
!==
""
&&
partner_data
.
phone
!==
"False"
&&
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"
)
.
append
(
partner_data
.
phone
);
.
append
(
partner_data
.
phone
);
}
else
{
$
(
".member_phone"
).
hide
();
}
...
...
members_space/static/js/members-space-my-shifts.js
View file @
b35a7800
...
...
@@ -14,7 +14,7 @@ function load_partner_history(offset = 0) {
partner_id
:
partner_data
.
concerned_partner_id
,
verif_token
:
partner_data
.
verif_token
,
limit
:
history_items_limit
,
offset
:
offset
,
offset
:
offset
},
dataType
:
"json"
,
traditional
:
true
,
...
...
@@ -82,7 +82,7 @@ function init_history() {
{
data
:
"shift_name"
,
title
:
"<spans class='dt-body-center'>Service</span>"
,
width
:
"60%"
,
width
:
"60%"
},
{
data
:
"details"
,
...
...
members_space/static/js/members-space.js
View file @
b35a7800
...
...
@@ -152,6 +152,7 @@ function init_my_info_data() {
let
pns
=
partner_data
.
name
.
split
(
" - "
);
let
name
=
pns
.
length
>
1
?
pns
[
1
]
:
pns
[
0
];
$
(
".member_name"
).
text
(
name
);
// Status related
...
...
@@ -218,11 +219,12 @@ $(document).ready(function() {
?
partner_data
.
parent_id
:
partner_data
.
partner_id
;
partner_data
.
is_in_association
=
partner_data
.
is_in_association
=
partner_data
.
is_associated_people
===
"True"
||
partner_data
.
associated_partner_id
!==
"False"
;
// For associated people, their parent name is attached in their display name
let
partner_name_split
=
partner_data
.
name
.
split
(
', '
);
partner_data
.
name
=
partner_name_split
[
partner_name_split
.
length
-
1
];
base_location
=
(
app_env
===
'dev'
)
?
'/members_space/'
:
'/'
;
...
...
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