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
3
Merge Requests
3
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
601455ba
Commit
601455ba
authored
3 years ago
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
calendar legend
parent
ed4c4c1a
dev_cooperatic
…
#5673_bug_calendrier_echange_service
3832-makeups-and-member-status-update
4081
4444_improve_presence_recording
4709
4778-reception-dont-get-finished-orders
4809-remove-shelf-value-col-to-reduce-server-load
4880-rapports-reception-faux
4950-douchage-appli-reception
5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages
5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites
6286_bug_encaissement_souscription_cheque_espece
6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template
6832--certaines-absences-engendrent-une-erreur
7723-7559-change-purchase-order-workflow-django-side
7731-third-party-side-brinks-pos-export-not-working
7747-inventaire-par-article
7800-make-test-solution-work
7819-prevent-adding-product-already-in-order
7848-cannot-validate-qty-with-decimal-on-kg-product
7918_bug_quantites_stade_demande_prix
adaptation_supercafoutch
adaptation_supercoop
adaptation_supercoop_supercafoutch
adpatation_chouette
assistance_import_article
coop_dev_necessitant_modules_bdm_odoo_modifies
correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif
dev_principale
docker
export_capital_detenu
fix_bug_process_picking
fusion_custom_graoucoop
graoucoop_backup
graoucoop_prod
graoucoop_tmp
hot_fix_shelf_labels_auto_print
impression_etiquettes_rayons
integration_lien_precommandes_dans_espace_membre
lacagette_prod
local_branch
master
meal-voucher-and-label-printer-software-bug
migration-v12
pour_graoucoop_prod
pour_version_prod_cagette
refonte_espace_membre_sc
retouches_tickets_supercoop
sc-setup-stock-app
supercafoutch-preprod
supercafoutch-prod-20221003
supercafoutch_prod
ticket_4146
supercafoutch_20250120_151258
supercafoutch_20250120_150340
supercafoutch_20240909_080630
supercafoutch_20240609_115709
supercafoutch_20240212_082431
supercafoutch_20240107_181851
supercafoutch_prod_until_240107
supercafoutch-prod-20221003
supercafoutch-230911
supercafoutch-230824
supercafoutch-230823
supercafoutch-230823-the-true-one
migration-v12-tag
lacagette_20240310_074751
lacagette_20240107_122554
lacagette_20240107_120916
graoucoop_20240609_122614
cagette_testtag
cagette-230814
cagette-230630
5 merge requests
!103
WIP: Dev cooperatic
,
!87
Integration Evolution bdm
,
!104
merge dev_cooperatic into dev_principale
,
!106
Dev principale
,
!84
Ticket 1738
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
77 additions
and
0 deletions
+77
-0
members-space-shifts-exchange.css
members_space/static/css/members-space-shifts-exchange.css
+48
-0
members-space-shifts-exchange.js
members_space/static/js/members-space-shifts-exchange.js
+14
-0
index.html
templates/members_space/index.html
+11
-0
shifts_exchange.html
templates/members_space/shifts_exchange.html
+4
-0
No files found.
members_space/static/css/members-space-shifts-exchange.css
View file @
601455ba
...
...
@@ -3,6 +3,7 @@
margin
:
3rem
auto
;
display
:
flex
;
flex-direction
:
column
;
position
:
relative
;
}
/* -- Suspended screen */
...
...
@@ -16,6 +17,21 @@
margin
:
1.5rem
0
;
}
/* -- Calendar screen, area on top of the calendar */
#calendar_top_info
{
display
:
flex
;
justify-content
:
space-between
;
}
@media
screen
and
(
max-width
:
768px
)
{
#calendar_top_info
{
display
:
flex
;
flex-direction
:
column
;
justify-content
:
space-between
;
}
}
/* -- Calendar screen, shifts list */
#shifts_list
{
...
...
@@ -120,3 +136,34 @@
.date_old_shift
,
.time_old_shift
,
.date_new_shift
,
.time_new_shift
{
font-weight
:
bold
;
}
/* -- Explainations */
#calendar_explaination_area
{
max-width
:
33%
;
border
:
2px
solid
#585858
;
border-radius
:
15px
;
padding
:
1rem
;
}
.example-event
{
max-width
:
200px
;
margin
:
2rem
0
0.5rem
0
;
font-size
:
1.4rem
!important
;
padding
:
0
!important
;
}
@media
screen
and
(
max-width
:
768px
)
{
.example-event
{
margin
:
2rem
auto
0.5rem
auto
;
}
}
.arrow_explanation_numbers
{
margin
:
0
3px
;
}
#calendar_explaination_button
{
max-width
:
60%
;
margin
:
2rem
auto
-1rem
auto
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
members_space/static/js/members-space-shifts-exchange.js
View file @
601455ba
...
...
@@ -176,8 +176,22 @@ function init_shifts_list() {
* Inits the page when the calendar is displayed
*/
function
init_calendar_page
()
{
let
template_explanations
=
$
(
"#calendar_explaination_template"
);
if
(
vw
<=
768
)
{
$
(
".loading-calendar"
).
show
();
$
(
"#calendar_explaination_area"
).
hide
();
$
(
"#calendar_explaination_button"
).
on
(
"click"
,
()
=>
{
openModal
(
template_explanations
.
html
(),
closeModal
,
"J'ai compris"
)
})
}
else
{
$
(
"#calendar_explaination_button"
).
hide
();
$
(
"#calendar_explaination_area"
).
html
(
template_explanations
.
html
());
}
if
(
incoming_shifts
!==
null
)
{
...
...
This diff is collapsed.
Click to expand it.
templates/members_space/index.html
View file @
601455ba
...
...
@@ -49,9 +49,20 @@
<div>
par celui du :
</div>
<div><span
class=
"date_new_shift"
></span>
à
<span
class=
"time_new_shift"
></span></div>
</div>
<div
id=
"modal_add_shift_template"
>
<div>
Je suis sur le point de m'inscrire au service du :
<span
class=
"date_new_shift"
></span>
à
<span
class=
"time_new_shift"
></span></div>
</div>
<div
id=
"calendar_explaination_template"
>
<h4>
Légende du calendrier
</h4>
<a
class=
"example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_booked"
><div
class=
"fc-event-main"
><div
class=
"fc-event-main-frame"
><div
class=
"fc-event-time"
>
06:00
</div><div
class=
"fc-event-title-container"
><div
class=
"fc-event-title fc-sticky"
>
Clemenceau -- 9/12
</div></div></div></div></a>
<p>
Un service colorié en noir : je suis déjà inscrit à ce service.
</p>
<a
class=
"example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_less_alf"
><div
class=
"fc-event-main"
><div
class=
"fc-event-main-frame"
><div
class=
"fc-event-time"
>
10:45
</div><div
class=
"fc-event-title-container"
><div
class=
"fc-event-title fc-sticky"
>
Clemenceau -- 3/12
</div></div></div></div></a>
<p>
Un service colorié en bleu : je peux m'inscrire à ce service.
</p>
<p>
3/12
<i
class=
"arrow_explanation_numbers fas fa-arrow-right"
></i>
il y a déjà 3 places réservées à ce service sur 12 disponibles.
<b>
Plus le chiffre de gauche est petit, plus on a besoin de coopérateurs.rices à ce service !
</b></p>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
templates/members_space/shifts_exchange.html
View file @
601455ba
...
...
@@ -19,6 +19,7 @@
<span
class=
"select_makeups_message_block"
>
Je dois les sélectionner dans le calendrier.
</span>
<span
class=
"select_makeups_message_block"
>
Je ne peux pas échanger de service tant que je n'ai pas choisi mes rattrapages.
</span>
</div>
<div
id=
"calendar_top_info"
>
<div
id=
"partner_shifts_list"
>
<h4>
Liste de mes services :
</h4>
<div
class=
"loading-incoming-shifts"
>
...
...
@@ -26,6 +27,9 @@
</div>
<div
id=
"shifts_list"
></div>
</div>
<div
id=
"calendar_explaination_area"
></div>
<button
id=
"calendar_explaination_button"
class=
"btn--success"
>
Légende du calendrier
</button>
</div>
<div
class=
"loading-calendar"
>
<i
class=
"fas fa-spinner fa-spin fa-2x"
></i>
</div>
...
...
This diff is collapsed.
Click to expand it.
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