Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(dashboard): climate ui updates #304

Merged
merged 4 commits into from
Jul 27, 2024
Merged

chore(dashboard): climate ui updates #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cafaf1
chore: update marker click
chrismclarke Jul 23, 2024
8d6137e
chore: update favicon
chrismclarke Jul 27, 2024
1ac9bda
chore: update seed data
chrismclarke Jul 27, 2024
5480d49
chore: add station index to map
chrismclarke Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/picsa-apps/dashboard/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"inlineStyleLanguage": "scss",
"assets": [
"apps/picsa-apps/dashboard/src/favicon.ico",
"apps/picsa-apps/dashboard/src/favicon.svg",
"apps/picsa-apps/dashboard/src/assets",
{
"glob": "*.svg",
Expand Down
5 changes: 3 additions & 2 deletions ...apps/dashboard/src/app/modules/climate/pages/station-details/station-details.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ export class StationDetailsPageComponent implements OnInit {
}

public get stationSummary() {
const entries = Object.entries(this.station || {}).filter(([key]) => !['id', 'country_code'].includes(key));
return {
keys: Object.keys(this.station || {}),
values: Object.values(this.station || {}),
keys: entries.map(([key]) => key),
values: entries.map(([, value]) => value),
};
}

Expand Down
12 changes: 9 additions & 3 deletions apps/picsa-apps/dashboard/src/app/modules/climate/pages/station/station.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ <h3>Stations ({{ service.apiCountryCode }})</h3>
<div style="display: flex; gap: 1rem">
<div style="flex: 1">
<table mat-table class="stations-table" [dataSource]="service.stations()" style="width: 200px">
<!-- index -->
<ng-container matColumnDef="station_id">
<th mat-header-cell *matHeaderCellDef>station_id</th>
<td mat-cell *matCellDef="let station">{{ station.station_id }}</td>
<th mat-header-cell *matHeaderCellDef></th>
<td mat-cell *matCellDef="let station; let i = index">{{ i + 1 }}</td>
</ng-container>
<!-- station name -->
<ng-container matColumnDef="station_name">
<th mat-header-cell *matHeaderCellDef>station_name</th>
<td mat-cell *matCellDef="let station">{{ station.station_name }}</td>
Expand All @@ -24,6 +26,10 @@ <h3>Stations ({{ service.apiCountryCode }})</h3>
></tr>
</table>
</div>
<picsa-map style="height: 500px; width: 500px" [markers]="mapMarkers()"></picsa-map>
<picsa-map
style="height: 500px; width: 500px"
[markers]="mapMarkers()"
(onMarkerClick)="handleMarkerClick($event)"
></picsa-map>
</div>
</div>
12 changes: 9 additions & 3 deletions apps/picsa-apps/dashboard/src/app/modules/climate/pages/station/station.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
import { Component, computed, OnInit } from '@angular/core';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatTableModule } from '@angular/material/table';
import { RouterModule } from '@angular/router';
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
import { IMapMarker, PicsaMapComponent } from '@picsa/shared/features/map/map';

import { ClimateService } from '../../climate.service';
Expand Down Expand Up @@ -36,17 +36,23 @@ export class ClimateStationPageComponent implements OnInit {
showStatusCode: false,
};

constructor(public service: ClimateService) {}
constructor(public service: ClimateService, private router: Router, private route: ActivatedRoute) {}

async ngOnInit() {
await this.service.ready();
}

public handleMarkerClick(marker: IMapMarker) {
const { _index } = marker;
const station = this.service.stations()[_index];
this.router.navigate(['./', station.station_id], { relativeTo: this.route });
}

private calcMapMarkers(stations: IStationRow[]): IMapMarker[] {
return stations.map((s, _index) => ({
_index,
latlng: [s.latitude as number, s.longitude as number],
number: parseInt(s.station_id),
number: _index + 1,
}));
}
}
Binary file modified apps/picsa-apps/dashboard/src/favicon.ico
View file
Open in desktop
Binary file not shown.
60 changes: 60 additions & 0 deletions apps/picsa-apps/dashboard/src/favicon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/picsa-apps/dashboard/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" type="image/x-icon" href="favicon.ico" />
<link rel="icon" type="image/svg+xml" href="favicon.svg" />
</head>
<body data-theme="picsa-dashboard">
<dashboard-root></dashboard-root>
Expand Down
9 changes: 5 additions & 4 deletions apps/picsa-server/supabase/data/climate_products_rows.csv
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions apps/picsa-server/supabase/data/climate_stations_rows.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
station_id,country_code,station_name,latitude,longitude,elevation,district
zambia_eastern,zm_workshops,Zambia_Eastern,-21.8,20.2,557,Test
chipata,zm_workshops,Chipata,-13.6,32.6,1025,Chipata
Nkhotakota,mw_workshops,Nkhotakota,-12.9,34.28,500,Nhkotakota
Kasungu,mw_workshops,Kasungu,-13.02,33.47,1300,Kasungu
Chipata Met,zm_workshops,Chipata Met,-13.6,32.6,1025,Chipata
Lundazi Met,zm_workshops,Lundazi Met,-12.28,33.2,1143,Lundazi
Mfuwe Met,zm_workshops,Mfuwe Met,-13.26,31.93,570,Mambwe
Msekera Agromet,zm_workshops,Msekera Agromet,-13.65,32.56,1025,Chipata
Petauke Met,zm_workshops,Petauke Met,-14.25,31.28,1036,Petauke
Loading