Merge branch 'development' of https://github.com/hzi-braunschweig/SORMAS-Project into 3110-Incorrect_behavior_on_Person_forms_related_to_Facility_fields

Author: sergiupacurariu

CONTRIBUTING.md

@@ -79,19 +79,36 @@ If you're interested in participating in the development of SORMAS, you can use
    > #61 - added model to define classification, apply automatic case classification whenever a field value changes
 6. Each pull request should be related to a single issue (if possible). 
 
-### SORMAS Sprint Board
+### SORMAS Product Backlog
 
-The SORMAS sprint board is segmented into the following categories:
+The board **Product Backlog** is used to plan, refine and prioritize the tickets for the upcoming sprints. 
+The sorting from top to bottom in every column reflects the priority for the product. The Product Owner is responsible to put tickets into the Backlog and keep the ticket information updated.
 
-* **Backlog:** Issues that have been selected to be done in the current sprint, but for which work has not yet started.
+The Product Backlog contains the following columns:
+* **Backlog:** Issues that have been identified by the Product Owner to be done in the next sprints. There can be a column for each Scrum Team if it fits the need.
+* **Sprint n:** Contain tickets picked by the Product Owner to be done in the named sprint. Text notes or separate columns are used to separate issues between Scrum Teams. It gives a forecast what might come in the upcoming sprint and it is the starting point for the Sprint Planning. Every ticket the Development Team do not pick into their Sprint Backlog needs to be moved back to the Backlog column or one sprint further.
+* **Done:** Tickets that are closed (usually resolved within the running sprint) are moved here **automatically**. The sorting does not represent the priority here any more.
+
+
+### SORMAS Sprint Backlog
+
+The board **Sprint Backlog** exists for each Scrum Team and is segmented into the following categories:
+
+* **Backlog:** Issues that have been selected by the Development Team to be done in the current sprint, but for which work has not yet started. The sorting top to bottom on this column reflects the priority given by the Product Owner at the time of the Sprint Planning.
 * **In Progress:** Issues that have been assigned to a contributor and for which work has started.
 * **Waiting:** Issues for which work has started and that have been put on hold, e.g. because action or feedback by an external contributor is required.
 * **Review:** Issues that have been resolved, but not been reviewed by another contributor yet. The ticket status is usually **Open**, but **Closed** is also allowed if no code change or merge is needed.
+* **Testing:** Issues that have been reviewed and merged to **development** branch to be tested and verified on a central TEST instance. The ticket status is supposed to be **Closed**.
 * **Done:** Issues that have been resolved, reviewed and satisfy the Definition of Done. The ticket status is supposed to be **Closed**.
 
-The general workflow is that whenever a contributor starts working on an issue, they **assign** themselves to it and manually **move the issue** from **Backlog** to **In Progress**.
+The general workflow is that whenever a contributor starts working on an issue, they **assign** themselves to it and manually **move the issue** from **Backlog** to **In Progress**. 
+Transitions to **Waiting** and **Review** also need to be done manually. When the developer is done with all work (no code changes or merges needed, milestone is set), the ticket is supposed to be closed to go automatically to **Testing**.
+Approved tickets are supposed to be moved manually from **Testing** to **Done*.
+
+The GitHub project has been configured to **automatically** move issues that are closed to **Testing** and issues that are reopened back to **In Progress**.
+
+The Development Team is responsible to keep the tickets up to date on this board and to assign the appropriate milestone in which the work is going to be released.
 
-The GitHub project has been configured to **automatically** move issues that are closed to **Done** and issues that are reopened back to **In Progress**.
 
 ### Eclipse Troubleshooting
 

README.md

@@ -17,7 +17,7 @@
 You can give SORMAS a try on our play server at https://sormas.helmholtz-hzi.de!
 
 #### How Can I Get Involved?
