Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit c7a0fd1

Browse files
MateStrysewskeMateStrysewske
committed
1 parent 7196be5 commit c7a0fd1

3 files changed

Lines changed: 154 additions & 145 deletions

File tree

‎sormas-ui/src/main/java/de/symeda/sormas/ui/caze/BulkCaseDataForm.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ public class BulkCaseDataForm extends AbstractEditForm<CaseBulkEditData> {
7171
private static final String SURVEILLANCE_OFFICER_CHECKBOX = "surveillanceOfficerCheckbox";
7272
private static final String HEALTH_FACILITY_CHECKBOX = "healthFacilityCheckbox";
7373
private static final String TYPE_GROUP_LOC = "typeGroupLoc";
74-
private static final String TYPE_LOC = "typeLoc";
7574
private static final String FACILITY_OR_HOME_LOC = "facilityOrHomeLoc";
7675
private static final String WARNING_LAYOUT = "warningLayout";
7776

@@ -97,7 +96,7 @@ public class BulkCaseDataForm extends AbstractEditForm<CaseBulkEditData> {
9796
fluidRowLocs(CaseBulkEditData.REGION,
9897
CaseBulkEditData.DISTRICT,
9998
CaseBulkEditData.COMMUNITY) +
100-
fluidRowLocs(FACILITY_OR_HOME_LOC, TYPE_GROUP_LOC, TYPE_LOC) +
99+
fluidRowLocs(FACILITY_OR_HOME_LOC, TYPE_GROUP_LOC, CaseBulkEditData.FACILITY_TYPE) +
101100
fluidRowLocs(WARNING_LAYOUT) +
102101
fluidRowLocs(CaseDataDto.HEALTH_FACILITY, CaseBulkEditData.HEALTH_FACILITY_DETAILS);
103102
//@formatter:on
@@ -225,9 +224,7 @@ protected void addFields() {
225224
addCustomField(facilityTypeGroup, TYPE_GROUP_LOC, I18nProperties.getCaption(Captions.Facility_typeGroup));
226225
facilityTypeGroup.addItems(FacilityTypeGroup.getAccomodationGroups());
227226
facilityTypeGroup.setEnabled(false);
228-
facilityType = new ComboBox();
229-
facilityType.setId(CaseDataDto.FACILITY_TYPE);
230-
addCustomField(facilityType, TYPE_LOC, I18nProperties.getPrefixCaption(FacilityDto.I18N_PREFIX, FacilityDto.TYPE));
227+
facilityType = addField(CaseDataDto.FACILITY_TYPE, ComboBox.class);
231228
facilityType.setEnabled(false);
232229
ComboBox facility = addInfrastructureField(CaseBulkEditData.HEALTH_FACILITY);
233230
facility.setImmediate(true);

‎sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseBulkEditData.java‎

Lines changed: 151 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import de.symeda.sormas.api.caze.PlagueType;
1010
import de.symeda.sormas.api.caze.RabiesType;
1111
import de.symeda.sormas.api.facility.FacilityReferenceDto;
12+
import de.symeda.sormas.api.facility.FacilityType;
1213
import de.symeda.sormas.api.region.CommunityReferenceDto;
1314
import de.symeda.sormas.api.region.DistrictReferenceDto;
1415
import de.symeda.sormas.api.region.RegionReferenceDto;
@@ -19,147 +20,157 @@
1920
*/
2021
public class CaseBulkEditData extends EntityDto {
2122

22-
private static final long serialVersionUID = -4670022133882295863L;
23-
24-
public static final String DISEASE = "disease";
25-
public static final String DISEASE_DETAILS = "diseaseDetails";
26-
public static final String PLAGUE_TYPE = "plagueType";
27-
public static final String DENGUE_FEVER_TYPE = "dengueFeverType";
28-
public static final String RABIES_TYPE = "rabiesType";
29-
public static final String CASE_CLASSIFICATION = "caseClassification";
30-
public static final String INVESTIGATION_STATUS = "investigationStatus";
31-
public static final String OUTCOME = "outcome";
32-
public static final String SURVEILLANCE_OFFICER = "surveillanceOfficer";
33-
public static final String REGION = "region";
34-
public static final String DISTRICT = "district";
35-
public static final String COMMUNITY = "community";
36-
public static final String HEALTH_FACILITY = "healthFacility";
37-
public static final String HEALTH_FACILITY_DETAILS = "healthFacilityDetails";
38-
39-
private Disease disease;
40-
private String diseaseDetails;
41-
private PlagueType plagueType;
42-
private DengueFeverType dengueFeverType;
43-
private RabiesType rabiesType;
44-
private CaseClassification caseClassification;
45-
private InvestigationStatus investigationStatus;
46-
private CaseOutcome outcome;
47-
private UserReferenceDto surveillanceOfficer;
48-
private RegionReferenceDto region;
49-
private DistrictReferenceDto district;
50-
private CommunityReferenceDto community;
51-
private FacilityReferenceDto healthFacility;
52-
private String healthFacilityDetails;
53-
54-
public Disease getDisease() {
55-
return disease;
56-
}
57-
58-
public void setDisease(Disease disease) {
59-
this.disease = disease;
60-
}
61-
62-
public String getDiseaseDetails() {
63-
return diseaseDetails;
64-
}
65-
66-
public void setDiseaseDetails(String diseaseDetails) {
67-
this.diseaseDetails = diseaseDetails;
68-
}
69-
70-
public PlagueType getPlagueType() {
71-
return plagueType;
72-
}
73-
74-
public void setPlagueType(PlagueType plagueType) {
75-
this.plagueType = plagueType;
76-
}
77-
78-
public DengueFeverType getDengueFeverType() {
79-
return dengueFeverType;
80-
}
81-
82-
public void setDengueFeverType(DengueFeverType dengueFeverType) {
83-
this.dengueFeverType = dengueFeverType;
84-
}
85-
86-
public RabiesType getRabiesType() {
87-
return rabiesType;
88-
}
89-
90-
public void setRabiesType(RabiesType rabiesType) {
91-
this.rabiesType = rabiesType;
92-
}
93-
94-
public CaseClassification getCaseClassification() {
95-
return caseClassification;
96-
}
97-
98-
public void setCaseClassification(CaseClassification caseClassification) {
99-
this.caseClassification = caseClassification;
100-
}
101-
102-
public InvestigationStatus getInvestigationStatus() {
103-
return investigationStatus;
104-
}
105-
106-
public void setInvestigationStatus(InvestigationStatus investigationStatus) {
107-
this.investigationStatus = investigationStatus;
108-
}
109-
110-
public CaseOutcome getOutcome() {
111-
return outcome;
112-
}
113-
114-
public void setOutcome(CaseOutcome outcome) {
115-
this.outcome = outcome;
116-
}
117-
118-
public UserReferenceDto getSurveillanceOfficer() {
119-
return surveillanceOfficer;
120-
}
121-
122-
public void setSurveillanceOfficer(UserReferenceDto surveillanceOfficer) {
123-
this.surveillanceOfficer = surveillanceOfficer;
124-
}
125-
126-
public RegionReferenceDto getRegion() {
127-
return region;
128-
}
129-
130-
public void setRegion(RegionReferenceDto region) {
131-
this.region = region;
132-
}
133-
134-
public DistrictReferenceDto getDistrict() {
135-
return district;
136-
}
137-
138-
public void setDistrict(DistrictReferenceDto district) {
139-
this.district = district;
140-
}
141-
142-
public CommunityReferenceDto getCommunity() {
143-
return community;
144-
}
145-
146-
public void setCommunity(CommunityReferenceDto community) {
147-
this.community = community;
148-
}
149-
150-
public FacilityReferenceDto getHealthFacility() {
151-
return healthFacility;
152-
}
23+
private static final long serialVersionUID = -4670022133882295863L;
24+
25+
public static final String DISEASE = "disease";
26+
public static final String DISEASE_DETAILS = "diseaseDetails";
27+
public static final String PLAGUE_TYPE = "plagueType";
28+
public static final String DENGUE_FEVER_TYPE = "dengueFeverType";
29+
public static final String RABIES_TYPE = "rabiesType";
30+
public static final String CASE_CLASSIFICATION = "caseClassification";
31+
public static final String INVESTIGATION_STATUS = "investigationStatus";
32+
public static final String OUTCOME = "outcome";
33+
public static final String SURVEILLANCE_OFFICER = "surveillanceOfficer";
34+
public static final String REGION = "region";
35+
public static final String DISTRICT = "district";
36+
public static final String COMMUNITY = "community";
37+
public static final String HEALTH_FACILITY = "healthFacility";
38+
public static final String HEALTH_FACILITY_DETAILS = "healthFacilityDetails";
39+
public static final String FACILITY_TYPE = "facilityType";
40+
41+
private Disease disease;
42+
private String diseaseDetails;
43+
private PlagueType plagueType;
44+
private DengueFeverType dengueFeverType;
45+
private RabiesType rabiesType;
46+
private CaseClassification caseClassification;
47+
private InvestigationStatus investigationStatus;
48+
private CaseOutcome outcome;
49+
private UserReferenceDto surveillanceOfficer;
50+
private RegionReferenceDto region;
51+
private DistrictReferenceDto district;
52+
private CommunityReferenceDto community;
53+
private FacilityType facilityType;
54+
private FacilityReferenceDto healthFacility;
55+
private String healthFacilityDetails;
56+
57+
public Disease getDisease() {
58+
return disease;
59+
}
60+
61+
public void setDisease(Disease disease) {
62+
this.disease = disease;
63+
}
64+
65+
public String getDiseaseDetails() {
66+
return diseaseDetails;
67+
}
68+
69+
public void setDiseaseDetails(String diseaseDetails) {
70+
this.diseaseDetails = diseaseDetails;
71+
}
72+
73+
public PlagueType getPlagueType() {
74+
return plagueType;
75+
}
76+
77+
public void setPlagueType(PlagueType plagueType) {
78+
this.plagueType = plagueType;
79+
}
80+
81+
public DengueFeverType getDengueFeverType() {
82+
return dengueFeverType;
83+
}
84+
85+
public void setDengueFeverType(DengueFeverType dengueFeverType) {
86+
this.dengueFeverType = dengueFeverType;
87+
}
88+
89+
public RabiesType getRabiesType() {
90+
return rabiesType;
91+
}
92+
93+
public void setRabiesType(RabiesType rabiesType) {
94+
this.rabiesType = rabiesType;
95+
}
96+
97+
public CaseClassification getCaseClassification() {
98+
return caseClassification;
99+
}
100+
101+
public void setCaseClassification(CaseClassification caseClassification) {
102+
this.caseClassification = caseClassification;
103+
}
104+
105+
public InvestigationStatus getInvestigationStatus() {
106+
return investigationStatus;
107+
}
108+
109+
public void setInvestigationStatus(InvestigationStatus investigationStatus) {
110+
this.investigationStatus = investigationStatus;
111+
}
112+
113+
public CaseOutcome getOutcome() {
114+
return outcome;
115+
}
116+
117+
public void setOutcome(CaseOutcome outcome) {
118+
this.outcome = outcome;
119+
}
120+
121+
public UserReferenceDto getSurveillanceOfficer() {
122+
return surveillanceOfficer;
123+
}
124+
125+
public void setSurveillanceOfficer(UserReferenceDto surveillanceOfficer) {
126+
this.surveillanceOfficer = surveillanceOfficer;
127+
}
128+
129+
public RegionReferenceDto getRegion() {
130+
return region;
131+
}
132+
133+
public void setRegion(RegionReferenceDto region) {
134+
this.region = region;
135+
}
136+
137+
public DistrictReferenceDto getDistrict() {
138+
return district;
139+
}
140+
141+
public void setDistrict(DistrictReferenceDto district) {
142+
this.district = district;
143+
}
144+
145+
public CommunityReferenceDto getCommunity() {
146+
return community;
147+
}
148+
149+
public void setCommunity(CommunityReferenceDto community) {
150+
this.community = community;
151+
}
152+
153+
public FacilityType getFacilityType() {
154+
return facilityType;
155+
}
153156

154-
public void setHealthFacility(FacilityReferenceDto healthFacility) {
155-
this.healthFacility = healthFacility;
156-
}
157+
public void setFacilityType(FacilityType facilityType) {
158+
this.facilityType = facilityType;
159+
}
157160

158-
public String getHealthFacilityDetails() {
159-
return healthFacilityDetails;
160-
}
161+
public FacilityReferenceDto getHealthFacility() {
162+
return healthFacility;
163+
}
161164

162-
public void setHealthFacilityDetails(String healthFacilityDetails) {
163-
this.healthFacilityDetails = healthFacilityDetails;
164-
}
165+
public void setHealthFacility(FacilityReferenceDto healthFacility) {
166+
this.healthFacility = healthFacility;
167+
}
168+
169+
public String getHealthFacilityDetails() {
170+
return healthFacilityDetails;
171+
}
172+
173+
public void setHealthFacilityDetails(String healthFacilityDetails) {
174+
this.healthFacilityDetails = healthFacilityDetails;
175+
}
165176
}

‎sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseController.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,7 @@ private void bulkEditWithFacilities(
759759
updatedCase.setRegion(updatedCaseBulkEditData.getRegion());
760760
updatedCase.setDistrict(updatedCaseBulkEditData.getDistrict());
761761
updatedCase.setCommunity(updatedCaseBulkEditData.getCommunity());
762+
updatedCase.setFacilityType(updatedCaseBulkEditData.getFacilityType());
762763
updatedCase.setHealthFacility(updatedCaseBulkEditData.getHealthFacility());
763764
updatedCase.setHealthFacilityDetails(updatedCaseBulkEditData.getHealthFacilityDetails());
764765
CaseLogic.handleHospitalization(updatedCase, caseFacade.getCaseDataByUuid(indexDto.getUuid()), doTransfer);

0 commit comments

Comments
 (0)