Skip to content

Commit 41cf88a

Browse files
Merge pull request #13700 from SORMAS-Foundation/bugfix-13684-latent-tuberculosis-symptoms-tab-should-be-hidden
Bugfix 13684 latent tuberculosis symptoms tab should be hidden
2 parents a02101a + 08f285c commit 41cf88a

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,8 @@ public class CaseDataDto extends SormasToSormasShareableDto implements IsCase {
643643
private String department;
644644

645645
private NotifierReferenceDto notifier;
646+
@Diseases(value = {
647+
Disease.TUBERCULOSIS })
646648
private RadiographyCompatibility radiographyCompatibility;
647649
private String otherDiagnosticCriteria;
648650

sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleMaterial.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ public enum SampleMaterial {
256256
AMNIOTIC_FLUID,
257257

258258
@Diseases(value = {
259-
Disease.MEASLES,
260259
Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
261260
Disease.CRYPTOSPORIDIOSIS }, hide = true)
262261
CLINICAL_SAMPLE,

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/AbstractCaseView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public void refreshMenu(SubMenu menu, String params) {
177177
I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, CaseDataDto.PORT_HEALTH_INFO),
178178
params);
179179
}
180-
if (UiUtil.enabled(FeatureType.VIEW_TAB_CASES_SYMPTOMS)) {
180+
if (UiUtil.enabled(FeatureType.VIEW_TAB_CASES_SYMPTOMS) && !List.of(Disease.LATENT_TUBERCULOSIS).contains(caze.getDisease())) {
181181
menu.addView(CaseSymptomsView.VIEW_NAME, I18nProperties.getPrefixCaption(CaseDataDto.I18N_PREFIX, CaseDataDto.SYMPTOMS), params);
182182
}
183183
if (UiUtil.enabled(FeatureType.VIEW_TAB_CASES_EPIDEMIOLOGICAL_DATA) && caze.getDisease() != Disease.CONGENITAL_RUBELLA) {

sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/DevModeView.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,11 @@ private void generateCases() {
945945
valid = false;
946946
}
947947

948+
if (config.getDisease() == null) {
949+
errorMessage.append("You must set a valid value for field 'Disease of the cases' in 'Generate Cases'").append("<br>");
950+
valid = false;
951+
}
952+
948953
if (valid) {
949954
generateCases(config);
950955
} else {

0 commit comments

Comments
 (0)