@@ -29,7 +5,7 @@
- {{
- section.label.includes("passportView")
- ? $t(`${section.label}`)
- : semanticId ===
- "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"
- ? $t(`passportView.tppComponentsNames.${section.label}`)
- : $t(`passportView.dppComponentsNames.${section.label}`)
- }}
+ {{ $t(`passportView.componentsNames.${section.label}`) }}
@@ -48,7 +41,11 @@
:key="index"
:value="section.component"
>
-
@@ -57,10 +54,8 @@
\ No newline at end of file
+
diff --git a/dpp-frontend/src/components/passport/BatteryCards.vue b/dpp-frontend/src/components/passport/BatteryCards.vue
index aef6a7e5d..3ab5ddfc5 100644
--- a/dpp-frontend/src/components/passport/BatteryCards.vue
+++ b/dpp-frontend/src/components/passport/BatteryCards.vue
@@ -63,13 +63,15 @@
@@ -144,30 +146,32 @@ export default {
setup() {
return {
- noCollection,
Battery00,
BatteryCd,
+ noCollection,
BatteryHg,
BatteryPb,
};
},
data() {
return {
- separateCollectionImage: "BATTERY_CD",
currentValue:
- this.$props.data.aspect.batteryCycleLife.cycleLifeTestDepthOfDischarge,
- maxValue: this.$props.data.aspect.batteryCycleLife.expectedLifetime,
+ this.$props.data.aspect.performance.rated.lifetime.cycleLifeTesting
+ .depthOfDischarge,
+ maxValue:
+ this.$props.data.aspect.performance.rated.lifetime.cycleLifeTesting
+ .cycles,
cards: [
{
title: "batteryCards.titleGeneral",
label: "batteryCards.labelGeneral",
secondLabel: "batteryCards.secondLabelGeneral",
icon: "general",
- value: this.$props.data.aspect.batteryIdentification
- ? this.$props.data.aspect.batteryIdentification.batteryType
+ value: this.$props.data.aspect.identification
+ ? this.$props.data.aspect.identification.chemistry
: "-",
- secondValue: this.$props.data.aspect.batteryIdentification
- ? this.$props.data.aspect.batteryIdentification.batteryModel
+ secondValue: this.$props.data.aspect.identification
+ ? this.$props.data.aspect.identification.category
: "-",
},
{
@@ -175,14 +179,11 @@ export default {
label: "batteryCards.labelPerformance",
secondLabel: "batteryCards.secondLabelPerformance",
icon: "performance",
- value:
- this.$props.data.aspect.electrochemicalProperties.ratedCapacity,
+ value: this.$props.data.aspect.performance.rated.capacity.value,
valueUnits: "kWh",
secondValueUnits: "kW",
- secondValue: this.$props.data.aspect.electrochemicalProperties
- .batteryPower
- ? this.$props.data.aspect.electrochemicalProperties.batteryPower
- .originalPowerCapability
+ secondValue: this.$props.data.aspect.performance.rated.power
+ ? this.$props.data.aspect.performance.rated.power.value
: "-",
description: {
title: "batteryCards.descriptionPerformanceTitle",
@@ -194,8 +195,9 @@ export default {
label: "batteryCards.labelHealth",
secondLabel: "batteryCards.secondLabelHealth",
icon: "health",
- value: this.$props.data.aspect.stateOfBattery
- ? this.$props.data.aspect.stateOfBattery.stateOfHealth
+ value: this.$props.data.aspect.performance?.rated?.roundTripEfficiency
+ ? this.$props.data.aspect.performance.rated.roundTripEfficiency
+ .depthOfDischarge
: "-",
valueUnits: "%",
secondValue: this.$props.data.aspect.batteryIdentification
@@ -210,37 +212,11 @@ export default {
title: "batteryCards.titleSustainability",
icon: "sustainability",
secondLabel: "batteryCards.secondLabelSustainability",
-
- value: [
- {
- materialPercentageMassFraction: 47,
- materialName: "Ni",
- materialWeight: 2.5,
- },
- {
- materialPercentageMassFraction: 9,
- materialName: "Co",
- materialWeight: 2.5,
- },
- {
- materialPercentageMassFraction: 19,
- materialName: "Li",
- materialWeight: 2.5,
- },
- {
- materialPercentageMassFraction: 0,
- materialName: "Pb",
- materialWeight: 2.5,
- },
- ],
- cathodeCompositionOther: [
- {
- materialPercentageMassFraction: 19,
- materialName: "Pb",
- materialWeight: 2.5,
- },
- ],
- secondValue: this.$props.data.aspect.cO2FootprintTotal,
+ value: this.$props.data.aspect.materials.active,
+ secondValue:
+ this.$props.data.aspect.sustainability.carbonFootprint.length > 0
+ ? this.$props.data.aspect.sustainability.carbonFootprint[0].value
+ : "-",
description: {
title: "batteryCards.descriptionHSustainabilityTitle",
value: "batteryCards.descriptionSustainabilityValue",
@@ -251,14 +227,20 @@ export default {
},
methods: {
- getImageByKey(key) {
+ getImageByKey() {
+ const firstHazardousKey = Object.keys(
+ this.$props.data.aspect.materials.hazardous
+ )[0].toUpperCase();
+
const imageMap = {
- BATTERY_00: this.Battery00,
- BATTERY_CD: this.BatteryCd,
- BATTERY_HG: this.BatteryHg,
- BATTERY_PB: this.BatteryPb,
+ CADMIUM: this.BatteryCd,
+ LEAD: this.BatteryPb,
+ MERCURY: this.BatteryHg,
+ OTHER: this.Battery00,
+ NO_COLLECTION: this.noCollection,
};
- return imageMap.hasOwnProperty(key) ? imageMap[key] : this.noCollection;
+
+ return imageMap[firstHazardousKey] || this.noCollection;
},
callIconFinder(icon) {
return passportUtil.iconFinder(icon);
diff --git a/dpp-frontend/src/components/passport/ElementChart.vue b/dpp-frontend/src/components/passport/ElementChart.vue
index 905dfbd5d..26fa85d03 100644
--- a/dpp-frontend/src/components/passport/ElementChart.vue
+++ b/dpp-frontend/src/components/passport/ElementChart.vue
@@ -27,13 +27,11 @@
{{ $t(card.secondLabel) }}
-
- ![Separate collection]()
-
+
+
+ ![Separate collection]()
+
+
- {{ material.materialName }}
-
- {{ material.materialPercentageMassFraction }}%
-
+ {{ key }}
+ {{ material.recycled }}%
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dpp-frontend/src/components/passport/sections/Handling.vue b/dpp-frontend/src/components/passport/sections/Handling.vue
index 389a80f28..dcc3b5c42 100644
--- a/dpp-frontend/src/components/passport/sections/Handling.vue
+++ b/dpp-frontend/src/components/passport/sections/Handling.vue
@@ -26,98 +26,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dpp-frontend/src/components/passport/sections/Metadata.vue b/dpp-frontend/src/components/passport/sections/Metadata.vue
index 21ab8e5a5..c8be0ad11 100644
--- a/dpp-frontend/src/components/passport/sections/Metadata.vue
+++ b/dpp-frontend/src/components/passport/sections/Metadata.vue
@@ -21,53 +21,131 @@
SPDX-License-Identifier: Apache-2.0
-->
-
+ {{ $t("sections.materials.hazardous") }}
+
+
+
+
+
+
+
+
+ {{ $t("sections.materials.composition") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ detail.location }}
+
+
+ + {{ chemistry }} +
+
+ {{ $t("sections.materials.recyclateContent") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dpp-frontend/src/components/passport/sections/ProductSpecificParameters.vue b/dpp-frontend/src/components/passport/sections/ProductSpecificParameters.vue
index 84bcd35d5..919114196 100644
--- a/dpp-frontend/src/components/passport/sections/ProductSpecificParameters.vue
+++ b/dpp-frontend/src/components/passport/sections/ProductSpecificParameters.vue
@@ -26,8 +26,44 @@
+ {{ $t("sections.performance.rated") }}
+
+
+
+
+ {{ $t("sections.performance.lifetime") }}
+
+
+
+ {{ $t("sections.performance.cycleLifeTesting") }}
+
+
+
+ {{ $t("sections.performance.power") }}
+
+
+
+ {{ $t("sections.performance.voltage") }}
+
+
+
+ {{ $t("sections.performance.energy") }}
+
+
+
+ {{ $t("sections.performance.capacity") }}
+
+
+
+ {{ $t("sections.performance.dynamic") }}
+
+
+
+ {{ $t("sections.performance.roundTripEfficiency") }}
+
+
+
+ {{ $t("sections.performance.operatingEnvironment") }}
+
+
+
+ {{ $t("sections.performance.performanceDocument") }}
+
+
+
+ {{ $t("sections.performance.power") }}
+
+
+
+ {{ $t("sections.performance.negativeEvents") }}
+
+
+
+ {{ $t("sections.performance.resistance") }}
+
+
+
+
+ {{ $t("sections.performance.capacity") }}
+
+
+
+ {{ $t("sections.performance.energy") }}
+
+
+ {{ $t('sections.productSpecificParameters.standardGearRatio') }}
+
+ {{ $t("sections.productSpecificParameters.standardGearRatio") }}
+
- {{ $t('sections.productSpecificParameters.speedResistance') }}
+
+ {{ $t("sections.productSpecificParameters.speedResistance") }}
+
-
+ {{ $t("sections.productSpecificParameters.torque") }}
+
+
+ {{ $t("sections.productSpecificParameters.power") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dpp-frontend/src/components/passport/sections/Sources.vue b/dpp-frontend/src/components/passport/sections/Sources.vue
index 8ec57576c..171e6e245 100644
--- a/dpp-frontend/src/components/passport/sections/Sources.vue
+++ b/dpp-frontend/src/components/passport/sections/Sources.vue
@@ -26,10 +26,10 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dpp-frontend/src/components/passport/sections/Sustainability.vue b/dpp-frontend/src/components/passport/sections/Sustainability.vue
index 653f52abd..c4246e328 100644
--- a/dpp-frontend/src/components/passport/sections/Sustainability.vue
+++ b/dpp-frontend/src/components/passport/sections/Sustainability.vue
@@ -23,12 +23,50 @@
-->
-
+
+
+
+
+
+ {{ $t("sections.productSpecificParameters.standardGearRatio") }}
+
+
+
+
+ {{ $t("sections.productSpecificParameters.speedResistance") }}
+
+
+
+
+ {{ $t("sections.productSpecificParameters.torque") }}
+
+
+ {{ $t("sections.productSpecificParameters.power") }}
+
+
+
-
-
-
+
+
+
-
+
+
+
+
+
-
+
@@ -107,8 +277,8 @@
-
-
+
+
+
+
-
+
+
+
diff --git a/dpp-frontend/src/config/templates/passports.json b/dpp-frontend/src/config/templates/passports.json
index d8e1949fb..26d0d0480 100644
--- a/dpp-frontend/src/config/templates/passports.json
+++ b/dpp-frontend/src/config/templates/passports.json
@@ -1,35 +1,28 @@
{
- "urn:samm:io.catenax.generic.digital_product_passport:2.0.0#DigitalProductPassport": {
- "typology": {
- "shortName": null,
- "class": {
- "definition": null,
- "code": null
- },
- "longName": null
- },
+ "urn:samm:io.catenax.generic.digital_product_passport:5.0.0#DigitalProductPassport": {
"metadata": {
+ "backupReference": null,
+ "registrationIdentifier": null,
+ "economicOperatorId": null,
+ "lastModification": null,
"predecessor": null,
"issueDate": null,
"version": null,
- "economicOperator": {
- "legitimization": null,
- "identification": null
- },
+ "passportIdentifier": null,
"status": null,
"expirationDate": null
},
"characteristics": {
+ "generalPerformanceClass": null,
+ "physicalState": null,
"physicalDimension": {
- "grossWeight": {
+ "volume": {
"value": null,
"unit": null
},
- "weightOrVolume": {
- "left": {
- "value": null,
- "unit": null
- }
+ "grossWeight": {
+ "value": null,
+ "unit": null
},
"diameter": {
"value": null,
@@ -47,6 +40,10 @@
"value": null,
"unit": null
},
+ "weight": {
+ "value": null,
+ "unit": null
+ },
"height": {
"value": null,
"unit": null
@@ -58,18 +55,37 @@
"unit": null,
"key": null
}
- ],
- "physicalState": null
+ ]
},
"commercial": {
- "placedOnMarket": null
+ "placedOnMarket": null,
+ "purpose": [null]
},
"identification": {
- "localIdentifier": {
- "value": null,
- "key": null
+ "batch": [
+ {
+ "value": null,
+ "key": null
+ }
+ ],
+ "codes": [
+ {
+ "value": null,
+ "key": null
+ }
+ ],
+ "type": {
+ "manufacturerPartId": null,
+ "nameAtManufacturer": null
},
- "additionalCode": [
+ "classification": [
+ {
+ "classificationStandard": null,
+ "classificationID": null,
+ "classificationDescription": null
+ }
+ ],
+ "serial": [
{
"value": null,
"key": null
@@ -80,594 +96,1232 @@
"carrierLayout": null
}
},
- "sources": [],
- "handling": {
- "spareParts": {
- "left": {
- "producer": [
- {
- "id": null
- }
- ],
- "part": [
- {
- "name": null,
- "gtin": null
- }
- ]
- }
- },
- "substanceOfConcern": {
- "left": [
+ "sources": [
+ {
+ "header": null,
+ "category": null,
+ "type": null,
+ "content": null
+ }
+ ],
+ "materials": {
+ "substancesOfConcern": {
+ "applicable": null,
+ "content": [
{
- "name": {
- "name": null,
- "type": null
- },
- "location": null,
"unit": null,
- "concentration": {
- "left": [
- {
- "max": null,
- "min": null
- }
- ]
+ "hazardClassification": {
+ "category": null,
+ "statement": null,
+ "class": null
},
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "concentrationRange": [
+ {
+ "max": null,
+ "min": null
+ }
+ ],
+ "location": null,
+ "concentration": null,
"exemption": null,
"id": [
{
"type": null,
+ "name": null,
"id": null
}
]
}
]
- }
- },
- "additionalData": [],
- "sustainability": {
- "PEF": {
- "carbon": [
- {
- "lifecycle": null,
- "rulebook": null,
- "unit": null,
- "type": null,
- "value": null
- }
- ],
- "carbon2": {
- "lifecycle": null,
- "rulebook": null,
- "unit": null,
- "type": null,
- "value": null
- },
- "environmental": [
- {
- "lifecycle": null,
- "rulebook": null,
- "unit": null,
- "type": null,
- "value": null
- }
- ]
},
- "state": null,
- "material": {
- "left": [
+ "materialComposition": {
+ "applicable": null,
+ "content": [
{
- "name": {
- "name": null,
- "type": null
- },
"unit": null,
"recycled": null,
+ "critical": null,
+ "renewable": null,
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "concentration": null,
"id": [
{
"type": null,
+ "name": null,
"id": null
}
- ],
- "value": null,
- "renewable": null
+ ]
}
]
- },
- "critical": {
- "left": [
- null
+ }
+ },
+ "handling": {
+ "applicable": null,
+ "content": {
+ "producer": [
+ {
+ "id": null
+ }
+ ],
+ "sparePart": [
+ {
+ "manufacturerPartId": null,
+ "nameAtManufacturer": null
+ }
]
}
},
+ "additionalData": [
+ {
+ "description": null,
+ "label": null,
+ "type": {
+ "typeUnit": null,
+ "dataType": null
+ },
+ "data": null,
+ "children": [
+ {
+ "description": null,
+ "label": null,
+ "type": {
+ "typeUnit": null,
+ "dataType": null
+ },
+ "data": null
+ }
+ ]
+ }
+ ],
"operation": {
- "importer": {
- "left": {
+ "import": {
+ "applicable": null,
+ "content": {
"eori": null,
"id": null
}
},
+ "other": {
+ "id": null,
+ "role": null
+ },
"manufacturer": {
- "facility": null,
+ "facility": [
+ {
+ "facility": null
+ }
+ ],
"manufacturingDate": null,
"manufacturer": null
}
+ },
+ "sustainability": {
+ "reparabilityScore": null,
+ "productFootprint": {
+ "material": [
+ {
+ "lifecycle": null,
+ "rulebook": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "unit": null,
+ "performanceClass": null,
+ "manufacturingPlant": [
+ {
+ "facility": null
+ }
+ ],
+ "type": null,
+ "value": null,
+ "declaration": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
+ }
+ ],
+ "carbon": [
+ {
+ "lifecycle": null,
+ "rulebook": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "unit": null,
+ "performanceClass": null,
+ "manufacturingPlant": [
+ {
+ "facility": null
+ }
+ ],
+ "type": null,
+ "value": null,
+ "declaration": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
+ }
+ ],
+ "environmental": [
+ {
+ "lifecycle": null,
+ "rulebook": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "unit": null,
+ "performanceClass": null,
+ "manufacturingPlant": [
+ {
+ "facility": null
+ }
+ ],
+ "type": null,
+ "value": null,
+ "declaration": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
+ }
+ ]
+ },
+ "status": null,
+ "durabilityScore": null
}
},
- "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass": {
- "productSpecificParameters": {
- "torqueConverter": null,
- "driveType": null,
- "oilType": null,
- "spreading": null,
- "torque": null,
- "power": null,
- "standardGearRatio": {
- "gear": null,
- "ratio": null
- },
- "oilCapacity": null,
- "electricPerformance": null,
- "speedResistance": {
- "speed": null,
- "gear": null
- }
- },
- "instructions": {
- "packagingInstructions": [
- {
- "documentTitle": null,
- "documentLink": null
- }
- ],
- "transportationInstructions": [
+ "urn:samm:io.catenax.transmission.transmission_pass:3.0.0#TransmissionPass": {
+ "specific": {
+ "serviceHistory": [
{
- "documentTitle": null,
- "documentLink": null
+ "contentType": null,
+ "header": null,
+ "content": null
}
],
- "dismantlingProcedure": [
+ "oil": {
+ "oilType": [null],
+ "oilCapacity": null
+ },
+ "torqueConverter": [null],
+ "driveType": [null],
+ "spreading": null,
+ "torque": null,
+ "power": null,
+ "standardGearRatio": [
{
- "documentTitle": null,
- "documentLink": null
+ "gearRatio": null,
+ "gear": null
}
],
- "safetyMeasures": [
+ "speedResistance": [
{
- "documentTitle": null,
- "documentLink": null
+ "ratedSpeed": null,
+ "gear": null
}
],
- "vehicleDismantlingProcedure": [
- {
- "documentTitle": null,
- "documentLink": null
- }
- ]
- },
- "identification": {
- "manufacturerId": null,
- "localIdentifiers": [
- {
- "value": null,
- "key": null
+ "electricalPerformance": {
+ "applicable": null,
+ "electricalMachine": {
+ "torque": {
+ "max": null,
+ "maximumAvailability": null,
+ "continuous": null
+ },
+ "power": {
+ "max": null,
+ "continuous": null,
+ "maximumAvailability": null
+ },
+ "speed": null,
+ "voltage": null
}
- ],
- "dataMatrixCode": null
- },
- "sparePartSupplier": [
- {
- "supplierContact": {
- "faxNumber": null,
- "website": null,
- "phoneNumber": null,
- "email": null
- },
- "supplierId": null,
- "sparePartName": null
}
- ],
- "stateOfHealth": {
- "serviceHistory": null,
- "expectedLifespan": null,
- "remanufacturing": {
- "remanufacturingDate": null,
- "productStatusValue": null
- }
- },
- "generalInformation": {
- "additionalInformation": null,
- "physicalDimensionsProperty": {
- "width": null,
- "length": null,
- "weight": null,
- "diameter": null,
- "height": null
- },
- "warrantyPeriod": null,
- "productDescription": null,
- "productType": null
},
- "sustainability": {
- "substancesOfConcern": null,
- "responsibleSourcingDocument": [
- {
- "documentTitle": null,
- "documentLink": null
- }
- ],
- "recyclateContent": {
- "nickel": null,
- "lithium": null,
- "cobalt": null,
- "otherSubstance": [
- {
- "substancePercentage": null,
- "substanceName": null
+ "generic": {
+ "characteristics": {
+ "physicalDimension": {
+ "volume": {
+ "value": null,
+ "unit": null
+ },
+ "grossWeight": {
+ "value": null,
+ "unit": null
+ },
+ "diameter": {
+ "value": null,
+ "unit": null
+ },
+ "grossVolume": {
+ "value": null,
+ "unit": null
+ },
+ "width": {
+ "value": null,
+ "unit": null
+ },
+ "length": {
+ "value": null,
+ "unit": null
+ },
+ "weight": {
+ "value": null,
+ "unit": null
+ },
+ "height": {
+ "value": null,
+ "unit": null
}
- ]
+ },
+ "warranty": null,
+ "lifeTime": null
+ },
+ "metadata": {
+ "backupReference": null,
+ "registrationIdentifier": null,
+ "economicOperatorId": null,
+ "lastModification": null,
+ "predecessor": null,
+ "issueDate": null,
+ "version": null,
+ "passportIdentifier": null,
+ "status": null,
+ "expirationDate": null
},
- "criticalRawMaterials": null,
- "carbonFootprint": {
- "crossSectoralStandardsUsed": [
+ "commercial": {
+ "placedOnMarket": null,
+ "purpose": [null]
+ },
+ "identification": {
+ "batch": [
{
- "crossSectoralStandard": null
+ "value": null,
+ "key": null
}
],
- "co2FootprintTotal": null,
- "productOrSectorSpecificRules": [
+ "codes": [
{
- "operator": null,
- "ruleNames": null,
- "otherOperatorName": null
+ "value": null,
+ "key": null
}
- ]
- }
- }
- },
- "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass": {
- "electrochemicalProperties": {
- "ratedCapacity": null,
- "batteryEnergy": {
- "energyRoundtripEfficiencyChange": null,
- "maximumAllowedBatteryEnergy": null,
- "energyRoundtripEfficiency": null
- },
- "ratioMaximumAllowedBatteryPowerAndMaximumAllowedBatteryEnergy": null,
- "batteryVoltage": {
- "nominalVoltage": null,
- "maxVoltage": null,
- "minVoltage": null
- },
- "internalResistance": {
- "cellInternalResistance": null,
- "packInternalResistanceIncrease": null,
- "packInternalResistance": null
- },
- "capacityThresholdExhaustion": null,
- "batteryPower": {
- "powerFade": null,
- "originalPowerCapability": null,
- "originalPowerCapabilityLimits": null,
- "maximumAllowedBatteryPower": null,
- "powerCapabilityAt20Charge": null,
- "powerCapabilityAt80Charge": null
- },
- "capacityFade": null
- },
- "document": {
- "responsibleSourcing": [
- {
- "title": null,
- "fileLocation": null
- },
- {
- "title": null,
- "fileLocation": null
- },
- {
- "title": null,
- "fileLocation": null
- },
- {
- "title": null,
- "fileLocation": null
- },
- {
- "title": null,
- "fileLocation": null
- },
- {
- "title": null,
- "fileLocation": null
+ ],
+ "type": {
+ "manufacturerPartId": null,
+ "nameAtManufacturer": null
},
- {
- "title": null,
- "fileLocation": null
- }
- ],
- "packagingInstructions": [
- {
- "title": null,
- "fileLocation": null
+ "classification": [
+ {
+ "classificationStandard": null,
+ "classificationID": null,
+ "classificationDescription": null
+ }
+ ],
+ "serial": [
+ {
+ "value": null,
+ "key": null
+ }
+ ],
+ "dataCarrier": {
+ "carrierType": null,
+ "carrierLayout": null
}
- ],
- "transportationInstructions": [
+ },
+ "sources": [
{
- "title": null,
- "fileLocation": null
+ "header": null,
+ "category": null,
+ "type": null,
+ "content": null
}
],
- "vehicleDismantlingProcedure": [
- {
- "title": null,
- "fileLocation": null
- }
- ],
- "testReportsResults": [
- {
- "title": null,
- "fileLocation": null
- }
- ],
- "batteryDismantlingProcedure": [
- {
- "title": null,
- "fileLocation": null
- }
- ],
- "safetyMeasures": [
- {
- "title": null,
- "fileLocation": null
- }
- ],
- "declarationOfConformity": [
- {
- "title": null,
- "fileLocation": null
- }
- ]
- },
- "datePlacedOnMarket": null,
- "cellChemistry": {
- "electrolyteComposition": [
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
- }
- ],
- "anodeCompositionOther": [
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "materials": {
+ "substancesOfConcern": {
+ "applicable": null,
+ "content": [
+ {
+ "unit": null,
+ "hazardClassification": {
+ "category": null,
+ "statement": null,
+ "class": null
+ },
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "concentrationRange": [
+ {
+ "max": null,
+ "min": null
+ }
+ ],
+ "location": null,
+ "concentration": null,
+ "exemption": null,
+ "id": [
+ {
+ "type": null,
+ "name": null,
+ "id": null
+ }
+ ]
+ }
+ ]
+ },
+ "materialComposition": {
+ "applicable": null,
+ "content": [
+ {
+ "unit": null,
+ "recycled": null,
+ "critical": null,
+ "renewable": null,
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "concentration": null,
+ "id": [
+ {
+ "type": null,
+ "name": null,
+ "id": null
+ }
+ ]
+ }
+ ]
}
- ],
- "recyclateContentActiveMaterials": [
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ },
+ "handling": {
+ "applicable": null,
+ "content": {
+ "producer": [
+ {
+ "id": null
+ }
+ ],
+ "sparePart": [
+ {
+ "manufacturerPartId": null,
+ "nameAtManufacturer": null
+ }
+ ]
}
- ],
- "anodeActiveMaterials": [
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ },
+ "operation": {
+ "import": {
+ "applicable": null,
+ "content": {
+ "eori": null,
+ "id": null
+ }
+ },
+ "other": {
+ "id": null,
+ "role": null
+ },
+ "manufacturer": {
+ "facility": [
+ {
+ "facility": null
+ }
+ ],
+ "manufacturingDate": null,
+ "manufacturer": null
}
- ],
- "cathodeActiveMaterials": [
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ },
+ "sustainability": {
+ "reparabilityScore": null,
+ "productFootprint": {
+ "material": [
+ {
+ "lifecycle": null,
+ "rulebook": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "unit": null,
+ "performanceClass": null,
+ "manufacturingPlant": [
+ {
+ "facility": null
+ }
+ ],
+ "type": null,
+ "value": null,
+ "declaration": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
+ }
+ ],
+ "carbon": [
+ {
+ "lifecycle": null,
+ "rulebook": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "unit": null,
+ "performanceClass": null,
+ "manufacturingPlant": [
+ {
+ "facility": null
+ }
+ ],
+ "type": null,
+ "value": null,
+ "declaration": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
+ }
+ ],
+ "environmental": [
+ {
+ "lifecycle": null,
+ "rulebook": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "unit": null,
+ "performanceClass": null,
+ "manufacturingPlant": [
+ {
+ "facility": null
+ }
+ ],
+ "type": null,
+ "value": null,
+ "declaration": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
+ }
+ ]
},
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "status": null,
+ "durabilityScore": null
+ }
+ }
+ },
+ "urn:samm:io.catenax.battery.battery_pass:6.0.0#BatteryPass": {
+ "characteristics": {
+ "physicalDimension": {
+ "length": {
+ "value": null,
+ "unit": null
},
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "width": {
+ "value": null,
+ "unit": null
},
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
- }
- ],
- "cathodeCompositionOther": [
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "weight": {
+ "value": null,
+ "unit": null
+ },
+ "height": {
+ "value": null,
+ "unit": null
}
- ]
- },
- "physicalDimensions": {
- "length": null,
- "width": null,
- "weight": null,
- "diameter": null,
- "height": null
+ },
+ "warranty": {
+ "lifeValue": null,
+ "lifeUnit": null
+ }
},
- "temperatureRangeIdleState": {
- "temperatureRangeIdleStateUpperLimit": null,
- "temperatureRangeIdleStateLowerLimit": null
+ "metadata": {
+ "backupReference": null,
+ "registrationIdentifier": null,
+ "economicOperatorId": null,
+ "lastModification": null,
+ "predecessor": null,
+ "issueDate": null,
+ "version": null,
+ "passportIdentifier": null,
+ "status": null,
+ "expirationDate": null
},
- "batteryCycleLife": {
- "cycleLifeTestCRate": null,
- "cycleLifeTestDepthOfDischarge": null,
- "expectedLifetime": null
+ "commercial": {
+ "placedOnMarket": null,
+ "purpose": [null]
},
- "manufacturer": {
- "name": null,
- "contact": {
- "faxNumber": null,
- "website": null,
- "phoneNumber": null,
- "email": null
+ "identification": {
+ "chemistry": null,
+ "idDmc": null,
+ "identification": {
+ "batch": [
+ {
+ "value": null,
+ "key": null
+ }
+ ],
+ "codes": [
+ {
+ "value": null,
+ "key": null
+ }
+ ],
+ "type": {
+ "manufacturerPartId": null,
+ "nameAtManufacturer": null
+ },
+ "classification": [
+ {
+ "classificationStandard": null,
+ "classificationID": null,
+ "classificationDescription": null
+ }
+ ],
+ "serial": [
+ {
+ "value": null,
+ "key": null
+ }
+ ],
+ "dataCarrier": {
+ "carrierType": null,
+ "carrierLayout": null
+ }
},
- "address": {
- "locality": {
- "value": null,
- "technicalKey": null
+ "category": null
+ },
+ "performance": {
+ "rated": {
+ "roundTripEfficiency": {
+ "depthOfDischarge": null,
+ "temperature": null,
+ "50PercentLife": null,
+ "initial": null
+ },
+ "selfDischargingRate": null,
+ "performanceDocument": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "testReport": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "temperature": {
+ "lower": null,
+ "upper": null
},
- "country": {
- "shortName": null
+ "lifetime": {
+ "report": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "cycleLifeTesting": {
+ "temperature": null,
+ "depthOfDischarge": null,
+ "appliedDischargeRate": null,
+ "cycles": null,
+ "appliedChargeRate": null
+ },
+ "expectedYears": null
},
- "postCode": {
+ "power": {
+ "at20SoC": null,
+ "temperature": null,
"value": null,
- "technicalKey": null
+ "at80SoC": null
+ },
+ "resistance": {
+ "temperature": null,
+ "cell": null,
+ "pack": null,
+ "module": null
+ },
+ "voltage": {
+ "temperature": null,
+ "min": null,
+ "nominal": null,
+ "max": null
},
- "thoroughfare": {
+ "energy": {
+ "temperature": null,
+ "value": null
+ },
+ "capacity": {
+ "temperature": null,
"value": null,
- "number": null,
- "technicalKey": null
+ "thresholdExhaustion": null
+ }
+ },
+ "dynamic": {
+ "selfDischargingRate": null,
+ "roundTripEfficiency": {
+ "remaining": {
+ "value": null,
+ "time": null
+ },
+ "fade": {
+ "value": null,
+ "time": null
+ }
},
- "premise": {
+ "operatingEnvironment": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "stateOfCharge": {
"value": null,
- "technicalKey": null
+ "time": null
},
- "postalDeliveryPoint": {
+ "performanceDocument": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "fullCycles": {
"value": null,
- "technicalKey": null
+ "time": null
+ },
+ "power": {
+ "remaining": {
+ "value": null,
+ "time": null
+ },
+ "fade": {
+ "value": null,
+ "time": null
+ }
+ },
+ "negativeEvents": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "resistance": {
+ "increase": {
+ "cell": {
+ "value": null,
+ "time": null
+ },
+ "pack": {
+ "value": null,
+ "time": null
+ },
+ "module": {
+ "value": null,
+ "time": null
+ }
+ },
+ "remaining": {
+ "cell": {
+ "value": null,
+ "time": null
+ },
+ "pack": {
+ "value": null,
+ "time": null
+ },
+ "module": {
+ "value": null,
+ "time": null
+ }
+ }
+ },
+ "capacity": {
+ "fade": {
+ "value": null,
+ "time": null
+ },
+ "throughput": {
+ "value": null,
+ "time": null
+ },
+ "capacity": {
+ "value": null,
+ "time": null
+ }
+ },
+ "energy": {
+ "remaining": {
+ "value": null,
+ "time": null
+ },
+ "soce": {
+ "value": null,
+ "time": null
+ },
+ "throughput": {
+ "value": null,
+ "time": null
+ }
}
}
},
- "warrantyPeriod": null,
- "composition": {
- "compositionOfBattery": [
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "sources": [
+ {
+ "header": null,
+ "category": null,
+ "type": null,
+ "content": null
+ }
+ ],
+ "materials": {
+ "hazardous": {
+ "cadmium": {
+ "concentration": null,
+ "location": null,
+ "critical": null,
+ "impactOfSubstances": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "materialUnit": null,
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
},
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "other": [
+ {
+ "critical": null,
+ "impactOfSubstances": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "concentration": null,
+ "materialIdentification": [
+ {
+ "type": null,
+ "name": null,
+ "id": null
+ }
+ ],
+ "location": null,
+ "materialUnit": null
+ }
+ ],
+ "mercury": {
+ "concentration": null,
+ "location": null,
+ "critical": null,
+ "impactOfSubstances": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "materialUnit": null,
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
},
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "lead": {
+ "recycled": null,
+ "critical": null,
+ "impactOfSubstances": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "location": null,
+ "concentration": null,
+ "materialUnit": null
+ }
+ },
+ "active": {
+ "nickel": {
+ "location": null,
+ "recycled": null,
+ "critical": null,
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
},
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "lithium": {
+ "location": null,
+ "recycled": null,
+ "critical": null,
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
},
- {
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "cobalt": {
+ "location": null,
+ "recycled": null,
+ "critical": null,
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
},
+ "other": [
+ {
+ "location": null,
+ "materialIdentification": [
+ {
+ "type": null,
+ "name": null,
+ "id": null
+ }
+ ],
+ "recycled": null,
+ "critical": null,
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
+ }
+ ],
+ "lead": {
+ "recycled": null,
+ "critical": null,
+ "impactOfSubstances": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "location": null,
+ "concentration": null,
+ "materialUnit": null
+ }
+ },
+ "composition": [
{
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "unit": null,
+ "recycled": null,
+ "critical": null,
+ "renewable": null,
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "concentration": null,
+ "location": null,
+ "id": [
+ {
+ "type": null,
+ "name": null,
+ "id": null
+ }
+ ]
},
{
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
- },
+ "unit": null,
+ "recycled": null,
+ "critical": null,
+ "renewable": null,
+ "documentation": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "concentration": null,
+ "location": null,
+ "id": [
+ {
+ "type": null,
+ "name": null,
+ "id": null
+ }
+ ]
+ }
+ ]
+ },
+ "safety": {
+ "usableExtinguishAgent": [
{
- "materialPercentageMassFraction": null,
- "materialName": null,
- "materialWeight": null
+ "fireClass": null,
+ "document": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "media": null
}
],
- "criticalRawMaterials": null,
- "components": {
- "componentsPartNumber": [
- null
+ "safeDischarging": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "meaningOfLabels": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "dismantling": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "removalFromAppliance": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "safetyMeasures": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
+ },
+ "handling": {
+ "applicable": null,
+ "content": {
+ "producer": [
+ {
+ "id": null
+ }
],
- "componentsSupplier": [
+ "sparePart": [
{
- "componentsSupplierName": null,
- "address": {
- "locality": {
- "value": null,
- "technicalKey": null
- },
- "country": {
- "shortName": null
- },
- "postCode": {
- "value": null,
- "technicalKey": null
- },
- "thoroughfare": {
- "value": null,
- "number": null,
- "technicalKey": null
- },
- "premise": {
- "value": null,
- "technicalKey": null
- },
- "postalDeliveryPoint": {
- "value": null,
- "technicalKey": null
- }
- },
- "contact": {
- "faxNumber": null,
- "website": null,
- "phoneNumber": null,
- "email": null
- }
+ "manufacturerPartId": null,
+ "nameAtManufacturer": null
}
]
}
},
- "manufacturing": {
- "dateOfManufacturing": null,
- "address": {
- "locality": {
- "value": null,
- "technicalKey": null
- },
- "country": {
- "shortName": null
- },
- "postCode": {
- "value": null,
- "technicalKey": null
- },
- "thoroughfare": {
- "value": null,
- "number": null,
- "technicalKey": null
- },
- "premise": {
- "value": null,
- "technicalKey": null
- },
- "postalDeliveryPoint": {
- "value": null,
- "technicalKey": null
+ "conformity": {
+ "declarationOfConformityId": null,
+ "thirdPartyAssurance": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
}
- }
- },
- "batteryIdentification": {
- "batteryType": null,
- "batteryIDDMCCode": null,
- "batteryModel": null
+ ],
+ "resultOfTestReport": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "declarationOfConformity": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "dueDiligencePolicy": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
},
- "stateOfBattery": {
- "stateOfHealth": null,
- "statusBattery": null,
- "stateOfCharge": null
+ "operation": {
+ "intoServiceDate": null,
+ "manufacturer": {
+ "facility": [
+ {
+ "facility": null
+ }
+ ],
+ "manufacturingDate": null,
+ "manufacturer": null
+ }
},
- "cO2FootprintTotal": null
+ "sustainability": {
+ "documents": {
+ "separateCollection": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "sustainabilityReport": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "euTaxonomyDisclosureStatement": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "wastePrevention": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
+ },
+ "carbonFootprint": [
+ {
+ "lifecycle": null,
+ "rulebook": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ],
+ "unit": null,
+ "performanceClass": null,
+ "manufacturingPlant": [
+ {
+ "facility": null
+ }
+ ],
+ "type": null,
+ "value": null,
+ "declaration": [
+ {
+ "contentType": null,
+ "header": null,
+ "content": null
+ }
+ ]
+ }
+ ],
+ "status": null
+ }
}
-}
\ No newline at end of file
+}
diff --git a/dpp-frontend/src/services/Authentication.js b/dpp-frontend/src/services/Authentication.js
index 9978b539c..d4c2ef4f0 100644
--- a/dpp-frontend/src/services/Authentication.js
+++ b/dpp-frontend/src/services/Authentication.js
@@ -76,8 +76,8 @@ export default class Authentication {
app.mount("#app");
//Token Refresh
setInterval(() => {
- this.updateToken(60, app);
- }, 60000);
+ this.updateToken(20, app);
+ }, 20000);
})
.catch((e) => {
console.log(e);
diff --git a/dpp-frontend/src/translations/de.json b/dpp-frontend/src/translations/de.json
index d92b4fddb..93524d6cf 100644
--- a/dpp-frontend/src/translations/de.json
+++ b/dpp-frontend/src/translations/de.json
@@ -43,17 +43,7 @@
"dpp": "Digitaler Produkt Pass",
"bpp": "Batterie Pass",
"tpp": "Getriebe Pass",
- "batteryComponentsNames": {
- "generalInformation": "Allgemeine Informationen",
- "stateOfBattery": "Zustand der Batterie",
- "components": "Komponenten",
- "batteryComposition": "Batteriezusammensetzung",
- "cellChemistry": "Zellenchemie",
- "electrochemicalProperties": "Elektrochemische Eigenschaften",
- "documents": "Dokumente",
- "exchange": "Austausch"
- },
- "dppComponentsNames": {
+ "componentsNames": {
"typology": "Typologie",
"metadata": "Metadaten",
"characteristics": "Merkmale",
@@ -65,18 +55,16 @@
"additionalData": "Zusätzliche Daten",
"sustainability": "Nachhaltigkeit",
"operation": "Betrieb",
- "exchange": "Austausch"
- },
- "tppComponentsNames": {
- "productSpecificParameters": "Produktspezifische Parameter",
+ "exchange": "Austausch",
+ "performance": "Leistung",
+ "materials": "Materialien",
+ "safety": "Sicherheit",
+ "conformity": "Konformität",
+ "specific": "Produktspezifische Parameter",
"intructions": "Anleitungen",
"sparePartSupplier": "Ersatzteil-Lieferant",
- "components": "Komponenten",
"stateOfHealth": "Zustand der Gesundheit",
- "identification": "Identifikation",
- "generalInformation": "Allgemeine Informationen",
- "sustainability": "Nachhaltigkeit",
- "exchange": "Austausch"
+ "generalInformation": "Allgemeine Informationen"
}
},
"home": {
@@ -111,10 +99,10 @@
"batteryCards": {
"titleGeneral": "ALLGEMEIN",
"labelGeneral": "Typ",
- "secondLabelGeneral": "Modell",
+ "secondLabelGeneral": "Kategorie",
"titlePerformance": "LEISTUNG",
"labelPerformance": "Nennkapazität",
- "secondLabelPerformance": "Modell",
+ "secondLabelPerformance": "Strom",
"descriptionPerformanceTitle": "Leistung",
"descriptionPerformanceValue": "Beschreibung der Leistung",
"titleHealth": "GESUNDHEIT",
@@ -157,7 +145,8 @@
"oilType": "Öltyp"
},
"passportHeader": {
- "backBtn": "Zurück"
+ "backBtn": "Zurück",
+ "verification": "Verifikation"
},
"field": {
"tempRange": "Temperaturbereich:",
@@ -199,10 +188,88 @@
"passportRetrieval": "Passabruf",
"retrieving": "Abruf... ",
"createdProcess": "Erstellte Prozess-ID: ",
- "contractId": "Vertrags-ID: "
+ "contractId": "Vertrags-ID: ",
+ "compositionOf": "Composition of",
+ "verification": "Passkontrolle",
+ "verifying": "Überprüfen...",
+ "verified": "Verifiziert"
},
"sections": {
+ "materials": {
+ "exemption": "Befreiung",
+ "statement": "Aussage",
+ "recycled": "Recycelte Materialien",
+ "renewable": "Nachwachsende Rohstoffe",
+ "hazardClassification": "Gefahrenklassifikation",
+ "concentrationRange": "Konzentrationsbereich",
+ "documentation": "Dokumentation",
+ "concentration": "Konzentration",
+ "name": "Name",
+ "otherMaterials": "Andere Materialien",
+ "type": "Typ",
+ "location": "Standort",
+ "recycledContent": "Recycelter Inhalt",
+ "materialIdentification": "Materialidentifikation",
+ "hazardous": "Gefährlich",
+ "compositionOf": "Zusammensetzung von",
+ "recyclateContent": "Rezyklatgehalt"
+ },
+ "performance": {
+ "rated": "Bewertet",
+ "depthOfDischarge": "Entladetiefe",
+ "temperature": "Temperatur",
+ "50PercentLife": "50% Lebensdauer",
+ "initial": "Anfangs",
+ "selfDischargingRate": "Selbstentladerate",
+ "lowerTemperature": "Niedrigere Temperatur",
+ "upperTemperature": "Höhere Temperatur",
+ "lifetime": "Lebensdauer",
+ "dynamic": "Dynamisch",
+ "appliedDischargeRate": "Angewandte Entladerate",
+ "cycleLifeTesting": "Lebensdauertest",
+ "cycles": "Zyklen",
+ "expectedYears": "Erwartete Jahre",
+ "at20SoC": "Bei 20°C",
+ "at80SoC": "Bei 80°C",
+ "power": "Leistung",
+ "cell": "Zelle",
+ "pack": "Pack",
+ "module": "Modul",
+ "voltage": "Spannung",
+ "voltageMin": "Minimale Spannung",
+ "voltageMax": "Maximale Spannung",
+ "voltageNominal": "Nennspannung",
+ "energy": "Energie",
+ "capacity": "Kapazität",
+ "thresholdExhaustion": "Erschöpfungsschwelle",
+ "roundTripEfficiency": "Rundum-Wirkungsgrad",
+ "remaining": "Verbleibende Leistung",
+ "fade": "Leistungsabfall",
+ "operatingEnvironment": "Betriebsumgebung",
+ "stateOfCharge": "Ladezustand",
+ "performanceDocument": "Leistungsdokumentation",
+ "fullCycles": "Volle Zyklen",
+ "negativeEvents": "Negative Ereignisse",
+ "resistance": "Widerstand",
+ "remainingCell": "Verbleibender Zellwiderstand",
+ "remainingPack": "Verbleibender Packwiderstand",
+ "remainingModule": "Verbleibender Modulwiderstand",
+ "increaseCell": "Zunehmender Zellwiderstand",
+ "increasePack": "Zunehmender Packwiderstand",
+ "increaseModule": "Zunehmender Modulwiderstand",
+ "capacityFade": "Kapazitätsverlust",
+ "throughput": "Durchsatz",
+ "remainingEnergy": "Verbleibende Energie",
+ "soce": "Ladezustandsschätzung"
+ },
"productSpecificParameters": {
+ "serviceHistory": "Servicehistorie",
+ "oil": "Öl",
+ "torquePeak": "Drehmomentspitze",
+ "torqueContinuous": "Dauerhaftes Drehmoment",
+ "time": "Zeit",
+ "powerPeak": "Leistungsspitze",
+ "voltage": "Spannung",
"torqueConverter": "Drehmomentwandler",
"driveType": "Antriebstyp",
"oilType": "Öltyp",
@@ -255,15 +322,6 @@
"manufacturerContact": "Herstellerkontakt",
"cO2FootprintTotal": "CO2-Fußabdruck"
},
- "stateOfBattery": {
- "stateOfHealth": "aktueller Zustand",
- "cycleLifeTestCRate": "Zykluslebensdauertest C-Rate",
- "stateOfCharge": "Ladezustand",
- "cycleLifeTestDepthOfDischarge": "Tiefe der Entladung im Zykluslebensdauertest",
- "expectedLifetime": "Erwartete Lebensdauer",
- "temperatureRange": "Temperaturbereich (im Ruhezustand)",
- "statusBattery": "Batterie-Status"
- },
"components": {
"searchForChild": "Die Suche nach verbauten Komponenten hat begonnen, dies kann eine Weile dauern...",
"noChild": "Keine verbauten Komponenten gefunden",
@@ -273,10 +331,6 @@
"batteryComposites": "Hauptbestandteile der Batterie",
"criticalRawMaterials": "Kritische Rohstoffe"
},
- "cellChemistry": {
- "electrolyteComposition": "Zusammensetzung des Elektrolyts",
- "recyclateContent": "Recyclat-Anteil"
- },
"electrochemicalProperties": {
"capacity": "Kapazität",
"ratedCapacity": "Nennkapazität",
@@ -339,6 +393,9 @@
"contentType": "Inhaltstyp"
},
"characteristics": {
+ "lifeTime": "Lebenszeit",
+ "volume": "Volumen",
+ "generalPerformanceClass": "Allgemeine Leistungsklasse",
"physicalDimensionsProperty": "Eigenschaft der physischen Abmessungen",
"weight": "Gewicht",
"lifespan": "Lebensdauer",
@@ -348,13 +405,17 @@
"weightOrVolume": "Gewicht oder Volumen",
"diameter": "Durchmesser",
"grossWeight": "Bruttogewicht",
- "grossVolume": "Bruttovolumen"
+ "grossVolume": "Bruttovolumen",
+ "warranty": "Garantie"
},
"commercial": {
"placedOnMarket": "Markteinführung",
- "warranty": "Garantie"
+ "warranty": "Garantie",
+ "purpose": "Zweck"
},
"handling": {
+ "manufacturerPartId": "Herstellerteilenummer",
+ "nameAtManufacturer": "Name beim Hersteller",
"maintenanceHistory": "Wartungshistorie",
"spareParts": "Ersatzteile",
"substanceOfConcern": "Besorgniserregende Substanz",
@@ -371,11 +432,17 @@
"id": "ID"
},
"identification": {
+ "description": "Beschreibung",
+ "classification": "Klassifikation",
"gtin": "GTIN",
"manufacturerId": "Hersteller-ID",
- "dataMatrixCode": "Data-Matrix-Code"
+ "dataMatrixCode": "Datenmatrixcode",
+ "chemistry": "Chemie",
+ "idDmc": "DMC-ID",
+ "category": "Kategorie"
},
"metadata": {
+ "lastModification": "Letzte Änderung",
"predecessor": "Vorgänger",
"legitimization": "Legitimation",
"identification": "Identifikation",
@@ -385,9 +452,15 @@
"customerPartId": "Kundenteil-ID",
"manufacturerPartId": "Herstellerteil-ID",
"status": "Status",
- "expirationDate": "Ablaufdatum"
+ "expirationDate": "Ablaufdatum",
+ "backupReference": "Backup-Referenz",
+ "registrationIdentifier": "Registrierungs-ID",
+ "economicOperatorId": "Wirtschaftsteilnehmer-ID",
+ "passportIdentifier": "Pass-ID"
},
"operation": {
+ "importerID": "Importeur-ID",
+ "intoServiceDate": "Inbetriebnahmedatum",
"importer": "Importeur-ID",
"importerEori": "Importer-EORI",
"manufacturerId": "Hersteller-ID",
@@ -404,8 +477,21 @@
"quantity": "Menge"
},
"sustainability": {
+ "durabilityScore": "Haltbarkeitswert",
+ "reparabilityScore": "Reparaturwert",
+ "lifecycle": "Lebenszyklus",
"state": "Zustand",
+ "status": "Status",
+ "carbonFootprint": "CO2-Fußabdruck",
+ "performanceClass": "Leistungsklasse",
+ "type": "Typ",
+ "rulebook": "Regelwerk",
+ "manufacturingPlant": "Produktionsstätte",
+ "declaration": "Erklärung",
"material": "Material",
+ "documents": "Dokumente",
+ "carbon": "Kohlenstoff",
+ "environmental": "Umwelt",
"carbonContentTotal": "Gesamtkohlenstoffgehalt",
"crossSectoralStandard": "Sektorenübergreifender Standard",
"substancesOfConcern": "Besorgniserregende Stoffe",
@@ -425,6 +511,10 @@
"code": "Code",
"nameAtManufacturer": "Name beim Hersteller",
"nameAtCustomer": "Name beim Kunden"
+ },
+ "safety": {
+ "fireClass": "Brandklasse",
+ "media": "Medien"
}
}
-}
+}
\ No newline at end of file
diff --git a/dpp-frontend/src/translations/en.json b/dpp-frontend/src/translations/en.json
index 2997c9d4b..ec4ad2392 100644
--- a/dpp-frontend/src/translations/en.json
+++ b/dpp-frontend/src/translations/en.json
@@ -43,17 +43,7 @@
"dpp": "Digital Product Passport",
"bpp": "Battery Product Passport",
"tpp": "Transmission Product Passport",
- "batteryComponentsNames": {
- "generalInformation": "General Information",
- "stateOfBattery": "State Of Battery",
- "components": "Components",
- "batteryComposition": "Battery Composition",
- "cellChemistry": "Cell Chemistry",
- "electrochemicalProperties": "Electrochemical Properties",
- "documents": "Documents",
- "exchange": "Exchange"
- },
- "dppComponentsNames": {
+ "componentsNames": {
"typology": "Typology",
"metadata": "Metadata",
"characteristics": "Characteristics",
@@ -65,18 +55,16 @@
"additionalData": "Additional Data",
"sustainability": "Sustainability",
"operation": "Operation",
- "exchange": "Exchange"
- },
- "tppComponentsNames": {
- "productSpecificParameters": "Product Specific Parameters",
+ "exchange": "Exchange",
+ "performance": "Performance",
+ "materials": "Materials",
+ "safety": "Safety",
+ "conformity": "Conformity",
+ "specific": "Product Specific Parameters",
"instructions": "Instructions",
"sparePartSupplier": "Spare Part Supplier",
- "components": "Components",
"stateOfHealth": "State of Health",
- "identification": "Identification",
- "generalInformation": "General Information",
- "sustainability": "Sustainability",
- "exchange": "Exchange"
+ "generalInformation": "General Information"
}
},
"home": {
@@ -111,10 +99,10 @@
"batteryCards": {
"titleGeneral": "GENERAL",
"labelGeneral": "Type",
- "secondLabelGeneral": "Model",
+ "secondLabelGeneral": "Category",
"titlePerformance": "PERFORMANCE",
"labelPerformance": "Rated Capacity",
- "secondLabelPerformance": "Model",
+ "secondLabelPerformance": "Power",
"descriptionPerformanceTitle": "Performance",
"descriptionPerformanceValue": "Description of the performance",
"titleHealth": "HEALTH",
@@ -151,13 +139,19 @@
"descriptionSustainabilityValue": "Description of the Sustainability"
},
"transmissionCards": {
+ "partID": "Part ID",
+ "carbonFootprint": "Carbon Footprint",
"matrixCode": "Matrix code",
"parameters": "SPECIFIC PARAMETERS",
"driveType": "Drive type",
"oilType": "Oil type"
},
"passportHeader": {
- "backBtn": "Back"
+ "backBtn": "Back",
+ "verification": "Verification",
+ "issuer": "Issuer",
+ "issuedAt": "Issued at",
+ "expirationDate": "Expiration date"
},
"field": {
"tempRange": "Temp range:",
@@ -199,9 +193,79 @@
"passportRetrieval": "Passport Retrieval",
"retrieving": "Retrieving... ",
"createdProcess": "Created Process ID: ",
- "contractId": "Contract ID: "
+ "contractId": "Contract ID: ",
+ "verification": "Passport verification",
+ "verifying": "Verifying...",
+ "verified": "Verified"
},
"sections": {
+ "materials": {
+ "exemption": "Exemption",
+ "statement": "Statement",
+ "recycled": "Recycled materials",
+ "renewable": "Renewable materials",
+ "hazardClassification": "Hazard classification",
+ "concentrationRange": "Concentration range",
+ "documentation": "Documentation",
+ "concentration": "Concentration",
+ "name": "Name",
+ "otherMaterials": "Other materials",
+ "type": "Type",
+ "location": "Location",
+ "recycledContent": "Recycled content",
+ "materialIdentification": "Material identification",
+ "hazardous": "Hazardous",
+ "compositionOf": "Composition of",
+ "recyclateContent": "Recyclate content"
+ },
+ "performance": {
+ "rated": "Rated",
+ "depthOfDischarge": "Depth of Discharge",
+ "temperature": "Temperature",
+ "50PercentLife": "50% Life",
+ "initial": "Initial",
+ "selfDischargingRate": "Self Discharging Rate",
+ "lowerTemperature": "Lower Temperature",
+ "upperTemperature": "Upper Temperature",
+ "lifetime": "Lifetime",
+ "dynamic": "Dynamic",
+ "appliedDischargeRate": "Applied Discharge Rate",
+ "cycleLifeTesting": "Lifecycle testing",
+ "cycles": "Cycles",
+ "expectedYears": "Expected years",
+ "at20SoC": "At 20°C",
+ "at80SoC": "At 80°C",
+ "power": "Power",
+ "cell": "Cell",
+ "pack": "Pack",
+ "module": "Module",
+ "voltage": "Voltage",
+ "voltageMin": "Voltage Min",
+ "voltageMax": "Voltage Max",
+ "voltageNominal": "Voltage nominal",
+ "energy": "Energy",
+ "capacity": "Capacity",
+ "thresholdExhaustion": "Threshold Exhaustion",
+ "roundTripEfficiency": "Round Trip Efficiency",
+ "remaining": "Remaining power",
+ "fade": "Power fade",
+ "operatingEnvironment": "Operating environment",
+ "stateOfCharge": "State of charge",
+ "performanceDocument": "Performance document",
+ "fullCycles": "Full cycles",
+ "negativeEvents": "Negative events",
+ "resistance": "Resistance",
+ "remainingCell": "Remaining cell resistance",
+ "remainingPack": "Remaining pack resistance",
+ "remainingModule": "Remaining module resistance",
+ "increaseCell": "Increasing cell resistance",
+ "increasePack": "Increasing pack resistance",
+ "increaseModule": "Increasing module resistance",
+ "capacityFade": "Capacity fade",
+ "throughput": "Throughput",
+ "remainingEnergy": "Remaining energy",
+ "soce": "Soce"
+ },
"instructions": {
"packagingInstructions": "Packaging instructions",
"transportationInstructions": "Transportation instructions",
@@ -210,6 +274,13 @@
"vehicleDismantlingProcedure": "Vehicle dismantling procedure"
},
"productSpecificParameters": {
+ "serviceHistory": "Service history",
+ "oil": "Oil",
+ "torquePeak": "Torque peak",
+ "torqueContinuous": "Torque continuous",
+ "time": "Time",
+ "powerPeak": "Power peak",
+ "voltage": "Voltage",
"torqueConverter": "Torque converter",
"driveType": "Drive type",
"oilType": "Oil type",
@@ -255,15 +326,6 @@
"manufacturerContact": "Manufacturer Contact",
"cO2FootprintTotal": "CO2 Footprint"
},
- "stateOfBattery": {
- "stateOfHealth": "State of health",
- "cycleLifeTestCRate": "Cycle life test c rate",
- "stateOfCharge": "State of charge",
- "cycleLifeTestDepthOfDischarge": "Cycle life test depth of discharge",
- "expectedLifetime": "Expected lifetime",
- "temperatureRange": "Temperature range (idle state)",
- "statusBattery": "Status battery"
- },
"components": {
"searchForChild": "The search for child components started, this may take a while...",
"noChild": "No child components found",
@@ -273,10 +335,6 @@
"batteryComposites": "Main Battery Composites",
"criticalRawMaterials": "Critical raw materials"
},
- "cellChemistry": {
- "electrolyteComposition": "Composition of electrolyte",
- "recyclateContent": "Recyclate Content Active Materials"
- },
"electrochemicalProperties": {
"capacity": "Capacity",
"ratedCapacity": "Rated capacity",
@@ -339,6 +397,9 @@
"contentType": "Content type"
},
"characteristics": {
+ "lifeTime": "Life time",
+ "volume": "Volume",
+ "generalPerformanceClass": "General performance class",
"physicalDimensionsProperty": "Physical dimensions property",
"weight": "Weight",
"lifespan": "Lifespan",
@@ -348,13 +409,17 @@
"weightOrVolume": "Weight or volume",
"diameter": "Diameter",
"grossWeight": "Gross weight",
- "grossVolume": "Gross volume"
+ "grossVolume": "Gross volume",
+ "warranty": "Warranty"
},
"commercial": {
"placedOnMarket": "Place on the market",
- "warranty": "Warranty"
+ "warranty": "Warranty",
+ "purpose": "Purpose"
},
"handling": {
+ "manufacturerPartId": "Manufacturer part ID",
+ "nameAtManufacturer": "Name at manufacturer",
"maintenanceHistory": "Maintenance history",
"spareParts": "Spare parts",
"substanceOfConcern": "Substance of concern",
@@ -371,11 +436,17 @@
"id": "Id"
},
"identification": {
+ "description": "Description",
+ "classification": "Classification",
"gtin": "Gtin",
"manufacturerId": "Manufacturer ID",
- "dataMatrixCode": "Data matrix code"
+ "dataMatrixCode": "Data matrix code",
+ "chemistry": "Chemistry",
+ "idDmc": "DMC ID",
+ "category": "Category"
},
"metadata": {
+ "lastModification": "Last modification",
"predecessor": "Predecessor",
"legitimization": "Legitimization",
"identification": "Identification",
@@ -385,9 +456,15 @@
"customerPartId": "Customer part ID",
"manufacturerPartId": "Manufacturer part ID",
"status": "Status",
- "expirationDate": "Expiration date"
+ "expirationDate": "Expiration date",
+ "backupReference": "Backup reference",
+ "registrationIdentifier": "Registration identifier",
+ "economicOperatorId": "Economic operator ID",
+ "passportIdentifier": "Passport identifier"
},
"operation": {
+ "importerID": "Importer ID",
+ "intoServiceDate": "Into service date",
"importer": "Importer ID",
"importerEori": "Importer EORI",
"manufacturerId": "Manufacturer ID",
@@ -404,8 +481,21 @@
"quantity": "Quantity"
},
"sustainability": {
+ "durabilityScore": "Durability score",
+ "reparabilityScore": "Reparability Score",
+ "lifecycle": "Lifecycle",
"state": "State",
+ "status": "Status",
+ "documents": "Documents",
+ "carbonFootprint": "Carbon Footprint",
+ "performanceClass": "Performance Class",
+ "type": "Type",
+ "rulebook": "Rulebook",
+ "manufacturingPlant": "Manufacturing plant",
+ "declaration": "Declaration",
"material": "Material",
+ "carbon": "Carbon",
+ "environmental": "Environmental",
"carbonContentTotal": "Carbon content total",
"crossSectoralStandard": "Cross sectoral standard used",
"substancesOfConcern": "Substances of concern",
@@ -425,6 +515,10 @@
"code": "Code",
"nameAtManufacturer": "Name at manufacturer",
"nameAtCustomer": "Name at customer"
+ },
+ "safety": {
+ "fireClass": "Fire class",
+ "media": "Media"
}
}
-}
+}
\ No newline at end of file
diff --git a/dpp-frontend/src/utils/jsonUtil.js b/dpp-frontend/src/utils/jsonUtil.js
index fa468809e..a257c8549 100644
--- a/dpp-frontend/src/utils/jsonUtil.js
+++ b/dpp-frontend/src/utils/jsonUtil.js
@@ -78,13 +78,13 @@ export default {
}
return uniqueKey; //Return unique id
},
- toJson(json){
+ toJson(json) {
return JSON.parse(json);
},
- toJsonString(json){
+ toJsonString(json) {
return JSON.stringify(json);
},
- flatternJsonAttributes(json, attributes=[], sep=".", allowNull = false, allowEmpty = false) {
+ flatternJsonAttributes(json, attributes = [], sep = ".", allowNull = false, allowEmpty = false) {
if (json == null) return null;
if (!(json instanceof Object)) return json;
// Deep Copy param into objects
@@ -100,14 +100,14 @@ export default {
// Interate over keys
let parentKey = keys[index]; // Get key value in array
let parent = this.get(parentKey, objects, sep, null); // Get current node value
-
+
if (parent == null) {
// If nulls are not allowed
continue;
}
let tmpObjects = this.deleteDeepKey(parentKey, objects, sep, null); // Delete current node from interation object
- if(tmpObjects == null){
+ if (tmpObjects == null) {
continue;
}
objects = this.deepCopy(tmpObjects);
@@ -324,12 +324,12 @@ export default {
}
return tempSourceObj;
},
- deleteDeepKey(ref,json, sep = ".", defaultReturn = null ) {
+ deleteDeepKey(ref, json, sep = ".", defaultReturn = null) {
try {
let tmpJson = this.copy(json);
let refs = ref.split(sep);
- if(refs.length == 1){
- if(!Object.prototype.hasOwnProperty.call(tmpJson, ref)){
+ if (refs.length == 1) {
+ if (!Object.prototype.hasOwnProperty.call(tmpJson, ref)) {
throw new Error("deleteDeepKey: Key [" + ref + "] is not defined in json");
}
delete tmpJson[ref]
@@ -338,24 +338,24 @@ export default {
let lastRef = refs.pop();
let parentPath = refs.join(sep);
let parent = this.get(parentPath, json, sep, null);
- if(parent == null){
+ if (parent == null) {
throw new Error("deleteDeepKey: Parent [" + parentPath + "] does not exist!");
}
- if(!Object.prototype.hasOwnProperty.call(parent, lastRef)){
+ if (!Object.prototype.hasOwnProperty.call(parent, lastRef)) {
throw new Error("deleteDeepKey: Key [" + lastRef + "] does not exists in parent!");
}
delete parent[lastRef];
- return this.set(parentPath, parent,tmpJson, sep, defaultReturn);
+ return this.set(parentPath, parent, tmpJson, sep, defaultReturn);
} catch {
return defaultReturn;
}
},
- set(ref, data, json, sep = ".", defaultReturn = null){
- try{
+ set(ref, data, json, sep = ".", defaultReturn = null) {
+ try {
let tmpObject = {};
let refs = ref.split(sep);
- if(refs.length == 1){
+ if (refs.length == 1) {
tmpObject = this.copy(json);
tmpObject[ref] = data;
return tmpObject;
@@ -365,29 +365,30 @@ export default {
let part;
let parentPath;
let tmpParent = null;
- for(let i = refs.length - 1; i >= 0; i--){
+ for (let i = refs.length - 1; i >= 0; i--) {
tmpObject = {}
- part = refs[i];
- currentPath = currentPath.filter(e => e !== part);
+ part = refs[i];
+ currentPath.pop(-1)
parentPath = currentPath.join(sep);
tmpParent = this.get(parentPath, json, sep, {});
tmpObject[part] = tmpValue;
tmpParent = this.extend(tmpParent, tmpObject);
tmpValue = tmpParent;
}
- if(tmpParent == null){
+ if (tmpParent == null) {
return defaultReturn;
}
return this.extend(json, tmpParent);
- }catch {
+ } catch {
return defaultReturn;
}
},
- extendDeep(originJson, json){
- if(!json){
+ extendDeep(originJson, json) {
+
+ if (!json) {
return originJson;
}
- if (!(json instanceof Object)) return originJson;
+ if (parent instanceof Array || !(parent instanceof Object) || parent instanceof String || parent instanceof Boolean || parent instanceof Number) return originJson;
// Deep Copy param into object
let objects = JSON.parse(JSON.stringify(json));
let retObject = JSON.parse(JSON.stringify(originJson)); // Return/Final Object
@@ -405,22 +406,21 @@ export default {
continue;
}
- if (!(parent instanceof Object)) {
+ if (parent instanceof Array || !(parent instanceof Object) || parent instanceof String || parent instanceof Boolean || parent instanceof Number) {
// If current node is not a object
retObject = this.set(parentKey, parent, retObject);
continue;
}
-
for (let childKey in parent) {
// Interate over children
let child = parent[childKey]; // Get children
-
+
if (child == null) {
// Skip null children
continue;
}
- let childstoreKey = this.buildPath(parentKey, childKey);
- if (!(child instanceof Object)) {
+ let childstoreKey = this.buildPath(parentKey, childKey)
+ if (child instanceof Array || !(child instanceof Object) || child instanceof String || child instanceof Boolean || child instanceof Number) {
// If children is not a object is a property from the father
// Check if key is not existing
retObject = this.set(childstoreKey, child, retObject);
diff --git a/dpp-frontend/src/utils/passportUtil.js b/dpp-frontend/src/utils/passportUtil.js
index b54cf5884..fd101f632 100644
--- a/dpp-frontend/src/utils/passportUtil.js
+++ b/dpp-frontend/src/utils/passportUtil.js
@@ -25,6 +25,19 @@
import iconMappings from "@/config/templates/iconMappings.json";
export default {
+ currentData(tppData, propsData) {
+ if (tppData && Object.keys(tppData).length > 0) {
+ return tppData;
+ }
+ return propsData;
+ },
+ isObject(value) {
+ return value !== null && typeof value === "object";
+ },
+ hasContent(...args) {
+ // Check if any of the passed arguments is truthy
+ return args.some((arg) => !!arg);
+ },
formattedDate(timestamp) {
const date = new Date(timestamp);
const formattedDate = date.toLocaleDateString("en-GB", {
@@ -34,6 +47,17 @@ export default {
});
return formattedDate;
},
+ processDateTime(dateTimeString) {
+ if (!dateTimeString)
+ return
+ // Check if the string contains 'T'
+ if (dateTimeString.includes("T")) {
+ // Replace 'T' with ', time: ' and return the new string
+ return dateTimeString.replace("T", ", time: ");
+ }
+ // Return the original string if 'T' is not found
+ return dateTimeString;
+ },
toSentenceCase(text) {
// Convert the string to sentence case
const words = text.split(/(?=[A-Z])/);
@@ -100,4 +124,3 @@ export default {
}
}
};
-
diff --git a/dpp-frontend/src/views/PassportView.vue b/dpp-frontend/src/views/PassportView.vue
index 58a60ed42..ba24faf39 100644
--- a/dpp-frontend/src/views/PassportView.vue
+++ b/dpp-frontend/src/views/PassportView.vue
@@ -28,19 +28,11 @@
{{ $t("passportView.dpp") }}
-
+
{{ $t("passportView.bpp") }}
{{ $t("passportView.tpp") }}
@@ -51,10 +43,7 @@
-
+
@@ -64,10 +53,7 @@
-
+
{{ contractIndex + 1 }}.
@@ -89,19 +75,11 @@
+ {{ $t("sections.sustainability.material") }}
+
+
+
+
+ {{ $t("sections.sustainability.documents") }}
+
+
+
+
+
+ {{ $t("sections.sustainability.carbon") }}
+
+
+
+
+ {{ $t("sections.sustainability.environmental") }}
+
+
+
+ {{ $t("sections.sustainability.status") }}
+
+
+ {{ $t("sections.sustainability.carbonFootprint") }}
+
+
+
+
Policy {{ contractIndex + 1 }}.{{
- index + 1
- }}Policy {{ contractIndex + 1 }}.{{ index + 1 }}
-
+
@@ -113,17 +91,11 @@
-
+
@@ -262,9 +205,7 @@
variant="outlined"
style="border: 2px solid"
@click="cancelDeclineContract()"
- >{{
- $t("passportView.policyAgreement.declineModal.cancel")
- }}{{ $t("passportView.policyAgreement.declineModal.cancel") }}
@@ -288,34 +224,18 @@
ID
{{ policyKey }}
@@ -132,9 +104,7 @@
@@ -144,26 +114,14 @@
-
- {{
- attribute.constraints.operator
- }}
+ {{
+ attribute.constraints.operator
+ }}
- [{{
- constraint.leftOperand
- }}] [{{ constraint.operator }}]
- [{{
+ >- [{{ constraint.leftOperand }}] [{{ constraint.operator }}] [{{
constraint.rightOperand
}}]
@@ -201,13 +159,7 @@
size="x-large"
class="text-none ms-4 text-white"
color="#0F71CB"
- @click="
- resumeNegotiation(
- searchResponse,
- contractToSign.contract,
- contractToSign.policy
- )
- "
+ @click="resumeNegotiation(searchResponse, contractToSign.contract, contractToSign.policy)"
>{{ $t("passportView.policyAgreement.agree") }}
@@ -216,11 +168,7 @@
rounded="xl"
size="x-large"
variant="text"
- :prepend-icon="
- !details
- ? 'mdi-plus-circle-outline'
- : 'mdi-minus-circle-outline'
- "
+ :prepend-icon="!details ? 'mdi-plus-circle-outline' : 'mdi-minus-circle-outline'"
@click="toggleDetails"
class="details-btn text-none"
>
@@ -232,12 +180,7 @@
-
+
-
-
@@ -363,7 +269,6 @@
-
-
+