Note Details redesign #1752

TheSlimvReal · 2023-03-01T10:56:10Z

see issue: #1083

Based on #1793 so review and merge this first.

Visible/Frontend Changes

enum dropdown component is used
More responsive design

Architectural/Backend Changes

Note details uses same form setup as other components that edit entities
Refactor ChildMeetingNoteAttendance to also work with the form setup (maybe this can become a individual datatype rather than a combination of children and childrenAttendance

github-actions · 2023-03-01T10:56:36Z

Deployed to https://pr-1752.aam-digital.net/

sleidig

code looks good 👍
I'll test UX and functional properly in the last PR

we are now completely loosing the confirmation dialog on closing a popup form but this was partly missing before, so maybe a separate topic (--> Unsaved details forms not warning before navigating away #1424)

src/app/core/form-dialog/form-dialog.service.ts

sleidig · 2023-03-30T17:28:06Z

src/app/core/entity/model/entity.ts

@@ -302,7 +301,7 @@ export class Entity {
   */
  public copy(generateNewId: boolean = false): this {
    const other = new (this.getConstructor())(this._id);
-    Object.assign(other, cloneDeep(this));
+    Object.assign(other, this);


I think we added the deep clone for a reason to make sure references/arrays are not reused?

There is a problem with that approach.
When we do a deep copy, we might make a "too deep" copy: E.g. the configurable enum values cannot be matched anymore because in the basic autocomplete component we use object equality but due to the deep copy this does not work anymore.
So I suggest that instead the subclasses take care of creating a proper copy that is as deep as it needs to be (this is anyway what we are already doing).

Sounds slightly risky to rely on the sub-classes to remember this, but I understand the point.

Isn't this impossible to cover config-defined array properties then?

Good point but then we have a slightly bigger topic to cover, I moved this to #1805

src/app/core/config/config-fix.ts

...-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts

src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.ts

src/app/child-dev-project/notes/note-details/note-details.component.spec.ts

src/app/child-dev-project/notes/note-details/note-details.component.ts

src/app/core/entity-components/entity-form/entity-form.service.ts

Common popup buttons

# Conflicts: # src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts # src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html # src/app/child-dev-project/attendance/attendance-details/attendance-details.component.ts # src/app/child-dev-project/children/child-block/child-block.component.ts # src/app/child-dev-project/children/child-details/grouped-child-attendance/grouped-child-attendance.component.ts # src/app/child-dev-project/children/children-list/bmi-block/bmi-block.component.spec.ts # src/app/child-dev-project/children/children-list/bmi-block/bmi-block.component.ts # src/app/child-dev-project/children/children-list/recent-attendance-blocks/recent-attendance-blocks.component.spec.ts # src/app/child-dev-project/children/children-list/recent-attendance-blocks/recent-attendance-blocks.component.ts # src/app/child-dev-project/children/dashboard-widgets/entity-count-dashboard/entity-count-dashboard.component.ts # src/app/child-dev-project/notes/notes-related-to-entity/notes-related-to-entity.component.ts # src/app/child-dev-project/schools/activities-overview/activities-overview.component.ts # src/app/child-dev-project/schools/child-school-overview/child-school-overview.component.spec.ts # src/app/child-dev-project/schools/child-school-overview/child-school-overview.component.ts # src/app/core/entity-components/entity-details/form/form.component.spec.ts # src/app/core/entity-components/entity-details/form/form.component.ts # src/app/core/entity-components/entity-details/related-entities/related-entities.component.spec.ts # src/app/core/entity-components/entity-details/related-entities/related-entities.component.ts # src/app/core/entity-components/entity-select/edit-entity-array/edit-entity-array.component.ts # src/app/core/entity-components/entity-utils/view-components/display-date/display-date.component.ts # src/app/core/form-dialog/form-dialog.service.spec.ts # src/app/core/form-dialog/form-dialog.service.ts # src/app/features/matching-entities/matching-entities/matching-entities.component.spec.ts # src/app/features/matching-entities/matching-entities/matching-entities.component.ts # src/app/features/todos/todos-related-to-entity/todos-related-to-entity.component.ts

and improve its layout

sleidig

pushed some small bug fixes and UI improvements. From my review and testing this looks good to go now! :-)

Co-authored-by: Sebastian <sebastian.leidig@gmail.com>

sonarcloud · 2023-04-04T17:14:12Z

Kudos, SonarCloud Quality Gate passed!

2 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

aam-digital-ci · 2023-04-04T17:29:58Z

🎉 This PR is included in version 3.20.0-master.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

aam-digital-ci · 2023-04-11T15:33:25Z

🎉 This PR is included in version 3.20.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

TheSlimvReal changed the base branch from master to dynamic_component_input March 22, 2023 15:04

TheSlimvReal force-pushed the note_redesign branch from 35ce62a to c6ed3be Compare March 23, 2023 14:40

TheSlimvReal marked this pull request as ready for review March 23, 2023 14:49

TheSlimvReal mentioned this pull request Mar 23, 2023

Common popup buttons #1794

Merged

1 task

TheSlimvReal added 11 commits March 27, 2023 09:10

dynamic component directive uses @input bindings

035207c

using @input in dynamic dashboard components

04f9030

using @input in all other dynamic components

afc2330

fixing tests

4745e50

fixed remaining tests

2c947e1

code cleanups

cb85add

fixed test

67199cd

removed unused import

56b099d

fixed lodash imports

ce1c1ca

using locale date format on default

0823719

improved form configuration to already hold additional schema config

116b0f3

TheSlimvReal force-pushed the dynamic_component_input branch from afa0f78 to 116b0f3 Compare March 27, 2023 07:10

TheSlimvReal added 13 commits March 27, 2023 09:12

making note-details use forms

0ce612a

note details component uses forms in UI

3205eee

note details is opened as form component

71dc580

working on note deep copy

868af62

added todo for making attendance select a form

58d54e7

removed unneeded openForm function

a8c97f8

added comment

8740f43

added component for editing children with attendance

fb8b9b7

edit attendance component allows to select attendance

25a5a82

fixed tests

b202a9b

removed log

ced4f25

made note details forms configurable

4671fb6

added delete button

edc16e3

TheSlimvReal added 5 commits March 27, 2023 09:34

edit attendance component allows to select attendance

20d9b2e

added delete button

cfc83e7

fix: using some buttons in all popups

75caf67

fixed tests

d897f8b

removed log

776fc3f

TheSlimvReal mentioned this pull request Mar 27, 2023

File uploads in Note #1742

Closed

Base automatically changed from dynamic_component_input to master March 30, 2023 17:28

sleidig requested changes Mar 30, 2023

View reviewed changes

sleidig mentioned this pull request Mar 30, 2023

Use EditConfigurableEnumComponent in NoteDetails #1725

Closed

TheSlimvReal and others added 12 commits April 3, 2023 14:53

Merge pull request #1794 from Aam-Digital/common_popup_buttons

fbd7916

Common popup buttons

cleaned up form dialog service

a0edcff

added configurable attachment to note

1776138

added missing @input

a999595

fixed test

739fa7e

added test for attendance selection

40219f8

added further tests

e1f4d0c

make corner close buttons look square

b4bcec2

some layout and margin improvements

7973c0f

tweak styling of attendee list

4c055b6

fix displaying attendees on mobile

2b6bfb3

and improve its layout

sleidig approved these changes Apr 4, 2023

View reviewed changes

add comment

991f56e

Co-authored-by: Sebastian <sebastian.leidig@gmail.com>

TheSlimvReal merged commit 9585bfd into master Apr 4, 2023

TheSlimvReal deleted the note_redesign branch April 4, 2023 17:28

aam-digital-ci added the released on @master label Apr 4, 2023

aam-digital-ci added the released label Apr 11, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Note Details redesign #1752

Note Details redesign #1752

TheSlimvReal commented Mar 1, 2023 •

edited

Loading

github-actions bot commented Mar 1, 2023

sleidig left a comment

sleidig Mar 30, 2023

TheSlimvReal Mar 30, 2023

sleidig Apr 4, 2023

TheSlimvReal Apr 4, 2023

sleidig left a comment

sonarcloud bot commented Apr 4, 2023

aam-digital-ci commented Apr 4, 2023

aam-digital-ci commented Apr 11, 2023

Note Details redesign #1752

Note Details redesign #1752

Conversation

TheSlimvReal commented Mar 1, 2023 • edited Loading

Visible/Frontend Changes

Architectural/Backend Changes

github-actions bot commented Mar 1, 2023

sleidig left a comment

Choose a reason for hiding this comment

sleidig Mar 30, 2023

Choose a reason for hiding this comment

TheSlimvReal Mar 30, 2023

Choose a reason for hiding this comment

sleidig Apr 4, 2023

Choose a reason for hiding this comment

TheSlimvReal Apr 4, 2023

Choose a reason for hiding this comment

sleidig left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Apr 4, 2023

aam-digital-ci commented Apr 4, 2023

aam-digital-ci commented Apr 11, 2023

TheSlimvReal commented Mar 1, 2023 •

edited

Loading