[GITFLOW]merging 'release-0.1.0' into 'master'

SORMAS-Foundation · Jul 21, 2017 · c9d97a8 · c9d97a8
2 parents 7a80829 + 06c8369
commit c9d97a8
Show file tree

Hide file tree

Showing 138 changed files with 30,248 additions and 3,531 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@
 deploy
 /sormas-base/build.properties
 /sormas-ui/bin
+
+sormas-ui/src/main/webapp/VAADIN/themes/sormastheme/addons.scss
diff --git a/README.md b/README.md
diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml
@@ -1,14 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>0.0.1</version>
+		<version>0.1.0</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>sormas-api</artifactId>
-
+	<name>${project.artifactId}</name>
 
 	<build>
 		<finalName>${project.artifactId}</finalName>
@@ -34,17 +33,19 @@
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<maven.compiler.target>1.7</maven.compiler.target>
 	</properties>
-
-	<name>${project.artifactId}</name>
+
 	<dependencies>
+
 		<dependency>
 			<groupId>javax</groupId>
 			<artifactId>javaee-web-api</artifactId>
 		</dependency>
+
 		<dependency>
-		  <groupId>joda-time</groupId>
-		  <artifactId>joda-time</artifactId>
-		  <version>2.9.4</version>
-		</dependency>		
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+		</dependency>
+
 	</dependencies>
