From ba241c6f8843f9f50c53afeb19e8b3b72571ad7a Mon Sep 17 00:00:00 2001 From: JuanBerrocal Date: Mon, 9 Mar 2026 00:21:59 +0100 Subject: [PATCH 1/5] Capacity percentage fixed --- .../components/reservoir-card-gauge.tsx | 2 +- package-lock.json | 21 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/front/src/pods/embalse/components/reservoir-card-gauge.tsx b/front/src/pods/embalse/components/reservoir-card-gauge.tsx index d4e9a54..523dc51 100644 --- a/front/src/pods/embalse/components/reservoir-card-gauge.tsx +++ b/front/src/pods/embalse/components/reservoir-card-gauge.tsx @@ -13,7 +13,7 @@ export const ReservoirCardGauge: React.FC = (props) => { return (

{name}

- 100 ? 100 : percentage} measurementDate= {measurementDate} /> =12" } @@ -4528,7 +4527,6 @@ "integrity": "sha512-QgODejq9K3OzoBbuyobZlUhznP5SKwPqp+6Q6xw6o8gnhr4O85L2U915iM2IDcfF2NPXVaM9zlo9tdwipnYwzg==", "dev": true, "license": "MIT", - "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -4687,7 +4685,6 @@ "node_modules/react": { "version": "19.1.1", "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -4695,7 +4692,6 @@ "node_modules/react-dom": { "version": "19.1.1", "license": "MIT", - "peer": true, "dependencies": { "scheduler": "^0.26.0" }, @@ -5468,7 +5464,6 @@ "version": "5.9.2", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -5500,7 +5495,6 @@ "version": "7.1.3", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", @@ -5848,14 +5842,19 @@ "version": "0.0.1", "hasInstallScript": true, "dependencies": { - "mongodb": "^6.19.0" + "arcgis": "*", + "db-model": "*", + "mongodb": "^6.19.0", + "scraping-cuenca-mediterranea": "*" }, "devDependencies": { "@types/prompts": "^2.4.9", - "arcgis": "*", "prompts": "^2.4.2", - "scraping-cuenca-duero": "*", "scraping-cuenca-cantabrico": "*", + "scraping-cuenca-catalana": "*", + "scraping-cuenca-duero": "*", + "scraping-cuenca-guadalquivir": "*", + "scraping-cuenca-jucar": "*", "scraping-cuenca-mediterranea": "*" } }, From 24778b58fc567462738ebc0bd5c4804bb2604c62 Mon Sep 17 00:00:00 2001 From: JuanBerrocal Date: Mon, 9 Mar 2026 00:37:50 +0100 Subject: [PATCH 2/5] Capacity percentage. Conflicts fixed --- front/src/pods/embalse/components/reservoir-card-gauge.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/pods/embalse/components/reservoir-card-gauge.tsx b/front/src/pods/embalse/components/reservoir-card-gauge.tsx index 523dc51..f219eb4 100644 --- a/front/src/pods/embalse/components/reservoir-card-gauge.tsx +++ b/front/src/pods/embalse/components/reservoir-card-gauge.tsx @@ -11,7 +11,7 @@ export const ReservoirCardGauge: React.FC = (props) => { const percentage = totalCapacity > 0 ? currentVolume / totalCapacity : 0; return ( -
+

{name}

100 ? 100 : percentage} measurementDate= {measurementDate} /> @@ -19,6 +19,6 @@ export const ReservoirCardGauge: React.FC = (props) => { currentVolume={currentVolume} totalCapacity={totalCapacity} /> -
+ ); }; \ No newline at end of file From e287c1bca23d85fd203728723582459b7c786dd2 Mon Sep 17 00:00:00 2001 From: JuanBerrocal Date: Mon, 9 Mar 2026 00:43:21 +0100 Subject: [PATCH 3/5] Capacity percentage. Conflicts fixed --- front/src/pods/embalse/components/reservoir-card-gauge.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/front/src/pods/embalse/components/reservoir-card-gauge.tsx b/front/src/pods/embalse/components/reservoir-card-gauge.tsx index f219eb4..3fa440e 100644 --- a/front/src/pods/embalse/components/reservoir-card-gauge.tsx +++ b/front/src/pods/embalse/components/reservoir-card-gauge.tsx @@ -11,7 +11,10 @@ export const ReservoirCardGauge: React.FC = (props) => { const percentage = totalCapacity > 0 ? currentVolume / totalCapacity : 0; return ( -
+

{name}

100 ? 100 : percentage} measurementDate= {measurementDate} /> From 2dee2837b8ebc8d33b52e49b2e3a7865a5439ec1 Mon Sep 17 00:00:00 2001 From: JuanBerrocal Date: Mon, 9 Mar 2026 00:44:30 +0100 Subject: [PATCH 4/5] Capacity percentage. Conflicts fixed --- front/src/pods/embalse/components/reservoir-card-gauge.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/pods/embalse/components/reservoir-card-gauge.tsx b/front/src/pods/embalse/components/reservoir-card-gauge.tsx index 3fa440e..2e04473 100644 --- a/front/src/pods/embalse/components/reservoir-card-gauge.tsx +++ b/front/src/pods/embalse/components/reservoir-card-gauge.tsx @@ -15,7 +15,7 @@ export const ReservoirCardGauge: React.FC = (props) => { className="card bg-base-100 mx-auto w-full items-center gap-6 rounded-2xl p-4 shadow-lg" aria-labelledby="gauge-title" > -

{name}

+

100 ? 100 : percentage} measurementDate= {measurementDate} /> Date: Mon, 9 Mar 2026 00:45:41 +0100 Subject: [PATCH 5/5] Capacity percentage. Conflicts fixed --- front/src/pods/embalse/components/reservoir-card-gauge.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/front/src/pods/embalse/components/reservoir-card-gauge.tsx b/front/src/pods/embalse/components/reservoir-card-gauge.tsx index 2e04473..2db2230 100644 --- a/front/src/pods/embalse/components/reservoir-card-gauge.tsx +++ b/front/src/pods/embalse/components/reservoir-card-gauge.tsx @@ -15,7 +15,9 @@ export const ReservoirCardGauge: React.FC = (props) => { className="card bg-base-100 mx-auto w-full items-center gap-6 rounded-2xl p-4 shadow-lg" aria-labelledby="gauge-title" > -

+

+ {name} +

100 ? 100 : percentage} measurementDate= {measurementDate} />