Compare commits
No commits in common. "bd1459d495c4764968bead8852c7a67bb9b4da26" and "0d6de4fd90ad0e593a91437d946f90fd0c8211a6" have entirely different histories.
bd1459d495
...
0d6de4fd90
|
|
@ -1,10 +0,0 @@
|
|||
.DS_Store
|
||||
node_modules
|
||||
/build
|
||||
/.svelte-kit
|
||||
/package
|
||||
.env
|
||||
.env.*
|
||||
!.env.example
|
||||
vite.config.js.timestamp-*
|
||||
vite.config.ts.timestamp-*
|
||||
16
Dockerfile
16
Dockerfile
|
|
@ -1,16 +0,0 @@
|
|||
FROM node:alpine AS builder
|
||||
USER node
|
||||
|
||||
COPY --chown=node \
|
||||
package.json package-lock.json \
|
||||
./usr/web/
|
||||
|
||||
WORKDIR /usr/web/
|
||||
RUN npm ci
|
||||
|
||||
COPY --chown=node \
|
||||
. /usr/web/
|
||||
RUN npm run build
|
||||
|
||||
FROM sebp/lighttpd
|
||||
COPY --from=builder /usr/web/build/ /var/www/localhost/htdocs/
|
||||
|
|
@ -133,10 +133,7 @@
|
|||
medGeOuSpe === 'mg' && aIndemniteZipZac ? parseFloat(bases.indemniteHebergement) : 0;
|
||||
|
||||
// Prime Outremer
|
||||
let zoneOutremer: string = "zone1";
|
||||
$: tauxPrimeOutremer = estUltramarin ?
|
||||
(zoneOutremer === "zone1" ? parseFloat(bases.tauxPrimeOutremerNiv1) : parseFloat(bases.tauxPrimeOutremerNiv2))
|
||||
: 0;
|
||||
$: tauxPrimeOutremer = estUltramarin ? parseFloat(bases.tauxPrimeOutremer) : 0;
|
||||
|
||||
// Gardes et astreintes
|
||||
$: valDemiGardeSem = parseFloat(bases.demigardeSem);
|
||||
|
|
@ -170,8 +167,9 @@
|
|||
|
||||
// Retraite IRCANTEC
|
||||
$: baseRetraite =
|
||||
(base + indemniteSujetionRetraite + indemniteTransport + indemniteHebergement + primeSASPAS)
|
||||
* 2 / 3;
|
||||
((base + indemniteSujetionRetraite + indemniteTransport + indemniteHebergement + primeSASPAS) *
|
||||
2) /
|
||||
3;
|
||||
$: plafondSS = parseFloat(bases.plafondSS);
|
||||
$: baseIrcantecA = baseRetraite > plafondSS ? plafondSS : baseRetraite;
|
||||
$: baseIrcantecB = baseRetraite > plafondSS ? baseRetraite - plafondSS : 0;
|
||||
|
|
@ -233,15 +231,6 @@
|
|||
<SlideToggle name="slider-nourri" bind:checked={isNourri}>Nourri</SlideToggle>
|
||||
<SlideToggle name="slider-outremer" bind:checked={estUltramarin}>Outremer</SlideToggle>
|
||||
</div>
|
||||
{#if estUltramarin && dateCourante < new Date("2023-04-01")}
|
||||
<div class="md:col-span-5 flex flex-col md:flex-row gap-1">
|
||||
<label class="label pl-1" for="zoneOutremer">Zone pour la majoration outremer</label>
|
||||
<select class="select" id="zoneOutremer" bind:value={zoneOutremer}>
|
||||
<option value="zone1">Guadeloupe, Martinique, Saint-Barthélemy, Saint-Martin</option>
|
||||
<option value="zone2">Guyane, La Réunion, Mayotte, Saint-Pierre-et-Miquelon</option>
|
||||
</select>
|
||||
</div>
|
||||
{/if}
|
||||
<div class="col-span-2 flex flex-col gap-1">
|
||||
<div class="grow pb-2 flex justify-left">
|
||||
<RadioGroup id="medGeOuSpe">
|
||||
|
|
@ -370,7 +359,7 @@
|
|||
<LigneSalaire
|
||||
type="taux"
|
||||
label="S.S Vieillesse déplafonnée"
|
||||
base={totalBrut}
|
||||
base={baseRetraite}
|
||||
taux={-tauxVieillesseDeplafonee}
|
||||
/>
|
||||
<LigneSalaire
|
||||
|
|
|
|||
|
|
@ -38,8 +38,9 @@ export function recupBasesLegales(vigueur : Date) {
|
|||
"primeSASPAS": "125", // mars 2014 - https://www.legifrance.gouv.fr/loda/id/JORFTEXT000028684829
|
||||
"indemniteDeplacement": "130", // mars 2014 - https://www.legifrance.gouv.fr/jorf/id/JORFTEXT000028684837
|
||||
"indemniteHebergement": "300", // nov 2020 - cf. historique
|
||||
"tauxPrimeOutremerNiv1" : "40", // harmonisation avril 2023 - https://www.legifrance.gouv.fr/jorf/id/JORFTEXT000047387836
|
||||
"tauxPrimeOutremerNiv2" : "40", // cf. historique
|
||||
"tauxPrimeOutremer": "40", // harmonisation avril 2023 - https://www.legifrance.gouv.fr/jorf/id/JORFTEXT000047387836
|
||||
"tauxPrimeOutremerNiv1" : "40", // TODO
|
||||
"tauxPrimeOutremerNiv2" : "40", // TODO
|
||||
|
||||
"gardeSem": "156.53", // juil 2023 - cf. historique
|
||||
"gardeWE": "171.24", // juil 2023 - cf. historique
|
||||
|
|
|
|||
Loading…
Reference in New Issue