-</project>
+
+</project>
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java
@@ -29,6 +29,7 @@ public class CaseDataDto extends CaseReferenceDto {
 	public static final String DISTRICT = "district";
 	public static final String COMMUNITY = "community";
 	public static final String HEALTH_FACILITY = "healthFacility";
+	public static final String HEALTH_FACILITY_DETAILS = "healthFacilityDetails";
 	public static final String REPORTING_USER = "reportingUser";
 	public static final String REPORT_DATE = "reportDate";
 	public static final String INVESTIGATED_DATE = "investigatedDate";
@@ -58,6 +59,7 @@ public class CaseDataDto extends CaseReferenceDto {
 	private DistrictReferenceDto district;
 	private CommunityReferenceDto community;
 	private FacilityReferenceDto healthFacility;
+	private String healthFacilityDetails;
 
 	private SymptomsDto symptoms;
 
@@ -114,7 +116,15 @@ public FacilityReferenceDto getHealthFacility() {
 	public void setHealthFacility(FacilityReferenceDto healthFacility) {
 		this.healthFacility = healthFacility;
 	}
+
+	public String getHealthFacilityDetails() {
+		return healthFacilityDetails;
+	}
 
+	public void setHealthFacilityDetails(String healthFacilityDetails) {
+		this.healthFacilityDetails = healthFacilityDetails;
+	}
+
 	public Date getReportDate() {
 		return reportDate;
 	}

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/facility/FacilityDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/facility/FacilityDto.java
@@ -1,5 +1,7 @@
 package de.symeda.sormas.api.facility;
 
+import javax.xml.bind.annotation.XmlTransient;
+
 import de.symeda.sormas.api.region.CommunityReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
@@ -9,6 +11,7 @@ public class FacilityDto extends FacilityReferenceDto {
 	private static final long serialVersionUID = -7987228795475507196L;
 
 	public static final String I18N_PREFIX = "Facility";
+	public static final String OTHER_FACILITY_UUID = "SORMAS-CONSTID-OTHERS-FACILITY";
 
 	private String name;
 	private RegionReferenceDto region;
@@ -27,13 +30,15 @@ public void setName(String name) {
 		this.name = name;
 	}
 
+	@XmlTransient
 	public RegionReferenceDto getRegion() {
 		return region;
 	}
 	public void setRegion(RegionReferenceDto region) {
 		this.region = region;
 	}
 
+	@XmlTransient
 	public DistrictReferenceDto getDistrict() {
 		return district;
 	}

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/facility/FacilityFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/facility/FacilityFacade.java
@@ -13,11 +13,12 @@ public interface FacilityFacade {
 
 	List<FacilityReferenceDto> getAll();
 
-    List<FacilityReferenceDto> getAllByCommunity(CommunityReferenceDto community);
-    List<FacilityReferenceDto> getAllByDistrict(DistrictReferenceDto district);
+    List<FacilityReferenceDto> getAllByCommunity(CommunityReferenceDto community, boolean includeOthers);
+    List<FacilityReferenceDto> getAllByDistrict(DistrictReferenceDto district, boolean includeOthers);
     List<FacilityReferenceDto> getAllLaboratories();
 
-	List<FacilityDto> getAllAfter(Date date);
+	List<FacilityDto> getAllByRegionAfter(String regionUuid, Date date);
+	List<FacilityDto> getAllWithoutRegionAfter(Date date);
 
 	FacilityDto getByUuid(String uuid);
 }
diff --git a/sormas-api/src/main/resources/fieldCaptions.properties b/sormas-api/src/main/resources/fieldCaptions.properties
@@ -11,6 +11,9 @@ CaseData.caseOfficerClassification=Case classification
 CaseData.investigationStatus=Investigation status
 CaseData.disease=Disease
 CaseData.healthFacility=Health facility
+CaseData.healthFacilityDetails=Health facility name & description
+# Android workaround
+CaseData.facilityDetails=Health facility name & description
 CaseData.reportingUser=Reporting user
 CaseData.reportDate=Date of report
 CaseData.investigatedDate=Date of investigation

diff --git a/sormas-app/app/build.gradle b/sormas-app/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "de.symeda.sormas.app"
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 2
-        versionName "0.0.1"
+        versionCode buildVersionCode()
+        versionName getVersionName()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 //        signingConfig signingConfigs.config
     }
@@ -35,6 +35,10 @@ android {
     }
     productFlavors {
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
 repositories {
@@ -50,6 +54,7 @@ configurations.all {
     }
 }
 
+ext.sormasVersion = getVersionName()
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     // https://mvnrepository.com/artifact/com.googlecode/openbeans
@@ -60,7 +65,7 @@ dependencies {
     compile 'com.j256.ormlite:ormlite-core:4.48'
     compile 'com.j256.ormlite:ormlite-android:4.48'
     compile 'javax.persistence:persistence-api:1.0.2'
-    compile 'de.symeda.sormas:sormas-api:0.0.1'
+    compile "de.symeda.sormas:sormas-api:$sormasVersion"
     compile 'com.google.android.gms:play-services-analytics:10.0.1'
     compile 'com.googlecode:openbeans:1.0'
     testCompile 'junit:junit:4.12'

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/AbstractRootTabActivity.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/AbstractRootTabActivity.java
@@ -53,8 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 getResources().getString(R.string.main_menu_events),
                 getResources().getString(R.string.main_menu_samples),
                 getResources().getString(R.string.main_menu_settings),
-                getResources().getString(R.string.main_menu_sync_all),
-                getResources().getString(R.string.main_menu_logout) + " (" + ConfigProvider.getUsername() + ")"
+                getResources().getString(R.string.main_menu_sync_all)
         };
 
         menuDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -92,7 +91,7 @@ protected void onResume() {
             }
         }
 
-        synchronizeData(SynchronizeDataAsync.SyncMode.ChangesOnly, false, null);
+        synchronizeData(SynchronizeDataAsync.SyncMode.ChangesOnly, false, false, null);
     }
 
     @Override
@@ -183,13 +182,6 @@ public void showSettingsView() {
         startActivity(intent);
     }
 
-    public void logout() {
-        ConfigProvider.clearUsernameAndPassword();
-        ConfigProvider.clearPin();
-        Intent intent = new Intent(this, LoginActivity.class);
-        startActivity(intent);
-    }
-
     /**
      * Swaps fragments in the main content view
      */
@@ -220,9 +212,6 @@ private void selectItem(int position) {
                 // don't keep this button selected
                 menuDrawerList.clearChoices();
                 break;
-            case 7:
-                logout();
-                break;
             default:
                 throw new IndexOutOfBoundsException("No action defined for menu entry: " + position);
         }