Skip to content
Snippets Groups Projects
Commit 4132dc4e authored by Dorine Lambinet's avatar Dorine Lambinet
Browse files

Merge branch 'bug-lien-openfisca-variables' into 'master' 

Bug lien openfisca variables

See merge request leximpact/leximpact-socio-fiscal-ui!132
parents 63f57290 f1680373
Branches
Tags 0.0.383
1 merge request!132Bug lien openfisca variables
Pipeline #8350 passed
Stage: build
Show whitespace changes
Inline Side-by-side
src/lib/components/variables/FormulaView.svelte
+ 14
− 15
View file @ 4132dc4e
......@@ -82,8 +82,11 @@
</script>
{#if formula.documentation !== undefined}
<div class="">
<div class="my-4 px-5">
<p class="italic">
<span class="text-base not-italic text-gray-600">Notes&nbsp;:</span>
{formula.documentation.replace(/^\n+/, "").replace(/\n+$/, "")}
</p>
</div>
{/if}
......@@ -91,23 +94,19 @@
<p class="mb-4 overflow-x-auto whitespace-pre-wrap break-all tracking-wider">
{formula.source_code}
</p>
<a
class="link break-all text-gray-900"
href={newFormulaRepositoryUrl(metadata, formula)}
rel="noreferrer"
href="https://github.com/openfisca/openfisca-france/blob/master/{encodeURIComponent(
formula.file_path,
)}#L{formula.start_line_number}"
target="_blank"
rel="noreferrer"
>
<svg
class="inline h-5 w-5 fill-current"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
width="24"
height="24"
><path fill="none" d="M0 0h24v24H0z" /><path
d="M12 2C6.475 2 2 6.475 2 12a9.994 9.994 0 0 0 6.838 9.488c.5.087.687-.213.687-.476 0-.237-.013-1.024-.013-1.862-2.512.463-3.162-.612-3.362-1.175-.113-.288-.6-1.175-1.025-1.413-.35-.187-.85-.65-.013-.662.788-.013 1.35.725 1.538 1.025.9 1.512 2.338 1.087 2.912.825.088-.65.35-1.087.638-1.337-2.225-.25-4.55-1.113-4.55-4.938 0-1.088.387-1.987 1.025-2.688-.1-.25-.45-1.275.1-2.65 0 0 .837-.262 2.75 1.026a9.28 9.28 0 0 1 2.5-.338c.85 0 1.7.112 2.5.337 1.912-1.3 2.75-1.024 2.75-1.024.55 1.375.2 2.4.1 2.65.637.7 1.025 1.587 1.025 2.687 0 3.838-2.337 4.688-4.562 4.938.362.312.675.912.675 1.85 0 1.337-.013 2.412-.013 2.75 0 .262.188.574.688.474A10.016 10.016 0 0 0 22 12c0-5.525-4.475-10-10-10z"
/></svg
>
Formule OpenFisca sur Github</a
Formule OpenFisca sur Github<iconify-icon
class="ml-1 align-[-0.15rem] text-base"
icon="ri-external-link-line"
/></a
>
</div>
......
src/lib/components/variables/VariableView.svelte
+ 22
− 46
View file @ 4132dc4e
......@@ -105,23 +105,6 @@
>. <br />La dernière date de relecture du dispositif
<b>est inconnue.</b>
<br />
<a
class="link text-sm text-gray-700"
href={newVariableRepositoryUrl(metadata, variable)}
rel="noreferrer"
target="_blank"
>
Mettre à jour la formule sur Github <svg
class="inline h-4 w-4 fill-current"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
width="24"
height="24"
><path fill="none" d="M0 0h24v24H0z" /><path
d="M12 2C6.475 2 2 6.475 2 12a9.994 9.994 0 0 0 6.838 9.488c.5.087.687-.213.687-.476 0-.237-.013-1.024-.013-1.862-2.512.463-3.162-.612-3.362-1.175-.113-.288-.6-1.175-1.025-1.413-.35-.187-.85-.65-.013-.662.788-.013 1.35.725 1.538 1.025.9 1.512 2.338 1.087 2.912.825.088-.65.35-1.087.638-1.337-2.225-.25-4.55-1.113-4.55-4.938 0-1.088.387-1.987 1.025-2.688-.1-.25-.45-1.275.1-2.65 0 0 .837-.262 2.75 1.026a9.28 9.28 0 0 1 2.5-.338c.85 0 1.7.112 2.5.337 1.912-1.3 2.75-1.024 2.75-1.024.55 1.375.2 2.4.1 2.65.637.7 1.025 1.587 1.025 2.687 0 3.838-2.337 4.688-4.562 4.938.362.312.675.912.675 1.85 0 1.337-.013 2.412-.013 2.75 0 .262.188.574.688.474A10.016 10.016 0 0 0 22 12c0-5.525-4.475-10-10-10z"
/></svg
>
</a>
</p>
</div>
</div>
......@@ -147,31 +130,31 @@
)}.</b
>
<br />
<a
class="link text-sm text-gray-700"
href={newVariableRepositoryUrl(metadata, variable)}
rel="noreferrer"
target="_blank"
>
Proposer une modification de la formule sur Github <svg
class="inline h-4 w-4 fill-current"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
width="24"
height="24"
><path fill="none" d="M0 0h24v24H0z" /><path
d="M12 2C6.475 2 2 6.475 2 12a9.994 9.994 0 0 0 6.838 9.488c.5.087.687-.213.687-.476 0-.237-.013-1.024-.013-1.862-2.512.463-3.162-.612-3.362-1.175-.113-.288-.6-1.175-1.025-1.413-.35-.187-.85-.65-.013-.662.788-.013 1.35.725 1.538 1.025.9 1.512 2.338 1.087 2.912.825.088-.65.35-1.087.638-1.337-2.225-.25-4.55-1.113-4.55-4.938 0-1.088.387-1.987 1.025-2.688-.1-.25-.45-1.275.1-2.65 0 0 .837-.262 2.75 1.026a9.28 9.28 0 0 1 2.5-.338c.85 0 1.7.112 2.5.337 1.912-1.3 2.75-1.024 2.75-1.024.55 1.375.2 2.4.1 2.65.637.7 1.025 1.587 1.025 2.687 0 3.838-2.337 4.688-4.562 4.938.362.312.675.912.675 1.85 0 1.337-.013 2.412-.013 2.75 0 .262.188.574.688.474A10.016 10.016 0 0 0 22 12c0-5.525-4.475-10-10-10z"
/></svg
>
</a>
</p>
</div>
</div>
{/if}
</div>
{#if variable.file_path !== undefined}
<div class="mt-4 flex">
<a
class="mx-4 mb-3 flex h-8 grow-0 items-center rounded-md bg-gray-300 px-2 py-1 text-sm uppercase text-black shadow-md hover:bg-le-bleu hover:text-white focus:outline-none md:mx-0"
href="https://github.com/openfisca/openfisca-france/blob/master/{encodeURIComponent(
variable.file_path,
)}#L{variable.start_line_number}"
target="_blank"
rel="noreferrer"
>Voir la formule sur OpenFisca<iconify-icon
class="ml-1 align-[-0.1rem] text-base"
icon="ri-external-link-line"
/></a
>
</div>
{/if}
{#each buildInstantFormulaAndReferencesArray(variable) as { formula, instant, references }}
<p class="mt-5 pb-3 text-xl font-bold">
<p class="mt-5 text-xl font-bold">
{#if formula === undefined}
<!-- {#if instant !== "0001-01-01"}
Le <i>{instant}</i>&nbsp;:
......@@ -216,17 +199,10 @@
)}
>Voir toutes les variables des cas types influant sur la formule,
à la date du {date}&nbsp;
<!-- RemixIcon :external-link-line -->
<svg
class="inline h-4 w-4 fill-current"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
width="24"
height="24"
><path fill="none" d="M0 0h24v24H0z" /><path
d="M10 6v2H5v11h11v-5h2v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h6zm11-3v8h-2V6.413l-7.793 7.794-1.414-1.414L17.585 5H13V3h8z"
/></svg
></a
<iconify-icon
class="align-[-0.1rem] text-base"
icon="ri-external-link-line"
/></a
>
</div>
<!--
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment