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

Move IncidentType to DBDashboard #20

Merged
merged 1 commit into from
May 11, 2024

Conversation

dienruei123
Copy link
Collaborator

IMPORTANT: Please do not create a Pull Request without creating an issue first.

Summary

Issue: Enter the issue(s) this pull request resolves.

A clear and concise description of this pull request

Type (Fill in "x" to check)

  • Bug Fix
  • New Feature

Checklist

Please make sure that all items are checked before submitting this request.

  • Code linter has been run and issues have all been resolved
  • The code has been thoroughly tested and no visible bugs have been introduced
  • The pull request will completely resolve the issue(s) mentioned
  • The pull request only resolves the issue(s) mentioned and nothing more

Additional context

Add any other context here.

@dienruei123 dienruei123 merged commit 631d9d6 into rakechen-0307:main May 11, 2024
1 of 3 checks passed
@dienruei123 dienruei123 deleted the incident branch May 11, 2024 18:41
dienruei123 added a commit to dienruei123/Taipei-City-Dashboard that referenced this pull request May 26, 2024
rakechen-0307 added a commit that referenced this pull request Jun 2, 2024
* disable ssl, add user location

* Add new incident report module (#13)

* Dev1 (#14)

* add two components

* add download info function

* disaster and stuff

* region position

* ..

* QQ

* Finish incident routes, modify AdminDisaster.vue (#15)

* add download info function

* upload to geojson not finished

* automatic update geojson

* Automatic Update GeoJson  (#16)

* add two components

* add download info function

* upload to geojson not finished

* automatic update geojson

* add download info function

* upload to geojson not finished

* automatic update geojson

* Minor fix: squash functions & init_migrate incident DB (#17)

* add two components

* add download info function

* Dev3 (#18)

* add download info function

* upload to geojson not finished

* automatic update geojson

* add two components

* add download info function

---------

Signed-off-by: 陳柏睿 <[email protected]>

* Disaster Icon (#19)

* 1

* 1

* db

* download info dialog

* disaster icons

---------

Co-authored-by: fuyingxx0 <[email protected]>

* Move IncidentType to DBDashboard (#20)

* adjust adminDisaster

* small fix

* Adjust AdminDisaster (#21)

* add download info function

* upload to geojson not finished

* automatic update geojson

* add two components

* add download info function

* adjust adminDisaster

* small fix

* fix location bug

* Fix Location Bug (#22)

* add download info function

* upload to geojson not finished

* automatic update geojson

* add two components

* add download info function

* adjust adminDisaster

* small fix

* fix location bug

* map multiple icons

* Map Multiple Icons (#23)

* add download info function

* upload to geojson not finished

* automatic update geojson

* add two components

* add download info function

* adjust adminDisaster

* small fix

* fix location bug

* map multiple icons

* Fix route issues (#24)

* feat(FE): advanced life support

* adminDisaster

* Dev6 (#26)

* add download info function

* upload to geojson not finished

* automatic update geojson

* add two components

* add download info function

* adjust adminDisaster

* small fix

* fix location bug

* map multiple icons

* adminDisaster

* Add & Finish notification feature (#27)

* fix distance bug

* Fix Distance Bug (#28)

* add download info function

* upload to geojson not finished

* automatic update geojson

* add two components

* add download info function

* adjust adminDisaster

* small fix

* fix location bug

* map multiple icons

* adminDisaster

* fix distance bug

* small change

* Dev7 (#29)

* add download info function

* upload to geojson not finished

* automatic update geojson

* add two components

* add download info function

* adjust adminDisaster

* small fix

* fix location bug

* map multiple icons

* adminDisaster

* fix distance bug

* small change

* demo ver.

* Demo Ver. (#30)

* add download info function

* upload to geojson not finished

* automatic update geojson

* add two components

* add download info function

* adjust adminDisaster

* small fix

* fix location bug

* map multiple icons

* adminDisaster

* fix distance bug

* small change

* demo ver.

* copy of hackathon version

* Incident report form adjustments (#33)

* Remove IncidentType DB init

* Configure routes (incident, ws), remove unused routes (incidentType)

* Configure Incident related functions, types; remove IncidentType related codes

* Configure Incident related functions, remove IncidentType related functions

* Place unused callback func (ws, write)

* Remove ws

* Add new attr: Status

* Handle AdminDisaster page: handle Status related logic, little css, remove unused code

* Modify Time type

* no need to send time info

* Limit description maxlength

* Modify time display, fix some css

* Delete disaster logic, commented updateDisaster

* handleDelete

* Modify updateDisaster (not used) & rewrite handleReview function

* modify notif display

* Add filter status

* Add filter option

* Add filter status interface

* move fetch location to backend

* remove unnecessary parts

* fix conflict

* small adjustment

* frontend linting

* Bug Fix: Incident report dialog display

---------

Signed-off-by: 陳柏睿 <[email protected]>
Co-authored-by: dienruei123 <[email protected]>
Co-authored-by: fuyingxx0 <[email protected]>
Co-authored-by: Brian Tzu-Pin Ho <[email protected]>
Co-authored-by: Brian Tzu-Pin Ho <[email protected]>
Co-authored-by: dienruei123 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant