Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Homogéniser et généraliser l'affichage de "libre" #621

Merged
merged 4 commits into from
Nov 19, 2022

Conversation

raphodn
Copy link
Member

@raphodn raphodn commented Nov 17, 2022

Quoi ?

Modifications apportées :

  • Admin > Gérer les créneaux > visibiliser les créneaux qui sont "libre"
  • Admin > Semaine type > homogéniser l'affichage de "libre" (avec son affichage ailleurs)

Captures d'écran

Avant Après
Gérer les créneaux (créneau à venir) Screenshot from 2022-11-17 13-29-10 Screenshot from 2022-11-17 13-28-54
Gérer les créneaux (créneau passé) Screenshot from 2022-11-17 13-29-20 Screenshot from 2022-11-17 13-28-18
Semaine type Screenshot from 2022-11-17 13-24-34 Screenshot from 2022-11-17 13-24-08
/cardReader Screenshot from 2022-11-17 13-48-09 Screenshot from 2022-11-17 13-47-32 Screenshot from 2022-11-18 19-46-06

@raphodn raphodn self-assigned this Nov 17, 2022
@raphodn raphodn requested review from symartin and petitalb November 17, 2022 12:31
@raphodn raphodn changed the title Homogéniser l'affichage de "libre" Homogéniser et généraliser l'affichage de "libre" Nov 17, 2022
@@ -198,7 +198,7 @@ public function cardReaderAction(Request $request)
$em = $this->getDoctrine()->getManager();
$shifts = $em->getRepository('AppBundle:Shift')->findRemainingToday();
$buckets = $this->get('shift_service')->generateShiftBuckets($shifts);
$buckets = $this->get('shift_service')->removeEmptyShift($buckets);
// $buckets = $this->get('shift_service')->removeEmptyShift($buckets);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

à supprimer ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, j'ai laissé car j'ai du mal à évaluer si ce genre de modifs ne va pas provoquer quelques questions ^^
(que ce soit à l'elefan, ou dans d'autres coop, donc maybe un paramètre à terme ?)

Comment on lines 53 to 61
{% if (shiftercount == 0) %}
<li style="height: 30px">
<span class="red-text" style="margin-right: 5px; font-size: 16px">
<i class="material-icons tiny">warning</i>
Personne n'est inscrit sur ce créneau
<i class="material-icons tiny">warning</i>
</span>
</li>
{% endif %}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

J'aurais plutot déplacé cet encart en entête de la card :

/!\ Personne n'est inscrit sur ce créneau /!\   (<= centré)
Poste d'accueil / 17h30 - 19h00
- Libre
- Libre

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bonne remarque, je teste 🙏

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@petitalb j'ai fait un commit ici : 4c769c0 (le code n'est pas hyper beau car je calcule directement dans le template si le shift est vide - quoique c'était déjà le cas, j'ai juste remonté le calcul)

Screenshot from 2022-11-18 19-46-06

@raphodn raphodn merged commit c17b845 into master Nov 19, 2022
@raphodn raphodn deleted the raphodn/shift-libre-display branch November 19, 2022 09:23
@raphodn raphodn linked an issue Nov 23, 2022 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rendre plus visible les créneaux libre
2 participants