diff --git a/angular-client/src/components/carousel/carousel.component.html b/angular-client/src/components/carousel/carousel.component.html index 6a6be750..919b15b5 100644 --- a/angular-client/src/components/carousel/carousel.component.html +++ b/angular-client/src/components/carousel/carousel.component.html @@ -11,24 +11,39 @@
- + - + - - - - + - +
- Select this Run + Select this Run
diff --git a/angular-client/src/pages/graph-page/graph-caption/graph-caption.component.html b/angular-client/src/pages/graph-page/graph-caption/graph-caption.component.html index 222ec5fe..ed18238d 100644 --- a/angular-client/src/pages/graph-page/graph-caption/graph-caption.component.html +++ b/angular-client/src/pages/graph-page/graph-caption/graph-caption.component.html @@ -4,7 +4,11 @@ @if (dataTypeName) {
- +
} @else { - + }
- +
- - +
diff --git a/angular-client/src/utils/types.utils.ts b/angular-client/src/utils/types.utils.ts index 2ee190ec..a8f54665 100644 --- a/angular-client/src/utils/types.utils.ts +++ b/angular-client/src/utils/types.utils.ts @@ -15,7 +15,8 @@ export interface NodeWithVisibilityToggle extends Node { dataTypesAreVisible: boolean; } -export interface NodeWithVisibilityToggleObservable extends NodeWithVisibilityToggle { +export interface NodeWithVisibilityToggleObservable + extends NodeWithVisibilityToggle { dataTypesObservable: Observable; } @@ -34,7 +35,6 @@ export type Run = { id: number; locationName: string; driverName: string; - systemName: string; time: Date; }; diff --git a/scylla-server/src/schema.rs b/scylla-server/src/schema.rs index 52414e46..66f5060a 100644 --- a/scylla-server/src/schema.rs +++ b/scylla-server/src/schema.rs @@ -33,4 +33,8 @@ diesel::table! { diesel::joinable!(data -> dataType (dataTypeName)); diesel::joinable!(data -> run (runId)); -diesel::allow_tables_to_appear_in_same_query!(data, dataType, run,); +diesel::allow_tables_to_appear_in_same_query!( + data, + dataType, + run, +); diff --git a/scylla-server/src/transformers/run_transformer.rs b/scylla-server/src/transformers/run_transformer.rs index 3dc01b15..5540c1a5 100644 --- a/scylla-server/src/transformers/run_transformer.rs +++ b/scylla-server/src/transformers/run_transformer.rs @@ -8,8 +8,6 @@ pub struct PublicRun { pub location_name: String, #[serde(rename = "driverName")] pub driver_name: String, - #[serde(rename = "systemName")] - pub system_name: String, #[serde(rename = "time")] pub time_ms: i64, } @@ -20,7 +18,6 @@ impl From for PublicRun { id: value.id, location_name: value.locationName.unwrap_or_default(), driver_name: value.driverName.clone().unwrap_or_default(), - system_name: value.driverName.unwrap_or_default(), // TODO no system name time_ms: value.time.timestamp_millis(), } }