Merge pull request #13932 from SORMAS-Foundation/bugfix-reverting-to-development

Reverting the partial commit

Author: KarnaiahPesula

sormas-api/src/main/java/de/symeda/sormas/api/Disease.java

@@ -90,7 +90,6 @@ public enum Disease
 	INVASIVE_MENINGOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false, true, 1, 10),
 	GIARDIASIS(true, true, true, false, true, 14, false, false, false, true, 7, 21),
 	CRYPTOSPORIDIOSIS(true, true, true, false, true, 14, false, false, false, true, 2, 12),
-	SHIGELLOSIS(true, true, true, false, true, 14, false, false, false, true, 1, 7),
 	SALMONELLOSIS(true, true, true, false, true, 14, false, false, false, true, 1, 3),
 	OTHER(true, true, true, false, true, 21, false, false, false, false, 0, 0),
 	UNDEFINED(true, true, true, false, true, 0, false, false, false, false, 0, 0);

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

@@ -236,8 +236,7 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE,
-		Disease.SHIGELLOSIS }, hide = true)
+		Disease.DENGUE }, hide = true)
 	BRAIN_TISSUE,
 
 	@Diseases(value = {
@@ -248,8 +247,7 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE,
-		Disease.SHIGELLOSIS }, hide = true)
+		Disease.DENGUE }, hide = true)
 	ANTERIOR_NARES_SWAB,
 
 	@Diseases(value = {
@@ -260,8 +258,7 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE,
-		Disease.SHIGELLOSIS }, hide = true)
+		Disease.DENGUE }, hide = true)
 	OP_ASPIRATE,
 
 	@Diseases(value = {
@@ -270,8 +267,7 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE,
-		Disease.SHIGELLOSIS }, hide = true)
+		Disease.DENGUE }, hide = true)
 	NP_ASPIRATE,
 
 	@Diseases(value = {
@@ -281,8 +277,7 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE,
-		Disease.SHIGELLOSIS }, hide = true)
+		Disease.DENGUE }, hide = true)
 	PLEURAL_FLUID,
 
 	@Diseases(value = {
@@ -299,8 +294,7 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE,
-		Disease.SHIGELLOSIS }, hide = true)
+		Disease.DENGUE }, hide = true)
 	AMNIOTIC_FLUID,
 
 	@Diseases(value = {
@@ -315,8 +309,7 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE,
-		Disease.SHIGELLOSIS }, hide = true)
+		Disease.DENGUE }, hide = true)
 	PERITONEAL_FLUID,
 
 	@Diseases(value = {
@@ -325,15 +318,13 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS,
 		Disease.CRYPTOSPORIDIOSIS,
 		Disease.MALARIA,
-		Disease.DENGUE,
-		Disease.SHIGELLOSIS }, hide = true)
+		Disease.DENGUE }, hide = true)
 	SYNOVIAL_FLUID,
 
 	@Diseases(value = {
 		Disease.RESPIRATORY_SYNCYTIAL_VIRUS,
 		Disease.GIARDIASIS,
-		Disease.CRYPTOSPORIDIOSIS,
-		Disease.SHIGELLOSIS }, hide = true)
+		Disease.CRYPTOSPORIDIOSIS }, hide = true)
 	EDTA_WHOLE_BLOOD,
 
 	@Diseases(value = {
@@ -344,10 +335,6 @@ public enum SampleMaterial {
 		Disease.GIARDIASIS })
 	DUODENUM_FLUID,
 
-	@Diseases(value = {
-		Disease.SHIGELLOSIS })
-	PUS,
-
 	OTHER;
 
 	@Override

sormas-api/src/main/resources/captions.properties

@@ -1956,7 +1956,7 @@ PathogenTest.prescriberCity=City
 PathogenTest.prescriberCountry=Country
 PathogenTest.rifampicinResistant=Rifampicin resistant
 PathogenTest.isoniazidResistant=Isoniazid resistant
-PathogenTest.specie=Species
+PathogenTest.specie=Specie
 PathogenTest.patternProfile=Pattern profile
 PathogenTest.strainCallStatus=Strain Call Status
 PathogenTest.testScale=Test Scale