Skip to content
Snippets Groups Projects

merge dev into main

Merged Zoe Michaela Dietmar Pfister requested to merge develop into main
8 files
+ 148
12
Compare changes
  • Side-by-side
  • Inline
Files
8
@@ -47,7 +47,7 @@
</mat-form-field>
</form>
<!--
<mat-form-field class=" " appearance="fill" *ngIf="t_bool">
<mat-label>Select a Station</mat-label>
<input type="text"
@@ -57,6 +57,7 @@
[formControl]="t_control"
[matAutocomplete]="auto2">
<mat-error *ngIf="stationControl.hasError('invalid')">This Station does not exists</mat-error>
<mat-autocomplete #auto2="matAutocomplete">
<div *ngIf="t_bool">
<mat-select>
@@ -70,15 +71,27 @@
</mat-form-field>
<div class="relative inline-block text-left ">
<mat-form-field class="" appearance="fill">
<mat-label>Favorite food</mat-label>
<input matInput placeholder="Ex. Pizza" value="Sushi" [formControl]="t_control2" (focus)="onFocus()"
(blur)="onBlur()" #inputField>
</mat-form-field>
<div class="absolute overflow-y-auto h-32 right-0 z-10 mt-2 w-56 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="menu-button" tabindex="-1">
<div *ngFor="let x of t_string" class="py-1" role="none">
<a href="#" class="text-gray-700 block px-4 py-0.5 text-sm" role="menuitem" tabindex="-1" id="menu-item-0"> <mat-checkbox class="example-margin"></mat-checkbox>{{x}}</a>
<div *ngIf="isFocused " class="relative inline-block text-left" >
<div class="absolute overflow-y-auto h-32 right-0 z-10 mt-2 w-56 origin-top-right rounded-md
bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
role="menu" aria-orientation="vertical" aria-labelledby="menu-button" tabindex="-1"
tabindex="-1"
(focus)="menuOpen=true" (blur)="menuOpen=false">
<div *ngFor="let x of t_string" class="py-1" role="none" >
<a class="text-gray-700 block px-4 py-0.5 text-sm" role="menuitem" id="menu-item-0"
(click)="isFocused=true; inputField.focus()">
<mat-checkbox class="example-margin" ></mat-checkbox>{{x}}
</a>
</div>
</div>
</div>
</div>
-->
{{isFocused}}{{menuOpen}}
<div class="flex flex-wrap w-full justify-center sm:justify-end
[&>*]:w-full [&>*]:sm:w-1/4 [&>*]:h-16 [&>*]:p-2 ">
@@ -90,6 +103,9 @@
</div>
-->
<div class="">
<section class=" h-full w-full flex items-center rounded-2xl">
<button class="w-full h-full" mat-raised-button color="primary" (click)="downloadCSV4()">Download Data <mat-icon>download</mat-icon></button>
Loading