Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • informatik/qe/forte/frontend
  • csat2062/frontend
2 results
Show changes
Commits on Source (2)
import { NgModule } from '@angular/core'
import { BrowserModule } from '@angular/platform-browser'
import { AppRoutingModule } from './app-routing.module'
import { AppComponent } from './app.component'
import { UserManagementComponent } from './module/pages/admin/userManagment/userManagement.component'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { MatFormFieldModule } from '@angular/material/form-field'
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'
import { SignupComponent } from './module/pages/signup/signup.component'
import { StationComponent } from './module/pages/admin/stationManagement/station/station.component'
import { ClientComponent } from './module/pages/admin/stationManagement/client/client.component'
import { SensorComponent } from './module/pages/admin/stationManagement/sensor/sensor.component'
import { HostComponent } from './module/pages/admin/stationManagement/host/host.component'
import { EventEmitterService } from './shared/event.emitter.service'
import { NgModule } from "@angular/core";
import { BrowserModule } from "@angular/platform-browser";
import { AppRoutingModule } from "./app-routing.module";
import { AppComponent } from "./app.component";
import { UserManagementComponent } from "./module/pages/admin/userManagment/userManagement.component";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { MatFormFieldModule } from "@angular/material/form-field";
import { HTTP_INTERCEPTORS, HttpClientModule } from "@angular/common/http";
import { SignupComponent } from "./module/pages/signup/signup.component";
import { StationComponent } from "./module/pages/admin/stationManagement/station/station.component";
import { ClientComponent } from "./module/pages/admin/stationManagement/client/client.component";
import { SensorComponent } from "./module/pages/admin/stationManagement/sensor/sensor.component";
import { HostComponent } from "./module/pages/admin/stationManagement/host/host.component";
import { EventEmitterService } from "./shared/event.emitter.service";
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
import { MatIconModule } from '@angular/material/icon'
import { StationManagementComponent } from './module/pages/admin/stationManagement/stationManagement.component'
import { MatSelectModule } from '@angular/material/select'
import { MatInputModule } from '@angular/material/input'
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { MatIconModule } from "@angular/material/icon";
import { StationManagementComponent } from "./module/pages/admin/stationManagement/stationManagement.component";
import { MatSelectModule } from "@angular/material/select";
import { MatInputModule } from "@angular/material/input";
import {
MAT_DATE_FORMATS,
MatDateFormats,
MatNativeDateModule,
NativeDateModule,
} from '@angular/material/core'
import { DataHeaderComponent } from './module/pages/admin/stationManagement/header/data-header/data-header.component'
import { ConfigHeaderComponent } from './module/pages/admin/stationManagement/header/config-header/config-header.component'
MAT_DATE_FORMATS,
MatDateFormats,
MatNativeDateModule,
NativeDateModule
} from "@angular/material/core";
import { DataHeaderComponent } from "./module/pages/admin/stationManagement/header/data-header/data-header.component";
import {
ConfigHeaderComponent
} from "./module/pages/admin/stationManagement/header/config-header/config-header.component";
import {
CjsTimline
} from "./module/components/charts/dendrometer-chart-js-timeline/dendrometer-chart-js-timeline.component";
import { ProViewComponent } from "./module/components/pro-view/pro-view.component";
import { MatAutocompleteModule } from "@angular/material/autocomplete";
import { MatCheckboxModule } from "@angular/material/checkbox";
import { InterceptorService } from "./shared/auth/interceptor.service";
import { ChartJSTimelineComponent } from "./module/components/charts/chart-js-timeline/chart-js-timeline.component";
import { MatButtonModule } from "@angular/material/button";
import { ThermometerComponent } from "./module/components/customUX/thermometer/thermometer.component";
import { HomeComponent } from "./module/pages/home/home.component";
import { LoginTailwindcssComponent } from "./module/pages/login/login.component";
import { SliderComponent } from "./module/pages/home/summary/list-icon/slider/slider.component";
import { MatSliderModule } from "@angular/material/slider";
import { MatCardModule } from "@angular/material/card";
import { ApiModule } from "../../projects/generated-api/src";
import { SummaryComponent } from "./module/pages/home/summary/summary.component";
import { ListIconComponent } from "./module/pages/home/summary/list-icon/list-icon.component";
import { MatDatepickerModule } from "@angular/material/datepicker";
import { MomentDateModule } from "@angular/material-moment-adapter";
import { MatTreeModule } from "@angular/material/tree";
import { FormDialogComponent } from "./module/components/customUX/forms/form-dialog/form-dialog.component";
import { AlertComponent } from "./module/components/customUX/alert/alert.component";
import { MatSnackBarModule } from "@angular/material/snack-bar";
import { MatButtonToggleModule } from "@angular/material/button-toggle";
import {
SumOrAverageCardComponent
} from "./module/pages/home/summary/list-icon/sum-or-average-card/sum-or-average-card.component";
import {
AverageMinMaxCardComponent
} from "./module/pages/home/summary/list-icon/average-min-max-card/average-min-max-card.component";
import {
DendrometerDailyValueCardComponent
} from "./module/pages/home/summary/list-icon/dendrometer-daily-value-card/dendrometer-daily-value-card.component";
import { MatTooltipModule } from "@angular/material/tooltip";
import { MatProgressSpinnerModule } from "@angular/material/progress-spinner";
import { MatPaginatorModule } from "@angular/material/paginator";
import { MatSort, MatSortModule } from "@angular/material/sort";
import { MatTableModule } from "@angular/material/table";
import { MatMenuModule } from "@angular/material/menu";
import { StationConfigComponent } from "./module/pages/home/station-config/station-config.component";
import { TableTimelineComponent } from "./module/components/tables/table-timeline/table-timeline.component";
import { CjsTimline } from './module/components/charts/dendrometer-chart-js-timeline/dendrometer-chart-js-timeline.component'
import { ProViewComponent } from './module/components/pro-view/pro-view.component'
import { MatAutocompleteModule } from '@angular/material/autocomplete'
import { MatCheckboxModule } from '@angular/material/checkbox'
import { InterceptorService } from './shared/auth/interceptor.service'
import { ChartJSTimelineComponent } from './module/components/charts/chart-js-timeline/chart-js-timeline.component'
import { MatButtonModule } from '@angular/material/button'
import { ThermometerComponent } from './module/components/customUX/thermometer/thermometer.component'
import { HomeComponent } from './module/pages/home/home.component'
import { LoginTailwindcssComponent } from './module/pages/login/login.component'
import { SliderComponent } from './module/pages/home/summary/list-icon/slider/slider.component'
import { MatSliderModule } from '@angular/material/slider'
import { MatCardModule } from '@angular/material/card'
import { ApiModule } from '../../projects/generated-api/src'
import { SummaryComponent } from './module/pages/home/summary/summary.component'
import { ListIconComponent } from './module/pages/home/summary/list-icon/list-icon.component'
import { MatDatepickerModule } from '@angular/material/datepicker'
import { MomentDateModule } from '@angular/material-moment-adapter'
import { MatTreeModule } from '@angular/material/tree'
import { FormDialogComponent } from './module/components/customUX/forms/form-dialog/form-dialog.component'
import { AlertComponent } from './module/components/customUX/alert/alert.component'
import { MatSnackBarModule } from '@angular/material/snack-bar'
import { MatButtonToggleModule } from '@angular/material/button-toggle'
import { SumOrAverageCardComponent } from './module/pages/home/summary/list-icon/sum-or-average-card/sum-or-average-card.component'
import { AverageMinMaxCardComponent } from './module/pages/home/summary/list-icon/average-min-max-card/average-min-max-card.component'
import { DendrometerDailyValueCardComponent } from './module/pages/home/summary/list-icon/dendrometer-daily-value-card/dendrometer-daily-value-card.component'
import { MatTooltipModule } from '@angular/material/tooltip'
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'
import { MatPaginatorModule } from '@angular/material/paginator'
import { MatSort, MatSortModule } from '@angular/material/sort'
import { MatTableModule } from '@angular/material/table'
import { MatMenuModule } from '@angular/material/menu'
import { StationConfigComponent } from './module/pages/home/station-config/station-config.component'
import { MatTooltipModule } from '@angular/material/tooltip';
import { TableTimelineComponent } from './module/components/tables/table-timeline/table-timeline.component'
import {MatSortModule} from "@angular/material/sort";
import {MatTableModule} from "@angular/material/table";
import {MatPaginatorModule} from "@angular/material/paginator";
const MY_DATE_FORMATS: MatDateFormats = {
parse: {
dateInput: 'DD/MM/YYYY',
},
display: {
dateInput: 'DD/MM/YYYY',
monthYearLabel: 'MMMM YYYY',
dateA11yLabel: 'DD/MM/YYYY',
monthYearA11yLabel: 'MMMM YYYY',
},
}
parse: {
dateInput: "DD/MM/YYYY"
},
display: {
dateInput: "DD/MM/YYYY",
monthYearLabel: "MMMM YYYY",
dateA11yLabel: "DD/MM/YYYY",
monthYearA11yLabel: "MMMM YYYY"
}
};
@NgModule({
declarations: [
AppComponent,
UserManagementComponent,
SignupComponent,
StationComponent,
HostComponent,
ClientComponent,
SensorComponent,
StationManagementComponent,
SummaryComponent,
DataHeaderComponent,
ConfigHeaderComponent,
CjsTimline,
ProViewComponent,
ChartJSTimelineComponent,
ThermometerComponent,
HomeComponent,
LoginTailwindcssComponent,
SliderComponent,
SummaryComponent,
ListIconComponent,
FormDialogComponent,
AlertComponent,
SumOrAverageCardComponent,
AverageMinMaxCardComponent,
DendrometerDailyValueCardComponent,
StationConfigComponent,
StationManagementComponent,
SensorComponent,
HostComponent,
ClientComponent,
StationComponent,
TableTimelineComponent,
],
imports: [
BrowserModule,
AppRoutingModule,
ReactiveFormsModule,
HttpClientModule,
FormsModule,
BrowserAnimationsModule,
MatIconModule,
MatFormFieldModule,
MatSelectModule,
MatDatepickerModule,
MatInputModule,
MatNativeDateModule,
MatAutocompleteModule,
MatCheckboxModule,
MatButtonModule,
ApiModule,
MatSliderModule,
MatCardModule,
MatDatepickerModule,
NativeDateModule,
MomentDateModule,
MatTreeModule,
MatSnackBarModule,
MatProgressSpinnerModule,
MatButtonToggleModule,
MatTooltipModule,
MatTableModule,
MatSortModule,
MatPaginatorModule
MatProgressSpinnerModule,
MatTableModule,
MatSortModule,
MatProgressSpinnerModule,
MatInputModule,
MatPaginatorModule,
MatMenuModule,
],
//Todo remove old swagger client
providers: [
EventEmitterService,
{
provide: HTTP_INTERCEPTORS,
useClass: InterceptorService,
multi: true,
},
{ provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMATS },
],
bootstrap: [AppComponent],
declarations: [
AppComponent,
UserManagementComponent,
SignupComponent,
StationComponent,
HostComponent,
ClientComponent,
SensorComponent,
StationManagementComponent,
SummaryComponent,
DataHeaderComponent,
ConfigHeaderComponent,
CjsTimline,
ProViewComponent,
ChartJSTimelineComponent,
ThermometerComponent,
HomeComponent,
LoginTailwindcssComponent,
SliderComponent,
SummaryComponent,
ListIconComponent,
FormDialogComponent,
AlertComponent,
SumOrAverageCardComponent,
AverageMinMaxCardComponent,
DendrometerDailyValueCardComponent,
StationConfigComponent,
StationManagementComponent,
SensorComponent,
HostComponent,
ClientComponent,
StationComponent,
TableTimelineComponent
],
imports: [
BrowserModule,
AppRoutingModule,
ReactiveFormsModule,
HttpClientModule,
FormsModule,
BrowserAnimationsModule,
MatIconModule,
MatFormFieldModule,
MatSelectModule,
MatDatepickerModule,
MatInputModule,
MatNativeDateModule,
MatAutocompleteModule,
MatCheckboxModule,
MatButtonModule,
ApiModule,
MatSliderModule,
MatCardModule,
MatDatepickerModule,
NativeDateModule,
MomentDateModule,
MatTreeModule,
MatSnackBarModule,
MatProgressSpinnerModule,
MatButtonToggleModule,
MatTooltipModule,
MatTableModule,
MatSortModule,
MatPaginatorModule,
MatProgressSpinnerModule,
MatTableModule,
MatSortModule,
MatProgressSpinnerModule,
MatInputModule,
MatPaginatorModule,
MatMenuModule
],
//Todo remove old swagger client
providers: [
EventEmitterService,
{
provide: HTTP_INTERCEPTORS,
useClass: InterceptorService,
multi: true
},
{ provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMATS }
],
bootstrap: [AppComponent]
})
export class AppModule {}
export class AppModule {
}
......@@ -45,6 +45,14 @@
</mat-form-field>
</div>
<div class="relative z-0 w-full mb-6 group ">
<mat-form-field class="w-full">
<mat-label>E-Mail des verantwortlichen Person (Statusmails)</mat-label>
<input formControlName="email" matInput />
<mat-error> Bitte kontrollieren sie die E-Mail Addresse</mat-error>
</mat-form-field>
</div>
<div class="relative z-0 w-full mb-6 group">
<mat-form-field class="w-full">
<mat-label>Notiz</mat-label>
......
......@@ -448,6 +448,9 @@ export class FormDialogComponent implements OnInit {
this.stationForm.controls["name"].setValue(
this.station?.name
);
this.stationForm.controls["email"].setValue(
this.station?.email
);
this.stationForm.controls["diary"].setValue(
this.station?.diary
);
......