#12468 - Add environment sample list to app

SORMAS-Foundation · Sep 4, 2023 · b6ff8b1 · b6ff8b1
1 parent fee805d
commit b6ff8b1
Show file tree

Hide file tree

Showing 16 changed files with 1,235 additions and 390 deletions.
diff --git a/sormas-app/app/src/main/AndroidManifest.xml b/sormas-app/app/src/main/AndroidManifest.xml
@@ -452,6 +452,12 @@
             android:launchMode="singleTop">
         </activity>
 
+        <activity
+            android:name=".environmentsample.list.EnvironmentSampleListActivity"
+            android:theme="@style/ActivityWithOverflowMenuTheme"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTop">
+        </activity>
 
         <!-- Only needed for androidTest - found no other way to manifest this -->
         <activity

diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/BaseActivity.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/BaseActivity.java
@@ -308,6 +308,8 @@ public boolean onNavigationItemSelected(MenuItem item) {
 					NavigationHelper.goToSamples(getContext());
 				} else if (id == R.id.menu_item_environments) {
 					NavigationHelper.goToEnvironments(getContext());
+				} else if (id == R.id.menu_item_environment_samples) {
+					NavigationHelper.goToEnvironmentSamples(getContext());
 				} else if (id == R.id.menu_item_immunizations) {
 					NavigationHelper.goToImmunizations(getContext());
 				} else if (id == R.id.menu_item_campaigns) {
@@ -413,6 +415,7 @@ private void setupDrawer(NavigationView navView) {
 			MenuItem eventMenu = menuNav.findItem(R.id.menu_item_events);
 			MenuItem sampleMenu = menuNav.findItem(R.id.menu_item_samples);
 			MenuItem environmentMenu = menuNav.findItem(R.id.menu_item_environments);
+			MenuItem environmentSampleMenu = menuNav.findItem(R.id.menu_item_environment_samples);
 			MenuItem immunizationMenu = menuNav.findItem(R.id.menu_item_immunizations);
 			MenuItem reportMenu = menuNav.findItem(R.id.menu_item_reports);
 			MenuItem campaignMenu = menuNav.findItem(R.id.menu_item_campaigns);
@@ -447,6 +450,12 @@ private void setupDrawer(NavigationView navView) {
 						&& !DatabaseHelper.getFeatureConfigurationDao().isFeatureDisabled(FeatureType.ENVIRONMENT_MANAGEMENT));
 			}
 
+			if (environmentSampleMenu != null) {
+				environmentSampleMenu.setVisible(
+					ConfigProvider.hasUserRight(UserRight.ENVIRONMENT_SAMPLE_VIEW)
+						&& !DatabaseHelper.getFeatureConfigurationDao().isFeatureDisabled(FeatureType.ENVIRONMENT_MANAGEMENT));
+			}
+
 			if (immunizationMenu != null)
 				immunizationMenu.setVisible(
 					ConfigProvider.hasUserRight(UserRight.IMMUNIZATION_VIEW)