Skip to content

feat(draw): Management of the editing of individual element #1065

Merged
pelord merged 52 commits into
nextfrom
DessinApplicationStyleParElement
Nov 3, 2022
Merged

feat(draw): Management of the editing of individual element #1065
pelord merged 52 commits into
nextfrom
DessinApplicationStyleParElement

Conversation

@kalvinkhuu
Copy link
Copy Markdown
Contributor

Please check if the PR fulfills these requirements

What is the current behavior? (You can also link to an open issue here)

Link to the issue

What is the new behavior?

  1. User can now edit the fill and stroke color, the font style and size and the offset of the label of individual drawing
  2. The edition table will only appears if the user selected an element

Does this PR introduce a breaking change? (check one with "x")

  • Yes
  • No

If this PR contains a breaking change, please describe the impact and migration path for existing applications:

Other information:

kalvinkhuu added 12 commits May 19, 2022 10:33
   * In the store, each entities have their own style, but when applying the style,
   * the setStyle function does not recognize each entities
   *
   * TODO:
   *  Either redo the setStyle function to take in entities or find a
   *  way to change the features inside the store
   *
   *  When changing the label, set the style to the original style
   *
   *  Repeat this for all colors
   *
   *  Remove any useless things and add comments
draw.interface.ts:
	Add attributes for color stroke and color fill
draw.component.ts:
	Change the global variables of fillForm and strokeForm
	Create functions to return their color stroke and fill
	Do a similar thing as onFontChange
draw-style.service.ts
(Housecleaning: Change the variable for the properties of each features)
Bugs:
- When moving the drawing, it resets the color and the font
- When the user edits the label, it bugs the whole website
Might change the design of the page
Started playing with the design of the page
Need to clean the code and work on if it is an icon
@PhilippeLafreniere18 PhilippeLafreniere18 marked this pull request as draft June 1, 2022 15:38
Comment thread packages/common/src/lib/entity/entity-table/entity-table.component.html Outdated
Comment thread packages/common/src/lib/entity/entity-table/entity-table.component.scss Outdated
Comment thread packages/geo/src/locale/en.geo.json
Comment thread packages/geo/src/locale/fr.geo.json Outdated
Comment thread packages/geo/src/lib/draw/draw/draw.component.html Outdated
@PhilippeLafreniere18 PhilippeLafreniere18 marked this pull request as ready for review July 6, 2022 18:14
Copy link
Copy Markdown
Member

@pelord pelord left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bundle the feature style changer into a standalone component

@PhilippeLafreniere18 PhilippeLafreniere18 added the in progress In progress // Développement en cours label Oct 28, 2022
@PhilippeLafreniere18 PhilippeLafreniere18 added ready to merge and removed in progress In progress // Développement en cours labels Nov 2, 2022
@pelord pelord merged commit 8427863 into next Nov 3, 2022
@PhilippeLafreniere18 PhilippeLafreniere18 deleted the DessinApplicationStyleParElement branch November 30, 2022 18:44
cbourget pushed a commit that referenced this pull request Mar 21, 2023
* Merge branch 'DrawingGestionOnLabels' into DessinGestionDesEtiquettes

* Progress in the selection of the element

   * In the store, each entities have their own style, but when applying the style,
   * the setStyle function does not recognize each entities
   *
   * TODO:
   *  Either redo the setStyle function to take in entities or find a
   *  way to change the features inside the store
   *
   *  When changing the label, set the style to the original style
   *
   *  Repeat this for all colors
   *
   *  Remove any useless things and add comments

* Working selection of an element for font size and font style

Need to do onColorChange

* TODO next week

draw.interface.ts:
	Add attributes for color stroke and color fill
draw.component.ts:
	Change the global variables of fillForm and strokeForm
	Create functions to return their color stroke and fill
	Do a similar thing as onFontChange
draw-style.service.ts
(Housecleaning: Change the variable for the properties of each features)

* Selection per element for the color works

Bugs:
- When moving the drawing, it resets the color and the font
- When the user edits the label, it bugs the whole website

* Working features

Might change the design of the page

* Partially clean it up

Started playing with the design of the page

* Implemented edition of the position of label

Need to clean the code and work on if it is an icon

* Cleaned up the code

* Added a CSS style for the edition of the draw

* removed unused code

* Initial scrollbar for the table

* Progress in table

* Update entity-table.component.html

* formatted the html

* format ts file

* Fixed some formatting issues

* Redid design of the inputs box

* updated format

* edit the formatting

* Update package-lock.json

* Implemented a possible solution

* Dynamic table height

Uses the length of the store ()

* Update to fit 6 elements of the table

* Cleaned up the code

* Reformatting

* reformating

* reformatting

* Requested changes

* updateFrontend to getFeature

* fix ol geometry type

* remove flashing from layer refresh

* fix(draw): fix font and offset flashing geom change

* feat(draw): only display border color with linestring

* feat(layer): add reusable style modal component

* fix/feat(draw): upgrade to color-picker 13 + icon and modal fix

* i18n(draw): traduction change

* fix/feat(draw): deselect on init / css minor fix / add tooltip

Co-authored-by: Philippe Lafreniere <philippe.lafreniere@msp.gouv.qc.ca>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants