Skip to content
Snippets Groups Projects

merge dev into main

Merged Zoe Michaela Dietmar Pfister requested to merge develop into main
3 files
+ 42
20
Compare changes
  • Side-by-side
  • Inline
Files
3
<div class="bg-sky-500">
<div class="flex-col">
<form class="mt-10 flex flex-wrap justify-center sm:justify-between w-full
[&>*]:w-full [&>*]:sm:w-1/4 [&>*]:p-2">
@@ -118,12 +117,14 @@
</section>
</div>
</div>
<!--
<app-Cjs-timeline-multiple *ngIf="this.sensorControl.value?.length!=1||!isDendrometer" [chartId]="chartId_chartAll" #timeline [sensorData]="this.sensorData" [sensorDataArray]="this.sensorDataArray" >
</app-Cjs-timeline-multiple>
*ngIf="sensorControl.value?.length==1&&isDendrometer"
-->
<div class="bg-slate-500 flex">
<app-Cjs-timeline-multiple [sensorData]="this.sensorData" [sensorDataArray]="this.sensorDataArray" ></app-Cjs-timeline-multiple>
<app-Cjs-timline></app-Cjs-timline>
</div>
</div>
@@ -133,7 +134,7 @@
<div class="w-full flex flex-row items-end justify-center flex-wrap">
<div #dendrometer class="w-full flex flex-row items-end justify-center flex-wrap ">
<div class="card-dendrometer">
<h1>Dendrometer</h1>
@@ -155,7 +156,7 @@
</div>
</div>
<app-Cjs-timline *ngIf="threePhaseDendromete" [threePhaseDenrometer]="this.threePhaseDendromete"></app-Cjs-timline>
<app-Cjs-timline [chartId]="chartId_dendrometer" *ngIf="threePhaseDendromete" [threePhaseDenrometer]="this.threePhaseDendromete"></app-Cjs-timline>
</div>
</div>
Loading