diff --git a/client/src/app/modules/keys/components/handover-dialog/handover-dialog.component.html b/client/src/app/modules/keys/components/handover-dialog/handover-dialog.component.html index dc4b694..d9a19d9 100644 --- a/client/src/app/modules/keys/components/handover-dialog/handover-dialog.component.html +++ b/client/src/app/modules/keys/components/handover-dialog/handover-dialog.component.html @@ -4,9 +4,10 @@ }

Übergaben {{ data.name }}

- + +
@@ -40,9 +41,15 @@
+ + + + + + @@ -69,12 +76,10 @@
Kunde
+ + + + - - - - - - \ No newline at end of file diff --git a/client/src/app/modules/keys/components/handover-dialog/handover-dialog.component.ts b/client/src/app/modules/keys/components/handover-dialog/handover-dialog.component.ts index 00d450b..e508b77 100644 --- a/client/src/app/modules/keys/components/handover-dialog/handover-dialog.component.ts +++ b/client/src/app/modules/keys/components/handover-dialog/handover-dialog.component.ts @@ -20,13 +20,12 @@ import {MatListModule} from '@angular/material/list'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatRadioModule} from '@angular/material/radio'; import { HotToastService } from '@ngxpert/hot-toast'; -import {MatExpansionModule} from '@angular/material/expansion'; import {MatTabsModule} from '@angular/material/tabs'; @Component({ selector: 'app-handover-dialog', standalone: true, - imports: [FormsModule, MatExpansionModule, MatTabsModule, ReactiveFormsModule, MatDatepickerModule, MatFormFieldModule, MatInputModule, MatButtonModule, MatDialogModule, CommonModule, MatAutocompleteModule, MatProgressSpinnerModule, MatRadioModule], + imports: [FormsModule, MatTabsModule, ReactiveFormsModule, MatDatepickerModule, MatFormFieldModule, MatInputModule, MatButtonModule, MatDialogModule, CommonModule, MatAutocompleteModule, MatProgressSpinnerModule, MatRadioModule], providers: [ provideNativeDateAdapter(), { provide: LOCALE_ID, useValue: 'de-DE' }, diff --git a/client/src/app/modules/keys/keys.component.ts b/client/src/app/modules/keys/keys.component.ts index bf37d2c..a299323 100644 --- a/client/src/app/modules/keys/keys.component.ts +++ b/client/src/app/modules/keys/keys.component.ts @@ -36,12 +36,14 @@ export class KeysComponent { { cellRenderer: AgOpenHandoutComponent, width: 100, - headerName: 'Übergabe' + headerName: 'Übergabe', + sortable: false, + colId: 'handover', }, - { field: 'handedOut' , headerName: 'Ausgegeben', width: 100, editable: false, filter: false, headerTooltip: 'Ausgegeben' }, - { field: 'name' , headerName: 'Name', flex: 1, editable: true, sort: 'asc', filter: true }, - { field: 'nr' , headerName: 'Schlüsselnummer', flex: 1, editable: true, filter: true }, - { field: 'cylinder' , headerName: 'Zylinder', flex: 1, editable: true, filter: true, cellRenderer: (data: any) => {return data.value?.name}, cellEditor: 'agSelectCellEditor', + { colId: 'handedOut', field: 'handedOut' , headerName: 'Ausgegeben', width: 100, editable: false, filter: false, headerTooltip: 'Ausgegeben' }, + { colId: 'name', field: 'name' , headerName: 'Name', flex: 1, editable: true, sort: 'asc', filter: true }, + { colId: 'nr', field: 'nr' , headerName: 'Schlüsselnummer', flex: 1, editable: true, filter: true }, + { colId: 'cylinder', field: 'cylinder' , headerName: 'Zylinder', flex: 1, editable: true, filter: true, cellRenderer: (data: any) => {return data.value?.name}, cellEditor: 'agSelectCellEditor', cellEditorParams: () => { return { values: this.cylinders, @@ -51,7 +53,7 @@ export class KeysComponent { return val.value?.name; } }, - { field: 'cylinder.system' , headerName: 'Schließanlage', flex: 1, editable: false, filter: true, cellRenderer: (data: any) => {return data.value?.name} }, + { colId: 'system', field: 'cylinder.system' , headerName: 'Schließanlage', flex: 1, editable: false, filter: true, cellRenderer: (data: any) => {return data.value?.name} }, { field: 'createdAt' , headerName: 'Erstellt' @@ -60,6 +62,7 @@ export class KeysComponent { , cellRenderer: (data: any) => this.datePipe.transform(new Date(data.value)) , tooltipValueGetter: (data: any) => this.datePipe.transform(new Date(data.value), 'medium') },{ + colId: 'updatedAt', field: 'updatedAt' , headerName: 'Geändert' , width: 120 @@ -69,7 +72,7 @@ export class KeysComponent { } ], loading: true, - rowHeight: 48, + rowHeight: 36, } ngOnInit(): void { diff --git a/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.html b/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.html index 5df3305..fba54ca 100644 --- a/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.html +++ b/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.html @@ -1 +1 @@ -
+
diff --git a/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.scss b/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.scss index 0708e2b..b8c9b12 100644 --- a/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.scss +++ b/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.scss @@ -7,5 +7,5 @@ } .handover { - background-image: url('../../../../../assets/img/handover.svg'); + background-image: url('../../../../../assets/img/key_2.svg'); } \ No newline at end of file diff --git a/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.ts b/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.ts index 2a34237..4cce201 100644 --- a/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.ts +++ b/client/src/app/shared/ag-grid/components/ag-open-handout/ag-open-handout.component.ts @@ -4,11 +4,12 @@ import { ICellRendererParams } from 'ag-grid-community'; import { IKey } from '../../../../model/interface/key.interface'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { HandoverDialogComponent } from '../../../../modules/keys/components/handover-dialog/handover-dialog.component'; +import {MatTooltipModule} from '@angular/material/tooltip'; @Component({ selector: 'app-ag-open-handout', standalone: true, - imports: [MatDialogModule], + imports: [MatDialogModule, MatTooltipModule], templateUrl: './ag-open-handout.component.html', styleUrl: './ag-open-handout.component.scss' }) diff --git a/client/src/assets/img/key_2.svg b/client/src/assets/img/key_2.svg new file mode 100644 index 0000000..972691d --- /dev/null +++ b/client/src/assets/img/key_2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/styles.scss b/client/src/styles.scss index bbd9ee6..0254bb8 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -29,11 +29,11 @@ html, body { padding: 4px; box-sizing: border-box; border-radius: 6px; - background-size: 28px; + background-size: 20px; background-position: center; background-repeat: no-repeat; - width: 38px; - height: 38px; + width: 26px; + height: 26px; }