Commit 12ebdf2
authored
chore: annotation mapping for DataElement (#23092)
* chore: annotation mapping for DataElement
* minor
* code format
* code format
* minor
* minor
* fix getters
* add sortable annotation
* fix short name translation
* fix getter
* fix clone Dimensional object
* minor
* move get de.ds.periodType to service
* fix AnalyticsServiceTest
* fix lazy exception
* fix test
* fix test
* fix test
* clean up
* clean up
* minor1 parent 469e067 commit 12ebdf2
36 files changed
Lines changed: 612 additions & 207 deletions
File tree
- dhis-2
- dhis-api/src/main/java/org/hisp/dhis
- common
- dataelement
- dataset
- datavalue
- eventchart
- eventreport
- eventvisualization
- programrule
- program
- notification/template
- sms/command/code
- trackedentity
- dhis-services
- dhis-service-administration/src/main/java/org/hisp/dhis/merge
- dhis-service-analytics/src
- main/java/org/hisp/dhis/analytics
- data
- test/java/org/hisp/dhis/analytics
- data
- util
- dhis-service-core/src/main
- java/org/hisp/dhis
- dataelement/hibernate
- dimension
- resources/org/hisp/dhis/dataelement/hibernate
- dhis-test-integration/src/test/java/org/hisp/dhis/analytics/data
- dhis-web-api/src/test/java/org/hisp/dhis/analytics/dimension
- mappers
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
44 | 45 | | |
45 | 46 | | |
| 47 | + | |
46 | 48 | | |
47 | 49 | | |
48 | 50 | | |
| |||
60 | 62 | | |
61 | 63 | | |
62 | 64 | | |
63 | | - | |
| 65 | + | |
64 | 66 | | |
65 | 67 | | |
66 | 68 | | |
| 69 | + | |
67 | 70 | | |
68 | 71 | | |
69 | 72 | | |
| |||
97 | 100 | | |
98 | 101 | | |
99 | 102 | | |
100 | | - | |
| 103 | + | |
101 | 104 | | |
102 | 105 | | |
103 | 106 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
337 | 337 | | |
338 | 338 | | |
339 | 339 | | |
340 | | - | |
| 340 | + | |
341 | 341 | | |
342 | 342 | | |
343 | 343 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
| 74 | + | |
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
| |||
0 commit comments