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.

Sign up for GitHub

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

Jump to bottom

Waitp 1231 base matrix part 2 #4714

Merged
merged 18 commits into from
Jul 11, 2023
Merged

Waitp 1231 base matrix part 2 #4714

merged 18 commits into from
Jul 11, 2023

Commits on Jul 7, 2023

  1. Working legend, grouped columns

    @alexd-bes
    alexd-bes committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    59ee3b3 View commit details
    Browse the repository at this point in the history

  2. Apply location values

    @alexd-bes
    alexd-bes committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    d294c79 View commit details
    Browse the repository at this point in the history

  3. Tidy up

    @alexd-bes
    alexd-bes committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    00732cd View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. Styled column groups

    @alexd-bes
    alexd-bes committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    d595b39 View commit details
    Browse the repository at this point in the history

  2. Tiy up files

    @alexd-bes
    alexd-bes committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    d872192 View commit details
    Browse the repository at this point in the history

  3. Add in hidden column titles

    @alexd-bes
    alexd-bes committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    e18fde6 View commit details
    Browse the repository at this point in the history

  4. Update hidden column title and config types

    @alexd-bes
    alexd-bes committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    bb1705f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'epic-frontend-rewrite' into waitp-1231-base-matrix-part-2

    @alexd-bes
    alexd-bes committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    32abaf4 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Generate types

    @alexd-bes
    alexd-bes committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    140f95b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'epic-frontend-rewrite' into waitp-1231-base-matrix-part-2

    @alexd-bes
    alexd-bes committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    a548ee8 View commit details
    Browse the repository at this point in the history

  3. Move the buttons

    @alexd-bes
    alexd-bes committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    1d95911 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'waitp-1231-base-matrix-component' into waitp-1231-base-… 

    …matrix-part-2
    @tcaiger
    tcaiger committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    81d936c View commit details
    Browse the repository at this point in the history

  5. WAITP-1222: Marker layer (#4686) 

    * setup map entites

* wip

* wip

* re organise project view

* mobile search layout

* polygon layer

* map animation

* fix mini map

* Update Dashboard.tsx

* merging

* map overlay data

* add Map overlays feature folder

* useEntitiesWithLocation

* typescript

* remove test code

* Update InteractivePolygon.tsx

* set up

* fix api

* marker layer

* Update types.d.ts

* update map layout

* wip map overlays

* revert map control layout

* Update useEntities.ts

* copy lesmis

* wip

* Update MapOverlayList.tsx

* default map overlay

* radius overlays

* navigate to dashboard

* fix scroll

* measure level

* refactor marker layer

* refactor useDefaultMapOverlay

* types

* useEntitiesByMeasureLevel

* Update MapOverlaysRoute.ts

* fix active entity

* Update MarkerLayer.tsx

* add comments

* Update processMeasureData.ts

* refactor useDefaultMapOverlay
    @tcaiger
    tcaiger authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    da68bb5 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Merge branch 'epic-frontend-rewrite' into waitp-1231-base-matrix-part-2

    @alexd-bes
    alexd-bes committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    16ae71c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'waitp-1231-base-matrix-component' into waitp-1231-base-… 

    …matrix-part-2
    @alexd-bes
    alexd-bes committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    b3ce5f0 View commit details
    Browse the repository at this point in the history

  3. Fix merge conflicts

    @alexd-bes
    alexd-bes committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    0fe0210 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'waitp-1231-base-matrix-component' into waitp-1231-base-… 

    …matrix-part-2
    @alexd-bes
    alexd-bes committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    708e783 View commit details
    Browse the repository at this point in the history

  5. Fix conflict errors

    @alexd-bes
    alexd-bes committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    c466635 View commit details
    Browse the repository at this point in the history