Skip to content

Commit

Permalink
đź”– Release 3.3.4 (#2467)
Browse files Browse the repository at this point in the history
* Modifs linge + cuisine

* Suppression division par foyer

* Voiture propriétaire par défaut

* Hausse lessives par habitant

* Fix par défaut voiture

* par défaut voiture modif

* Plus d'eau jardin

* Hausse cuisine + vaisselle

* Encore plus de lessives

* Ajout lien ressource ADEME eau domestique

* Traductions

* Ajout de notes

* Français devient humain

* Traductions

* Fix trads

* ✨ Add types for Categories and Subcategories (#2458)

* ✨ Add types for Categories and Subcategories

* ♻️ Remove unused var

* Ch model adaptations (#2454)

* Modifications CH-fr model June 2024

* Add notes and small modification CH-fr July 2024

* Modification August on Actions/agir

* Fix CH-fr model to renamed base rules keys + translate CH-es and CH-en using DeepL

* Minor Fix requested by NGC.fr team

---------

Co-authored-by: jrichard <jrichard@unepgrid.ch>
Co-authored-by: Benjamin Arias <bjlaa@proton.me>

* Enlève par défaut régulier non propriétaire (#2462)

* Supprime mot sur Ă©nergies renouvelables PAC

* Enlève par défaut régulier non propriétaire

* 🏷️ NGCRule

* Update package.json

---------

Co-authored-by: JuliePouliquen <julie.pouliquen@gmail.com>
Co-authored-by: Benjamin Arias <bjlaa@proton.me>
Co-authored-by: Cedric Gampert <cgampert@gmail.com>
Co-authored-by: jrichard <jrichard@unepgrid.ch>
Co-authored-by: Benjamin Arias <benjamin.j.arias@gmail.com>
  • Loading branch information
6 people authored Nov 12, 2024
1 parent b32ff01 commit 9508e70
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
12 changes: 9 additions & 3 deletions index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Rule, RuleNode, Evaluation, Situation } from 'publicodes'
import { Evaluation, Rule, RuleNode, Situation } from 'publicodes'
// This file is generated on package build
import { DottedName } from './dottedNames'

Expand Down Expand Up @@ -70,15 +70,21 @@ export type SupportedRegion = Record<string, RegionParams>

export type SupportedRegions = Record<RegionCode, SupportedRegion>

export type NGCRule = Rule & {
export type NGCRule = Omit<
Rule,
'formule' | 'question' | 'références' | 'valeur'
> & {
formule?: Rule['formule'] | number
question?: Rule['question'] | null
références?: Rule['références'] | string[]
valeur?: Rule['valeur'] | number
abréviation?: string
mosaique?: MosaiqueNode
type?: string
action?: { dépasse: string[] }
icĂ´nes?: string
sévérité?: string
dottedName?: DottedName
question?: string
plus?: boolean
aide?: string
inactif?: string
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@incubateur-ademe/nosgestesclimat",
"version": "3.3.3",
"version": "3.3.4",
"description": "Le modèle de calcul d'empreinte climat individuelle de consommation",
"main": "index.js",
"types": "index.d.ts",
Expand Down

0 comments on commit 9508e70

Please sign in to comment.