Skip to content

T
third-party
Commit 33dd5142 by Etienne Freiss
Options

lint js

parent e19a7a25
Pipeline #1846 passed with stage
in 1 minute 26 seconds
Showing with 82 additions and 92 deletions
members_space/static/js/members-space-my-shifts.js
...@@ -66,29 +66,29 @@ function prepare_server_data(data) { ...@@ -66,29 +66,29 @@ 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;
}else if(history_item.associate_registered==="associate"){ } else if (history_item.associate_registered==="associate") {
history_item.associate_registered = partner_data.associated_partner_name history_item.associate_registered = partner_data.associated_partner_name;
}else if(history_item.associate_registered==="both"){ } else if (history_item.associate_registered==="both") {
history_item.associate_registered = "Les deux" history_item.associate_registered = "Les deux";
}else{ } else {
history_item.associate_registered = "" history_item.associate_registered = "";
} }
}else if(partner_data.parent_id != "False"){ } else if (partner_data.parent_id != "False") {
if(history_item.associate_registered==="partner"){ if (history_item.associate_registered==="partner") {
history_item.associate_registered = partner_data.parent_name history_item.associate_registered = partner_data.parent_name;
}else if(history_item.associate_registered==="associate"){ } else if (history_item.associate_registered==="associate") {
history_item.associate_registered = partner_data.name history_item.associate_registered = partner_data.name;
}else if(history_item.associate_registered==="both"){ } else if (history_item.associate_registered==="both") {
history_item.associate_registered = "Les deux" history_item.associate_registered = "Les deux";
}else{ } else {
history_item.associate_registered = "" history_item.associate_registered = "";
} }
} }
} }
...@@ -187,30 +187,28 @@ function init_incoming_shifts() { ...@@ -187,30 +187,28 @@ function init_incoming_shifts() {
for (shift of incoming_shifts) { for (shift of incoming_shifts) {
let shift_line_template = prepare_shift_line_template(shift.date_begin); let shift_line_template = prepare_shift_line_template(shift.date_begin);
if(partner_data.associated_partner_id != "False"){ if (partner_data.associated_partner_id != "False") {
if(shift.associate_registered==="partner"){ if (shift.associate_registered==="partner") {
shift_line_template.find(".shift_line_associate").text(' - '+partner_data.name+'') shift_line_template.find(".shift_line_associate").text(' - '+partner_data.name+'');
}else if(shift.associate_registered==="associate"){ } else if (shift.associate_registered==="associate") {
shift_line_template.find(".shift_line_associate").text(' - '+partner_data.associated_partner_name+'') shift_line_template.find(".shift_line_associate").text(' - '+partner_data.associated_partner_name+'');
}else if(shift.associate_registered==="both"){ } else if (shift.associate_registered==="both") {
shift_line_template.find(".shift_line_associate").text(' - Les deux') shift_line_template.find(".shift_line_associate").text(' - Les deux');
}else{ } else {
shift_line_template.find(".shift_line_associate").text('A définir') shift_line_template.find(".shift_line_associate").text('A définir');
} }
}else if(partner_data.parent_id != "False"){ } else if (partner_data.parent_id != "False") {
if(shift.associate_registered==="partner"){ if (shift.associate_registered==="partner") {
shift_line_template.find(".shift_line_associate").text(' - '+partner_data.parent_name+'') shift_line_template.find(".shift_line_associate").text(' - '+partner_data.parent_name+'');
}else if(shift.associate_registered==="associate"){ } else if (shift.associate_registered==="associate") {
shift_line_template.find(".shift_line_associate").text(' - '+partner_data.name+'') shift_line_template.find(".shift_line_associate").text(' - '+partner_data.name+'');
}else if(shift.associate_registered==="both"){ } else if (shift.associate_registered==="both") {
shift_line_template.find(".shift_line_associate").text(' - Les deux') shift_line_template.find(".shift_line_associate").text(' - Les deux');
}else{ } else {
shift_line_template.find(".shift_line_associate").text('A définir') shift_line_template.find(".shift_line_associate").text('A définir');
} }
} }
$("#incoming_shifts").append(shift_line_template.html()); $("#incoming_shifts").append(shift_line_template.html());
} }
} }
......
members_space/static/js/members-space-shifts-exchange.js
...@@ -142,29 +142,29 @@ function init_shifts_list() { ...@@ -142,29 +142,29 @@ function init_shifts_list() {
shift_line_template.find(".checkbox").prop("value", shift.id); shift_line_template.find(".checkbox").prop("value", shift.id);
} }
if(partner_data.associated_partner_id === "False" && partner_data.parent_id === "False"){ if (partner_data.associated_partner_id === "False" && partner_data.parent_id === "False") {
shift_line_template.find('.affect_associate_reistered').hide(); shift_line_template.find('.affect_associate_reistered').hide();
}else{ } else {
shift_line_template.find('.affect_associate_registered').attr('id','shidt_id_'+shift.id) shift_line_template.find('.affect_associate_registered').attr('id', 'shidt_id_'+shift.id);
if (shift.associate_registered==="both"){ if (shift.associate_registered==="both") {
shift_line_template.find('.affect_associate_registered').text("Les deux") shift_line_template.find('.affect_associate_registered').text("Les deux");
}else if (shift.associate_registered==="partner"){ } else if (shift.associate_registered==="partner") {
if(partner_data.associated_partner_id !== "False"){ if (partner_data.associated_partner_id !== "False") {
shift_line_template.find('.affect_associate_registered').text(partner_data.name) shift_line_template.find('.affect_associate_registered').text(partner_data.name);
}else{ } else {
shift_line_template.find('.affect_associate_registered').text(partner_data.parent_name) shift_line_template.find('.affect_associate_registered').text(partner_data.parent_name);
} }
}else if (shift.associate_registered==="associate"){ } else if (shift.associate_registered==="associate") {
if(partner_data.associated_partner_id !== "False"){ if (partner_data.associated_partner_id !== "False") {
shift_line_template.find('.affect_associate_registered').text(partner_data.associated_partner_name) shift_line_template.find('.affect_associate_registered').text(partner_data.associated_partner_name);
}else{ } else {
shift_line_template.find('.affect_associate_registered').text(partner_data.name) shift_line_template.find('.affect_associate_registered').text(partner_data.name);
} }
}else{ } else {
shift_line_template.find('.affect_associate_registered').text("A déterminer") shift_line_template.find('.affect_associate_registered').text("A déterminer");
} }
} }
$("#shifts_list").append(shift_line_template.html()); $("#shifts_list").append(shift_line_template.html());
} }
...@@ -195,45 +195,40 @@ function init_shifts_list() { ...@@ -195,45 +195,40 @@ function init_shifts_list() {
} }
} }
}); });
$(".affect_associate_registered").on("click", function(e) { $(".affect_associate_registered").on("click", function() {
// Display modal // Display modal
id = $(this).attr('id').split('_')[2] id = $(this).attr('id')
.split('_')[2];
let modal_template = $("#modal_affect_shift"); let modal_template = $("#modal_affect_shift");
if(partner_data.associated_partner_id != "False") {
if (partner_data.associated_partner_id != "False") {
modal_template.find("#shift_partner").text(partner_data.name); modal_template.find("#shift_partner").text(partner_data.name);
modal_template.find("#shift_associate").text(partner_data.associated_partner_name); modal_template.find("#shift_associate").text(partner_data.associated_partner_name);
}else{ } else {
modal_template.find("#shift_partner").text(partner_data.associated_partner_name); modal_template.find("#shift_partner").text(partner_data.associated_partner_name);
modal_template.find("#shift_associate").text(partner_data.parent_name); modal_template.find("#shift_associate").text(partner_data.parent_name);
} }
openModal( openModal(
modal_template.html(), modal_template.html(),
() => { () => {
}, },
"Valider" "Valider"
); );
modal.find('#shift_partner').on("click", function(e) { modal.find('#shift_partner').on("click", function() {
affect_shift("partner",id) affect_shift("partner", id);
}); });
modal.find('#shift_associate').on("click", function(e) { modal.find('#shift_associate').on("click", function() {
affect_shift("associate",id) affect_shift("associate", id);
}); });
modal.find('#shift_both').on("click", function(e) { modal.find('#shift_both').on("click", function() {
affect_shift("both",id) affect_shift("both", id);
}); });
modal.find(".btn-modal-ok").hide() modal.find(".btn-modal-ok").hide();
}); });
} }
} }
...@@ -244,8 +239,7 @@ function init_shifts_list() { ...@@ -244,8 +239,7 @@ function init_shifts_list() {
* @param {string} partner * @param {string} partner
* @param {string} shift_id * @param {string} shift_id
*/ */
function affect_shift(partner, shift_id) { function affect_shift(partner, shift_id) {
tData = 'idShiftRegistration=' + shift_id tData = 'idShiftRegistration=' + shift_id
+'&idPartner=' + partner_data.partner_id +'&idPartner=' + partner_data.partner_id
...@@ -253,7 +247,6 @@ function init_shifts_list() { ...@@ -253,7 +247,6 @@ function init_shifts_list() {
+ '&verif_token=' + partner_data.verif_token; + '&verif_token=' + partner_data.verif_token;
tUrl = '/shifts/affect_shift'; tUrl = '/shifts/affect_shift';
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
...@@ -261,24 +254,23 @@ function init_shifts_list() { ...@@ -261,24 +254,23 @@ function init_shifts_list() {
dataType:"json", dataType:"json",
data: tData, data: tData,
timeout: 3000, timeout: 3000,
success: function(data) { success: function() {
load_partner_shifts(partner_data.concerned_partner_id) load_partner_shifts(partner_data.concerned_partner_id)
.then(() => { .then(() => {
init_shifts_list(); init_shifts_list();
closeModal(); closeModal();
}); });
}, },
error: function(error) { error: function() {
init_shifts_list(); init_shifts_list();
closeModal(); closeModal();
alert(`Une erreur est survenue. ` + alert(`Une erreur est survenue. ` +
`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.`);
} }
}); });
} }
/** /**
...@@ -508,7 +500,6 @@ function init_read_only_calendar_page() { ...@@ -508,7 +500,6 @@ function init_read_only_calendar_page() {
const hidden_days = days_to_hide.length > 0 ? $.map(days_to_hide.split(", "), Number) : []; const hidden_days = days_to_hide.length > 0 ? $.map(days_to_hide.split(", "), Number) : [];
const calendarEl = document.getElementById('read_only_calendar'); const calendarEl = document.getElementById('read_only_calendar');
console.log(calendarEl)
calendar = new FullCalendar.Calendar(calendarEl, { calendar = new FullCalendar.Calendar(calendarEl, {
locale: 'fr', locale: 'fr',
...@@ -576,6 +567,7 @@ function init_shifts_exchange() { ...@@ -576,6 +567,7 @@ function init_shifts_exchange() {
} else if ( } else if (
partner_data.comite === "True") { partner_data.comite === "True") {
let msg_template = $("#comite_template"); let msg_template = $("#comite_template");
$(".comite_content_msg").html(msg_template.html()); $(".comite_content_msg").html(msg_template.html());
$("#comite_content").show(); $("#comite_content").show();
init_read_only_calendar_page(); init_read_only_calendar_page();
......
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