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
50e242ce
Commit
50e242ce
authored
Mar 11, 2022
by
Thibault Grandjean
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add confirmation for deletion and loading modal.
parent
7ff5f591
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
15 deletions
+27
-15
manage_attached.js
members/static/js/admin/manage_attached.js
+17
-15
manage_attached_delete_pair.html
templates/members/admin/manage_attached_delete_pair.html
+10
-0
No files found.
members/static/js/admin/manage_attached.js
View file @
50e242ce
...
...
@@ -42,14 +42,6 @@ function load_member_infos(divId, memberId) {
});
}
function
ready_for_submission
()
{
if
(
parentId
!=
null
&&
childId
!=
null
)
{
console
.
log
(
"ready"
);
return
true
;
}
}
/**
* Display member info
*/
...
...
@@ -79,6 +71,7 @@ function display_member_infos(divId, memberData) {
* Load attached members
*/
function
load_attached_members
()
{
openModal
();
$
.
ajax
({
type
:
'GET'
,
url
:
"/members/get_attached_members"
,
...
...
@@ -88,16 +81,17 @@ function load_attached_members() {
success
:
function
(
data
)
{
attached_members
=
data
.
res
;
display_attached_members
();
closeModal
();
},
error
:
function
(
data
)
{
err
=
{
msg
:
"erreur serveur lors de la récupération des membres
avec rattrapag
e"
,
ctx
:
'load_makeups_members'
};
err
=
{
msg
:
"erreur serveur lors de la récupération des membres
en binôm
e"
,
ctx
:
'load_makeups_members'
};
if
(
typeof
data
.
responseJSON
!=
'undefined'
&&
typeof
data
.
responseJSON
.
error
!=
'undefined'
)
{
err
.
msg
+=
' : '
+
data
.
responseJSON
.
error
;
}
report_JS_error
(
err
,
'orders'
);
closeModal
();
alert
(
'Erreur serveur lors de la récupération des membres
avec rattrapag
e. Ré-essayez plus tard.'
);
alert
(
'Erreur serveur lors de la récupération des membres
en binôm
e. Ré-essayez plus tard.'
);
}
});
}
...
...
@@ -107,8 +101,6 @@ function load_attached_members() {
*/
function
display_attached_members
()
{
// load_attached_members()
// var attached_members_table = $('#attached_members_table')
// if (attached_members_table) {
// $('#attached_members_table').off();
// attached_members_table.clear().destroy();
...
...
@@ -206,11 +198,11 @@ function delete_pair(childId) {
contentType
:
"application/json; charset=utf-8"
,
data
:
JSON
.
stringify
(
payload
),
success
:
function
()
{
alert
(
"binôme désolidarisé"
);
//
alert("binôme désolidarisé");
location
.
reload
();
},
error
:
function
(
data
)
{
err
=
{
msg
:
"
erreur serveur lors de la récupération des membres avec rattrapage
"
,
ctx
:
'load_makeups_members'
};
err
=
{
msg
:
"
Erreur serveur lors de la désolidarisation du binôme.
"
,
ctx
:
'load_makeups_members'
};
if
(
typeof
data
.
responseJSON
!=
'undefined'
&&
typeof
data
.
responseJSON
.
error
!=
'undefined'
)
{
err
.
msg
+=
' : '
+
data
.
responseJSON
.
error
;
}
...
...
@@ -222,6 +214,16 @@ function delete_pair(childId) {
});
}
function
confirmDeletion
(
childId
)
{
var
modalContent
=
$
(
"#confirmModal"
).
html
()
openModal
(
modalContent
,
()
=>
{
if
(
is_time_to
(
'delete_pair'
))
{
delete_pair
(
childId
)
}
},
'Valider'
);
}
$
(
document
).
ready
(
function
()
{
if
(
coop_is_connected
())
{
$
.
ajaxSetup
({
headers
:
{
"X-CSRFToken"
:
getCookie
(
'csrftoken'
)
}
});
...
...
@@ -378,6 +380,6 @@ $(document).ready(function() {
$
(
document
).
on
(
'click'
,
'.delete_pair'
,
function
(
event
)
{
var
childId
=
event
.
target
.
id
.
split
(
'_'
).
slice
(
-
1
)[
0
];
delete_pair
(
childId
);
confirmDeletion
(
childId
);
});
});
templates/members/admin/manage_attached_delete_pair.html
View file @
50e242ce
...
...
@@ -14,6 +14,16 @@
{% endblock %}
{% block content %}
<div
id=
"template"
style=
"display:None;"
>
<div
id=
"confirmModal"
>
<div
class=
"mconfirm"
>
<h3>
Le binôme est sur le point d'être désolidarisé
</h3>
<br
/>
<p>
Êtes-vous sur de vouloir continuer
</p>
<hr/>
</div>
</div>
</div>
<div
class=
"page_body"
>
<div
id=
"back_to_admin_index"
>
<button
type=
"button"
class=
"btn--danger"
><i
class=
"fas fa-arrow-left"
></i>
Retour
</button>
...
...
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