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.

Sign up for GitHub

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

Jump to bottom

Période : améliorer encore l'affichage lorsque cycle_type n'est pas défini #961

Merged
merged 3 commits into from
Aug 23, 2023
Merged

Période : améliorer encore l'affichage lorsque cycle_type n'est pas défini #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2a0c2d
Period: hide Semaine title
raphodn Aug 23, 2023
fbd2d21
Allow PeriodPosition weekCycle field to be null
raphodn Aug 23, 2023
d237ee4
Common template for PeriodPosition edit collapsible
raphodn Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions app/DoctrineMigrations/Version20230823170329_period_position_weekcycle_allow_null.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?php

declare(strict_types=1);

namespace Application\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20230823170329 extends AbstractMigration
{
public function getDescription() : string
{
return '';
}

public function up(Schema $schema) : void
{
// this up() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');

$this->addSql('ALTER TABLE period_position CHANGE week_cycle week_cycle VARCHAR(1) DEFAULT NULL');
}

public function down(Schema $schema) : void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');

$this->addSql('ALTER TABLE period_position CHANGE week_cycle week_cycle VARCHAR(1) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
}
}
115 changes: 10 additions & 105 deletions app/Resources/views/admin/period/edit.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,114 +36,19 @@

<h5>Postes disponibles</h5>

{% if use_fly_and_fixed %}
{% if (period.positionsperweekcycle | length == 0) %}
Aucun poste n'existe pour ce créneau
{% endif %}
{% for week, positions in period.positionsperweekcycle %}
{% if cycle_type == 'abcd' %}
<h6>Semaine {{ week }}</h6>
{% endif %}
<ul class="collapsible">
{% for position in positions %}
{% if position.shifter %}
<li id="position{{ position.id }}">
<div class="collapsible-header">
<div class="col s12">
{% if position.formation %}<b data-formation="{{ position.formation.name }}">{% endif %}
{{ position.shifter.displayNameWithMemberNumber }}
{% if position.formation %}</b>&nbsp;({{ position.formation.name }}){% endif %}
{% if not position.formation and position.shifter.formations | length > 0 %}
&nbsp;<b class="orange-text">({{ position.shifter.formations | join(', ') }})</b>
{% endif %}
{% if position.shifter.isNew %}
&nbsp;<strong class="red-text" title="Nouveau membre">{{ beneficiary_new_icon }}</strong>
{% endif %}
</div>
</div>
<div class="collapsible-body">
<p>
Créneau fixe réservé
pour <a href="{{ path("member_show", { 'member_number': position.shifter.membership.memberNumber }) }}" target="_blank">{{ position.shifter }}</a>
le <i>{{ position.bookedTime | date_fr_full_with_time }}</i>
par {% include "admin/member/_partial/member_or_user_link.html.twig" with { user: position.booker, target_blank: true } %}.
</p>
{{ form_start(positions_free_forms[position.id]) }}
{{ form_widget(positions_free_forms[position.id]) }}
<a href="#" class="btn waves-effect waves-light orange" onclick="var r = confirm('Etes-vous sûr de vouloir libérer ce poste ?!'); if (r == true) {$(this).closest('form').submit();}; event.stopPropagation();" title="Libérer ce poste">
<i class="material-icons left">lock_open</i>Libérer
</a>
{{ form_end(positions_free_forms[position.id]) }}
</div>
</li>
{% else %}
<li id="position{{ position.id }}">
<div class="collapsible-header">
<div class="row" style="margin-bottom: 0; width: 100%;">
<div class="col s12">
<b>
<span style="font-style: italic">libre</span>
</b>
{% if position.formation %}
&nbsp;({{ position.formation.name }})
{% else %}
&nbsp;(sans formation particulière)
{% endif %}
</div>
</div>
</div>
<div class="collapsible-body">
{{ form_start(positions_book_forms[position.id]) }}
<div class="row">
<div class="col s7 input-field">
{{ form_label(positions_book_forms[position.id].shifter) }}
{{ form_errors(positions_book_forms[position.id].shifter) }}
{{ form_widget(positions_book_forms[position.id].shifter) }}
</div>
<div class="col s3">
<button type="submit" class="btn waves-effect waves-light">
<i class="material-icons left">add</i>Ajouter
</button>
</div>
</div>
{{ form_end(positions_book_forms[position.id]) }}
{% if is_granted("ROLE_ADMIN") %}
<div class="row">
{{ form_start(positions_delete_forms[position.id]) }}
{{ form_widget(positions_delete_forms[position.id]) }}
<a href="#" class="btn waves-effect waves-light red" onclick="var r = confirm('Etes-vous sûr de vouloir supprimer ce poste ?!'); if (r == true) {$(this).closest('form').submit();}; event.stopPropagation();" title="Supprimer ce poste">
<i class="material-icons left">delete</i>Supprimer
</a>
{{ form_end(positions_delete_forms[position.id]) }}
</div>
{% endif %}
{% if position.createdBy %}
<p>
Poste type créé le <i>{{ position.createdAt | date_fr_full_with_time }}</i>
par {% include "admin/member/_partial/member_or_user_link.html.twig" with { user: position.createdBy, target_blank: true } %}.
</p>
{% endif %}
</div>
</li>
{% endif %}
{% endfor %}
</ul>
{% endfor %}
{% else %}
{% for week, positions in period.positionsperweekcycle %}
{% if (period.positionsperweekcycle | length == 0) %}
Aucun poste n'existe pour ce créneau
{% endif %}
{% for week, positions in period.positionsperweekcycle %}
{% if cycle_type == 'abcd' %}
<h6>Semaine {{ week }}</h6>
<ul>
{% endif %}
<ul class="collapsible">
{% for position in positions %}
<li>
{{ form_start(positions_delete_forms[position.id]) }}
{{ form_widget(positions_delete_forms[position.id]) }}
{{ position }} <a href="#" onclick="$(this).closest('form').submit()" title="supprimer" class="red-text">&cross;</a>
{{ form_end(positions_delete_forms[position.id]) }}
</li>
{% include "admin/periodposition/_partial/edit_collapsible.html.twig" with { position: position, position_free_form: positions_free_forms[position.id] ?? null, position_book_form: positions_book_forms[position.id] ?? null, position_delete_form: positions_delete_forms[position.id] ?? null } %}
{% endfor %}
</ul>
{% endfor %}
{% endif %}
</ul>
{% endfor %}

