Skip to content

Commit 2b61103

Browse files
taridepacotaridepaco
committed
[ANDROSDK-2183] fix scope helper
update api dump
1 parent bc3d61e commit 2b61103

File tree

2 files changed

+129
-1
lines changed

2 files changed

+129
-1
lines changed

‎core/api/core.api‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5659,6 +5659,134 @@ public abstract class org/hisp/dhis/android/core/event/search/EventQueryReposito
56595659
public abstract fun trackedEntityInstance ()Ljava/lang/String;
56605660
}
56615661

5662+
public abstract class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5663+
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
5664+
public final fun getApiName (Lorg/hisp/dhis/android/core/tracker/TrackerExporterVersion;)Ljava/lang/String;
5665+
}
5666+
5667+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$CompletedBy : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5668+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$CompletedBy;
5669+
public fun equals (Ljava/lang/Object;)Z
5670+
public fun hashCode ()I
5671+
public fun toString ()Ljava/lang/String;
5672+
}
5673+
5674+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$CompletedDate : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5675+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$CompletedDate;
5676+
public fun equals (Ljava/lang/Object;)Z
5677+
public fun hashCode ()I
5678+
public fun toString ()Ljava/lang/String;
5679+
}
5680+
5681+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$Created : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5682+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$Created;
5683+
public fun equals (Ljava/lang/Object;)Z
5684+
public fun hashCode ()I
5685+
public fun toString ()Ljava/lang/String;
5686+
}
5687+
5688+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$DataElement : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5689+
public fun <init> (Ljava/lang/String;)V
5690+
}
5691+
5692+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$DueDate : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5693+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$DueDate;
5694+
public fun equals (Ljava/lang/Object;)Z
5695+
public fun hashCode ()I
5696+
public fun toString ()Ljava/lang/String;
5697+
}
5698+
5699+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$Enrollment : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5700+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$Enrollment;
5701+
public fun equals (Ljava/lang/Object;)Z
5702+
public fun hashCode ()I
5703+
public fun toString ()Ljava/lang/String;
5704+
}
5705+
5706+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$EnrollmentStatus : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5707+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$EnrollmentStatus;
5708+
public fun equals (Ljava/lang/Object;)Z
5709+
public fun hashCode ()I
5710+
public fun toString ()Ljava/lang/String;
5711+
}
5712+
5713+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$Event : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5714+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$Event;
5715+
public fun equals (Ljava/lang/Object;)Z
5716+
public fun hashCode ()I
5717+
public fun toString ()Ljava/lang/String;
5718+
}
5719+
5720+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$EventDate : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5721+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$EventDate;
5722+
public fun equals (Ljava/lang/Object;)Z
5723+
public fun hashCode ()I
5724+
public fun toString ()Ljava/lang/String;
5725+
}
5726+
5727+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$FollowUp : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5728+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$FollowUp;
5729+
public fun equals (Ljava/lang/Object;)Z
5730+
public fun hashCode ()I
5731+
public fun toString ()Ljava/lang/String;
5732+
}
5733+
5734+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$LastUpdated : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5735+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$LastUpdated;
5736+
public fun equals (Ljava/lang/Object;)Z
5737+
public fun hashCode ()I
5738+
public fun toString ()Ljava/lang/String;
5739+
}
5740+
5741+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$OrgUnit : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5742+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$OrgUnit;
5743+
public fun equals (Ljava/lang/Object;)Z
5744+
public fun hashCode ()I
5745+
public fun toString ()Ljava/lang/String;
5746+
}
5747+
5748+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$OrgUnitName : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5749+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$OrgUnitName;
5750+
public fun equals (Ljava/lang/Object;)Z
5751+
public fun hashCode ()I
5752+
public fun toString ()Ljava/lang/String;
5753+
}
5754+
5755+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$Program : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5756+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$Program;
5757+
public fun equals (Ljava/lang/Object;)Z
5758+
public fun hashCode ()I
5759+
public fun toString ()Ljava/lang/String;
5760+
}
5761+
5762+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$ProgramStage : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5763+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$ProgramStage;
5764+
public fun equals (Ljava/lang/Object;)Z
5765+
public fun hashCode ()I
5766+
public fun toString ()Ljava/lang/String;
5767+
}
5768+
5769+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$Status : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5770+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$Status;
5771+
public fun equals (Ljava/lang/Object;)Z
5772+
public fun hashCode ()I
5773+
public fun toString ()Ljava/lang/String;
5774+
}
5775+
5776+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$StoredBy : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5777+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$StoredBy;
5778+
public fun equals (Ljava/lang/Object;)Z
5779+
public fun hashCode ()I
5780+
public fun toString ()Ljava/lang/String;
5781+
}
5782+
5783+
public final class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$TrackedEntityInstance : org/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName {
5784+
public static final field INSTANCE Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderApiName$TrackedEntityInstance;
5785+
public fun equals (Ljava/lang/Object;)Z
5786+
public fun hashCode ()I
5787+
public fun toString ()Ljava/lang/String;
5788+
}
5789+
56625790
public abstract class org/hisp/dhis/android/core/event/search/EventQueryScopeOrderByItem : org/hisp/dhis/android/core/trackedentity/search/QueryScopeOrderByItem {
56635791
public fun <init> ()V
56645792
public abstract fun column ()Lorg/hisp/dhis/android/core/event/search/EventQueryScopeOrderColumn;

‎core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryRepositoryScopeHelper.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ internal object EventQueryRepositoryScopeHelper {
4848
criteria.organisationUnit()?.let { builder.orgUnits(listOf(it)) }
4949
criteria.ouMode()?.let { builder.orgUnitMode(it) }
5050
criteria.assignedUserMode()?.let { builder.assignedUserMode(it) }
51-
criteria.order()?.let { builder.order(parseOrderString(it, TrackerExporterVersion.V2)) }
51+
criteria.order()?.let { builder.order(parseOrderString(it, TrackerExporterVersion.V1)) }
5252
criteria.dataFilters()?.let { builder.dataFilters(it) }
5353
criteria.events()?.let { builder.events(it) }
5454
criteria.eventStatus()?.let { builder.eventStatus(listOf(it)) }

0 commit comments

Comments
 (0)