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
0ccb258d
Commit
0ccb258d
authored
Nov 23, 2021
by
François C.
Browse files
Options
Browse Files
Download
Plain Diff
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
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
10 deletions
+9
-10
members-space-my-shifts.js
members_space/static/js/members-space-my-shifts.js
+6
-7
faq.html
templates/members_space/faq.html
+1
-1
header.html
templates/members_space/header.html
+1
-1
home.html
templates/members_space/home.html
+1
-1
No files found.
members_space/static/js/members-space-my-shifts.js
View file @
0ccb258d
...
...
@@ -60,11 +60,11 @@ function prepare_server_data(data) {
history_item
.
details
=
''
;
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
)
{
history_item
.
details
=
"Présent (En Retard)"
;
history_item
.
details
=
"Présent
.e
(En Retard)"
;
}
else
if
(
history_item
.
state
===
'done'
)
{
history_item
.
details
=
"Présent"
;
history_item
.
details
=
"Présent
.e
"
;
}
else
if
(
history_item
.
state
===
'cancel'
)
{
history_item
.
details
=
"Annulé"
;
}
...
...
@@ -108,11 +108,11 @@ function init_history() {
for
(
var
i
=
0
;
i
<
row
.
cells
.
length
;
i
++
)
{
const
cell
=
$
(
row
.
cells
[
i
]);
if
(
cell
.
text
()
===
"Présent"
)
{
if
(
cell
.
text
()
===
"Présent
.e
"
)
{
$
(
row
).
addClass
(
'row_partner_ok'
);
}
else
if
(
cell
.
text
()
===
"Retard"
)
{
$
(
row
).
addClass
(
'row_partner_late'
);
}
else
if
(
cell
.
text
()
===
"Absent"
)
{
}
else
if
(
cell
.
text
()
===
"Absent
.e
"
)
{
$
(
row
).
addClass
(
'row_partner_absent'
);
}
else
if
(
cell
.
text
()
===
"Amnistie"
)
{
$
(
row
).
addClass
(
'row_partner_amnistie'
);
...
...
@@ -190,4 +190,4 @@ function init_my_shifts() {
}
});
});
}
\ No newline at end of file
}
templates/members_space/faq.html
View file @
0ccb258d
...
...
@@ -3,7 +3,7 @@
<div
class=
"page_title txtcenter"
>
<h1>
J'ai un problème ou une demande
Problèmes et Demandes
</h1>
</div>
...
...
templates/members_space/header.html
View file @
0ccb258d
...
...
@@ -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_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_faq"
>
Problèmes
&
Demandes
</a>
<a
href=
"javascript:void(0);"
class=
"nav_item"
id=
"nav_faq"
>
Problèmes
et
Demandes
</a>
<a
href=
"javascript:void(0);"
...
...
templates/members_space/home.html
View file @
0ccb258d
<div
id=
"home"
>
<div
class=
"page_title txtcenter"
>
<h1>
Mon espace m
embre
</h1>
<h1>
Espace M
embre
</h1>
</div>
<div
class=
"tiles_container"
>
<div
class=
"tile high_tile"
id=
"home_tile_my_info"
>
...
...
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