RAMPcapture V1 adjustments

.github/workflows/rampcapture-github-release-signed-apk.yml

@@ -87,6 +87,7 @@ jobs:
       - name: Build signed release APK
         run: ./gradlew app:assembleDhis2Release
         env:
+          RAMP_CAPTURE_VERSION: ${{ steps.release-info.outputs.forkNumber }}
           SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           SIGNING_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
           SIGNING_STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}

app/build.gradle.kts

@@ -93,8 +93,10 @@ android {
         multiDexEnabled = true
 
         val bitriseSentryDSN = System.getenv("SENTRY_DSN") ?: ""
+        val rampCaptureVersion = System.getenv("RAMP_CAPTURE_VERSION") ?: "local build"
 
         buildConfigField("String", "SDK_VERSION", "\"" + libs.versions.dhis2sdk.get() + "\"")
+        buildConfigField("String", "RAMP_CAPTURE_VERSION", "\"$rampCaptureVersion\"")
         buildConfigField("String", "MATOMO_URL", "\"https://usage.analytics.dhis2.org/matomo.php\"")
         buildConfigField("long", "VERSION_CODE", "${defaultConfig.versionCode}")
         buildConfigField("String", "VERSION_NAME", "\"${defaultConfig.versionName}\"")

app/src/androidTest/java/org/dhis2/usescases/about/AboutRobot.kt

@@ -15,9 +15,9 @@ fun aboutRobot(aboutBody: AboutRobot.() -> Unit) {
 
 class AboutRobot : BaseRobot() {
 
-    fun checkVersionNames(appName: String, sdkName: String) {
-        val appNameText = "App Version: $appName"
-        onView(withId(R.id.aboutApp)).check(matches(withText(appNameText)))
+    fun checkVersionNames(rampCaptureName: String, appName: String, sdkName: String) {
+        onView(withId(R.id.rampCaptureVersion)).check(matches(withText(rampCaptureName)))
+        onView(withId(R.id.aboutApp)).check(matches(withText(appName)))
         onView(withId(R.id.appSDK)).check(matches(withText(sdkName)))
     }
 }

app/src/androidTest/java/org/dhis2/usescases/about/AboutTest.kt

@@ -3,6 +3,7 @@ package org.dhis2.usescases.about
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import org.dhis2.bindings.buildInfo
+import org.dhis2.bindings.rampCaptureBuildInfo
 import org.dhis2.BuildConfig
 import org.dhis2.R
 import org.dhis2.usescases.BaseTest
@@ -21,6 +22,7 @@ class AboutTest : BaseTest() {
     @Test
     fun shouldCheckVersionsWhenOpenAboutScreen() {
         startActivity()
+        val rampCaptureVersion = getRampCaptureVersionName()
         val appVersion = getAppVersionName()
         val sdkVersion = getSDKVersionName()
 
@@ -30,17 +32,22 @@ class AboutTest : BaseTest() {
         }
 
         aboutRobot {
-            checkVersionNames(appVersion, sdkVersion)
+            checkVersionNames(rampCaptureVersion, appVersion, sdkVersion)
         }
     }
 
     private fun startActivity() {
         rule.launchActivity(null)
     }
 
-    private fun getAppVersionName(): String {
-        return context.buildInfo()
-    }
+    private fun getRampCaptureVersionName() =
+        String.format(
+            context.getString(R.string.ramp_capture_version),
+            context.rampCaptureBuildInfo(),
+        )
+
+    private fun getAppVersionName() =
+        String.format(context.getString(R.string.about_app), context.buildInfo())
 
     private fun getSDKVersionName() =
         String.format(context.getString(R.string.about_sdk), BuildConfig.SDK_VERSION)

app/src/main/java/org/dhis2/bindings/ContextExtensions.kt

@@ -14,6 +14,13 @@ fun Context.buildInfo(): String =
         "v${BuildConfig.VERSION_NAME} : ${BuildConfig.GIT_SHA} "
     }
 
+fun Context.rampCaptureBuildInfo(): String =
+    if (BuildConfig.BUILD_TYPE == "release") {
+        BuildConfig.RAMP_CAPTURE_VERSION
+    } else {
+        "${BuildConfig.RAMP_CAPTURE_VERSION} : ${BuildConfig.GIT_SHA} "
+    }
+
 fun Fragment.checkSMSPermission(
     requestPermission: Boolean,
     request: Int,

app/src/main/java/org/dhis2/simprints/ramp/data/EventHistoryTableRepository.kt

@@ -209,14 +209,15 @@ class EventHistoryTableRepository(
                 rows = followUpRows,
             )
         } else {
+            val rowsByDataElementUid = followUpRows.associateBy { row -> row.dataElementUid }
+
             sections.mapNotNull { section ->
-                val sectionDataElementUids =
+                val rows =
                     section
                         .dataElements()
                         .orEmpty()
-                        .mapNotNull { dataElement -> dataElement.uid() }
-                        .toSet()
-                val rows = followUpRows.filter { row -> row.dataElementUid in sectionDataElementUids }
+                        .mapNotNull { dataElement -> dataElement.uid()?.let(rowsByDataElementUid::get) }
+                        .distinctBy { row -> row.dataElementUid }
 
                 rows
                     .takeIf { it.isNotEmpty() }
@@ -296,6 +297,8 @@ class EventHistoryTableRepository(
                     .eq(tableContext.enrollmentUid)
                     .byProgramStageUid()
                     .eq(followUpVisitProgramStageUid)
+                    .byDeleted()
+                    .isFalse
                     .blockingGet()
             }
         val events =

app/src/main/java/org/dhis2/usescases/about/AboutFragment.kt

@@ -11,6 +11,7 @@ import org.dhis2.BuildConfig
 import org.dhis2.R
 import org.dhis2.bindings.app
 import org.dhis2.bindings.buildInfo
+import org.dhis2.bindings.rampCaptureBuildInfo
 import org.dhis2.databinding.FragmentAboutBinding
 import org.dhis2.usescases.general.FragmentGlobalAbstract
 import org.hisp.dhis.android.core.user.User
@@ -41,6 +42,8 @@ class AboutFragment :
                 aboutGit.movementMethod = LinkMovementMethod.getInstance()
                 aboutDev.movementMethod = LinkMovementMethod.getInstance()
                 aboutContact.movementMethod = LinkMovementMethod.getInstance()
+                rampCaptureVersion.text =
+                    getString(R.string.ramp_capture_version).format(context?.rampCaptureBuildInfo())
                 aboutApp.text = getString(R.string.about_app).format(context?.buildInfo())
                 appSDK.text = getString(R.string.about_sdk).format(BuildConfig.SDK_VERSION)
                 privacyPolicy.setOnClickListener { navigateToPrivacyPolicy() }

app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt

@@ -170,6 +170,7 @@ class EventCaptureActivity :
                 pageConfigurator!!.displayAnalytics(),
                 pageConfigurator!!.displayTableView(),
                 pageConfigurator!!.displayRelationships(),
+                pageConfigurator!!.displayNotes(),
                 intent.getBooleanExtra(OPEN_ERROR_LOCATION, false),
                 eventMode,
             )

app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureModule.kt

@@ -12,6 +12,7 @@ import org.dhis2.commons.network.NetworkUtils
 import org.dhis2.commons.prefs.PreferenceProvider
 import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.commons.schedulers.SchedulerProvider
+import org.dhis2.commons.simprints.ramp.repository.RampDatastoreRepository
 import org.dhis2.data.dhislogic.DhisEnrollmentUtils
 import org.dhis2.data.forms.dataentry.SearchTEIRepository
 import org.dhis2.data.forms.dataentry.SearchTEIRepositoryImpl
@@ -62,7 +63,12 @@ class EventCaptureModule(
 
     @Provides
     @PerActivity
-    fun provideRepository(d2: D2?): EventCaptureRepository = EventCaptureRepositoryImpl(eventUid, d2)
+    fun provideRepository(d2: D2): EventCaptureRepository =
+        EventCaptureRepositoryImpl(
+            eventUid,
+            d2,
+            RampDatastoreRepository(d2),
+        )
 
     @Provides
     @PerActivity

app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePagerAdapter.kt

@@ -22,6 +22,7 @@ class EventCapturePagerAdapter(
     displayAnalyticScreen: Boolean,
     displaySimprintsRampHistoryTableScreen: Boolean,
     displayRelationshipScreen: Boolean,
+    displayNotes: Boolean,
     private val shouldOpenErrorSection: Boolean,
     private val eventMode: EventMode,
 ) : FragmentStateAdapter(fragmentActivity) {
@@ -59,8 +60,11 @@ class EventCapturePagerAdapter(
             portraitPages.add(EventPageType.RELATIONSHIPS)
             landscapePages.add(EventPageType.RELATIONSHIPS)
         }
-        portraitPages.add(EventPageType.NOTES)
-        landscapePages.add(EventPageType.NOTES)
+
+        if (displayNotes) {
+            portraitPages.add(EventPageType.NOTES)
+            landscapePages.add(EventPageType.NOTES)
+        }
 
         if (displaySimprintsRampHistoryTableScreen) {
             portraitPages.add(EventPageType.SIMPRINTS_RAMP_HISTORY_TABLE)

app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt

@@ -107,6 +107,7 @@ class EventCapturePresenterImpl(
 
     private fun loadBottomBarItems() {
         val navItems = mutableListOf<NavigationBarItem<NavigationPage>>()
+        val displayTableView = pageConfigurator.displayTableView()
 
         if (pageConfigurator.displayDataEntry() || forceDisplayDataEntryNavigationItemForSimprintsRampTable) {
             navItems.add(
@@ -152,20 +153,27 @@ class EventCapturePresenterImpl(
             )
         }
 
-        if (pageConfigurator.displayTableView()) {
+        if (displayTableView) {
             navItems.add(
                 NavigationBarItem(
                     id = NavigationPage.TABLE_VIEW,
                     icon = Icons.Outlined.TableChart,
                     selectedIcon = Icons.Filled.TableChart,
-                    label = resourceManager.getString(R.string.navigation_simprints_ramp_history),
+                    label = resourceManager.getString(R.string.navigation_simprints_ramp_history_chart),
                 ),
             )
         }
 
+        val visibleItems = navItems.takeIf { it.size > 1 || displayTableView }.orEmpty()
+        val selectedItem =
+            navigationBarUIState.value.selectedItem
+                ?.takeIf { item -> visibleItems.any { it.id == item } }
+                ?: visibleItems.firstOrNull()?.id
+
         navigationBarUIState.value =
             navigationBarUIState.value.copy(
-                items = navItems.takeIf { it.size > 1 }.orEmpty(),
+                items = visibleItems,
+                selectedItem = selectedItem,
             )
     }
 

app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImpl.java

@@ -3,8 +3,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.google.gson.Gson;
-
 import org.dhis2.commons.bindings.SdkExtensionsKt;
 import org.dhis2.commons.simprints.ramp.model.ProgramStageHistoryTableConfig;
 import org.dhis2.commons.simprints.ramp.repository.RampDatastoreRepository;
@@ -38,10 +36,10 @@ public class EventCaptureRepositoryImpl implements EventCaptureContract.EventCap
     private final D2 d2;
     private final RampDatastoreRepository rampDatastoreRepository;
 
-    public EventCaptureRepositoryImpl(String eventUid, D2 d2) {
+    public EventCaptureRepositoryImpl(String eventUid, D2 d2, RampDatastoreRepository rampDatastoreRepository) {
         this.eventUid = eventUid;
         this.d2 = d2;
-        this.rampDatastoreRepository = new RampDatastoreRepository(d2, new Gson());
+        this.rampDatastoreRepository = rampDatastoreRepository;
     }
 
     private Event getCurrentEvent() {

app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventPageConfigurator.kt

@@ -10,11 +10,11 @@ class EventPageConfigurator(
 
     override fun displayDataEntry(): Boolean = isPortrait
 
-    override fun displayAnalytics(): Boolean = eventCaptureRepository.hasAnalytics()
+    override fun displayAnalytics(): Boolean = eventCaptureRepository.hasAnalytics() && !displayTableView()
 
     override fun displayRelationships(): Boolean = eventCaptureRepository.hasRelationships()
 
-    override fun displayNotes(): Boolean = true
+    override fun displayNotes(): Boolean = !displayTableView()
 
     override fun displayTableView(): Boolean = eventCaptureRepository.hasSimprintsRampProgramStageHistoryTable()
 }

app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchJavaToCompose.kt

@@ -19,14 +19,15 @@ fun ComposeView?.setLandscapeOpenSearchButton(
         DHIS2Theme {
             val screenState by searchTEIViewModel.screenState.observeAsState()
             val teTypeName by searchTEIViewModel.teTypeName.observeAsState()
+            val isSearchEnabled by searchTEIViewModel.isSearchEnabled.observeAsState(true)
 
             val visible =
                 screenState?.let {
                     (it is SearchList) && it.searchFilters.isOpened
                 } ?: false
             val isLandscape =
                 LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
-            AnimatedVisibility(visible = isLandscape && visible && !teTypeName.isNullOrBlank()) {
+            AnimatedVisibility(visible = isLandscape && visible && isSearchEnabled && !teTypeName.isNullOrBlank()) {
                 WrappedSearchButton(onClick = onClick, teTypeName = teTypeName!!)
             }
         }

app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepository.java

@@ -79,6 +79,8 @@ public interface SearchRepository {
 
     boolean canCreateInProgramWithoutSearch();
 
+    boolean isSearchEnabled();
+
     void setCurrentTheme(@org.jetbrains.annotations.Nullable ProgramSpinnerModel selectedProgram);
 
     List<String> trackedEntityTypeFields();

app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImpl.java

@@ -18,6 +18,7 @@
 import org.dhis2.commons.resources.DhisPeriodUtils;
 import org.dhis2.commons.resources.MetadataIconProvider;
 import org.dhis2.commons.resources.ResourceManager;
+import org.dhis2.commons.simprints.ramp.repository.RampDatastoreRepository;
 import org.dhis2.data.dhislogic.DhisEnrollmentUtils;
 import org.dhis2.data.forms.dataentry.SearchTEIRepository;
 import org.dhis2.data.forms.dataentry.ValueStore;
@@ -124,6 +125,7 @@ public class SearchRepositoryImpl implements SearchRepository {
 
     private final MetadataIconProvider metadataIconProvider;
     private final ProfilePictureProvider profilePictureProvider;
+    private final RampDatastoreRepository rampDatastoreRepository;
     private CustomIntentRepository customIntentRepository;
 
     SearchRepositoryImpl(String teiType,
@@ -141,7 +143,8 @@ public class SearchRepositoryImpl implements SearchRepository {
                          MetadataIconProvider metadataIconProvider,
                          ProfilePictureProvider profilePictureProvider,
                          DateUtils dateUtils,
-                         CustomIntentRepository customIntentRepository
+                         CustomIntentRepository customIntentRepository,
+                         RampDatastoreRepository rampDatastoreRepository
     ) {
         this.teiType = teiType;
         this.d2 = d2;
@@ -165,6 +168,7 @@ public class SearchRepositoryImpl implements SearchRepository {
         this.metadataIconProvider = metadataIconProvider;
         this.profilePictureProvider = profilePictureProvider;
         this.customIntentRepository = customIntentRepository;
+        this.rampDatastoreRepository = rampDatastoreRepository;
     }
 
 
@@ -1012,6 +1016,11 @@ public boolean canCreateInProgramWithoutSearch() {
         }
     }
 
+    @Override
+    public boolean isSearchEnabled() {
+        return rampDatastoreRepository.isSearchEnabled(currentProgram);
+    }
+
     private boolean displayOrgUnit() {
         return d2.organisationUnitModule().organisationUnits()
                 .byProgramUids(Collections.singletonList(currentProgram))
@@ -1022,4 +1031,3 @@ private boolean displayOrgUnit() {
 
 }
 
-