diff --git a/README.md b/README.md index e1a865fc..f6a10a1c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ +# Achtung: Bitte Milestone Simulation mit oberster Priorität abarbeiten!! +# Für Simulations-Features (sofern nicht generell gültig) Branch 'Pilot' nutzen. [![IMIS Cover](client/public/web-imis.png)](http://www.youtube.com/watch?v=XIIlMh3Lbsc "Pitch") - * [Demo](http://imis-prototyp.de) - * [Swagger API](http://imis-prototyp.de/swagger-ui.html) + * [Demo](https://imis-prototyp.de) + * [Swagger API](https://imis-prototyp.de/swagger-ui.html) * [Video pitch](https://www.youtube.com/watch?v=XIIlMh3Lbsc) Dieses Projekt entstand im Rahmen des [#WirvsVirus](https://wirvsvirushackathon.org/)-Hackathon. @@ -11,7 +13,9 @@ Dieses Projekt entstand im Rahmen des [#WirvsVirus](https://wirvsvirushackathon. * Mit freundlicher Unterstützung von [https://covidmeldeprozess.de/](https://covidmeldeprozess.de/) # Development -![Build](https://github.com/imis-Infektionsfall-uebermittellung/1_011_a_infektionsfall_uebermittellung/workflows/Build%20and%20Test/badge.svg?branch=dev) and ![Deployment](https://github.com/imis-Infektionsfall-uebermittellung/1_011_a_infektionsfall_uebermittellung/workflows/Build%20and%20Deploy%20to%20GKE/badge.svg?branch=dev) +### [Prod](https://imis-prototyp.de) ![Test](https://github.com/ImisDevelopers/1_011_a_infektionsfall_uebermittellung/workflows/Build%20and%20Test/badge.svg?branch=master&event=push) ![Deploy](https://github.com/ImisDevelopers/1_011_a_infektionsfall_uebermittellung/workflows/Deploy/badge.svg) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/imisDevelopers/1_011_a_infektionsfall_uebermittellung?color=green) +### [Dev](https://staing.imis-prototyp.de) ![Test](https://github.com/ImisDevelopers/1_011_a_infektionsfall_uebermittellung/workflows/Build%20and%20Test/badge.svg?branch=dev&event=push) ![Deploy](https://github.com/ImisDevelopers/1_011_a_infektionsfall_uebermittellung/workflows/Deploy/badge.svg?branch=dev&event=push) +### [Pilot](https://pilot.imis-prototyp.de) ![Test](https://github.com/ImisDevelopers/1_011_a_infektionsfall_uebermittellung/workflows/Build%20and%20Test/badge.svg?branch=pilot&event=push) ![Deploy](https://github.com/ImisDevelopers/1_011_a_infektionsfall_uebermittellung/workflows/Deploy/badge.svg?branch=pilot&event=push) ## General Guidelines _DO NOT COMMIT TO MASTER_ @@ -86,7 +90,7 @@ But you have to run Postgres in docker or install it and run it locally manually ## API communication An API developed by the backend is served via swagger on the server: http://localhost/swagger-ui.html -We are using the swagger docs to auto-generate the typescript api client. +We are using the swagger docs to autogenerate the typescript api client. ```yarn generate:api-client``` Make sure the server is running locally, the command updates the ts api client @@ -95,8 +99,6 @@ When you make changes to the backend, make sure to generate a new client. ## CI system All commits to `dev`, `master`, `feature/*` and all PRs will be CI checked. -New commit to `dev` will result in new release to: - * [staging.imis-prototyp.de](https://staging.imis-prototyp.de) - * [Swagger API](https://staging.imis-prototyp.de/swagger-ui.html) +New commit to `dev` will result in new release to `staging.imis-prototyp.de`. -A new release to `imis-prototyp.de` is not triggered by commit on `master` but by a [new release tag](https://github.com/ImisDevelopers/1_011_a_infektionsfall_uebermittellung/releases/new). \ No newline at end of file +A new release to `imis-prototyp.de` is not triggerd by commit on `master` but by a new release tag. diff --git a/client/src/components/LocationFormGroup.vue b/client/src/components/LocationFormGroup.vue index 983ae419..7fb74a2a 100644 --- a/client/src/components/LocationFormGroup.vue +++ b/client/src/components/LocationFormGroup.vue @@ -9,27 +9,16 @@ - @@ -74,15 +63,33 @@ - + placeholder="Bitte wählen..." + v-decorator="[keys.country, { rules: [{ + required: $props.required!==false, + message: 'Bitte Land auswählen', + }], initialValue: initialCountry()}]" + > + Belgien + Dänemark + Deutschland + Frankreich + Griechenland + Großbritannien + Italien + Luxemburg + Niederlande + Österreich + Polen + Portugal + Russland + Schweiz + Spanien + Tschechien + Türkei + @@ -171,7 +178,7 @@ export default Vue.extend({ }, async handleZipSearch(value: string) { this.currentZipSearch = value - if (!value || value.length < 2) { + if (!value || value.length < 4) { this.zips = [] } else { const result: Plz[] = await getPlzs(value) diff --git a/client/src/models/case-status.ts b/client/src/models/case-status.ts new file mode 100644 index 00000000..9db07f41 --- /dev/null +++ b/client/src/models/case-status.ts @@ -0,0 +1,52 @@ +import { PatientStatus2 } from '@/models/index' + +export interface CaseStatusItem { + id: PatientStatus2; + label: string; + icon: string; +} + +export const caseStatus: CaseStatusItem[] = [ + { + id: 'REGISTERED', + label: 'Registriert', + icon: 'login', + }, { + id: 'CONTACT', + label: 'Kontaktfall', + icon: 'search', + }, { + id: 'SUSPECTED', + label: 'Verdachtsfall', + icon: 'search', + }, { + id: 'TEST_FINISHED_POSITIVE', + label: 'Bestätigter Fall', + icon: 'check', + }, { + id: 'TEST_FINISHED_NEGATIVE', + label: 'Ausgeräumter Fall', + icon: 'stop', + }, { + id: 'RECOVERED_WITH_EMISSION', + label: 'Genesener Fall mit Ausscheidung', + icon: 'logout', + }, { + id: 'RECOVERED_NO_EMISSION', + label: 'Genesener Fall ohne Ausscheidung', + icon: 'logout', + }, { + id: 'RECOVERED_NO_TEST', + label: 'Genesener Fall ohne Nachweis', + icon: 'logout', + }, { + id: 'PATIENT_DEAD', + label: 'Verstorben', + icon: 'cloud', + }, + { + id: 'QUARANTINE_MANDATED', + label: 'Quarantäne angeordnet', + icon: 'safety', + }, +] diff --git a/client/src/models/risk-occupation.ts b/client/src/models/risk-occupation.ts index aa2c631d..43fe05ab 100644 --- a/client/src/models/risk-occupation.ts +++ b/client/src/models/risk-occupation.ts @@ -6,12 +6,12 @@ export interface RiskOccupationOption { } export const RISK_OCCUPATIONS: RiskOccupationOption[] = [ - { value: 'PUBLIC_ADMINISTRATION', label: 'Öffentliche Verwaltung' }, - { value: 'STUDENT', label: 'Schüler' }, - { value: 'TEACHER', label: 'Lehrer' }, - { value: 'FIRE_FIGHTER_POLICE', label: 'Gefahrenabwehr (Polizei, Feuerwehr usw.)' }, { value: 'DOCTOR', label: 'Arzt/Ärztin' }, { value: 'NURSE', label: 'Pflegepersonal' }, { value: 'CAREGIVER', label: 'Altenpflege' }, + { value: 'FIRE_FIGHTER_POLICE', label: 'Gefahrenabwehr (Polizei, Feuerwehr usw.)' }, + { value: 'PUBLIC_ADMINISTRATION', label: 'Öffentliche Verwaltung' }, + { value: 'STUDENT', label: 'Schüler-in' }, + { value: 'TEACHER', label: 'Lehrer-in/Kindergärtner-in' }, { value: 'NO_RISK_OCCUPATION', label: 'Keiner der genannten (bitte unten eingeben)' }, ] diff --git a/server/src/main/java/de/coronavirus/imis/config/WebMvcConfig.java b/server/src/main/java/de/coronavirus/imis/config/WebMvcConfig.java index e7493b2b..da351785 100644 --- a/server/src/main/java/de/coronavirus/imis/config/WebMvcConfig.java +++ b/server/src/main/java/de/coronavirus/imis/config/WebMvcConfig.java @@ -10,8 +10,11 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") - .allowedOrigins("https://imis-prototyp.de", "https://staging.imis-prototyp.de", - "http://imis-prototyp.de", "http://localhost:8080") + .allowedOrigins("https://imis-prototyp.de", + "https://staging.imis-prototyp.de", + "https://pilot.imis-prototyp.de", + "http://imis-prototyp.de", + "http://localhost:8080") .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") .allowCredentials(true); } diff --git a/server/src/main/resources/sample_data/createDepartmentOfHealth.json b/server/src/main/resources/sample_data/createDepartmentOfHealth.json index c412e35e..99fc2b04 100644 --- a/server/src/main/resources/sample_data/createDepartmentOfHealth.json +++ b/server/src/main/resources/sample_data/createDepartmentOfHealth.json @@ -1,12 +1,12 @@ { "institutionType": "DEPARTMENT_OF_HEALTH", - "name": "Krankenhaus", - "street": "Rhein-Straße", - "houseNumber": "13a", - "zip": "3454325", - "city": "Köln", - "email": "clinic@example.de", + "name": "Gesundheitsamt", + "street": "Hauptstrasse", + "houseNumber": "10-12", + "zip": "66117", + "city": "Saarbrücken", + "email": "healthagency@example.de", "phoneNumber": "43345", - "comment": "this is a comment for the clinic", + "comment": "this is a comment for the health agency", "id": "asdfa" } diff --git a/server/src/main/resources/sample_data/createLaboratory.json b/server/src/main/resources/sample_data/createLaboratory.json index 8cec9a04..b13dc05a 100644 --- a/server/src/main/resources/sample_data/createLaboratory.json +++ b/server/src/main/resources/sample_data/createLaboratory.json @@ -3,7 +3,7 @@ "name": "Labor123", "street": "Hauptstraße", "houseNumber": "12", - "zip": "2453543", + "zip": "10115", "city": "Berlin", "email": "email@example.de", "phoneNumber": "123456",