Compare commits

...

6 Commits

Author SHA1 Message Date
gitea-actions
1feedd0381 chore: bump version to v0.1.54
All checks were successful
Auto Tag Develop / tag (push) Successful in 4s
Build Release Artefact / build (push) Successful in 1m9s
2026-03-17 14:24:43 +00:00
f9cd5a0143 fix : RTT à la date du jour et affichage des congés restant
All checks were successful
Auto Tag Develop / tag (push) Successful in 5s
2026-03-17 15:24:32 +01:00
gitea-actions
ede7decaa7 chore: bump version to v0.1.53
All checks were successful
Auto Tag Develop / tag (push) Successful in 5s
Build Release Artefact / build (push) Successful in 1m44s
2026-03-17 14:05:55 +00:00
2cfb05e5de feat : ajout de cache sur la récupération des jours fériés
Some checks failed
Auto Tag Develop / tag (push) Has been cancelled
2026-03-17 15:05:43 +01:00
gitea-actions
0a8399a950 chore: bump version to v0.1.52
All checks were successful
Auto Tag Develop / tag (push) Successful in 4s
Build Release Artefact / build (push) Successful in 1m15s
2026-03-17 12:52:06 +00:00
6a64cb4c58 feat : ajout de sécurité sur les endpoints
Some checks failed
Auto Tag Develop / tag (push) Has been cancelled
2026-03-17 13:52:00 +01:00
8 changed files with 74 additions and 50 deletions

View File

@@ -1,2 +1,2 @@
parameters:
app.version: '0.1.51'
app.version: '0.1.54'

View File

@@ -1,35 +1,35 @@
<template>
<section class="flex h-full min-h-0 flex-col overflow-hidden pt-8">
<div class="grid grid-cols-4 rounded-md bg-tertiary-500 text-primary-500 text-[18px] border border-primary-500">
<p class="col-start-1 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Année acquis :</strong> {{
<p class="col-start-1 p-[10px] border-b border-r border-primary-500"><strong class="uppercase font-semibold">Année acquis :</strong> {{
formatCount(summary?.acquiredDays)
}} Jours
</p>
<p class="col-start-2 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Pris :</strong>
<p class="col-start-2 p-[10px] border-b border-r border-primary-500"><strong class="uppercase font-semibold">Pris :</strong>
{{ formatCount(isForfaitRule ? currentYearTakenDays : summary?.takenDays) }} Jours
</p>
<p class="col-start-3 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Reste à prendre :</strong>
<p class="col-start-3 p-[10px] border-b border-r border-b-white border-r-primary-500 bg-primary-500 text-white"><strong class="uppercase font-semibold">Reste à prendre :</strong>
{{ formatCount(summary?.remainingDays) }} Jours
</p>
<p class="col-start-4 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">En cours d'acquisition :</strong>
<p class="col-start-4 p-[10px] border-b border-primary-500"><strong class="uppercase font-semibold">En cours d'acquisition :</strong>
{{ formatCount(summary?.accruingDays) }} Jours
</p>
<p v-if="!isForfaitRule" class="col-start-1 p-[10px]"><span class="uppercase font-semibold">Samedi acquis :</span>
<p v-if="!isForfaitRule" class="col-start-1 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Samedi acquis :</span>
{{ formatCount(summary?.acquiredSaturdays) }} Jours
</p>
<p v-else class="col-start-1 p-[10px]"><span class="uppercase font-semibold">Année N-1 acquis :</span>
<p v-else class="col-start-1 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Année N-1 acquis :</span>
{{ formatCount(summary?.previousYearAcquiredDays) }} Jours
</p>
<p v-if="!isForfaitRule" class="col-start-2 p-[10px]"><span class="uppercase font-semibold">Pris :</span>
<p v-if="!isForfaitRule" class="col-start-2 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Pris :</span>
{{ formatCount(summary?.takenSaturdays) }} Jours
</p>
<p v-if="!isForfaitRule" class="col-start-3 p-[10px]"><span class="uppercase font-semibold">Reste à prendre :</span>
<p v-if="!isForfaitRule" class="col-start-3 p-[10px] border-r border-r-primary-500 bg-primary-500 text-white"><span class="uppercase font-semibold">Reste à prendre :</span>
{{ formatCount(summary?.remainingSaturdays) }} Jours
</p>
<p v-else class="col-start-2 p-[10px]"><span class="uppercase font-semibold">Pris :</span>
<p v-else class="col-start-2 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Pris :</span>
{{ formatCount(summary?.previousYearTakenDays) }} Jours
</p>
<p v-if="isForfaitRule" class="col-start-3 p-[10px]"><span class="uppercase font-semibold">Reste à prendre :</span>
<p v-if="isForfaitRule" class="col-start-3 p-[10px] border-r-primary-500 bg-primary-500 text-white"><span class="uppercase font-semibold">Reste à prendre :</span>
{{ formatCount(summary?.previousYearRemainingDays) }} Jours
</p>
<div v-if="!isForfaitRule" class="col-start-4 p-[10px] flex gap-7 items-center">

View File

@@ -22,8 +22,8 @@
</button>
</div>
<p class="text-[16px]">
<span class="font-bold">RTT À LA DATE DU JOUR :</span>
{{ formatMinutes(summary?.availableMinutes ?? 0) }}
<span class="font-bold">RTT À LA SEMAINE {{ lastCompleteWeek }} : </span>
<span class="font-bold">{{ formatMinutes(summary?.availableMinutes ?? 0) }}</span>
</p>
<div class="flex justify-center">
<button
@@ -258,6 +258,17 @@ const emit = defineEmits<{
(event: 'submit-rtt-payment', month: number, base25Minutes: number, bonus25Minutes: number, base50Minutes: number, bonus50Minutes: number): void
}>()
// --- Last complete week number ---
const lastCompleteWeek = computed(() => {
const now = new Date()
const startOfYear = new Date(now.getFullYear(), 0, 1)
const dayOfYear = Math.floor((now.getTime() - startOfYear.getTime()) / 86400000) + 1
const dayOfWeek = now.getDay() || 7 // Monday = 1, Sunday = 7
const currentWeek = Math.ceil((dayOfYear - dayOfWeek + 10) / 7)
return currentWeek - 1
})
// --- Month navigation ---
const orderedMonths = [6, 7, 8, 9, 10, 11, 12, 1, 2, 3, 4, 5] as const

View File

@@ -12,7 +12,7 @@ use App\State\EmployeeLeaveSummaryProvider;
operations: [
new Get(
uriTemplate: '/employees/{id}/leave-summary',
security: "is_granted('ROLE_USER')",
security: "is_granted('ROLE_ADMIN')",
provider: EmployeeLeaveSummaryProvider::class
),
],

View File

@@ -14,7 +14,7 @@ use App\State\EmployeeRttSummaryProvider;
operations: [
new Get(
uriTemplate: '/employees/{id}/rtt-summary',
security: "is_granted('ROLE_USER')",
security: "is_granted('ROLE_ADMIN')",
provider: EmployeeRttSummaryProvider::class
),
],

View File

@@ -21,10 +21,10 @@ use Symfony\Component\Serializer\Attribute\Groups;
#[ApiResource(
operations: [
new Get(
security: "is_granted('ROLE_USER')"
security: "is_granted('ROLE_ADMIN')"
),
new GetCollection(
security: "is_granted('ROLE_USER')"
security: "is_granted('ROLE_ADMIN')"
),
new Post(
security: "is_granted('ROLE_ADMIN')"

View File

@@ -24,10 +24,10 @@ use Symfony\Component\Serializer\Attribute\Groups;
#[ApiResource(
operations: [
new Get(
security: "is_granted('ROLE_USER')"
security: "is_granted('ROLE_ADMIN')"
),
new GetCollection(
security: "is_granted('ROLE_USER')"
security: "is_granted('ROLE_ADMIN')"
),
new Post(
security: "is_granted('ROLE_ADMIN')"
@@ -47,7 +47,7 @@ use Symfony\Component\Serializer\Attribute\Groups;
),
new Get(
uriTemplate: '/mileage_allowances/{id}/receipt',
security: "is_granted('ROLE_USER')",
security: "is_granted('ROLE_ADMIN')",
provider: MileageAllowanceReceiptDownloadProvider::class,
),
],

View File

@@ -6,6 +6,8 @@ namespace App\Service;
use Exception;
use RuntimeException;
use Symfony\Contracts\Cache\CacheInterface;
use Symfony\Contracts\Cache\ItemInterface;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
@@ -17,7 +19,8 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
{
public function __construct(
private HttpClientInterface $client,
private string $holidayUrl
private string $holidayUrl,
private CacheInterface $cache,
) {}
/**
@@ -30,24 +33,29 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
public function getHolidaysDay(string $zone): array
{
$zone = strtolower(trim($zone));
$url = $this->holidayUrl."{$zone}.json";
$key = "public_holidays_{$zone}_all";
try {
$response = $this->client->request(
'GET',
$url
);
} catch (TransportExceptionInterface) {
throw new RuntimeException('Unable to reach public holidays API.');
} catch (ClientExceptionInterface) {
throw new RuntimeException('Invalid zone provided for public holidays.');
} catch (ServerExceptionInterface) {
throw new RuntimeException('Public holidays API is temporarily unavailable.');
} catch (Throwable) {
throw new RuntimeException('Unexpected error while fetching public holidays.');
}
return $this->cache->get($key, function (ItemInterface $item) use ($zone): array {
$item->expiresAfter(30 * 86400);
$url = $this->holidayUrl."{$zone}.json";
return json_decode($response->getContent(), true);
try {
$response = $this->client->request(
'GET',
$url
);
} catch (TransportExceptionInterface) {
throw new RuntimeException('Unable to reach public holidays API.');
} catch (ClientExceptionInterface) {
throw new RuntimeException('Invalid zone provided for public holidays.');
} catch (ServerExceptionInterface) {
throw new RuntimeException('Public holidays API is temporarily unavailable.');
} catch (Throwable) {
throw new RuntimeException('Unexpected error while fetching public holidays.');
}
return json_decode($response->getContent(), true);
});
}
/**
@@ -60,20 +68,25 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
{
$zone = strtolower(trim($zone));
$years = trim($years);
$url = $this->holidayUrl."{$zone}/{$years}.json";
$key = "public_holidays_{$zone}_{$years}";
try {
$response = $this->client->request('GET', $url);
} catch (TransportExceptionInterface) {
throw new RuntimeException('Unable to reach public holidays API.');
} catch (ClientExceptionInterface) {
throw new RuntimeException('Invalid zone or year provided for public holidays.');
} catch (ServerExceptionInterface) {
throw new RuntimeException('Public holidays API is temporarily unavailable.');
} catch (Throwable) {
throw new RuntimeException('Unexpected error while fetching public holidays.');
}
return $this->cache->get($key, function (ItemInterface $item) use ($zone, $years): array {
$item->expiresAfter(30 * 86400);
$url = $this->holidayUrl."{$zone}/{$years}.json";
return json_decode($response->getContent(), true);
try {
$response = $this->client->request('GET', $url);
} catch (TransportExceptionInterface) {
throw new RuntimeException('Unable to reach public holidays API.');
} catch (ClientExceptionInterface) {
throw new RuntimeException('Invalid zone or year provided for public holidays.');
} catch (ServerExceptionInterface) {
throw new RuntimeException('Public holidays API is temporarily unavailable.');
} catch (Throwable) {
throw new RuntimeException('Unexpected error while fetching public holidays.');
}
return json_decode($response->getContent(), true);
});
}
}