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
3ac8dfd8
Commit
3ac8dfd8
authored
Mar 10, 2022
by
Damien Moulard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2417-diferent-color-for-makeups' into 'dev_cooperatic'
develop See merge request
!137
parents
0f923906
e34df3cc
Pipeline
#1908
passed with stage
in 1 minute 27 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
13 deletions
+40
-13
members-space-shifts-exchange.css
members_space/static/css/members-space-shifts-exchange.css
+13
-0
members-space-shifts-exchange.js
members_space/static/js/members-space-shifts-exchange.js
+16
-10
views.py
shifts/views.py
+7
-1
index.html
templates/members_space/index.html
+4
-2
No files found.
members_space/static/css/members-space-shifts-exchange.css
View file @
3ac8dfd8
...
...
@@ -180,6 +180,19 @@ td{
color
:
white
;
}
.fc-event.shift_booked_makeup
{
background-color
:
#f0ad4e
;
cursor
:
auto
;
border-color
:
#f0ad4e
;
}
.fc-event.shift_booked_makeup
td
{
--fc-list-event-hover-bg-color
:
#f0ad4e
;
}
.fc-list-event.shift_booked_makeup
{
color
:
white
;
}
#calendar
.fc-list-table
{
table-layout
:
auto
;
}
...
...
members_space/static/js/members-space-shifts-exchange.js
View file @
3ac8dfd8
...
...
@@ -306,17 +306,23 @@ function init_shifts_list() {
shift_line_template
.
find
(
".shift_line_time"
).
text
(
datetime_shift_start
.
toLocaleTimeString
(
"fr-fr"
,
time_options
));
// Disable or not
shift_line_template
.
find
(
".selectable_shift_line"
).
removeClass
(
"btn--primary"
);
shift_line_template
.
find
(
".selectable_shift_line"
).
removeClass
(
"btn"
);
shift_line_template
.
find
(
".selectable_shift_line"
).
removeClass
(
"btn--warning"
);
if
(
!
can_exchange_shifts
()
&&
block_actions_for_attached_people
===
"True"
)
{
shift_line_template
.
find
(
".selectable_shift_line"
).
removeClass
(
"btn--primary"
);
shift_line_template
.
find
(
".selectable_shift_line"
).
addClass
(
"btn"
);
shift_line_template
.
find
(
".checkbox"
).
prop
(
"disabled"
,
"disabled"
);
}
else
{
shift_line_template
.
find
(
".selectable_shift_line"
).
removeClass
(
"btn"
);
shift_line_template
.
find
(
".selectable_shift_line"
).
addClass
(
"btn--primary"
);
shift_line_template
.
find
(
".checkbox"
).
prop
(
"disabled"
,
false
);
shift_line_template
.
find
(
".checkbox"
).
prop
(
"value"
,
shift
.
id
);
if
(
shift
.
is_makeup
==
true
)
{
shift_line_template
.
find
(
".selectable_shift_line"
).
addClass
(
"btn--warning"
);
shift_line_template
.
find
(
".checkbox"
).
prop
(
"disabled"
,
false
);
shift_line_template
.
find
(
".checkbox"
).
prop
(
"value"
,
shift
.
id
);
}
else
{
shift_line_template
.
find
(
".selectable_shift_line"
).
addClass
(
"btn--primary"
);
shift_line_template
.
find
(
".checkbox"
).
prop
(
"disabled"
,
false
);
shift_line_template
.
find
(
".checkbox"
).
prop
(
"value"
,
shift
.
id
);
}
}
// Set assign shift button
if
(
partner_data
.
associated_partner_id
===
"False"
&&
partner_data
.
parent_id
===
"False"
)
{
shift_line_template
.
find
(
'.affect_associate_registered'
).
hide
();
...
...
@@ -525,7 +531,7 @@ function init_calendar_page() {
hiddenDays
:
hidden_days
,
events
:
'/shifts/get_list_shift_calendar/'
+
partner_data
.
concerned_partner_id
,
eventClick
:
function
(
info
)
{
if
(
!
$
(
info
.
el
).
hasClass
(
"shift_booked"
))
{
if
(
!
$
(
info
.
el
).
hasClass
(
"shift_booked"
)
&&
!
$
(
info
.
el
).
hasClass
(
"shift_booked_makeup"
)
)
{
const
new_shift_id
=
info
.
event
.
id
;
// Set new shift
...
...
@@ -789,9 +795,9 @@ function init_shifts_exchange() {
$
(
window
).
smartresize
(
function
()
{
// only apply if a width threshold is passed
if
(
vw
>
992
&&
window
.
innerWidth
<=
992
||
vw
<=
992
&&
window
.
innerWidth
>
992
||
vw
>
768
&&
window
.
innerWidth
<=
768
||
vw
>
992
&&
window
.
innerWidth
<=
992
||
vw
<=
992
&&
window
.
innerWidth
>
992
||
vw
>
768
&&
window
.
innerWidth
<=
768
||
vw
<=
768
&&
window
.
innerWidth
>
768
)
{
vw
=
window
.
innerWidth
;
...
...
shifts/views.py
View file @
3ac8dfd8
...
...
@@ -101,8 +101,11 @@ def get_list_shift_calendar(request, partner_id):
use_new_members_space
=
getattr
(
settings
,
'USE_NEW_MEMBERS_SPACE'
,
False
)
listRegisterPartner
=
[]
listMakeUpShift
=
[]
for
v
in
registerPartner
:
listRegisterPartner
.
append
(
v
[
'id'
])
if
v
[
'is_makeup'
]:
listMakeUpShift
.
append
(
v
[
'id'
])
start
=
request
.
GET
.
get
(
'start'
)
end
=
request
.
GET
.
get
(
'end'
)
...
...
@@ -136,7 +139,10 @@ def get_list_shift_calendar(request, partner_id):
if
len
(
l
)
>
0
:
if
use_new_members_space
is
True
:
event
[
"classNames"
]
=
[
"shift_booked"
]
if
set
(
value
[
'registration_ids'
])
&
set
(
listRegisterPartner
)
&
set
(
listMakeUpShift
):
event
[
"classNames"
]
=
[
"shift_booked_makeup"
]
else
:
event
[
"classNames"
]
=
[
"shift_booked"
]
else
:
event
[
"className"
]
=
"shift_booked"
event
[
"changed"
]
=
False
...
...
templates/members_space/index.html
View file @
3ac8dfd8
...
...
@@ -75,10 +75,12 @@
<div
id=
"calendar_explaination_template"
>
<h4>
Légende du calendrier
</h4>
<a
class=
"example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_booked"
><div
class=
"fc-event-main"
><div
class=
"fc-event-main-frame"
><div
class=
"fc-event-time"
>
06:00
</div><div
class=
"fc-event-title-container"
><div
class=
"fc-event-title fc-sticky"
>
- 9/12
</div></div></div></div></a>
<p>
Un service colorié en noir : je suis déjà inscrit.e à ce service.
</p>
<a
class=
"example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_less_alf"
><div
class=
"fc-event-main"
><div
class=
"fc-event-main-frame"
><div
class=
"fc-event-time"
>
10:45
</div><div
class=
"fc-event-title-container"
><div
class=
"fc-event-title fc-sticky"
>
- 3/12
</div></div></div></div></a>
<p>
Un service colorié en bleu : je peux m'inscrire à ce service.
</p>
<a
class=
"example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_booked"
><div
class=
"fc-event-main"
><div
class=
"fc-event-main-frame"
><div
class=
"fc-event-time"
>
06:00
</div><div
class=
"fc-event-title-container"
><div
class=
"fc-event-title fc-sticky"
>
- 9/12
</div></div></div></div></a>
<p>
Un service colorié en noir : je suis déjà inscrit.e à ce service.
</p>
<a
class=
"example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_booked_makeup"
><div
class=
"fc-event-main"
><div
class=
"fc-event-main-frame"
><div
class=
"fc-event-time"
>
13:30
</div><div
class=
"fc-event-title-container"
><div
class=
"fc-event-title fc-sticky"
>
- 7/12
</div></div></div></div></a>
<p>
Un service colorié en orange : je suis inscrit.e à un rattrapage sur ce service.
</p>
<p>
3/12
<i
class=
"arrow_explanation_numbers fas fa-arrow-right"
></i>
il y a déjà 3 places réservées à ce service sur 12 disponibles.
<b>
Plus le chiffre de gauche est petit, plus on a besoin de coopérateurs.rices à ce service !
</b></p>
</div>
...
...
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