API source update and resultItems

src/components/Graphs/GraphContainer.vue

@@ -33,8 +33,9 @@ import Dropdown from '@/components/Misc/Dropdown.vue'
 // Utility imports
 import { 
   geometryToChartData,
+  geometryToNestedChartData,
   ResultItemToChartData,
-  geometryToMaterialTypeNestedChartData
+  ResultItemToNestedChartData
   } from '@/utils/resultUtils'
 
 // Type imports
@@ -156,8 +157,8 @@ const updateGraphProps = (chart: string = "") => {
         aggregate: true,
         unit: "kgCO2e",
       }
-
-      data = geometryToMaterialTypeNestedChartData(projectStore.currProject.geometry)
+      
+      data = geometryToNestedChartData(projectStore.currProject.geometry, selectedResult.value.parameter)
       graphProps.value = {
         data,
         options,

src/models/result.ts

@@ -9,6 +9,7 @@ export interface GroupedResults{
   parameter: string
   data: GroupedEmission
   quantity?: Quantity
+  nested?: GroupedResults[]
 }
 
 /**
@@ -27,7 +28,6 @@ export interface ResultItem {
   parameter: string
   displayName: string
   data: GroupedResults[]
-  nested?: ResultItem
 }
 
 export type ResultList = ResultItem[]

src/models/settings.ts

@@ -20,7 +20,6 @@ export interface CalculationSettings {
     key: string,
     data: BuildingCodeItem[],
   },
-
 }
 
 export interface MaterialSettings {

src/utils/EPDUtils.ts

@@ -28,6 +28,7 @@ interface EPDService {
 
 /**
  * Class for fetching data from EcoPortal
+ * TODO: This implementation is not done yet, EPD Information is flaky at best
  */
 class EcoPortalService implements EPDService {
   createApiClient() {
@@ -93,12 +94,20 @@ class RevaluService implements EPDService {
     })
   }
 
+  // Create list URL, we check if dev or not and switch the URL
   createListUrl() {
-    return 'api/revalu/epds/search'
+    const apiListUrl = import.meta.env.MODE === 'development' 
+      ? '/SpeckleLCA/api/revalu/epds/search' 
+      : 'https://api.revalu.io/epds/search'
+    return apiListUrl
   }
 
+  // Create EPD URL, we check if dev or not and switch the URL
   createEPDUrl(epd: any) {
-    return `api/revalu/epds/${epd.id}`
+    const apiEPDUrl = import.meta.env.MODE === 'development' 
+      ? `/SpeckleLCA/api/revalu/epds/${epd.id}` 
+      : `https://api.revalu.io/epds/${epd.id}`
+    return apiEPDUrl
   }
 
   createListParams() {

src/utils/emissionUtils.ts

@@ -100,7 +100,7 @@ export class EmissionCalculator {
     for (const phase in matEmission) {
       // Check if the phase is included in the calculation settings, if not skip it
       if (this.settingsStore.calculationSettings.includedStages.relevantStages.some(
-        (stage) => phase === stage.stage)
+        (stage) => phase === stage.stage && stage.included)
       ){
         let value = matEmission[phase]
         if (value === undefined) value = matEmission[phase]

src/utils/projectUtils.ts

@@ -4,8 +4,7 @@ import type { GeometryObject } from '@/models/geometryObject'
 import { useProjectStore } from '@/stores/main'
 import { 
   baseColors, 
-  getValueColorFromGradient, 
-  generateColors,
+  getValueColorFromGradient,
   ColorManager 
 } from '@/utils/colorUtils'