From ad29fbd08c9abf14b7ebd0e1660ec2233940c715 Mon Sep 17 00:00:00 2001 From: ferdyrod Date: Tue, 7 Jul 2026 15:06:29 +0200 Subject: [PATCH 1/2] Adds plurals terminology to Program, ProgramStage and TrackedEntityType --- core/api/core.api | 63 ++++++++++++++----- core/src/main/assets/migrations/181.sql | 8 +++ .../hisp/dhis/android/core/program/Program.kt | 9 +++ .../dhis/android/core/program/ProgramStage.kt | 2 + .../core/trackedentity/TrackedEntityType.kt | 2 + .../android/network/program/ProgramDTO.kt | 7 +++ .../android/network/program/ProgramFields.kt | 3 + .../network/programstage/ProgramStageDTO.kt | 2 + .../programstage/ProgramStageFields.kt | 1 + .../trackedentitytype/TrackedEntityTypeDTO.kt | 2 + .../TrackedEntityTypeFields.kt | 1 + .../android/persistence/program/ProgramDB.kt | 9 +++ .../persistence/program/ProgramStageDB.kt | 3 + .../trackedentity/TrackedEntityTypeDB.kt | 3 + .../core/data/program/ProgramSamples.java | 6 ++ .../data/program/ProgramStageSamples.java | 1 + .../TrackedEntityTypeSamples.java | 1 + .../sharedTest/resources/program/program.json | 3 + .../resources/program/program_stage.json | 3 +- .../resources/program/programs.json | 3 + .../trackedentity/tracked_entity_type.json | 1 + .../android/core/program/ProgramShould.kt | 3 + .../core/program/ProgramStageShould.kt | 1 + .../trackedentity/TrackedEntityTypeShould.kt | 1 + 24 files changed, 123 insertions(+), 15 deletions(-) diff --git a/core/api/core.api b/core/api/core.api index 652f5fe588a..da45bf72525 100644 --- a/core/api/core.api +++ b/core/api/core.api @@ -13538,7 +13538,7 @@ public final class org/hisp/dhis/android/core/program/OrgHispDhisAndroidCoreProg public final class org/hisp/dhis/android/core/program/Program : org/hisp/dhis/android/core/common/BaseNameableObjectKt, org/hisp/dhis/android/core/common/CoreObject, org/hisp/dhis/android/core/common/ObjectWithStyleKt { public static final field Companion Lorg/hisp/dhis/android/core/program/Program$Companion; - public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/program/ProgramType;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;Lorg/hisp/dhis/android/core/period/PeriodType;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/program/AccessLevel;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;)V + public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/program/ProgramType;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;Lorg/hisp/dhis/android/core/period/PeriodType;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/program/AccessLevel;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;)V public final fun access ()Lorg/hisp/dhis/android/core/common/Access; public final fun accessLevel ()Lorg/hisp/dhis/android/core/program/AccessLevel; public final fun attributeValues ()Ljava/util/List; @@ -13584,16 +13584,19 @@ public final class org/hisp/dhis/android/core/program/Program : org/hisp/dhis/an public final fun component44 ()Ljava/lang/String; public final fun component45 ()Ljava/lang/String; public final fun component46 ()Ljava/lang/String; - public final fun component47 ()Ljava/util/List; - public final fun component48 ()Lorg/hisp/dhis/android/core/common/ObjectWithUid; + public final fun component47 ()Ljava/lang/String; + public final fun component48 ()Ljava/lang/String; + public final fun component49 ()Ljava/lang/String; public final fun component5 ()Ljava/util/Date; - public final fun component50 ()Lorg/hisp/dhis/android/core/common/ObjectStyle; + public final fun component50 ()Ljava/util/List; + public final fun component51 ()Lorg/hisp/dhis/android/core/common/ObjectWithUid; + public final fun component53 ()Lorg/hisp/dhis/android/core/common/ObjectStyle; public final fun component6 ()Ljava/util/Date; public final fun component7 ()Ljava/lang/Boolean; public final fun component8 ()Ljava/lang/String; public final fun component9 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/program/ProgramType;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;Lorg/hisp/dhis/android/core/period/PeriodType;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/program/AccessLevel;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;)Lorg/hisp/dhis/android/core/program/Program; - public static synthetic fun copy$default (Lorg/hisp/dhis/android/core/program/Program;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/program/ProgramType;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;Lorg/hisp/dhis/android/core/period/PeriodType;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/program/AccessLevel;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;IILjava/lang/Object;)Lorg/hisp/dhis/android/core/program/Program; + public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/program/ProgramType;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;Lorg/hisp/dhis/android/core/period/PeriodType;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/program/AccessLevel;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;)Lorg/hisp/dhis/android/core/program/Program; + public static synthetic fun copy$default (Lorg/hisp/dhis/android/core/program/Program;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/program/ProgramType;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/util/List;Ljava/lang/Integer;Ljava/lang/Integer;Lorg/hisp/dhis/android/core/period/PeriodType;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/program/AccessLevel;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;IILjava/lang/Object;)Lorg/hisp/dhis/android/core/program/Program; public fun created ()Ljava/util/Date; public final fun dataEntryMethod ()Ljava/lang/Boolean; public fun deleted ()Ljava/lang/Boolean; @@ -13601,7 +13604,9 @@ public final class org/hisp/dhis/android/core/program/Program : org/hisp/dhis/an public fun displayDescription ()Ljava/lang/String; public final fun displayEnrollmentDateLabel ()Ljava/lang/String; public final fun displayEnrollmentLabel ()Ljava/lang/String; + public final fun displayEnrollmentsLabel ()Ljava/lang/String; public final fun displayEventLabel ()Ljava/lang/String; + public final fun displayEventsLabel ()Ljava/lang/String; public final fun displayFollowUpLabel ()Ljava/lang/String; public final fun displayFrontPageList ()Ljava/lang/Boolean; public final fun displayIncidentDate ()Ljava/lang/Boolean; @@ -13610,6 +13615,7 @@ public final class org/hisp/dhis/android/core/program/Program : org/hisp/dhis/an public final fun displayNoteLabel ()Ljava/lang/String; public final fun displayOrgUnitLabel ()Ljava/lang/String; public final fun displayProgramStageLabel ()Ljava/lang/String; + public final fun displayProgramStagesLabel ()Ljava/lang/String; public final fun displayRelationshipLabel ()Ljava/lang/String; public fun displayShortName ()Ljava/lang/String; public final fun displayTrackedEntityAttributeLabel ()Ljava/lang/String; @@ -13635,7 +13641,9 @@ public final class org/hisp/dhis/android/core/program/Program : org/hisp/dhis/an public fun getDisplayDescription ()Ljava/lang/String; public final fun getDisplayEnrollmentDateLabel ()Ljava/lang/String; public final fun getDisplayEnrollmentLabel ()Ljava/lang/String; + public final fun getDisplayEnrollmentsLabel ()Ljava/lang/String; public final fun getDisplayEventLabel ()Ljava/lang/String; + public final fun getDisplayEventsLabel ()Ljava/lang/String; public final fun getDisplayFollowUpLabel ()Ljava/lang/String; public final fun getDisplayFrontPageList ()Ljava/lang/Boolean; public final fun getDisplayIncidentDate ()Ljava/lang/Boolean; @@ -13644,6 +13652,7 @@ public final class org/hisp/dhis/android/core/program/Program : org/hisp/dhis/an public final fun getDisplayNoteLabel ()Ljava/lang/String; public final fun getDisplayOrgUnitLabel ()Ljava/lang/String; public final fun getDisplayProgramStageLabel ()Ljava/lang/String; + public final fun getDisplayProgramStagesLabel ()Ljava/lang/String; public final fun getDisplayRelationshipLabel ()Ljava/lang/String; public fun getDisplayShortName ()Ljava/lang/String; public final fun getDisplayTrackedEntityAttributeLabel ()Ljava/lang/String; @@ -13743,7 +13752,9 @@ public class org/hisp/dhis/android/core/program/ProgramBuilder : org/hisp/dhis/a public fun displayDescription (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; public final fun displayEnrollmentDateLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; public final fun displayEnrollmentLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; + public final fun displayEnrollmentsLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; public final fun displayEventLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; + public final fun displayEventsLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; public final fun displayFollowUpLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; public final fun displayFrontPageList (Ljava/lang/Boolean;)Lorg/hisp/dhis/android/core/program/Program$Builder; public final fun displayIncidentDate (Ljava/lang/Boolean;)Lorg/hisp/dhis/android/core/program/Program$Builder; @@ -13753,6 +13764,7 @@ public class org/hisp/dhis/android/core/program/ProgramBuilder : org/hisp/dhis/a public final fun displayNoteLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; public final fun displayOrgUnitLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; public final fun displayProgramStageLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; + public final fun displayProgramStagesLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; public final fun displayRelationshipLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; public synthetic fun displayShortName (Ljava/lang/String;)Lorg/hisp/dhis/android/core/common/BaseNameableObject$Builder; public fun displayShortName (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/Program$Builder; @@ -13774,7 +13786,9 @@ public class org/hisp/dhis/android/core/program/ProgramBuilder : org/hisp/dhis/a protected final fun getDisplayDescription ()Ljava/lang/String; protected final fun getDisplayEnrollmentDateLabel ()Ljava/lang/String; protected final fun getDisplayEnrollmentLabel ()Ljava/lang/String; + protected final fun getDisplayEnrollmentsLabel ()Ljava/lang/String; protected final fun getDisplayEventLabel ()Ljava/lang/String; + protected final fun getDisplayEventsLabel ()Ljava/lang/String; protected final fun getDisplayFollowUpLabel ()Ljava/lang/String; protected final fun getDisplayFrontPageList ()Ljava/lang/Boolean; protected final fun getDisplayIncidentDate ()Ljava/lang/Boolean; @@ -13783,6 +13797,7 @@ public class org/hisp/dhis/android/core/program/ProgramBuilder : org/hisp/dhis/a protected final fun getDisplayNoteLabel ()Ljava/lang/String; protected final fun getDisplayOrgUnitLabel ()Ljava/lang/String; protected final fun getDisplayProgramStageLabel ()Ljava/lang/String; + protected final fun getDisplayProgramStagesLabel ()Ljava/lang/String; protected final fun getDisplayRelationshipLabel ()Ljava/lang/String; protected final fun getDisplayShortName ()Ljava/lang/String; protected final fun getDisplayTrackedEntityAttributeLabel ()Ljava/lang/String; @@ -13835,7 +13850,9 @@ public class org/hisp/dhis/android/core/program/ProgramBuilder : org/hisp/dhis/a protected final fun setDisplayDescription (Ljava/lang/String;)V protected final fun setDisplayEnrollmentDateLabel (Ljava/lang/String;)V protected final fun setDisplayEnrollmentLabel (Ljava/lang/String;)V + protected final fun setDisplayEnrollmentsLabel (Ljava/lang/String;)V protected final fun setDisplayEventLabel (Ljava/lang/String;)V + protected final fun setDisplayEventsLabel (Ljava/lang/String;)V protected final fun setDisplayFollowUpLabel (Ljava/lang/String;)V protected final fun setDisplayFrontPageList (Ljava/lang/Boolean;)V protected final fun setDisplayIncidentDate (Ljava/lang/Boolean;)V @@ -13844,6 +13861,7 @@ public class org/hisp/dhis/android/core/program/ProgramBuilder : org/hisp/dhis/a protected final fun setDisplayNoteLabel (Ljava/lang/String;)V protected final fun setDisplayOrgUnitLabel (Ljava/lang/String;)V protected final fun setDisplayProgramStageLabel (Ljava/lang/String;)V + protected final fun setDisplayProgramStagesLabel (Ljava/lang/String;)V protected final fun setDisplayRelationshipLabel (Ljava/lang/String;)V protected final fun setDisplayShortName (Ljava/lang/String;)V protected final fun setDisplayTrackedEntityAttributeLabel (Ljava/lang/String;)V @@ -14817,7 +14835,7 @@ public final class org/hisp/dhis/android/core/program/ProgramSectionCollectionRe public final class org/hisp/dhis/android/core/program/ProgramStage : org/hisp/dhis/android/core/common/BaseIdentifiableObjectKt, org/hisp/dhis/android/core/common/CoreObject, org/hisp/dhis/android/core/common/ObjectWithStyleKt { public static final field Companion Lorg/hisp/dhis/android/core/program/ProgramStage$Companion; - public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/FormType;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/period/PeriodType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/ValidationStrategy;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;)V + public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/FormType;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/period/PeriodType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/ValidationStrategy;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;)V public final fun access ()Lorg/hisp/dhis/android/core/common/Access; public final fun allowGenerateNextVisit ()Ljava/lang/Boolean; public final fun attributeValues ()Ljava/util/List; @@ -14853,22 +14871,24 @@ public final class org/hisp/dhis/android/core/program/ProgramStage : org/hisp/dh public final fun component34 ()Lorg/hisp/dhis/android/core/common/ValidationStrategy; public final fun component35 ()Ljava/lang/String; public final fun component36 ()Ljava/lang/String; - public final fun component37 ()Ljava/util/List; - public final fun component38 ()Lorg/hisp/dhis/android/core/common/ObjectStyle; + public final fun component37 ()Ljava/lang/String; + public final fun component38 ()Ljava/util/List; + public final fun component39 ()Lorg/hisp/dhis/android/core/common/ObjectStyle; public final fun component4 ()Ljava/lang/String; public final fun component5 ()Ljava/util/Date; public final fun component6 ()Ljava/util/Date; public final fun component7 ()Ljava/lang/Boolean; public final fun component8 ()Ljava/lang/String; public final fun component9 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/FormType;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/period/PeriodType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/ValidationStrategy;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;)Lorg/hisp/dhis/android/core/program/ProgramStage; - public static synthetic fun copy$default (Lorg/hisp/dhis/android/core/program/ProgramStage;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/FormType;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/period/PeriodType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/ValidationStrategy;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;IILjava/lang/Object;)Lorg/hisp/dhis/android/core/program/ProgramStage; + public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/FormType;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/period/PeriodType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/ValidationStrategy;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;)Lorg/hisp/dhis/android/core/program/ProgramStage; + public static synthetic fun copy$default (Lorg/hisp/dhis/android/core/program/ProgramStage;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/FormType;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/period/PeriodType;Lorg/hisp/dhis/android/core/common/ObjectWithUid;Lorg/hisp/dhis/android/core/common/Access;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/common/ValidationStrategy;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/ObjectStyle;IILjava/lang/Object;)Lorg/hisp/dhis/android/core/program/ProgramStage; public fun created ()Ljava/util/Date; public fun deleted ()Ljava/lang/Boolean; public final fun description ()Ljava/lang/String; public final fun displayDescription ()Ljava/lang/String; public final fun displayDueDateLabel ()Ljava/lang/String; public final fun displayEventLabel ()Ljava/lang/String; + public final fun displayEventsLabel ()Ljava/lang/String; public final fun displayExecutionDateLabel ()Ljava/lang/String; public final fun displayGenerateEventBox ()Ljava/lang/Boolean; public fun displayName ()Ljava/lang/String; @@ -14893,6 +14913,7 @@ public final class org/hisp/dhis/android/core/program/ProgramStage : org/hisp/dh public final fun getDisplayDescription ()Ljava/lang/String; public final fun getDisplayDueDateLabel ()Ljava/lang/String; public final fun getDisplayEventLabel ()Ljava/lang/String; + public final fun getDisplayEventsLabel ()Ljava/lang/String; public final fun getDisplayExecutionDateLabel ()Ljava/lang/String; public final fun getDisplayGenerateEventBox ()Ljava/lang/Boolean; public fun getDisplayName ()Ljava/lang/String; @@ -14975,6 +14996,7 @@ public class org/hisp/dhis/android/core/program/ProgramStageBuilder : org/hisp/d public final fun displayDescription (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/ProgramStage$Builder; public final fun displayDueDateLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/ProgramStage$Builder; public final fun displayEventLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/ProgramStage$Builder; + public final fun displayEventsLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/ProgramStage$Builder; public final fun displayExecutionDateLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/program/ProgramStage$Builder; public final fun displayGenerateEventBox (Ljava/lang/Boolean;)Lorg/hisp/dhis/android/core/program/ProgramStage$Builder; public synthetic fun displayName (Ljava/lang/String;)Lorg/hisp/dhis/android/core/common/BaseIdentifiableObject$Builder; @@ -14996,6 +15018,7 @@ public class org/hisp/dhis/android/core/program/ProgramStageBuilder : org/hisp/d protected final fun getDisplayDescription ()Ljava/lang/String; protected final fun getDisplayDueDateLabel ()Ljava/lang/String; protected final fun getDisplayEventLabel ()Ljava/lang/String; + protected final fun getDisplayEventsLabel ()Ljava/lang/String; protected final fun getDisplayExecutionDateLabel ()Ljava/lang/String; protected final fun getDisplayGenerateEventBox ()Ljava/lang/Boolean; protected final fun getDisplayName ()Ljava/lang/String; @@ -15046,6 +15069,7 @@ public class org/hisp/dhis/android/core/program/ProgramStageBuilder : org/hisp/d protected final fun setDisplayDescription (Ljava/lang/String;)V protected final fun setDisplayDueDateLabel (Ljava/lang/String;)V protected final fun setDisplayEventLabel (Ljava/lang/String;)V + protected final fun setDisplayEventsLabel (Ljava/lang/String;)V protected final fun setDisplayExecutionDateLabel (Ljava/lang/String;)V protected final fun setDisplayGenerateEventBox (Ljava/lang/Boolean;)V protected final fun setDisplayName (Ljava/lang/String;)V @@ -21637,7 +21661,7 @@ public abstract interface class org/hisp/dhis/android/core/trackedentity/Tracked public final class org/hisp/dhis/android/core/trackedentity/TrackedEntityType : org/hisp/dhis/android/core/common/BaseNameableObjectKt, org/hisp/dhis/android/core/common/CoreObject, org/hisp/dhis/android/core/common/ObjectWithStyleKt { public static final field Companion Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType$Companion; - public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/Access;Lorg/hisp/dhis/android/core/common/ObjectStyle;)V + public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/Access;Lorg/hisp/dhis/android/core/common/ObjectStyle;Ljava/lang/String;)V public final fun access ()Lorg/hisp/dhis/android/core/common/Access; public static final fun builder ()Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType$Builder; public fun code ()Ljava/lang/String; @@ -21648,6 +21672,7 @@ public final class org/hisp/dhis/android/core/trackedentity/TrackedEntityType : public final fun component13 ()Lorg/hisp/dhis/android/core/common/FeatureType; public final fun component14 ()Lorg/hisp/dhis/android/core/common/Access; public final fun component15 ()Lorg/hisp/dhis/android/core/common/ObjectStyle; + public final fun component16 ()Ljava/lang/String; public final fun component2 ()Ljava/lang/String; public final fun component3 ()Ljava/lang/String; public final fun component4 ()Ljava/lang/String; @@ -21656,14 +21681,15 @@ public final class org/hisp/dhis/android/core/trackedentity/TrackedEntityType : public final fun component7 ()Ljava/lang/Boolean; public final fun component8 ()Ljava/lang/String; public final fun component9 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/Access;Lorg/hisp/dhis/android/core/common/ObjectStyle;)Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType; - public static synthetic fun copy$default (Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/Access;Lorg/hisp/dhis/android/core/common/ObjectStyle;ILjava/lang/Object;)Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType; + public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/Access;Lorg/hisp/dhis/android/core/common/ObjectStyle;Ljava/lang/String;)Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType; + public static synthetic fun copy$default (Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lorg/hisp/dhis/android/core/common/FeatureType;Lorg/hisp/dhis/android/core/common/Access;Lorg/hisp/dhis/android/core/common/ObjectStyle;Ljava/lang/String;ILjava/lang/Object;)Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType; public fun created ()Ljava/util/Date; public fun deleted ()Ljava/lang/Boolean; public fun description ()Ljava/lang/String; public fun displayDescription ()Ljava/lang/String; public fun displayName ()Ljava/lang/String; public fun displayShortName ()Ljava/lang/String; + public final fun displayTrackedEntityTypesLabel ()Ljava/lang/String; public fun equals (Ljava/lang/Object;)Z public final fun featureType ()Lorg/hisp/dhis/android/core/common/FeatureType; public final fun getAccess ()Lorg/hisp/dhis/android/core/common/Access; @@ -21674,6 +21700,7 @@ public final class org/hisp/dhis/android/core/trackedentity/TrackedEntityType : public fun getDisplayDescription ()Ljava/lang/String; public fun getDisplayName ()Ljava/lang/String; public fun getDisplayShortName ()Ljava/lang/String; + public final fun getDisplayTrackedEntityTypesLabel ()Ljava/lang/String; public final fun getFeatureType ()Lorg/hisp/dhis/android/core/common/FeatureType; public fun getLastUpdated ()Ljava/util/Date; public fun getName ()Ljava/lang/String; @@ -21801,6 +21828,7 @@ public class org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeBuilder : public fun displayName (Ljava/lang/String;)Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType$Builder; public synthetic fun displayShortName (Ljava/lang/String;)Lorg/hisp/dhis/android/core/common/BaseNameableObject$Builder; public fun displayShortName (Ljava/lang/String;)Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType$Builder; + public final fun displayTrackedEntityTypesLabel (Ljava/lang/String;)Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType$Builder; public final fun featureType (Lorg/hisp/dhis/android/core/common/FeatureType;)Lorg/hisp/dhis/android/core/trackedentity/TrackedEntityType$Builder; protected final fun getAccess ()Lorg/hisp/dhis/android/core/common/Access; protected final fun getCode ()Ljava/lang/String; @@ -21810,6 +21838,7 @@ public class org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeBuilder : protected final fun getDisplayDescription ()Ljava/lang/String; protected final fun getDisplayName ()Ljava/lang/String; protected final fun getDisplayShortName ()Ljava/lang/String; + protected final fun getDisplayTrackedEntityTypesLabel ()Ljava/lang/String; protected final fun getFeatureType ()Lorg/hisp/dhis/android/core/common/FeatureType; protected final fun getLastUpdated ()Ljava/util/Date; protected final fun getName ()Ljava/lang/String; @@ -21831,6 +21860,7 @@ public class org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeBuilder : protected final fun setDisplayDescription (Ljava/lang/String;)V protected final fun setDisplayName (Ljava/lang/String;)V protected final fun setDisplayShortName (Ljava/lang/String;)V + protected final fun setDisplayTrackedEntityTypesLabel (Ljava/lang/String;)V protected final fun setFeatureType (Lorg/hisp/dhis/android/core/common/FeatureType;)V protected final fun setLastUpdated (Ljava/util/Date;)V protected final fun setName (Ljava/lang/String;)V @@ -27060,6 +27090,7 @@ public final class org/hisp/dhis/android/persistence/program/ProgramStageTableIn public static final field DESCRIPTION Ljava/lang/String; public static final field DISPLAY_DESCRIPTION Ljava/lang/String; public static final field DISPLAY_DUE_DATE_LABEL Ljava/lang/String; + public static final field DISPLAY_EVENTS_LABEL Ljava/lang/String; public static final field DISPLAY_EVENT_LABEL Ljava/lang/String; public static final field DISPLAY_EXECUTION_DATE_LABEL Ljava/lang/String; public static final field DISPLAY_GENERATE_EVENT_BOX Ljava/lang/String; @@ -27110,8 +27141,10 @@ public final class org/hisp/dhis/android/persistence/program/ProgramTableInfo$Co public static final field DATA_ENTRY_METHOD Ljava/lang/String; public static final field DESCRIPTION Ljava/lang/String; public static final field DISPLAY_DESCRIPTION Ljava/lang/String; + public static final field DISPLAY_ENROLLMENTS_LABEL Ljava/lang/String; public static final field DISPLAY_ENROLLMENT_DATE_LABEL Ljava/lang/String; public static final field DISPLAY_ENROLLMENT_LABEL Ljava/lang/String; + public static final field DISPLAY_EVENTS_LABEL Ljava/lang/String; public static final field DISPLAY_EVENT_LABEL Ljava/lang/String; public static final field DISPLAY_FOLLOW_UP_LABEL Ljava/lang/String; public static final field DISPLAY_FRONT_PAGE_LIST Ljava/lang/String; @@ -27120,6 +27153,7 @@ public final class org/hisp/dhis/android/persistence/program/ProgramTableInfo$Co public static final field DISPLAY_NAME Ljava/lang/String; public static final field DISPLAY_NOTE_LABEL Ljava/lang/String; public static final field DISPLAY_ORG_UNIT_LABEL Ljava/lang/String; + public static final field DISPLAY_PROGRAM_STAGES_LABEL Ljava/lang/String; public static final field DISPLAY_PROGRAM_STAGE_LABEL Ljava/lang/String; public static final field DISPLAY_RELATIONSHIP_LABEL Ljava/lang/String; public static final field DISPLAY_SHORT_NAME Ljava/lang/String; @@ -28220,6 +28254,7 @@ public final class org/hisp/dhis/android/persistence/trackedentity/TrackedEntity public static final field DISPLAY_DESCRIPTION Ljava/lang/String; public static final field DISPLAY_NAME Ljava/lang/String; public static final field DISPLAY_SHORT_NAME Ljava/lang/String; + public static final field DISPLAY_TRACKED_ENTITY_TYPES_LABEL Ljava/lang/String; public static final field FEATURE_TYPE Ljava/lang/String; public static final field ICON Ljava/lang/String; public static final field LAST_UPDATED Ljava/lang/String; diff --git a/core/src/main/assets/migrations/181.sql b/core/src/main/assets/migrations/181.sql index 4dbf4436fac..1ab9a0e8760 100644 --- a/core/src/main/assets/migrations/181.sql +++ b/core/src/main/assets/migrations/181.sql @@ -182,3 +182,11 @@ ALTER TABLE TrackedEntityAttributeLegendSetLink RENAME TO TrackedEntityAttribute CREATE TABLE TrackedEntityAttributeLegendSetLink(trackedEntityAttribute TEXT NOT NULL, legendSet TEXT NOT NULL, sortOrder INTEGER NOT NULL, PRIMARY KEY(trackedEntityAttribute, legendSet), FOREIGN KEY(trackedEntityAttribute) REFERENCES TrackedEntityAttribute(uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY(legendSet) REFERENCES LegendSet(uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED); INSERT INTO TrackedEntityAttributeLegendSetLink(trackedEntityAttribute, legendSet, sortOrder) SELECT trackedEntityAttribute, legendSet, sortOrder FROM TrackedEntityAttributeLegendSetLink_Old; DROP TABLE IF EXISTS TrackedEntityAttributeLegendSetLink_Old; + + +# Add tracker custom terminology plurals labels (ANDROSDK-2275) +ALTER TABLE Program ADD COLUMN displayEnrollmentsLabel TEXT; +ALTER TABLE Program ADD COLUMN displayEventsLabel TEXT; +ALTER TABLE Program ADD COLUMN displayProgramStagesLabel TEXT; +ALTER TABLE ProgramStage ADD COLUMN displayEventsLabel TEXT; +ALTER TABLE TrackedEntityType ADD COLUMN displayTrackedEntityTypesLabel TEXT; \ No newline at end of file diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/Program.kt b/core/src/main/java/org/hisp/dhis/android/core/program/Program.kt index 51b635d63e9..ee6a811f445 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/Program.kt +++ b/core/src/main/java/org/hisp/dhis/android/core/program/Program.kt @@ -84,13 +84,16 @@ data class Program( val featureType: FeatureType?, val accessLevel: AccessLevel?, val displayEnrollmentLabel: String?, + val displayEnrollmentsLabel: String?, val displayFollowUpLabel: String?, val displayOrgUnitLabel: String?, val displayRelationshipLabel: String?, val displayNoteLabel: String?, val displayTrackedEntityAttributeLabel: String?, val displayProgramStageLabel: String?, + val displayProgramStagesLabel: String?, val displayEventLabel: String?, + val displayEventsLabel: String?, val attributeValues: List?, val enrollmentCategoryCombo: ObjectWithUid, internal val categoryMappings: List?, @@ -135,6 +138,8 @@ data class Program( fun enrollmentLabel(): String? = displayEnrollmentLabel fun displayEnrollmentLabel(): String? = displayEnrollmentLabel + fun displayEnrollmentsLabel(): String? = displayEnrollmentsLabel + @Deprecated("since v41, replaced by displayFollowUpLabel()") fun followUpLabel(): String? = displayFollowUpLabel fun displayFollowUpLabel(): String? = displayFollowUpLabel @@ -159,10 +164,14 @@ data class Program( fun programStageLabel(): String? = displayProgramStageLabel fun displayProgramStageLabel(): String? = displayProgramStageLabel + fun displayProgramStagesLabel(): String? = displayProgramStagesLabel + @Deprecated("since v41, replaced by displayEventLabel()") fun eventLabel(): String? = displayEventLabel fun displayEventLabel(): String? = displayEventLabel + fun displayEventsLabel(): String? = displayEventsLabel + fun attributeValues(): List? = attributeValues fun enrollmentCategoryCombo(): ObjectWithUid = enrollmentCategoryCombo internal fun categoryMappings(): List? = categoryMappings diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.kt index 925506bcadd..8d74c2631d3 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.kt +++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.kt @@ -82,6 +82,7 @@ data class ProgramStage( val validationStrategy: ValidationStrategy?, val displayProgramStageLabel: String?, val displayEventLabel: String?, + val displayEventsLabel: String?, val attributeValues: List?, override val style: ObjectStyle, ) : BaseIdentifiableObjectKt, CoreObject, ObjectWithStyleKt { @@ -129,6 +130,7 @@ data class ProgramStage( fun eventLabel(): String? = displayEventLabel fun displayEventLabel(): String? = displayEventLabel + fun displayEventsLabel(): String? = displayEventsLabel fun attributeValues(): List? = attributeValues fun toBuilder(): Builder = ProgramStageBuilder.from(this) diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityType.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityType.kt index 4c3666d2f28..51178366827 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityType.kt +++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityType.kt @@ -55,11 +55,13 @@ data class TrackedEntityType( val featureType: FeatureType?, val access: Access, override val style: ObjectStyle, + val displayTrackedEntityTypesLabel: String?, ) : BaseNameableObjectKt, CoreObject, ObjectWithStyleKt { fun trackedEntityTypeAttributes(): List? = trackedEntityTypeAttributes fun featureType(): FeatureType? = featureType fun access(): Access = access + fun displayTrackedEntityTypesLabel(): String? = displayTrackedEntityTypesLabel fun toBuilder(): Builder = TrackedEntityTypeBuilder.from(this) diff --git a/core/src/main/java/org/hisp/dhis/android/network/program/ProgramDTO.kt b/core/src/main/java/org/hisp/dhis/android/network/program/ProgramDTO.kt index 9682c305bdc..5aa821940d6 100644 --- a/core/src/main/java/org/hisp/dhis/android/network/program/ProgramDTO.kt +++ b/core/src/main/java/org/hisp/dhis/android/network/program/ProgramDTO.kt @@ -28,6 +28,7 @@ package org.hisp.dhis.android.network.program +import android.system.Os.access import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import org.hisp.dhis.android.core.common.FeatureType @@ -91,6 +92,7 @@ internal data class ProgramDTO( val accessLevel: String?, val enrollmentLabel: String?, val displayEnrollmentLabel: String?, + val displayEnrollmentsLabel: String?, val followUpLabel: String?, val displayFollowUpLabel: String?, val orgUnitLabel: String?, @@ -103,8 +105,10 @@ internal data class ProgramDTO( val displayTrackedEntityAttributeLabel: String?, val programStageLabel: String?, val displayProgramStageLabel: String?, + val displayProgramStagesLabel: String?, val eventLabel: String?, val displayEventLabel: String?, + val displayEventsLabel: String?, val attributeValues: List?, val enrollmentCategoryCombo: CategoryComboWithFallbackDTO = CategoryComboWithFallbackDTO(null), val categoryMappings: List?, @@ -142,13 +146,16 @@ internal data class ProgramDTO( featureType(featureType?.let { FeatureType.valueOf(it) }) accessLevel(accessLevel?.let { AccessLevel.valueOf(accessLevel) }) displayEnrollmentLabel(displayEnrollmentLabel ?: enrollmentLabel) + displayEnrollmentsLabel(displayEnrollmentsLabel ?: enrollmentLabel) displayFollowUpLabel(displayFollowUpLabel ?: followUpLabel) displayOrgUnitLabel(displayOrgUnitLabel ?: orgUnitLabel) displayRelationshipLabel(displayRelationshipLabel ?: relationshipLabel) displayNoteLabel(displayNoteLabel ?: noteLabel) displayTrackedEntityAttributeLabel(displayTrackedEntityAttributeLabel ?: trackedEntityAttributeLabel) displayProgramStageLabel(displayProgramStageLabel ?: programStageLabel) + displayProgramStagesLabel(displayProgramStagesLabel ?: programStageLabel) displayEventLabel(displayEventLabel ?: eventLabel) + displayEventsLabel(displayEventsLabel ?: eventLabel) attributeValues?.let { attributeValues(it.map { it.toDomain() }) } enrollmentCategoryCombo(enrollmentCategoryCombo.toDomain()) categoryMappings(categoryMappings?.map { it.toDomain(id) }) diff --git a/core/src/main/java/org/hisp/dhis/android/network/program/ProgramFields.kt b/core/src/main/java/org/hisp/dhis/android/network/program/ProgramFields.kt index cfc7f63a30e..023601c0614 100644 --- a/core/src/main/java/org/hisp/dhis/android/network/program/ProgramFields.kt +++ b/core/src/main/java/org/hisp/dhis/android/network/program/ProgramFields.kt @@ -97,6 +97,9 @@ internal object ProgramFields : BaseFields() { fh.field(Columns.DISPLAY_EVENT_LABEL), fh.nestedFieldWithUid(Columns.ENROLLMENT_CATEGORY_COMBO), fh.nestedField(CATEGORY_MAPPINGS).with(CategoryMappingFields.allFields), + fh.field(Columns.DISPLAY_ENROLLMENTS_LABEL), + fh.field(Columns.DISPLAY_PROGRAM_STAGES_LABEL), + fh.field(Columns.DISPLAY_EVENTS_LABEL), ) val allFields = Fields.from( diff --git a/core/src/main/java/org/hisp/dhis/android/network/programstage/ProgramStageDTO.kt b/core/src/main/java/org/hisp/dhis/android/network/programstage/ProgramStageDTO.kt index 4323c8ae3cf..ae9c9169379 100644 --- a/core/src/main/java/org/hisp/dhis/android/network/programstage/ProgramStageDTO.kt +++ b/core/src/main/java/org/hisp/dhis/android/network/programstage/ProgramStageDTO.kt @@ -87,6 +87,7 @@ internal data class ProgramStageDTO( val displayProgramStageLabel: String?, val eventLabel: String?, val displayEventLabel: String?, + val displayEventsLabel: String?, val attributeValues: List? = emptyList(), ) : BaseIdentifiableObjectDTO { fun toDomain(): ProgramStage { @@ -122,6 +123,7 @@ internal data class ProgramStageDTO( validationStrategy(validationStrategy?.let { ValidationStrategy.valueOf(it) }) displayProgramStageLabel(displayProgramStageLabel ?: programStageLabel) displayEventLabel(displayEventLabel ?: eventLabel) + displayEventsLabel(displayEventsLabel ?: eventLabel) attributeValues(attributeValues?.map { it.toDomain() }) } .build() diff --git a/core/src/main/java/org/hisp/dhis/android/network/programstage/ProgramStageFields.kt b/core/src/main/java/org/hisp/dhis/android/network/programstage/ProgramStageFields.kt index 7b29a992ebd..76f72d8f130 100644 --- a/core/src/main/java/org/hisp/dhis/android/network/programstage/ProgramStageFields.kt +++ b/core/src/main/java/org/hisp/dhis/android/network/programstage/ProgramStageFields.kt @@ -84,5 +84,6 @@ internal object ProgramStageFields : BaseFields() { fh.nestedField(STYLE).with(ObjectStyleFields.allFields), fh.nestedField(ATTRIBUTE_VALUES).with(AttributeValueFields.allFields), fh.nestedField(ACCESS).with(AccessFields.data.with(DataAccessFields.write)), + fh.field(Columns.DISPLAY_EVENTS_LABEL), ) } diff --git a/core/src/main/java/org/hisp/dhis/android/network/trackedentitytype/TrackedEntityTypeDTO.kt b/core/src/main/java/org/hisp/dhis/android/network/trackedentitytype/TrackedEntityTypeDTO.kt index 37d3440d226..41d274ddc21 100644 --- a/core/src/main/java/org/hisp/dhis/android/network/trackedentitytype/TrackedEntityTypeDTO.kt +++ b/core/src/main/java/org/hisp/dhis/android/network/trackedentitytype/TrackedEntityTypeDTO.kt @@ -56,6 +56,7 @@ internal data class TrackedEntityTypeDTO( val featureType: String?, val access: AccessDTO?, val style: ObjectWithStyleDTO?, + val displayTrackedEntityTypesLabel: String?, ) : BaseNameableObjectDTO { fun toDomain(): TrackedEntityType { return TrackedEntityType.builder().apply { @@ -64,6 +65,7 @@ internal data class TrackedEntityTypeDTO( featureType?.let { featureType(FeatureType.valueOf(it)) } access?.let { access(it.toDomain()) } style?.let { style(it.toDomain()) } + displayTrackedEntityTypesLabel?.let { displayTrackedEntityTypesLabel(it) } }.build() } } diff --git a/core/src/main/java/org/hisp/dhis/android/network/trackedentitytype/TrackedEntityTypeFields.kt b/core/src/main/java/org/hisp/dhis/android/network/trackedentitytype/TrackedEntityTypeFields.kt index 048170ac957..5d4db7e9320 100644 --- a/core/src/main/java/org/hisp/dhis/android/network/trackedentitytype/TrackedEntityTypeFields.kt +++ b/core/src/main/java/org/hisp/dhis/android/network/trackedentitytype/TrackedEntityTypeFields.kt @@ -53,5 +53,6 @@ internal object TrackedEntityTypeFields : BaseFields() { .with(TrackedEntityTypeAttributeFields.allFields), fh.nestedField(STYLE).with(ObjectStyleFields.allFields), fh.nestedField(ACCESS).with(AccessFields.data.with(DataAccessFields.allFields)), + fh.field(Columns.DISPLAY_TRACKED_ENTITY_TYPES_LABEL), ) } diff --git a/core/src/main/java/org/hisp/dhis/android/persistence/program/ProgramDB.kt b/core/src/main/java/org/hisp/dhis/android/persistence/program/ProgramDB.kt index a0ab991559b..db7cdf74b46 100644 --- a/core/src/main/java/org/hisp/dhis/android/persistence/program/ProgramDB.kt +++ b/core/src/main/java/org/hisp/dhis/android/persistence/program/ProgramDB.kt @@ -93,6 +93,9 @@ internal data class ProgramDB( val displayProgramStageLabel: String?, val displayEventLabel: String?, val enrollmentCategoryCombo: String, + val displayEnrollmentsLabel: String?, + val displayProgramStagesLabel: String?, + val displayEventsLabel: String?, ) : EntityDB, BaseNameableObjectDB { override fun toDomain(): Program { @@ -132,6 +135,9 @@ internal data class ProgramDB( displayProgramStageLabel(displayProgramStageLabel) displayEventLabel(displayEventLabel) enrollmentCategoryCombo(ObjectWithUid.create(enrollmentCategoryCombo)) + displayEnrollmentsLabel(displayEnrollmentsLabel) + displayProgramStagesLabel(displayProgramStagesLabel) + displayEventsLabel(displayEventsLabel) }.build() } } @@ -175,13 +181,16 @@ internal fun Program.toDB(): ProgramDB { color = style().color(), icon = style().icon(), displayEnrollmentLabel = displayEnrollmentLabel(), + displayEnrollmentsLabel = displayEnrollmentsLabel(), displayFollowUpLabel = displayFollowUpLabel(), displayOrgUnitLabel = displayOrgUnitLabel(), displayRelationshipLabel = displayRelationshipLabel(), displayNoteLabel = displayNoteLabel(), displayTrackedEntityAttributeLabel = displayTrackedEntityAttributeLabel(), displayProgramStageLabel = displayProgramStageLabel(), + displayProgramStagesLabel = displayProgramStagesLabel(), displayEventLabel = displayEventLabel(), + displayEventsLabel = displayEventsLabel(), enrollmentCategoryCombo = enrollmentCategoryCombo().uid(), ) } diff --git a/core/src/main/java/org/hisp/dhis/android/persistence/program/ProgramStageDB.kt b/core/src/main/java/org/hisp/dhis/android/persistence/program/ProgramStageDB.kt index ddd66978882..1c586caf536 100644 --- a/core/src/main/java/org/hisp/dhis/android/persistence/program/ProgramStageDB.kt +++ b/core/src/main/java/org/hisp/dhis/android/persistence/program/ProgramStageDB.kt @@ -66,6 +66,7 @@ internal data class ProgramStageDB( val validationStrategy: String?, val displayProgramStageLabel: String?, val displayEventLabel: String?, + val displayEventsLabel: String?, ) : EntityDB, BaseIdentifiableObjectDB, ObjectWithStyleDB { override fun toDomain(): ProgramStage { @@ -99,6 +100,7 @@ internal data class ProgramStageDB( validationStrategy?.let { validationStrategy(ValidationStrategy.valueOf(it)) } displayProgramStageLabel(displayProgramStageLabel) displayEventLabel(displayEventLabel) + displayEventsLabel(displayEventsLabel) }.build() } } @@ -140,5 +142,6 @@ internal fun ProgramStage.toDB(): ProgramStageDB { validationStrategy = validationStrategy()?.name, displayProgramStageLabel = displayProgramStageLabel(), displayEventLabel = displayEventLabel(), + displayEventsLabel = displayEventsLabel(), ) } diff --git a/core/src/main/java/org/hisp/dhis/android/persistence/trackedentity/TrackedEntityTypeDB.kt b/core/src/main/java/org/hisp/dhis/android/persistence/trackedentity/TrackedEntityTypeDB.kt index eade67152b0..23c9237e7a5 100644 --- a/core/src/main/java/org/hisp/dhis/android/persistence/trackedentity/TrackedEntityTypeDB.kt +++ b/core/src/main/java/org/hisp/dhis/android/persistence/trackedentity/TrackedEntityTypeDB.kt @@ -29,6 +29,7 @@ internal data class TrackedEntityTypeDB( override val color: String?, override val icon: String?, val accessDataWrite: AccessDB?, + val displayTrackedEntityTypesLabel: String?, ) : EntityDB, BaseNameableObjectDB, ObjectWithStyleDB { override fun toDomain(): TrackedEntityType { @@ -37,6 +38,7 @@ internal data class TrackedEntityTypeDB( style(this@TrackedEntityTypeDB.toDomainStyle()) featureType(featureType?.let { FeatureType.valueOf(it) }) accessDataWrite?.let { access(it.toDomain()) } + displayTrackedEntityTypesLabel(displayTrackedEntityTypesLabel) }.build() } } @@ -57,5 +59,6 @@ internal fun TrackedEntityType.toDB(): TrackedEntityTypeDB { color = style().color(), icon = style().icon(), accessDataWrite = access().toDB(), + displayTrackedEntityTypesLabel = displayTrackedEntityTypesLabel(), ) } diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramSamples.java b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramSamples.java index a689f7e6965..81f99fb00d5 100644 --- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramSamples.java +++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramSamples.java @@ -75,13 +75,16 @@ public static Program getProgram() { .featureType(FeatureType.POINT) .accessLevel(AccessLevel.PROTECTED) .displayEnrollmentLabel("enrollmentLabel") + .displayEnrollmentsLabel("enrollmentsLabel") .displayFollowUpLabel("followUpLabel") .displayOrgUnitLabel("orgUnitLabel") .displayRelationshipLabel("relationshipLabel") .displayNoteLabel("noteLabel") .displayTrackedEntityAttributeLabel("trackedEntityAttributeLabel") .displayProgramStageLabel("programStageLabel") + .displayProgramStagesLabel("programStagesLabel") .displayEventLabel("eventLabel") + .displayEventsLabel("eventsLabel") .enrollmentCategoryCombo(ObjectWithUid.create("category_combo_uid")) .build(); return builder.build(); @@ -122,13 +125,16 @@ public static Program getAntenatalProgram() { .featureType(FeatureType.NONE) .maxTeiCountToReturn(20) .displayEnrollmentLabel("Enrollment Label") + .displayEnrollmentsLabel("Enrollments Label") .displayFollowUpLabel("Follow up Label") .displayOrgUnitLabel("OrgUnit Label") .displayRelationshipLabel("Relationship Label") .displayNoteLabel("Note Label") .displayTrackedEntityAttributeLabel("TrackedEntityAttribute Label") .displayProgramStageLabel("ProgramStage Label") + .displayProgramStagesLabel("Program Stages Label") .displayEventLabel("Event Label") + .displayEventsLabel("Events Label") .enrollmentCategoryCombo(ObjectWithUid.create("m2jTvAj5kkm")) .build(); } diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSamples.java b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSamples.java index 1002339684d..71868342a36 100644 --- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSamples.java +++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSamples.java @@ -74,6 +74,7 @@ public static ProgramStage getProgramStage() { .validationStrategy(ValidationStrategy.ON_UPDATE_AND_INSERT) .displayProgramStageLabel("programStageLabel") .displayEventLabel("eventLabel") + .displayEventsLabel("eventsLabel") .build(); } diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/TrackedEntityTypeSamples.java b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/TrackedEntityTypeSamples.java index 2e3890b087c..ef96eecab46 100644 --- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/TrackedEntityTypeSamples.java +++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/TrackedEntityTypeSamples.java @@ -49,6 +49,7 @@ public static TrackedEntityType get() { .displayDescription("Person") .featureType(FeatureType.NONE) .access(AccessHelper.createForDataWrite(true)) + .displayTrackedEntityTypesLabel("TrackedEntityTypesLabel") .build(); } diff --git a/core/src/sharedTest/resources/program/program.json b/core/src/sharedTest/resources/program/program.json index 2901ea6d64f..5ed2e92e025 100644 --- a/core/src/sharedTest/resources/program/program.json +++ b/core/src/sharedTest/resources/program/program.json @@ -14,13 +14,16 @@ "selectIncidentDatesInFuture": true, "displayIncidentDateLabel": "Date of incident", "displayEnrollmentLabel": "Enrollment Label", + "displayEnrollmentsLabel": "Enrollments Label", "displayFollowUpLabel": "Follow up Label", "displayOrgUnitLabel": "OrgUnit Label", "displayRelationshipLabel": "Relationship Label", "displayNoteLabel": "Note Label", "displayTrackedEntityAttributeLabel": "TrackedEntityAttribute Label", "displayProgramStageLabel": "ProgramStage Label", + "displayProgramStagesLabel": "Program Stages Label", "displayEventLabel": "Event Label", + "displayEventsLabel": "Events Label", "selectEnrollmentDatesInFuture": false, "registration": true, "useFirstStageDuringRegistration": false, diff --git a/core/src/sharedTest/resources/program/program_stage.json b/core/src/sharedTest/resources/program/program_stage.json index e8247bec40b..87bca352990 100644 --- a/core/src/sharedTest/resources/program/program_stage.json +++ b/core/src/sharedTest/resources/program/program_stage.json @@ -101,6 +101,7 @@ "userGroupAccesses": [], "attributeValues": [], "programStageSections": [], - "periodType": "Monthly" + "periodType": "Monthly", + "displayEventsLabel": "Events Label" } diff --git a/core/src/sharedTest/resources/program/programs.json b/core/src/sharedTest/resources/program/programs.json index 5f3ac172a21..bc17729b09e 100644 --- a/core/src/sharedTest/resources/program/programs.json +++ b/core/src/sharedTest/resources/program/programs.json @@ -37,6 +37,9 @@ "expiryPeriodType": "BiMonthly", "minAttributesRequiredToSearch": 7, "maxTeiCountToReturn": 20, + "displayEnrollmentsLabel": "Enrollments Label", + "displayProgramStagesLabel": "Program Stages Label", + "displayEventsLabel": "Events Label", "style": { "color": "#333", "icon": "antenatal_icon" diff --git a/core/src/sharedTest/resources/trackedentity/tracked_entity_type.json b/core/src/sharedTest/resources/trackedentity/tracked_entity_type.json index 65748b1765f..908e7106590 100644 --- a/core/src/sharedTest/resources/trackedentity/tracked_entity_type.json +++ b/core/src/sharedTest/resources/trackedentity/tracked_entity_type.json @@ -7,6 +7,7 @@ "displayDescription": "Person", "displayName": "Person", "description": "Person", + "displayTrackedEntityTypesLabel": "Persons", "featureType": "NONE", "externalAccess": false, "access": { diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramShould.kt index eec2151a36f..59997a9fa6a 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramShould.kt +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramShould.kt @@ -81,6 +81,9 @@ internal class ProgramShould : CoreObjectShould("program/program.jso assertThat(program.programTrackedEntityAttributes()!![0].uid()).isEqualTo("YGMlKXYa5xF") assertThat(program.programTrackedEntityAttributes()!![1].uid()).isEqualTo("WZWEBrkJSAm") assertThat(program.programSections()!![0].uid()).isEqualTo("FdpWnXhl7c1") + assertThat(program.displayEnrollmentsLabel()).isEqualTo("Enrollments Label") + assertThat(program.displayEventsLabel()).isEqualTo("Events Label") + assertThat(program.displayProgramStagesLabel()).isEqualTo("Program Stages Label") val categoryMappings = program.categoryMappings()!! assertThat(categoryMappings.size).isEqualTo(1) diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageShould.kt index f8410ed14d1..c917dc19246 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageShould.kt +++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramStageShould.kt @@ -77,6 +77,7 @@ internal class ProgramStageShould : CoreObjectShould( assertThat(programStage.enableUserAssignment()).isTrue() assertThat(programStage.displayProgramStageLabel()).isEqualTo("ProgramStage Label") assertThat(programStage.displayEventLabel()).isEqualTo("Event Label") + assertThat(programStage.displayEventsLabel()).isEqualTo("Events Label") val dataElements = programStage.programStageDataElements() assertThat(dataElements?.get(0)?.uid()).isEqualTo("EQCf1l2Mdr8") diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeShould.kt index 5155c3a8ced..ef5d1bf8628 100644 --- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeShould.kt +++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeShould.kt @@ -54,5 +54,6 @@ internal class TrackedEntityTypeShould : CoreObjectShould( assertThat(entityType.displayDescription()).isEqualTo("Person") assertThat(entityType.featureType()).isEqualTo(FeatureType.NONE) assertThat(entityType.access()).isEqualTo(AccessHelper.createForDataWrite(true)) + assertThat(entityType.displayTrackedEntityTypesLabel()).isEqualTo("Persons") } } From 8e5a7c2ba1aa47bded8dfe463101c1b570e1e376 Mon Sep 17 00:00:00 2001 From: ferdyrod Date: Wed, 8 Jul 2026 12:32:42 +0200 Subject: [PATCH 2/2] reorder new columns to match program entity --- core/src/main/assets/migrations/181.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/assets/migrations/181.sql b/core/src/main/assets/migrations/181.sql index 1ab9a0e8760..ec3d8cdd1af 100644 --- a/core/src/main/assets/migrations/181.sql +++ b/core/src/main/assets/migrations/181.sql @@ -186,7 +186,7 @@ DROP TABLE IF EXISTS TrackedEntityAttributeLegendSetLink_Old; # Add tracker custom terminology plurals labels (ANDROSDK-2275) ALTER TABLE Program ADD COLUMN displayEnrollmentsLabel TEXT; -ALTER TABLE Program ADD COLUMN displayEventsLabel TEXT; ALTER TABLE Program ADD COLUMN displayProgramStagesLabel TEXT; +ALTER TABLE Program ADD COLUMN displayEventsLabel TEXT; ALTER TABLE ProgramStage ADD COLUMN displayEventsLabel TEXT; ALTER TABLE TrackedEntityType ADD COLUMN displayTrackedEntityTypesLabel TEXT; \ No newline at end of file