<br />
<h5>Actions supplémentaires</h5>
Expand Down
82 changes: 82 additions & 0 deletions app/Resources/views/admin/periodposition/_partial/edit_collapsible.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@

<li id="position{{ position.id }}">
<div class="collapsible-header">
<div class="row" style="margin-bottom: 0; width: 100%;">
<div class="col s12">
{% if use_fly_and_fixed %}
{% if position.shifter %}
{% if position.formation %}<b data-formation="{{ position.formation.name }}">{% endif %}
{{ position.shifter.displayNameWithMemberNumber }}
{% if position.formation %}</b>&nbsp;({{ position.formation.name }}){% endif %}
{% if not position.formation and position.shifter.formations | length > 0 %}
&nbsp;<b class="orange-text">({{ position.shifter.formations | join(', ') }})</b>
{% endif %}
{% if position.shifter.isNew %}
&nbsp;<strong class="red-text" title="Nouveau membre">{{ beneficiary_new_icon }}</strong>
{% endif %}
{% else %}
<strong style="font-style:italic">libre</strong>
{% if position.formation %}
&nbsp;({{ position.formation.name }})
{% else %}
&nbsp;(sans formation particulière)
{% endif %}
{% endif %}
{% else %}
{{ position }}
{% endif %}
</div>
</div>
</div>
<div class="collapsible-body">
{% if use_fly_and_fixed %}
{% if position.shifter %}
<p>
Créneau fixe réservé
pour <a href="{{ path("member_show", { 'member_number': position.shifter.membership.memberNumber }) }}" target="_blank">{{ position.shifter }}</a>
le <i>{{ position.bookedTime | date_fr_full_with_time }}</i>
par {% include "admin/member/_partial/member_or_user_link.html.twig" with { user: position.booker, target_blank: true } %}.
</p>
{{ form_start(position_free_form) }}
{{ form_widget(position_free_form) }}
<a href="#" class="btn waves-effect waves-light orange" onclick="var r = confirm('Etes-vous sûr de vouloir libérer ce poste ?!'); if (r == true) {$(this).closest('form').submit();}; event.stopPropagation();" title="Libérer ce poste">
<i class="material-icons left">lock_open</i>Libérer
</a>
{{ form_end(position_free_form) }}
{% else %}
{{ form_start(position_book_form) }}
<div class="row">
<div class="col s7 input-field">
{{ form_label(position_book_form.shifter) }}
{{ form_errors(position_book_form.shifter) }}
{{ form_widget(position_book_form.shifter) }}
</div>
<div class="col s3">
<button type="submit" class="btn waves-effect waves-light">
<i class="material-icons left">add</i>Ajouter
</button>
</div>
</div>
{{ form_end(position_book_form) }}
{% endif %}
{% endif %}
{% if not position.shifter %}
{% if is_granted("ROLE_ADMIN") %}
<div class="row">
{{ form_start(position_delete_form) }}
{{ form_widget(position_delete_form) }}
<a href="#" class="btn waves-effect waves-light red" onclick="var r = confirm('Etes-vous sûr de vouloir supprimer ce poste ?!'); if (r == true) {$(this).closest('form').submit();}; event.stopPropagation();" title="Supprimer ce poste">
<i class="material-icons left">delete</i>Supprimer
</a>
{{ form_end(position_delete_form) }}
</div>
{% endif %}
{% endif %}
{% if position.createdBy %}
<p>
Poste type créé le <i>{{ position.createdAt | date_fr_full_with_time }}</i>
par {% include "admin/member/_partial/member_or_user_link.html.twig" with { user: position.createdBy, target_blank: true } %}.
</p>
{% endif %}
</div>
</li>
4 changes: 3 additions & 1 deletion app/Resources/views/user/_partial/period_position_card.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<span class="card-title">
{{ period_position.period.dayOfWeekString }} de {{ period_position.period.start | date('G\\hi') }} à {{ period_position.period.end | date('G\\hi') }}
<br />
<small>(Semaine {{ period_position.weekCycle }})</small>
{% if cycle_type == 'abcd' %}
<small>(Semaine {{ period_position.weekCycle }})</small>
{% endif %}
</span>
<p>
<i class="material-icons">person</i>{{ period_position.shifter.firstname }}
Expand Down
23 changes: 17 additions & 6 deletions src/AppBundle/Controller/AdminPeriodController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,20 @@ public function newPeriodPositionAction(Request $request, Period $period)

