Skip to content
Snippets Groups Projects

merge dev into main

Merged Zoe Michaela Dietmar Pfister requested to merge develop into main
5 files
+ 75
16
Compare changes
  • Side-by-side
  • Inline
Files
5
<!--
<div class="flex w-full min-h-min ">
@@ -97,6 +97,13 @@
</div>
</div>
-->
<!--
<div class="w-full bg-gray-100 flex flex-col">
@@ -224,3 +231,46 @@
</div>
-->
<div class="w-full flex flex-row items-end justify-start flex-wrap">
<div *ngFor="let avgMMax of avgMinMax;let iX=index;">
<div class="card-group" [ngStyle]="{'box-shadow':avgMMax.isSensorGroup ? '15px 15px rgb(173,216,230,0.4) ,30px 30px rgb(173,216,230,0.2)':''}">
<header>
<h5>{{avgMMax.name}}</h5>
</header>
<main>
<div class="min">
<h3>Min</h3>
<h3>{{avgMMax.min?.value?.toFixed(2)}}</h3>
</div>
<div class="avg">
<h3>Avg</h3>
<h3>{{avgMMax.avg?.toFixed(2)}}</h3>
</div>
<div class="max">
<h3>Max</h3>
<h3>{{avgMMax.max?.value?.toFixed(2)}}</h3>
</div>
</main>
</div>
</div>
</div>
<div class="w-full flex flex-row items-end justify-start flex-wrap ">
<div *ngFor="let avgMMax of avgMinMax;let iX=index;">
<div class="card-group " [ngStyle]="{'box-shadow':avgMMax.isSensorGroup ? '15px 15px rgb(173,216,230,0.4) ,30px 30px rgb(173,216,230,0.2)':' rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px'}">
<header>
<h5>{{avgMMax.name}} <h6>(wemc)</h6></h5>
</header>
<main class="w-full mb-4 flex">
<app-slider [avg]="avgMMax.avg" [min]="avgMMax.min?.value" [max]="avgMMax.max?.value" class="w-full px-5" ></app-slider>
</main>
</div>
</div>
</div>
Loading