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
888a3e23
Commit
888a3e23
authored
Mar 11, 2022
by
Damien Moulard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2463-go-to-normal-validation-for-associated-member' into 'dev_cooperatic'
fix bug See merge request
!144
parents
c7b3bf64
730e964d
Pipeline
#1941
passed with stage
in 1 minute 28 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
inscriptions.js
members/static/js/inscriptions.js
+12
-5
inscriptions.html
templates/members/inscriptions.html
+1
-1
No files found.
members/static/js/inscriptions.js
View file @
888a3e23
...
...
@@ -92,12 +92,18 @@ function new_coop_validation() {
coop_registration_details
.
find
(
'.shift_template'
).
text
(
st
);
process_state
.
html
(
current_coop
.
firstname
+
' '
+
current_coop
.
lastname
);
get_next_shift
(
current_coop
.
shift_template
.
data
.
id
,
function
(
data
)
{
if
(
data
!=
null
)
coop_registration_details
.
find
(
'.next_shift'
).
text
(
data
.
date_begin
);
if
(
current_coop
.
shift_template
.
data
&&
current_coop
.
shift_template
.
data
.
id
!=
ASSOCIATE_MEMBER_SHIFT
)
{
get_next_shift
(
current_coop
.
shift_template
.
data
.
id
,
function
(
data
)
{
if
(
data
!=
null
)
{
coop_registration_details
.
find
(
'#next_shift_registration_detail'
).
show
();
coop_registration_details
.
find
(
'.next_shift'
).
text
(
data
.
date_begin
);
}
coop_registration_details
.
show
();
});
}
else
{
coop_registration_details
.
find
(
'#next_shift_registration_detail'
).
hide
();
coop_registration_details
.
show
();
});
}
}
function
reset_sex_radios
()
{
...
...
@@ -210,6 +216,7 @@ function _really_save_new_coop(email, fname, lname, cap, pm, cn, bc, msex) {
);
}
else
if
(
coop
.
is_associated_people
&&
typeof
coop
.
shift_template
!=
"undefined"
&&
coop
.
shift_template
.
data
.
id
==
ASSOCIATE_MEMBER_SHIFT
)
{
ncoop_view
.
hide
();
new_coop_validation
();
}
else
{
swipe_to_shift_choice
();
}
...
...
templates/members/inscriptions.html
View file @
888a3e23
...
...
@@ -132,7 +132,7 @@
<p>Pensez à inscrire ce numéro temporaire de coopérateur au crayon de papier sur les deux formulaires papier.</p>
-->
<p>
Créneau choisi :
<span
class=
"shift_template"
></span></p>
<p>
Prochain service :
<span
class=
"next_shift"
></span></p>
<p
id=
"next_shift_registration_detail"
>
Prochain service :
<span
class=
"next_shift"
></span></p>
<button
class=
"btn--primary"
id=
"next_coop"
>
Coopérateur.rice suivant.e !
</button>
</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