Skip to content
Snippets Groups Projects

merge dev into main

Merged Zoe Michaela Dietmar Pfister requested to merge develop into main
3 files
+ 12
7
Compare changes
  • Side-by-side
  • Inline
Files
3
  • de7b7118
    after meeting with zoe · de7b7118
    Bilal Hassan authored
    -removing unused navigation
    -moving the input data a little to the right
    -pushing title to the left
    -centering min max avg (was bevore shifted a lttle to the right)
@@ -34,10 +34,10 @@
<div class="header-left">
<h5>{{sumAvg.name}}</h5>
<h2 *ngIf="sumAvg.measurementType?.toString()=='SOLAR_RADIATION' ">
{{sumAvg.value?.toFixed(1)}}{{" "}}w/m<sup>2</sup>
{{sumAvg.value?.toFixed(3)}}{{" "}}w/m<sup>2</sup>
</h2>
<h2 *ngIf="sumAvg.measurementType?.toString()!='SOLAR_RADIATION' ">
{{sumAvg.value?.toFixed(1)}}{{" "+unitMapper.get(sumAvg.measurementType+"")}}
{{sumAvg.value?.toFixed(3)}}{{" "+unitMapper.get(sumAvg.measurementType+"")}}
</h2>
<div><h4>{{typeMapper.get( sumAvg.type+"")}}</h4></div>
</div>
@@ -89,7 +89,7 @@
*ngFor="let dent of dentrometerDailyValue"
[ngStyle]="{'box-shadow':dent.isSensorGroup ? '15px 15px rgb(173,216,230,0.4) ,30px 30px rgb(173,216,230,0.2)':''}">
<h1 class="flex font-bold text-4sm mb-6 justify-center">{{dent.name}}</h1>
<h1 class="flex font-bold text-4sm mb-6 justify-start ml-5">{{dent.name}}</h1>
<div class="mx-8 flex justify-between">
<div class="flex-col content-center items-center justify-center">
Loading