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
e848788f
Commit
e848788f
authored
Jan 26, 2025
by
François C.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modifications pour création binome avec membre existant sans créneau attente
parent
86acf5b1
Pipeline
#4176
failed with stage
in 0 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
inscriptions.js
members/static/js/inscriptions.js
+2
-2
common.js
outils/static/js/common.js
+4
-0
No files found.
members/static/js/inscriptions.js
View file @
e848788f
...
@@ -194,7 +194,7 @@ function _really_save_new_coop(email, fname, lname, cap, pm, cn, bc, msex, mjob)
...
@@ -194,7 +194,7 @@ function _really_save_new_coop(email, fname, lname, cap, pm, cn, bc, msex, mjob)
coop
.
is_associated_people
=
true
;
coop
.
is_associated_people
=
true
;
coop
.
parent_id
=
selected_associate
.
id
;
coop
.
parent_id
=
selected_associate
.
id
;
coop
.
parent_name
=
selected_associate
.
barcode_base
+
' - '
+
selected_associate
.
name
;
coop
.
parent_name
=
selected_associate
.
barcode_base
+
' - '
+
selected_associate
.
name
;
coop
.
shift_template
=
shift_templates
[
ASSOCIATE_MEMBER_SHIFT
];
coop
.
shift_template
=
{
data
:
{
id
:
''
}}
}
}
}
else
if
(
associated_old_choice
==
'new_member_choice'
&&
$
(
'#new_member_input'
).
val
()
!=
''
)
{
}
else
if
(
associated_old_choice
==
'new_member_choice'
&&
$
(
'#new_member_input'
).
val
()
!=
''
)
{
coop
.
is_associated_people
=
true
;
coop
.
is_associated_people
=
true
;
...
@@ -226,7 +226,7 @@ function _really_save_new_coop(email, fname, lname, cap, pm, cn, bc, msex, mjob)
...
@@ -226,7 +226,7 @@ function _really_save_new_coop(email, fname, lname, cap, pm, cn, bc, msex, mjob)
'Voulez-vous modifier le créneau choisi ?'
,
swipe_to_shift_choice
,
'oui'
,
'Voulez-vous modifier le créneau choisi ?'
,
swipe_to_shift_choice
,
'oui'
,
false
,
true
,
show_coop_list
false
,
true
,
show_coop_list
);
);
}
else
if
(
coop
.
is_associated_people
&&
typeof
coop
.
shift_template
!=
"undefined"
&&
coop
.
shift_template
.
data
.
id
==
ASSOCIATE_MEMBER_SHIFT
)
{
}
else
if
(
coop
.
is_associated_people
&&
(
ASSOCIATE_MEMBER_SHIFT
.
length
==
0
||
(
typeof
coop
.
shift_template
!=
"undefined"
&&
coop
.
shift_template
.
data
.
id
==
ASSOCIATE_MEMBER_SHIFT
))
)
{
ncoop_view
.
hide
();
ncoop_view
.
hide
();
new_coop_validation
();
new_coop_validation
();
}
else
{
}
else
{
...
...
outils/static/js/common.js
View file @
e848788f
...
@@ -44,6 +44,10 @@ function get_shift_name(s_data) {
...
@@ -44,6 +44,10 @@ function get_shift_name(s_data) {
shift_name
+=
s_data
.
day
+
' - '
+
s_data
.
begin
;
shift_name
+=
s_data
.
day
+
' - '
+
s_data
.
begin
;
shift_name
+=
' - '
+
s_data
.
place
;
shift_name
+=
' - '
+
s_data
.
place
;
}
}
}
else
{
if
(
s_data
.
id
==
ASSOCIATE_MEMBER_SHIFT
)
{
shift_name
=
'Binôme'
;
}
}
}
return
shift_name
;
return
shift_name
;
}
}
...
...
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