-Have a look at our [*Contributing Readme*](CONTRIBUTING.md) and contact us at [email protected] or join our [developer chat on Gitter](https://gitter.im/SORMAS-Project) to learn how you can help to drive the development of SORMAS forward and to get development support from our core developers. SORMAS is a community-driven project, and we'd love to have you on board!
+Read through our [*Contributing Readme*](CONTRIBUTING.md) and contact us at [email protected] or join our [developer chat on Gitter](https://gitter.im/SORMAS-Project) to learn how you can help to drive the development of SORMAS forward and to get development support from our core developers. SORMAS is a community-driven project, and we'd love to have you on board! If you want to contribute to the code, please strictly adhere to the [*Development Environment*](DEVELOPMENT_ENVIRONMENT.md) guide to ensure that everything is set up correctly. Please also make sure that you've read the [*Development Contributing Guidelines*](CONTRIBUTING.md#development-contributing-guidelines) before you start to develop.
 
 #### How Can I Report a Bug or Request a Feature?
 Please [create a new issue](https://github.com/hzi-braunschweig/SORMAS-Project/issues/new/choose) and read the [*Submitting an Issue*](CONTRIBUTING.md#submitting-an-issue) guide for more detailed instructions. We appreciate your help!

SERVER_CUSTOMIZATION.md

@@ -58,16 +58,28 @@ SORMAS supports a wide range of diseases, and not all of those might be relevant
 
 Right now, changing these variables unfortunately is not possible from within the user interface, but requires **direct database access**. If you have this access, you can edit the entries in the *diseaseconfiguration* table according to your needs. 
 
-**IMPORTANT:** Whenever you edit an entry in this table, you also need to manually set the *changedate* to the current date and time. This is required in order for the mobile app to synchronize the changes and use the edited disease configuration.
+**VERY IMPORTANT:** Whenever you edit an entry in this table, you also need to manually set the *changedate* to the current date and time. This is required in order for the mobile app to synchronize the changes and use the edited disease configuration.
 
 ## Feature Configuration
-Some of the features in SORMAS can be enabled or disabled for the system.
-Examples for this are aggregated reporting, event surveillance, national case sharing and more.
-
-Right now, changing these variables unfortunately is not possible from within the user interface, but requires **direct database access**. If you have this access, you can edit the entries in the *featureconfiguration* table. 
-
-* There will be an entry in the database table for each feature that is available in SORMAS
-* Set the "enabled" value of the feature to true or false to enable or disable it
-* The region, district, disease and enddate columns are currently only appicable for the line listing feature. The line listing feature is the only feature that can currently be configured using the UI.
-
-**IMPORTANT:** Whenever you edit an entry in this table, you also need to manually set the *changedate* to the current date and time. This is required in order for the mobile app to synchronize the changes and use the edited disease configuration.
+Some of the features in SORMAS can be enabled or disabled to further customize the system. Right now, changing these variables unfortunately is not possible from within the user interface, but requires **direct database access**. If you have this access, you can edit the entries in the *featureconfiguration* table. There is one entry for every configurable feature in this table, and you can set the value of the *enabled* column to *true* to enable it and *false* to disable it. The *region*, *district*, *disease* and *enddate* columns are currently only applicable for the line listing feature and define the scope in which line listing is used. Line listing is configurable from within the UI and does not need to be manually edited in the database. 
+
+**VERY IMPORTANT:** Whenever you edit an entry in this table, you also need to manually set the *changedate* to the current date and time. This is required in order for the mobile app to synchronize the changes and use the edited feature configuration.
+
+The following features are currently configurable:
+
+* **Case Surveillance** *(CASE_SURVEILANCE)*: The core module of SORMAS which allows the creation and management of suspect or confirmed disease cases.
+* **Contact Tracing** *(CONTACT_TRACING)*: Management and follow-up of contacts of disease cases.
+* **Sample Management** *(SAMPLES_LAB)*: Management of samples for cases, contacts or event participants and the documentation of pathogen tests performed on these samples.
+* **Event Surveillance** *(EVENT_SURVEILLANCE)*: Creating and managing events and event participants to identify potential outbreaks or disease hotspots.
+* **Aggregate Reporting** *(AGGREGATE_REPORTING)*: Allows collecting case numbers for a number of additional diseases for which case-based surveillance is not used. Commonly referred to as mSers in African countries.
+* **Weekly Reporting** *(WEEKLY_REPORTING)*: Allows mobile users to confirm the number of cases they have collected on a weekly basis and web users to see an overview of whether or not mobile users have submitted their reports and how many cases they have reported.
+* **Clinical Management** *(CLINICAL_MANAGEMENT)*: Enables the clinical management module of cases that allow collecting prescriptions and treatments as well as doctor's visits in a clinical context.
+* **National Case Sharing** *(NATIONAL_CASE_SHARING)*: Allows users with the respective rights to make cases available to the whole country, i.e. other users will see these cases even if they don't belong to their jurisdiction.
+* **Task Generation (Case Surveillance)** *(TASK_GENERATION_CASE_SURVEILLANCE)*: Enables or disables the automatic generation of tasks associated with case surveillance, especially the *Case Investigation* tasks that are usually generated when creating a new case.
+* **Task Generation (Contact Tracing)** *(TASK_GENERATION_CONTACT_TRACING)*: Enables or disables the automatic generation of tasks associated with contact tracing, especially the *Contact Investigation* tasks that are usually generated when creating a new contact and the *Contact Follow-Up* tasks that are created once a day for every contact that is under follow-up.
+* **Task Generation (Event Surveillance)** *(TASK_GENERATION_EVENT_SURVEILLANCE)*: Enables or disables the automatic generation of tasks associated with event surveillance.
+* **Task Generation (General)** *(TASK_GENERATION_GENERAL)*: Enables or disables the automatic generation of tasks that aren't directly associated with one of the three other task types described above, e.g. the *Weekly Report Generation* task that asks mobile users to submit their weekly reports.
+* **Campaigns** *(CAMPAIGNS)*: The campaigns module allows collecting flexible data which can be customized using the JSON format. Currently this is heavily geared towards vaccination campaigns in Afghanistan, but will be usable in a more generic way in the future for other countries as well.
+* **Area Infrastructure** *(INFRASTRUCTURE_TYPE_AREA)*: Enables an additional infrastructure level above region that is called area by default. Currently only used in the campaigns module.
+* **Case Follow-Up** *(CASE_FOLLOWUP)*: Enables the contact follow-up module for cases as well to allow a more detailed daily documentation of symptoms.
+* **Line Listing** *(LINE_LISTING)*: Whether or not using line listing for case entry is enabled in the specified jurisdiction for the specified disease. Configurable from the UI, no database interaction needed.

sormas-api/src/main/java/de/symeda/sormas/api/ConfigFacade.java

@@ -106,5 +106,7 @@ public interface ConfigFacade {
 
 	SormasToSormasConfig getSormasToSormasConfig();
 
+	String getSurvnetGatewayUrl();
+
 	String getAuthenticationProvider();
 }

sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java

@@ -60,6 +60,7 @@
 import de.symeda.sormas.api.sample.PathogenTestFacade;
 import de.symeda.sormas.api.sample.SampleFacade;
 import de.symeda.sormas.api.sormastosormas.SormasToSormasFacade;
+import de.symeda.sormas.api.survnet.SurvnetGatewayFacade;
 import de.symeda.sormas.api.symptoms.SymptomsFacade;
 import de.symeda.sormas.api.task.TaskFacade;
 import de.symeda.sormas.api.therapy.PrescriptionFacade;
@@ -290,6 +291,10 @@ public static SormasToSormasFacade getSormasToSormasFacade() {
 		return get().lookupEjbRemote(SormasToSormasFacade.class);
 	}
 
+	public static SurvnetGatewayFacade getSurvnetGatewayFacade() {
+		return get().lookupEjbRemote(SurvnetGatewayFacade.class);
+	}
+
 	public static AreaFacade getAreaFacade() {
 		return get().lookupEjbRemote(AreaFacade.class);
 	}

sormas-api/src/main/java/de/symeda/sormas/api/ResourceBundle.java

@@ -1,7 +1,5 @@
 package de.symeda.sormas.api;
 
-import org.apache.commons.text.StringEscapeUtils;
-
 public class ResourceBundle {
 
 	private java.util.ResourceBundle resourceBundle;

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataDto.java

@@ -143,4 +143,6 @@ public UserReferenceDto getCreatingUser() {
 	public void setCreatingUser(UserReferenceDto creatingUser) {
 		this.creatingUser = creatingUser;
 	}
+
+
 }

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -151,6 +151,7 @@ public interface Captions {
 	String campaignDashboardChartWidth = "campaignDashboardChartWidth";
 	String campaignDashboardOrder = "campaignDashboardOrder";
 	String campaignDashboardTabName = "campaignDashboardTabName";
+	String CampaignFormData_area = "CampaignFormData.area";
 	String CampaignFormData_campaign = "CampaignFormData.campaign";
 	String CampaignFormData_campaignFormMeta = "CampaignFormData.campaignFormMeta";
 	String CampaignFormData_formDate = "CampaignFormData.formDate";
@@ -1367,6 +1368,8 @@ public interface Captions {
 	String statisticsSpecifySelection = "statisticsSpecifySelection";
 	String statisticsStatistics = "statisticsStatistics";
 	String statisticsVisualizationType = "statisticsVisualizationType";
+	String SurvnetGateway_send = "SurvnetGateway.send";
+	String SurvnetGateway_title = "SurvnetGateway.title";
 	String Symptoms = "Symptoms";
 	String Symptoms_abdominalPain = "Symptoms.abdominalPain";
 	String Symptoms_abnormalLungXrayFindings = "Symptoms.abnormalLungXrayFindings";
@@ -1606,6 +1609,7 @@ public interface Captions {
 	String User_active = "User.active";
 	String User_address = "User.address";
 	String User_associatedOfficer = "User.associatedOfficer";
+	String User_hasConsentedToGdpr = "User.hasConsentedToGdpr";
 	String User_healthFacility = "User.healthFacility";
 	String User_laboratory = "User.laboratory";
 	String User_limitedDisease = "User.limitedDisease";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Descriptions.java

@@ -28,4 +28,5 @@ public interface Descriptions {
 	String descCaseFilterRelatedToEvent = "descCaseFilterRelatedToEvent";
 	String descContactOnlyWithExtendedQuarantine = "descContactOnlyWithExtendedQuarantine";
 	String descContactOnlyWithReducedQuarantine = "descContactOnlyWithReducedQuarantine";
+	String descGdpr = "descGdpr";
 }

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -594,6 +594,8 @@ public interface Strings {
 	String messageFollowUpCanceled = "messageFollowUpCanceled";
 	String messageFollowUpStatusChanged = "messageFollowUpStatusChanged";
 	String messageFormHasErrorsPathogenTest = "messageFormHasErrorsPathogenTest";
+	String messageGdpr = "messageGdpr";
+	String messageGdprCheck = "messageGdprCheck";
 	String messageImportCanceled = "messageImportCanceled";
 	String messageImportCanceledErrors = "messageImportCanceledErrors";
 	String messageImportError = "messageImportError";
@@ -781,6 +783,9 @@ public interface Strings {
 	String reportedBy = "reportedBy";
 	String reportedOn = "reportedOn";
 	String step = "step";
+	String SurvnetGateway_notificationEntryNotSent = "SurvnetGateway.notificationEntryNotSent";
+	String SurvnetGateway_notificationEntrySent = "SurvnetGateway.notificationEntrySent";
+	String SurvnetGateway_notificationErrorSending = "SurvnetGateway.notificationErrorSending";
 	String text = "text";
 	String toCase = "toCase";
 	String total = "total";