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
a47130e0
Commit
a47130e0
authored
Nov 19, 2021
by
Damien Moulard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'evolution_bdm' into ticket_1330
parents
7a830c75
9f883d7c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
5 deletions
+23
-5
members-space.css
members_space/static/css/members-space.css
+11
-0
members-space-shifts-exchange.js
members_space/static/js/members-space-shifts-exchange.js
+1
-1
models.py
shifts/models.py
+1
-1
views.py
shifts/views.py
+1
-1
no_content.html
templates/members_space/no_content.html
+9
-2
No files found.
members_space/static/css/members-space.css
View file @
a47130e0
...
...
@@ -349,3 +349,14 @@ body {
width
:
90%
;
}
}
/* - No content page */
.message_error
{
padding
:
7vw
;
font-size
:
1.8rem
;
}
.no_content_title
{
margin-bottom
:
1.5rem
;
}
members_space/static/js/members-space-shifts-exchange.js
View file @
a47130e0
...
...
@@ -136,7 +136,7 @@ function init_shifts_list() {
}
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"
).
removeProp
(
"disabled"
);
shift_line_template
.
find
(
".checkbox"
).
prop
(
"disabled"
,
false
);
shift_line_template
.
find
(
".checkbox"
).
prop
(
"value"
,
shift
.
id
);
}
...
...
shifts/models.py
View file @
a47130e0
...
...
@@ -37,7 +37,7 @@ class CagetteShift(models.Model):
'shift_type'
,
'date_alert_stop'
,
'date_delay_stop'
,
'extension_ids'
,
'cooperative_state'
,
'final_standard_point'
,
'create_date'
,
'final_ftop_point'
,
'shift_type'
,
'leave_ids'
,
'makeups_to_do'
,
'barcode_base'
,
'street'
,
'street2
,'
'zip'
,
'city'
,
'mobile'
,
'phone'
,
'email'
,
'street'
,
'street2
'
,
'zip'
,
'city'
,
'mobile'
,
'phone'
,
'email'
,
'is_associated_people'
,
'parent_id'
]
partnerData
=
self
.
o_api
.
search_read
(
'res.partner'
,
cond
,
fields
,
1
)
if
partnerData
:
...
...
shifts/views.py
View file @
a47130e0
...
...
@@ -124,7 +124,7 @@ def get_list_shift_calendar(request, partner_id):
if
company_code
!=
"lacagette"
and
len
(
value
[
'address_id'
])
==
2
and
','
in
value
[
'address_id'
][
1
]:
title_prefix
=
str
(
value
[
'address_id'
][
1
])
.
split
(
","
)[
1
]
+
" --"
elif
company_code
==
"lacagette"
:
title_prefix
=
" -
-
"
title_prefix
=
" - "
event
[
"title"
]
=
title_prefix
+
str
(
value
[
'seats_reserved'
])
+
"/"
+
str
(
smax
)
...
...
templates/members_space/no_content.html
View file @
a47130e0
<div
class=
"txtcenter"
>
Contenu invrouvable...
</div>
\ No newline at end of file
<div
class=
"txtcenter message_error"
>
<h1
class=
"no_content_title"
>
Oh zut, cette page ne fonctionne pas
!
</h1>
<p>
Cette erreur est probablement due aux raisons suivantes :
<br>
URL mal tapée, erreur de copier-coller, lien brisé, contenu déplacé ou contenu supprimé.
</p>
<p>
Vous pouvez retrouver votre chemin depuis votre
<a
href=
'home'
>
Espace
Membre
</a>
.
</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