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
1828883a
Commit
1828883a
authored
Mar 10, 2022
by
Etienne Freiss
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
develop
parent
366a1416
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
6 deletions
+19
-6
member.css
members/static/css/member.css
+1
-0
members.js
members/static/js/members.js
+13
-5
index.html
templates/members/index.html
+5
-1
No files found.
members/static/css/member.css
View file @
1828883a
...
@@ -45,6 +45,7 @@ h1 .member_name {font-weight: bold;}
...
@@ -45,6 +45,7 @@ h1 .member_name {font-weight: bold;}
.members_list
li
{
display
:
block
;
margin-bottom
:
5px
;}
.members_list
li
{
display
:
block
;
margin-bottom
:
5px
;}
.members_list
li
.btn--inverse
{
background
:
#449d44
;
color
:
#FFF
;
}
.members_list
li
.btn--inverse
{
background
:
#449d44
;
color
:
#FFF
;
}
.members_list
li
.btn--inverse.not_connected
{
cursor
:
not-allowed
}
.members_list
li
.btn--inverse.late
{
background-color
:
#de9b00
;
color
:
white
}
.members_list
li
.btn--inverse.late
{
background-color
:
#de9b00
;
color
:
white
}
.members_list
li
.btn--inverse.both
{
background-color
:
#0275d8
;
color
:
white
}
.members_list
li
.btn--inverse.both
{
background-color
:
#0275d8
;
color
:
white
}
...
...
members/static/js/members.js
View file @
1828883a
...
@@ -286,7 +286,7 @@ function fill_service_entry(s) {
...
@@ -286,7 +286,7 @@ function fill_service_entry(s) {
var
li_class
=
"btn"
;
var
li_class
=
"btn"
;
var
li_data
=
""
;
var
li_data
=
""
;
if
(
e
.
state
==
"done"
)
{
if
(
e
.
state
==
"done"
&&
coop_is_connected
()
)
{
li_data
=
' data-rid="'
+
e
.
id
+
'" data-mid="'
+
e
.
partner_id
[
0
]
+
'"'
;
li_data
=
' data-rid="'
+
e
.
id
+
'" data-mid="'
+
e
.
partner_id
[
0
]
+
'"'
;
li_class
+=
"--inverse"
;
li_class
+=
"--inverse"
;
if
(
e
.
is_late
==
true
)
{
if
(
e
.
is_late
==
true
)
{
...
@@ -295,6 +295,12 @@ function fill_service_entry(s) {
...
@@ -295,6 +295,12 @@ function fill_service_entry(s) {
if
(
e
.
associate_registered
==
'both'
)
{
if
(
e
.
associate_registered
==
'both'
)
{
li_class
+=
" both"
;
li_class
+=
" both"
;
}
}
}
else
if
(
e
.
state
==
"done"
&&
!
coop_is_connected
())
{
li_data
=
' data-rid="'
+
e
.
id
+
'" data-mid="'
+
e
.
partner_id
[
0
]
+
'"'
;
li_class
+=
"--inverse not_connected"
;
if
(
e
.
is_late
==
true
)
{
li_class
+=
" late"
;
}
}
else
{
}
else
{
li_data
=
' data-rid="'
+
e
.
id
+
'" data-mid="'
+
e
.
partner_id
[
0
]
+
'"'
;
li_data
=
' data-rid="'
+
e
.
id
+
'" data-mid="'
+
e
.
partner_id
[
0
]
+
'"'
;
}
}
...
@@ -698,11 +704,13 @@ shift_members.on("click", '.btn[data-rid]', function() {
...
@@ -698,11 +704,13 @@ shift_members.on("click", '.btn[data-rid]', function() {
});
});
shift_members
.
on
(
"click"
,
'.btn--inverse'
,
function
()
{
shift_members
.
on
(
"click"
,
'.btn--inverse'
,
function
()
{
var
clicked
=
$
(
this
);
if
(
coop_is_connected
())
{
var
rid
=
clicked
.
data
(
'rid'
);
var
clicked
=
$
(
this
);
var
mid
=
clicked
.
data
(
'mid'
);
var
rid
=
clicked
.
data
(
'rid'
);
var
mid
=
clicked
.
data
(
'mid'
);
cancel_service_presence
(
mid
,
rid
);
cancel_service_presence
(
mid
,
rid
);
}
});
});
pages
.
shopping_entry
.
on
(
'css'
,
function
()
{
pages
.
shopping_entry
.
on
(
'css'
,
function
()
{
...
...
templates/members/index.html
View file @
1828883a
...
@@ -138,9 +138,13 @@
...
@@ -138,9 +138,13 @@
</section>
</section>
</section>
</section>
<section
class=
"grid-6 has-gutter"
id=
"service_entry"
>
<section
class=
"grid-6 has-gutter"
id=
"service_entry"
>
<div
class=
"col-
6
row-2"
>
<div
class=
"col-
2
row-2"
>
<a
class=
"btn btn--primary"
data-next=
"first_page"
>
Retour accueil
</a>
<a
class=
"btn btn--primary"
data-next=
"first_page"
>
Retour accueil
</a>
</div>
</div>
<div
class=
"col-2 row-2"
></div>
<div
class=
"col-2 row-2 login_area"
>
{% include "common/conn_admin.html" %}
</div>
<div
class=
"col-1"
></div>
<div
class=
"col-1"
></div>
<div
class=
"col-4"
>
<div
class=
"col-4"
>
<h1
class=
"col-4 txtcenter"
>
Qui es-tu ?
</h1>
<h1
class=
"col-4 txtcenter"
>
Qui es-tu ?
</h1>
...
...
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