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
cc101100
Commit
cc101100
authored
Mar 09, 2022
by
François C.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix eslint warning
parent
5b119348
Pipeline
#1888
passed with stage
in 1 minute 32 seconds
Changes
5
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
8 deletions
+7
-8
members-space-faq.js
members_space/static/js/members-space-faq.js
+1
-1
members-space-my-shifts.js
members_space/static/js/members-space-my-shifts.js
+1
-2
members-space-shifts-exchange.js
members_space/static/js/members-space-shifts-exchange.js
+4
-4
members-space.js
members_space/static/js/members-space.js
+1
-1
orders_helper.js
orders/static/js/orders_helper.js
+0
-0
No files found.
members_space/static/js/members-space-faq.js
View file @
cc101100
...
@@ -20,7 +20,7 @@ function init_faq() {
...
@@ -20,7 +20,7 @@ function init_faq() {
}
}
$
(
document
).
on
(
'click'
,
"#shift_exchange_btn"
,
()
=>
{
$
(
document
).
on
(
'click'
,
"#shift_exchange_btn"
,
()
=>
{
goto
(
'echange-de-services'
);
goto
(
'echange-de-services'
);
});
});
$
(
document
).
on
(
'click'
,
'.accordion'
,
function
()
{
$
(
document
).
on
(
'click'
,
'.accordion'
,
function
()
{
...
...
members_space/static/js/members-space-my-shifts.js
View file @
cc101100
...
@@ -68,8 +68,7 @@ function prepare_server_data(data) {
...
@@ -68,8 +68,7 @@ function prepare_server_data(data) {
if
(
history_item
.
associate_registered
==
false
||
history_item
.
associate_registered
==
undefined
)
{
if
(
history_item
.
associate_registered
==
false
||
history_item
.
associate_registered
==
undefined
)
{
history_item
.
associate_registered
=
""
;
history_item
.
associate_registered
=
""
;
}
}
else
{
else
{
if
(
partner_data
.
associated_partner_id
!=
"False"
)
{
if
(
partner_data
.
associated_partner_id
!=
"False"
)
{
if
(
history_item
.
associate_registered
===
"partner"
)
{
if
(
history_item
.
associate_registered
===
"partner"
)
{
history_item
.
associate_registered
=
partner_data
.
name
;
history_item
.
associate_registered
=
partner_data
.
name
;
...
...
members_space/static/js/members-space-shifts-exchange.js
View file @
cc101100
...
@@ -20,7 +20,7 @@ function can_exchange_shifts() {
...
@@ -20,7 +20,7 @@ function can_exchange_shifts() {
* @returns boolean
* @returns boolean
*/
*/
function
should_select_makeup
()
{
function
should_select_makeup
()
{
return
partner_data
.
makeups_to_do
>
0
||
(
partner_data
.
makeups_to_do
>
0
&&
partner_data
.
is_associated_people
===
"True"
&&
block_actions_for_attached_people
===
"False"
);
return
partner_data
.
makeups_to_do
>
0
||
(
partner_data
.
makeups_to_do
>
0
&&
partner_data
.
is_associated_people
===
"True"
&&
block_actions_for_attached_people
===
"False"
);
}
}
/**
/**
...
@@ -36,7 +36,7 @@ function add_or_change_shift(new_shift_id) {
...
@@ -36,7 +36,7 @@ function add_or_change_shift(new_shift_id) {
+
'&idPartner='
+
partner_data
.
partner_id
+
'&idPartner='
+
partner_data
.
partner_id
+
'&shift_type='
+
partner_data
.
shift_type
+
'&shift_type='
+
partner_data
.
shift_type
+
'&verif_token='
+
partner_data
.
verif_token
;
+
'&verif_token='
+
partner_data
.
verif_token
;
}
else
if
(
partner_data
.
is_associated_people
===
"True"
&&
block_actions_for_attached_people
===
"False"
)
{
}
else
if
(
partner_data
.
is_associated_people
===
"True"
&&
block_actions_for_attached_people
===
"False"
)
{
tData
=
'idNewShift='
+
new_shift_id
tData
=
'idNewShift='
+
new_shift_id
+
'&idPartner='
+
partner_data
.
parent_id
+
'&idPartner='
+
partner_data
.
parent_id
+
'&shift_type='
+
partner_data
.
shift_type
+
'&shift_type='
+
partner_data
.
shift_type
...
@@ -101,10 +101,10 @@ function add_or_change_shift(new_shift_id) {
...
@@ -101,10 +101,10 @@ function add_or_change_shift(new_shift_id) {
`Il est néanmoins possible que la requête ait abouti, `
+
`Il est néanmoins possible que la requête ait abouti, `
+
`veuillez patienter quelques secondes puis vérifier vos services enregistrés.`
);
`veuillez patienter quelques secondes puis vérifier vos services enregistrés.`
);
// Refectch shifts anyway, if registration/exchange was still succesful
// Refectch shifts anyway, if registration/exchange was still succesful
setTimeout
(()
=>
{
setTimeout
(()
=>
{
load_partner_shifts
(
partner_data
.
concerned_partner_id
)
load_partner_shifts
(
partner_data
.
concerned_partner_id
)
.
then
(
init_shifts_list
);
.
then
(
init_shifts_list
);
},
300
);
},
300
);
}
}
},
},
...
...
members_space/static/js/members-space.js
View file @
cc101100
...
@@ -147,7 +147,7 @@ function prepare_shift_line_template(date_begin) {
...
@@ -147,7 +147,7 @@ function prepare_shift_line_template(date_begin) {
shift_line_template
.
find
(
".shift_line_date"
).
text
(
f_date_shift_start
);
shift_line_template
.
find
(
".shift_line_date"
).
text
(
f_date_shift_start
);
shift_line_template
.
find
(
".shift_line_time"
).
text
(
datetime_shift_start
.
toLocaleTimeString
(
"fr-fr"
,
time_options
));
shift_line_template
.
find
(
".shift_line_time"
).
text
(
datetime_shift_start
.
toLocaleTimeString
(
"fr-fr"
,
time_options
));
return
shift_line_template
;
return
shift_line_template
;
}
}
...
...
orders/static/js/orders_helper.js
View file @
cc101100
This diff is collapsed.
Click to expand it.
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