Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Note Details redesign #1752

Merged
merged 49 commits into from
Apr 4, 2023
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
035207c
dynamic component directive uses @Input bindings
TheSlimvReal Mar 21, 2023
04f9030
using @Input in dynamic dashboard components
TheSlimvReal Mar 21, 2023
afc2330
using @Input in all other dynamic components
TheSlimvReal Mar 21, 2023
4745e50
fixing tests
TheSlimvReal Mar 21, 2023
2c947e1
fixed remaining tests
TheSlimvReal Mar 22, 2023
cb85add
code cleanups
TheSlimvReal Mar 22, 2023
67199cd
fixed test
TheSlimvReal Mar 22, 2023
56b099d
removed unused import
TheSlimvReal Mar 22, 2023
ce1c1ca
fixed lodash imports
TheSlimvReal Mar 22, 2023
0823719
using locale date format on default
TheSlimvReal Mar 22, 2023
116b0f3
improved form configuration to already hold additional schema config
TheSlimvReal Mar 23, 2023
0ce612a
making note-details use forms
TheSlimvReal Feb 23, 2023
3205eee
note details component uses forms in UI
TheSlimvReal Feb 23, 2023
71dc580
note details is opened as form component
TheSlimvReal Feb 23, 2023
868af62
working on note deep copy
TheSlimvReal Feb 28, 2023
58d54e7
added todo for making attendance select a form
TheSlimvReal Mar 1, 2023
a8c97f8
removed unneeded openForm function
TheSlimvReal Mar 1, 2023
8740f43
added comment
TheSlimvReal Mar 1, 2023
fb8b9b7
added component for editing children with attendance
TheSlimvReal Mar 20, 2023
25a5a82
edit attendance component allows to select attendance
TheSlimvReal Mar 22, 2023
b202a9b
fixed tests
TheSlimvReal Mar 22, 2023
ced4f25
removed log
TheSlimvReal Mar 22, 2023
4671fb6
made note details forms configurable
TheSlimvReal Mar 23, 2023
edc16e3
added delete button
TheSlimvReal Mar 23, 2023
ac7d95b
not using deep clone anymore to keep enum equality
TheSlimvReal Mar 23, 2023
da0d4ac
fixed rebase
TheSlimvReal Mar 27, 2023
4adb2fb
making note-details use forms
TheSlimvReal Feb 23, 2023
51f0563
note details component uses forms in UI
TheSlimvReal Feb 23, 2023
aa3af29
note details is opened as form component
TheSlimvReal Feb 23, 2023
38b05d0
working on note deep copy
TheSlimvReal Feb 28, 2023
d890549
added todo for making attendance select a form
TheSlimvReal Mar 1, 2023
20d9b2e
edit attendance component allows to select attendance
TheSlimvReal Mar 22, 2023
cfc83e7
added delete button
TheSlimvReal Mar 23, 2023
75caf67
fix: using some buttons in all popups
TheSlimvReal Mar 23, 2023
d897f8b
fixed tests
TheSlimvReal Mar 23, 2023
776fc3f
removed log
TheSlimvReal Mar 27, 2023
fbd7916
Merge pull request #1794 from Aam-Digital/common_popup_buttons
TheSlimvReal Apr 3, 2023
a0edcff
cleaned up form dialog service
TheSlimvReal Apr 3, 2023
1776138
added configurable attachment to note
TheSlimvReal Apr 3, 2023
a999595
added missing @Input
TheSlimvReal Apr 3, 2023
739fa7e
fixed test
TheSlimvReal Apr 3, 2023
40219f8
added test for attendance selection
TheSlimvReal Apr 3, 2023
93ec815
Merge remote-tracking branch 'origin/master' into note_redesign
TheSlimvReal Apr 3, 2023
e1f4d0c
added further tests
TheSlimvReal Apr 4, 2023
b4bcec2
make corner close buttons look square
sleidig Apr 4, 2023
7973c0f
some layout and margin improvements
sleidig Apr 4, 2023
4c055b6
tweak styling of attendee list
sleidig Apr 4, 2023
2b6bfb3
fix displaying attendees on mobile
sleidig Apr 4, 2023
991f56e
add comment
TheSlimvReal Apr 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed lodash imports
TheSlimvReal committed Mar 27, 2023
commit ce1c1ca8e91f556d963c4f3846dcec9f10d54475
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import { EntitySchemaService } from "../../entity/schema/entity-schema.service";
import { DynamicValidatorsService } from "./dynamic-form-validators/dynamic-validators.service";
import { EntityAbility } from "../../permissions/ability/entity-ability";
import { InvalidFormFieldError } from "./invalid-form-field.error";
import * as _ from "lodash-es";
import { omit } from "lodash-es";

/**
* These are utility types that allow to define the type of `FormGroup` the way it is returned by `EntityFormService.create`
@@ -157,7 +157,7 @@ export class EntityFormService {
// Patch form with values from the entity
form.patchValue(entity as any);
// Clear values that are not yet present on the entity
const newKeys = Object.keys(_.omit(form.controls, Object.keys(entity)));
const newKeys = Object.keys(omit(form.controls, Object.keys(entity)));
newKeys.forEach((key) => form.get(key).setValue(null));
form.markAsPristine();
}
Original file line number Diff line number Diff line change
@@ -26,11 +26,11 @@ import { MatExpansionModule } from "@angular/material/expansion";
import { MatInputModule } from "@angular/material/input";
import { MatButtonModule } from "@angular/material/button";
import { MatAutocompleteModule } from "@angular/material/autocomplete";
import * as _ from "lodash";
import { BasicAutocompleteComponent } from "../../../core/configurable-enum/basic-autocomplete/basic-autocomplete.component";
import { DisplayEntityComponent } from "../../../core/entity-components/entity-select/display-entity/display-entity.component";
import { EntityMapperService } from "../../../core/entity/entity-mapper.service";
import { MatTooltipModule } from "@angular/material/tooltip";
import { pick } from "lodash-es";

@RouteTarget("Import")
@Component({
@@ -242,10 +242,7 @@ export class DataImportComponent {
}

private loadColumnMapping(columnMap: ImportColumnMap) {
Object.assign(
this.columnMap,
_.pick(columnMap, Object.keys(this.columnMap))
);
Object.assign(this.columnMap, pick(columnMap, Object.keys(this.columnMap)));
}

private patchIfPossible<T>(form: AbstractControl<T>, patch: T) {