Commit d5b889ca by Yvon

move html out of js and write default message and signature if none provided

parent 39e18e62
Pipeline #2434 passed with stage
in 1 minute 23 seconds
...@@ -150,15 +150,17 @@ function display_makeups_members() { ...@@ -150,15 +150,17 @@ function display_makeups_members() {
const member = makeups_members.find(m => m.id == member_id); const member = makeups_members.find(m => m.id == member_id);
let modal_template = $("#modal_decr_makeup_counter");
modal_template.find(".member_name").text(member.name);
openModal( openModal(
`Enlever un rattrapage à ${member.name} ? modal_template.html(),
<br><br><label>Explication : </label><input class="" type="text" id="decr-explanation">
<br><br><label>Signature : </label><input class="" type="text" id="decr-signature">`,
() => { () => {
update_members_makeups( update_members_makeups(
[member_id], [member_id],
"decrement", "decrement",
$("#decr-signature")[0].value + ' : ' + $("#decr-explanation")[0].value ($("#decr-signature")[0].value || "pas d'explication") + ' : ' + ($("#decr-explanation")[0].value || "auteur inconnu")
); );
}, },
"Confirmer", "Confirmer",
...@@ -173,15 +175,17 @@ function display_makeups_members() { ...@@ -173,15 +175,17 @@ function display_makeups_members() {
const member = makeups_members.find(m => m.id == member_id); const member = makeups_members.find(m => m.id == member_id);
let modal_template = $("#modal_incr_makeup_counter");
modal_template.find(".member_name").text(member.name);
openModal( openModal(
`Ajouter un rattrapage à ${member.name} ? modal_template.html(),
<br><br><label>Explication : </label><input class="" type="text" id="incr-explanation">
<br><br><label>Signature : </label><input class="" type="text" id="incr-signature">`,
() => { () => {
update_members_makeups( update_members_makeups(
[member_id], [member_id],
"increment", "increment",
$("#incr-signature")[0].value + ' : ' + $("#incr-explanation")[0].value ($("#incr-signature")[0].value || "pas d'explication") + ' : ' + ($("#incr-explanation")[0].value || "auteur inconnu")
); );
}, },
"Confirmer", "Confirmer",
...@@ -210,14 +214,12 @@ function display_makeups_members() { ...@@ -210,14 +214,12 @@ function display_makeups_members() {
if (first_select) { if (first_select) {
$("#decrement_selected_members_makeups").on("click", () => { $("#decrement_selected_members_makeups").on("click", () => {
openModal( openModal(
`Enlever un rattrapage aux membres sélectionnés ? $("#modal_decr_selected_makeup_counter").html(),
<br><br><label>Explication : </label><input class="" type="text" id="decr-explanation">
<br><br><label>Signature : </label><input class="" type="text" id="decr-signature">`,
() => { () => {
update_members_makeups( update_members_makeups(
selected_rows, selected_rows,
"decrement", "decrement",
$("#decr-signature")[0].value + ' : ' + $("#decr-explanation")[0].value ($("#decr-signature-selected")[0].value || "pas d'explication") + ' : ' + ($("#decr-explanation-selected")[0].value || "auteur inconnu")
); );
}, },
"Confirmer", "Confirmer",
...@@ -237,6 +239,7 @@ function display_makeups_members() { ...@@ -237,6 +239,7 @@ function display_makeups_members() {
* *
* @param {Array} member_ids * @param {Array} member_ids
* @param {String} action increment | decrement * @param {String} action increment | decrement
* @param description
*/ */
function update_members_makeups(member_ids, action, description) { function update_members_makeups(member_ids, action, description) {
openModal(); openModal();
......
...@@ -55,8 +55,23 @@ ...@@ -55,8 +55,23 @@
</div> </div>
</div> </div>
<div id="templates" style="display:none;">
<div id="templates" style="display:none;"></div> <div id="modal_incr_makeup_counter">
<p>Ajouter un rattrapage à <span class="member_name"></span> ?</p>
<br><label for="incr-explanation">Explication : </label><input class="" type="text" id="incr-explanation">
<br><br><label for="incr-signature">Signature : </label><input class="" type="text" id="incr-signature">
</div>
<div id="modal_decr_makeup_counter">
<p>Enlever un rattrapage à <span class="member_name"></span> ?</p>
<br><label for="decr-explanation">Explication : </label><input class="" type="text" id="decr-explanation">
<br><br><label for="decr-signature">Signature : </label><input class="" type="text" id="decr-signature">
</div>
<div id="modal_decr_selected_makeup_counter">
<p>Enlever un rattrapage aux membres sélectionnés ?</p>
<br><label for="decr-explanation-selected">Explication : </label><input class="" type="text" id="decr-explanation-selected">
<br><br><label for="decr-signature-selected">Signature : </label><input class="" type="text" id="decr-signature-selected">
</div>
</div>
</div> </div>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script> <script src='{% static "js/all_common.js" %}?v=1651853225'></script>
......
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