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
261
Issues
261
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Paul
third-party
Commits
fbc31301
Commit
fbc31301
authored
Jul 03, 2021
by
François
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Message when shift begin is missed improvement
parent
d0157c9c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
3 deletions
+16
-3
member.css
members/static/css/member.css
+2
-1
members.js
members/static/js/members.js
+4
-2
views.py
members/views.py
+2
-0
config.md
outils/config.md
+5
-0
index.html
templates/members/index.html
+3
-0
No files found.
members/static/css/member.css
View file @
fbc31301
...
@@ -58,7 +58,8 @@ h1 .member_name {font-weight: bold;}
...
@@ -58,7 +58,8 @@ h1 .member_name {font-weight: bold;}
#member_slide
.btn
[
data-next
]
#member_slide
.btn
[
data-next
]
{
margin-top
:
35px
;
background
:
#449d44
;
color
:
#FFF
;}
{
margin-top
:
35px
;
background
:
#449d44
;
color
:
#FFF
;}
[
data-next
=
"rattrapage_1"
]
{
float
:
right
;
color
:
#171A17
!important
;
margin-top
:
25px
;}
[
data-next
=
"rattrapage_1"
]
{
float
:
right
;
color
:
#171A17
!important
;
margin-top
:
25px
;}
#service_en_cours
.info
a
{
line-height
:
24px
;
font-size
:
18px
;
margin-top
:
15px
;}
#service_en_cours
.info
{
font-size
:
26px
;}
#service_en_cours
.info
a
{
line-height
:
24px
;
font-size
:
14px
;
margin-top
:
15px
;}
.outside_list
a
{
margin-left
:
15px
;}
.outside_list
a
{
margin-left
:
15px
;}
#rattrapage_1
.advice
{
margin-top
:
15px
;}
#rattrapage_1
.advice
{
margin-top
:
15px
;}
.btn.present
{
background
:
#50C878
;}
.btn.present
{
background
:
#50C878
;}
...
...
members/static/js/members.js
View file @
fbc31301
...
@@ -39,6 +39,8 @@ var photo_advice = $('#photo_advice');
...
@@ -39,6 +39,8 @@ var photo_advice = $('#photo_advice');
var
photo_studio
=
$
(
'#photo_studio'
);
var
photo_studio
=
$
(
'#photo_studio'
);
var
coop_info
=
$
(
'.coop-info'
);
var
coop_info
=
$
(
'.coop-info'
);
const
missed_begin_msg
=
$
(
'#missed_begin_msg'
).
html
();
let
no_pict_msg
=
$
(
'#no-picture-msg'
);
let
no_pict_msg
=
$
(
'#no-picture-msg'
);
var
pages
=
{
var
pages
=
{
...
@@ -358,8 +360,8 @@ function get_service_entry_data() {
...
@@ -358,8 +360,8 @@ function get_service_entry_data() {
page_title
.
text
(
'Qui es-tu ?'
);
page_title
.
text
(
'Qui es-tu ?'
);
try
{
try
{
if
(
rData
.
res
.
length
==
0
)
{
if
(
rData
.
res
.
length
==
0
)
{
info_place
.
text
(
'La période pendant laquelle il est possible de s
\'
enregistrer est close.'
);
info_place
.
html
(
missed_begin_msg
);
page_title
.
text
(
''
);
page_title
.
html
(
''
);
}
else
{
}
else
{
if
(
rData
.
res
.
length
>
1
)
{
if
(
rData
.
res
.
length
>
1
)
{
...
...
members/views.py
View file @
fbc31301
...
@@ -24,6 +24,8 @@ def index(request):
...
@@ -24,6 +24,8 @@ def index(request):
'WELCOME_SUBTITLE_ENTRANCE_MSG'
:
getattr
(
settings
,
'WELCOME_SUBTITLE_ENTRANCE_MSG'
,
''
),
'WELCOME_SUBTITLE_ENTRANCE_MSG'
:
getattr
(
settings
,
'WELCOME_SUBTITLE_ENTRANCE_MSG'
,
''
),
'ENTRANCE_SHOPPING_BTN'
:
getattr
(
settings
,
'ENTRANCE_SHOPPING_BTN'
,
'Je viens faire mes courses'
),
'ENTRANCE_SHOPPING_BTN'
:
getattr
(
settings
,
'ENTRANCE_SHOPPING_BTN'
,
'Je viens faire mes courses'
),
'ENTRANCE_SERVICE_BTN'
:
getattr
(
settings
,
'ENTRANCE_SERVICE_BTN'
,
'Je viens faire mon service'
),
'ENTRANCE_SERVICE_BTN'
:
getattr
(
settings
,
'ENTRANCE_SERVICE_BTN'
,
'Je viens faire mon service'
),
'ENTRANCE_MISSED_SHIFT_BEGIN_MSG'
:
getattr
(
settings
,
'ENTRANCE_MISSED_SHIFT_BEGIN_MSG'
,
"La période pendant laquelle il est possible de s'enregistrer est close."
),
'CONFIRME_PRESENT_BTN'
:
getattr
(
settings
,
'CONFIRME_PRESENT_BTN'
,
'Présent.e'
)
'CONFIRME_PRESENT_BTN'
:
getattr
(
settings
,
'CONFIRME_PRESENT_BTN'
,
'Présent.e'
)
}
}
for_shoping_msg
=
getattr
(
settings
,
'ENTRANCE_COME_FOR_SHOPING_MSG'
,
''
)
for_shoping_msg
=
getattr
(
settings
,
'ENTRANCE_COME_FOR_SHOPING_MSG'
,
''
)
...
...
outils/config.md
View file @
fbc31301
...
@@ -235,6 +235,11 @@
...
@@ -235,6 +235,11 @@
When set to True allow coop to identify and have 1 point (only if FTOP)
When set to True allow coop to identify and have 1 point (only if FTOP)
-
ENTRANCE_ADD_PT_EVENT_NAME = 'Add 1 point name throught easy validate' (default : 'Validation service comité'')
-
ENTRANCE_ADD_PT_EVENT_NAME = 'Add 1 point name throught easy validate' (default : 'Validation service comité'')
-
ENTRANCE_MISSED_SHIFT_BEGIN_MSG (default : "")
This message is dispayed when time to register is last
### Member space
### Member space
-
EM_URL = ''
-
EM_URL = ''
...
...
templates/members/index.html
View file @
fbc31301
...
@@ -236,6 +236,9 @@
...
@@ -236,6 +236,9 @@
<input
type=
"text"
placeholder=
"crop_height"
id=
"img_crop_height"
/><br
/>
<input
type=
"text"
placeholder=
"crop_height"
id=
"img_crop_height"
/><br
/>
<button
type=
"button"
id=
"init_webcam"
>
Cam
</button>
<button
type=
"button"
id=
"init_webcam"
>
Cam
</button>
</section>
</section>
<div
style=
"display:none;"
>
<p
id=
"missed_begin_msg"
>
{{ENTRANCE_MISSED_SHIFT_BEGIN_MSG|safe}}
</p>
</div>
<script
src=
"{% static "
js
/
all_common
.
js
"
%}?
v=
"></script>
<script
src=
"{% static "
js
/
all_common
.
js
"
%}?
v=
"></script>
<script src="
{%
static
"
js
/
members
.
js
"
%}?
v=
"></script>
<script src="
{%
static
"
js
/
members
.
js
"
%}?
v=
"></script>
{% endblock %}
{% endblock %}
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