Commit 50e242ce by Thibault Grandjean

add confirmation for deletion and loading modal.

parent 7ff5f591
dev_cooperatic #5673_bug_calendrier_echange_service 3832-makeups-and-member-status-update 4081 4444_improve_presence_recording 4709 4778-reception-dont-get-finished-orders 4809-remove-shelf-value-col-to-reduce-server-load 4880-rapports-reception-faux 4950-douchage-appli-reception 5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages 5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites 6286_bug_encaissement_souscription_cheque_espece 6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template 6832--certaines-absences-engendrent-une-erreur 7723-7559-change-purchase-order-workflow-django-side 7731-third-party-side-brinks-pos-export-not-working 7747-inventaire-par-article 7800-make-test-solution-work 7819-prevent-adding-product-already-in-order 7848-cannot-validate-qty-with-decimal-on-kg-product 7918_bug_quantites_stade_demande_prix adaptation_supercafoutch adaptation_supercoop adaptation_supercoop_supercafoutch adpatation_chouette assistance_import_article coop_dev_necessitant_modules_bdm_odoo_modifies correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif dev_principale export_capital_detenu fix_bug_process_picking fusion_custom_graoucoop graoucoop_backup graoucoop_prod graoucoop_tmp hot_fix_shelf_labels_auto_print impression_etiquettes_rayons integration_lien_precommandes_dans_espace_membre lacagette_prod local_branch meal-voucher-and-label-printer-software-bug migration-v12 pour_graoucoop_prod pour_version_prod_cagette refonte_espace_membre_sc retouches_tickets_supercoop sc-setup-stock-app supercafoutch-preprod supercafoutch-prod-20221003 supercafoutch_prod ticket_4146 supercafoutch_20250120_151258 supercafoutch_20250120_150340 supercafoutch_20240909_080630 supercafoutch_20240609_115709 supercafoutch_20240212_082431 supercafoutch_20240107_181851 supercafoutch_prod_until_240107 supercafoutch-prod-20221003 supercafoutch-230911 supercafoutch-230824 supercafoutch-230823 supercafoutch-230823-the-true-one migration-v12-tag lacagette_20240310_074751 lacagette_20240107_122554 lacagette_20240107_120916 graoucoop_20240609_122614 cagette_testtag cagette-230814 cagette-230630
2 merge requests!1412170 create delete binome,!164Intégration des dév. Cooperatic pour la Cagette
...@@ -42,14 +42,6 @@ function load_member_infos(divId, memberId) { ...@@ -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 * Display member info
*/ */
...@@ -79,6 +71,7 @@ function display_member_infos(divId, memberData) { ...@@ -79,6 +71,7 @@ function display_member_infos(divId, memberData) {
* Load attached members * Load attached members
*/ */
function load_attached_members() { function load_attached_members() {
openModal();
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: "/members/get_attached_members", url: "/members/get_attached_members",
...@@ -88,16 +81,17 @@ function load_attached_members() { ...@@ -88,16 +81,17 @@ function load_attached_members() {
success: function(data) { success: function(data) {
attached_members = data.res; attached_members = data.res;
display_attached_members(); display_attached_members();
closeModal();
}, },
error: function(data) { 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 récupération des membres en binôme", ctx: 'load_makeups_members'};
if (typeof data.responseJSON != 'undefined' && typeof data.responseJSON.error != 'undefined') { if (typeof data.responseJSON != 'undefined' && typeof data.responseJSON.error != 'undefined') {
err.msg += ' : ' + data.responseJSON.error; err.msg += ' : ' + data.responseJSON.error;
} }
report_JS_error(err, 'orders'); report_JS_error(err, 'orders');
closeModal(); closeModal();
alert('Erreur serveur lors de la récupération des membres avec rattrapage. Ré-essayez plus tard.'); alert('Erreur serveur lors de la récupération des membres en binôme. Ré-essayez plus tard.');
} }
}); });
} }
...@@ -107,8 +101,6 @@ function load_attached_members() { ...@@ -107,8 +101,6 @@ function load_attached_members() {
*/ */
function display_attached_members() { function display_attached_members() {
// load_attached_members()
// var attached_members_table = $('#attached_members_table')
// if (attached_members_table) { // if (attached_members_table) {
// $('#attached_members_table').off(); // $('#attached_members_table').off();
// attached_members_table.clear().destroy(); // attached_members_table.clear().destroy();
...@@ -206,11 +198,11 @@ function delete_pair(childId) { ...@@ -206,11 +198,11 @@ function delete_pair(childId) {
contentType: "application/json; charset=utf-8", contentType: "application/json; charset=utf-8",
data: JSON.stringify(payload), data: JSON.stringify(payload),
success: function() { success: function() {
alert("binôme désolidarisé"); // alert("binôme désolidarisé");
location.reload(); location.reload();
}, },
error: function(data) { 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') { if (typeof data.responseJSON != 'undefined' && typeof data.responseJSON.error != 'undefined') {
err.msg += ' : ' + data.responseJSON.error; err.msg += ' : ' + data.responseJSON.error;
} }
...@@ -222,6 +214,16 @@ function delete_pair(childId) { ...@@ -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() { $(document).ready(function() {
if (coop_is_connected()) { if (coop_is_connected()) {
$.ajaxSetup({ headers: { "X-CSRFToken": getCookie('csrftoken') } }); $.ajaxSetup({ headers: { "X-CSRFToken": getCookie('csrftoken') } });
...@@ -378,6 +380,6 @@ $(document).ready(function() { ...@@ -378,6 +380,6 @@ $(document).ready(function() {
$(document).on('click', '.delete_pair', function (event) { $(document).on('click', '.delete_pair', function (event) {
var childId = event.target.id.split('_').slice(-1)[0]; var childId = event.target.id.split('_').slice(-1)[0];
delete_pair(childId); confirmDeletion(childId);
}); });
}); });
...@@ -14,6 +14,16 @@ ...@@ -14,6 +14,16 @@
{% endblock %} {% endblock %}
{% block content %} {% 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 class="page_body">
<div id="back_to_admin_index"> <div id="back_to_admin_index">
<button type="button" class="btn--danger"><i class="fas fa-arrow-left"></i>&nbsp; Retour</button> <button type="button" class="btn--danger"><i class="fas fa-arrow-left"></i>&nbsp; Retour</button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment