Skip to content

Commit

Permalink
Merge pull request #76 from ls1intum/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
valentin-boehm authored Dec 11, 2023
2 parents 4dd2a11 + 8f6ce18 commit 3b8ec27
Show file tree
Hide file tree
Showing 22 changed files with 5 additions and 29 deletions.
23 changes: 0 additions & 23 deletions src/main/webapp/app/home/home.component.scss
Original file line number Diff line number Diff line change
@@ -1,23 +0,0 @@
/* ==========================================================================
Main page styles
========================================================================== */

.hipster {
display: inline-block;
width: 347px;
height: 497px;
background: url('../../content/images/jhipster_family_member_3.svg') no-repeat center top;
background-size: contain;
}

/* wait autoprefixer update to allow simple generation of high pixel density media query */
@media only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and (-moz-min-device-pixel-ratio: 2),
only screen and (-o-min-device-pixel-ratio: 2/1),
only screen and (min-resolution: 192dpi),
only screen and (min-resolution: 2dppx) {
.hipster {
background: url('../../content/images/jhipster_family_member_3.svg') no-repeat center top;
background-size: contain;
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, Input } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { SimulationStats } from '../../entities/simulation/simulationStats';
import { RequestType } from '../../entities/simulation/requestType';

Expand All @@ -7,9 +7,12 @@ import { RequestType } from '../../entities/simulation/requestType';
templateUrl: './result-box.component.html',
styleUrls: ['./result-box.component.scss'],
})
export class ResultBoxComponent {
export class ResultBoxComponent implements OnInit {
@Input() simulationStats?: SimulationStats;

ngOnInit(): void {
this.simulationStats?.statsByMinute.sort((a, b) => new Date(a.dateTime).getTime() - new Date(b.dateTime).getTime());
}
formatDuration(durationInNanoSeconds: number): string {
const durationInMicroSeconds = durationInNanoSeconds / 1000;
if (durationInMicroSeconds > 1000) {
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 3b8ec27

Please sign in to comment.