Commit 0ccb258d by François C.

Merge branch 'ticket_1740' into 'evolution_bdm'

Ticket 1740 - correction fautes de frappes

See merge request !82
parents 0e01f176 61234670
Pipeline #1539 passed with stage
in 1 minute 33 seconds
...@@ -60,11 +60,11 @@ function prepare_server_data(data) { ...@@ -60,11 +60,11 @@ function prepare_server_data(data) {
history_item.details = ''; history_item.details = '';
if (history_item.state === 'excused' || history_item.state === 'absent') { if (history_item.state === 'excused' || history_item.state === 'absent') {
history_item.details = "Absent"; history_item.details = "Absent.e";
} else if (history_item.state === 'done' && history_item.is_late != false) { } else if (history_item.state === 'done' && history_item.is_late != false) {
history_item.details = "Présent (En Retard)"; history_item.details = "Présent.e (En Retard)";
} else if (history_item.state === 'done') { } else if (history_item.state === 'done') {
history_item.details = "Présent"; history_item.details = "Présent.e";
} else if (history_item.state === 'cancel') { } else if (history_item.state === 'cancel') {
history_item.details = "Annulé"; history_item.details = "Annulé";
} }
...@@ -108,11 +108,11 @@ function init_history() { ...@@ -108,11 +108,11 @@ function init_history() {
for (var i = 0; i < row.cells.length; i++) { for (var i = 0; i < row.cells.length; i++) {
const cell = $(row.cells[i]); const cell = $(row.cells[i]);
if (cell.text() === "Présent") { if (cell.text() === "Présent.e") {
$(row).addClass('row_partner_ok'); $(row).addClass('row_partner_ok');
} else if (cell.text() === "Retard") { } else if (cell.text() === "Retard") {
$(row).addClass('row_partner_late'); $(row).addClass('row_partner_late');
} else if (cell.text() === "Absent") { } else if (cell.text() === "Absent.e") {
$(row).addClass('row_partner_absent'); $(row).addClass('row_partner_absent');
} else if (cell.text() === "Amnistie") { } else if (cell.text() === "Amnistie") {
$(row).addClass('row_partner_amnistie'); $(row).addClass('row_partner_amnistie');
...@@ -190,4 +190,4 @@ function init_my_shifts() { ...@@ -190,4 +190,4 @@ function init_my_shifts() {
} }
}); });
}); });
} }
\ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="page_title txtcenter"> <div class="page_title txtcenter">
<h1> <h1>
J'ai un problème ou une demande Problèmes et Demandes
</h1> </h1>
</div> </div>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<a href="javascript:void(0);" class="nav_item" id="nav_my_info">Mes Infos</a> <a href="javascript:void(0);" class="nav_item" id="nav_my_info">Mes Infos</a>
<a href="javascript:void(0);" class="nav_item" id="nav_my_shifts">Mes Services</a> <a href="javascript:void(0);" class="nav_item" id="nav_my_shifts">Mes Services</a>
<a href="javascript:void(0);" class="nav_item" id="nav_shifts_exchange">Échange de services</a> <a href="javascript:void(0);" class="nav_item" id="nav_shifts_exchange">Échange de services</a>
<a href="javascript:void(0);" class="nav_item" id="nav_faq">Problèmes & Demandes</a> <a href="javascript:void(0);" class="nav_item" id="nav_faq">Problèmes et Demandes</a>
<a <a
href="javascript:void(0);" href="javascript:void(0);"
......
<div id="home"> <div id="home">
<div class="page_title txtcenter"> <div class="page_title txtcenter">
<h1>Mon espace membre</h1> <h1>Espace Membre</h1>
</div> </div>
<div class="tiles_container"> <div class="tiles_container">
<div class="tile high_tile" id="home_tile_my_info"> <div class="tile high_tile" id="home_tile_my_info">
......
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