Skip to content

Commit ff25192

Browse files
committed
Create getDaysOfWeekArray method
1 parent 69eaa01 commit ff25192

File tree

6 files changed

+13
-7
lines changed

6 files changed

+13
-7
lines changed

app/Resources/views/admin/period/index.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,14 @@
232232
<table>
233233
<thead>
234234
<tr>
235-
{% for key,day in days_of_week %}
235+
{% for key,day in period_service.getDaysOfWeekArray() %}
236236
<th>{{ day }}</th>
237237
{% endfor %}
238238
</tr>
239239
</thead>
240240
<tbody>
241241
<tr>
242-
{% for key,day in days_of_week %}
242+
{% for key,day in period_service.getDaysOfWeekArray() %}
243243
<td>
244244
{% for period in periods_by_day[key] %}
245245
{% if ((filling_filter == null) and (beneficiary_filter == null))

app/Resources/views/period/index.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ It display a page with all the avaible periods (a.k.a the "Semaine type")
9191
<table>
9292
<thead>
9393
<tr>
94-
{% for key,day in days_of_week %}
94+
{% for key,day in period_service.getDaysOfWeekArray() %}
9595
<th>{{ day }}</th>
9696
{% endfor %}
9797
</tr>
9898
</thead>
9999
<tbody>
100100
<tr>
101-
{% for key,day in days_of_week %}
101+
{% for key,day in period_service.getDaysOfWeekArray() %}
102102
<td>
103103
{% for period in periods_by_day[key] %}
104104
{% if (filling_filter == null)

src/AppBundle/Controller/AdminPeriodController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ public function indexAction(Request $request, PeriodFormHelper $formHelper)
6868
}
6969

7070
return $this->render('admin/period/index.html.twig', array(
71-
'days_of_week' => Period::DAYS_OF_WEEK,
7271
'periods_by_day' => $periodsByDay,
7372
'filter_form' => $form->createView(),
7473
'week_filter' => $week_filter,

src/AppBundle/Controller/PeriodController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public function indexAction(Request $request, PeriodFormHelper $formHelper)
5353
}
5454

5555
return $this->render('period/index.html.twig', array(
56-
'days_of_week' => Period::DAYS_OF_WEEK,
5756
'periods_by_day' => $periodsByDay,
5857
'filter_form' => $form->createView(),
5958
'week_filter' => $week_filter,

src/AppBundle/Entity/Period.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class Period
1616
{
1717
const DAYS_OF_WEEK = ["Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche"];
1818
const DAYS_OF_WEEK_LIST_WITH_INT = ["Lundi" => 0, "Mardi" => 1, "Mercredi" => 2, "Jeudi" => 3, "Vendredi" => 4, "Samedi" => 5, "Dimanche" => 6];
19+
const WEEK_CYCLE = ["A", "B", "C", "D"];
1920

2021
/**
2122
* @var int

src/AppBundle/Service/PeriodService.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@
22

33
namespace AppBundle\Service;
44

5+
use AppBundle\Entity\Period;
6+
57
class PeriodService
68
{
79
public function __construct()
810
{
911
}
1012

13+
public function getDaysOfWeekArray()
14+
{
15+
return Period::DAYS_OF_WEEK;
16+
}
17+
1118
public function getWeekCycleArray()
1219
{
13-
return ["A", "B", "C", "D"];
20+
return Period::WEEK_CYCLE;
1421
}
1522
}

0 commit comments

Comments
 (0)