if ($form->isSubmitted() && $form->isValid()) {
$count = $form["nb_of_shifter"]->getData();
$week_cycles = ($this->cycle_type == "abcd") ? $form["week_cycle"]->getData() : [Period::WEEK_A];
foreach ($week_cycles as $week_cycle) {
$position->setWeekCycle($week_cycle);

if ($this->cycle_type == "abcd") {
$week_cycles = $form["week_cycle"]->getData();
foreach ($week_cycles as $week_cycle) {
$position->setWeekCycle($week_cycle);
$position->setCreatedBy($current_user);
foreach (range(0, $count-1) as $iteration) {
$p = clone($position);
$period->addPosition($p);
$em->persist($p);
}
}
} else {
$position->setWeekCycle(null);
$position->setCreatedBy($current_user);
foreach (range(0, $count-1) as $iteration) {
$p = clone($position);
Expand All @@ -219,10 +230,10 @@ public function newPeriodPositionAction(Request $request, Period $period)
$em->persist($period);
$em->flush();

$session->getFlashBag()->add('success', $count . ' poste' . (($count>1) ? 's':'') . ' ajouté ' . (($count>1) ? 's':'') . ' (pour chaque cycle sélectionné) !');
$session->getFlashBag()->add('success', $count . ' poste' . (($count>1) ? 's':'') . ' ajouté ' . (($count>1) ? 's':'') . (($this->cycle_type == "abcd") ? ' (pour chaque cycle sélectionné) !':' !'));
}

return $this->redirectToRoute('admin_period_edit',array('id'=>$period->getId()));
return $this->redirectToRoute('admin_period_edit', array('id' => $period->getId()));
}

/**
Expand All @@ -244,7 +255,7 @@ public function deletePeriodPositionAction(Request $request, Period $period, Per
$session->getFlashBag()->add('success', 'Le poste ' . $position . ' a bien été supprimé !');
}

return $this->redirectToRoute('admin_period_edit',array('id'=>$period->getId()));
return $this->redirectToRoute('admin_period_edit', array('id' => $period->getId()));
}

/**
Expand Down
7 changes: 5 additions & 2 deletions src/AppBundle/Entity/PeriodPosition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class PeriodPosition

/**
* @var string
* @ORM\Column(name="week_cycle", type="string", length=1, nullable=false)
* @ORM\Column(name="week_cycle", type="string", length=1, nullable=true)
*/
private $weekCycle;

Expand Down Expand Up @@ -95,7 +95,10 @@ public function __construct()
*/
public function __toString()
{
$name = $this->getPeriod() . ' - Semaine ' . $this->getWeekCycle();
$name = (string) $this->getPeriod();
if ($this->getWeekCycle()) {
$name .= ' - Semaine ' . $this->getWeekCycle();
}
if ($this->getFormation()) {
$name .= ' (' . $this->getFormation()->getName() . ')';
}
Expand Down
2 changes: 1 addition & 1 deletion src/AppBundle/Form/PeriodPositionType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
$builder
->add('week_cycle', ChoiceType::class, array(
'label' => 'Cycle',
'choices' => ($this->cycle_type == 'abcd') ? Period::WEEK_CYCLE_CHOICE_LIST : [],
'choices' => ($this->cycle_type == "abcd") ? Period::WEEK_CYCLE_CHOICE_LIST : [],
'expanded' => false,
'multiple' => true,
// 'data' => ($this->cycle_type == 'abcd') ? null : [Period::WEEK_A]
Expand Down
Loading