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

Commit adf070f

Browse files
author
Martin Wahnschaffe
committed
SORMAS-Foundation#1999 fixed line indent
changed import popup first section header changed value description naming for jurisdiction entity import columns
1 parent fc8aaf1 commit adf070f

13 files changed

Lines changed: 1478 additions & 1417 deletions

File tree

‎sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataDto.java‎

Lines changed: 111 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
package de.symeda.sormas.api.campaign.data;
2222

23+
import java.util.Date;
24+
import java.util.List;
25+
2326
import de.symeda.sormas.api.EntityDto;
2427
import de.symeda.sormas.api.ImportIgnore;
2528
import de.symeda.sormas.api.campaign.CampaignReferenceDto;
@@ -29,118 +32,115 @@
2932
import de.symeda.sormas.api.region.RegionReferenceDto;
3033
import de.symeda.sormas.api.user.UserReferenceDto;
3134
import de.symeda.sormas.api.utils.DataHelper;
32-
import java.util.Date;
33-
import java.util.List;
3435

3536
public class CampaignFormDataDto extends EntityDto {
3637

37-
private static final long serialVersionUID = -8087195060395038093L;
38-
39-
public static final String I18N_PREFIX = "CampaignFormData";
40-
41-
public static final String CAMPAIGN = "campaign";
42-
public static final String CAMPAIGN_FORM_META = "campaignFormMeta";
43-
public static final String FORM_DATE = "formDate";
44-
public static final String REGION = "region";
45-
public static final String DISTRICT = "district";
46-
public static final String COMMUNITY = "community";
47-
48-
private List<CampaignFormDataEntry> formValues;
49-
private CampaignReferenceDto campaign;
50-
private CampaignFormMetaReferenceDto campaignFormMeta;
51-
private Date formDate;
52-
private RegionReferenceDto region;
53-
private DistrictReferenceDto district;
54-
private CommunityReferenceDto community;
55-
private UserReferenceDto creatingUser;
56-
57-
public static CampaignFormDataDto build(
58-
CampaignReferenceDto campaign,
59-
CampaignFormMetaReferenceDto campaignFormMeta,
60-
RegionReferenceDto region,
61-
DistrictReferenceDto district,
62-
CommunityReferenceDto community) {
63-
CampaignFormDataDto campaignFormData = new CampaignFormDataDto();
64-
campaignFormData.setUuid(DataHelper.createUuid());
65-
campaignFormData.setCampaign(campaign);
66-
campaignFormData.setCampaignFormMeta(campaignFormMeta);
67-
campaignFormData.setRegion(region);
68-
campaignFormData.setDistrict(district);
69-
campaignFormData.setCommunity(community);
70-
campaignFormData.setFormDate(new Date());
71-
return campaignFormData;
72-
}
73-
74-
public static CampaignFormDataDto build() {
75-
CampaignFormDataDto campaignFormData = new CampaignFormDataDto();
76-
campaignFormData.setUuid(DataHelper.createUuid());
77-
return campaignFormData;
78-
}
79-
80-
81-
public List<CampaignFormDataEntry> getFormValues() {
82-
return formValues;
83-
}
84-
85-
public void setFormValues(List<CampaignFormDataEntry> formValues) {
86-
this.formValues = formValues;
87-
}
88-
89-
@ImportIgnore
90-
public CampaignFormMetaReferenceDto getCampaignFormMeta() {
91-
return campaignFormMeta;
92-
}
93-
94-
public void setCampaignFormMeta(CampaignFormMetaReferenceDto campaignFormMeta) {
95-
this.campaignFormMeta = campaignFormMeta;
96-
}
97-
98-
@ImportIgnore
99-
public CampaignReferenceDto getCampaign() {
100-
return campaign;
101-
}
102-
103-
public void setCampaign(CampaignReferenceDto campaign) {
104-
this.campaign = campaign;
105-
}
106-
107-
public Date getFormDate() {
108-
return formDate;
109-
}
110-
111-
public void setFormDate(Date formDate) {
112-
this.formDate = formDate;
113-
}
114-
115-
public RegionReferenceDto getRegion() {
116-
return region;
117-
}
118-
119-
public void setRegion(RegionReferenceDto region) {
120-
this.region = region;
121-
}
122-
123-
public DistrictReferenceDto getDistrict() {
124-
return district;
125-
}
126-
127-
public void setDistrict(DistrictReferenceDto district) {
128-
this.district = district;
129-
}
130-
131-
public CommunityReferenceDto getCommunity() {
132-
return community;
133-
}
134-
135-
public void setCommunity(CommunityReferenceDto community) {
136-
this.community = community;
137-
}
138-
139-
public UserReferenceDto getCreatingUser() {
140-
return creatingUser;
141-
}
142-
143-
public void setCreatingUser(UserReferenceDto creatingUser) {
144-
this.creatingUser = creatingUser;
145-
}
38+
private static final long serialVersionUID = -8087195060395038093L;
39+
40+
public static final String I18N_PREFIX = "CampaignFormData";
41+
42+
public static final String CAMPAIGN = "campaign";
43+
public static final String CAMPAIGN_FORM_META = "campaignFormMeta";
44+
public static final String FORM_DATE = "formDate";
45+
public static final String REGION = "region";
46+
public static final String DISTRICT = "district";
47+
public static final String COMMUNITY = "community";
48+
49+
private List<CampaignFormDataEntry> formValues;
50+
private CampaignReferenceDto campaign;
51+
private CampaignFormMetaReferenceDto campaignFormMeta;
52+
private Date formDate;
53+
private RegionReferenceDto region;
54+
private DistrictReferenceDto district;
55+
private CommunityReferenceDto community;
56+
private UserReferenceDto creatingUser;
57+
58+
public static CampaignFormDataDto build(
59+
CampaignReferenceDto campaign,
60+
CampaignFormMetaReferenceDto campaignFormMeta,
61+
RegionReferenceDto region,
62+
DistrictReferenceDto district,
63+
CommunityReferenceDto community) {
64+
CampaignFormDataDto campaignFormData = new CampaignFormDataDto();
65+
campaignFormData.setUuid(DataHelper.createUuid());
66+
campaignFormData.setCampaign(campaign);
67+
campaignFormData.setCampaignFormMeta(campaignFormMeta);
68+
campaignFormData.setRegion(region);
69+
campaignFormData.setDistrict(district);
70+
campaignFormData.setCommunity(community);
71+
campaignFormData.setFormDate(new Date());
72+
return campaignFormData;
73+
}
74+
75+
public static CampaignFormDataDto build() {
76+
CampaignFormDataDto campaignFormData = new CampaignFormDataDto();
77+
campaignFormData.setUuid(DataHelper.createUuid());
78+
return campaignFormData;
79+
}
80+
81+
public List<CampaignFormDataEntry> getFormValues() {
82+
return formValues;
83+
}
84+
85+
public void setFormValues(List<CampaignFormDataEntry> formValues) {
86+
this.formValues = formValues;
87+
}
88+
89+
@ImportIgnore
90+
public CampaignFormMetaReferenceDto getCampaignFormMeta() {
91+
return campaignFormMeta;
92+
}
93+
94+
public void setCampaignFormMeta(CampaignFormMetaReferenceDto campaignFormMeta) {
95+
this.campaignFormMeta = campaignFormMeta;
96+
}
97+
98+
@ImportIgnore
99+
public CampaignReferenceDto getCampaign() {
100+
return campaign;
101+
}
102+
103+
public void setCampaign(CampaignReferenceDto campaign) {
104+
this.campaign = campaign;
105+
}
106+
107+
public Date getFormDate() {
108+
return formDate;
109+
}
110+
111+
public void setFormDate(Date formDate) {
112+
this.formDate = formDate;
113+
}
114+
115+
public RegionReferenceDto getRegion() {
116+
return region;
117+
}
118+
119+
public void setRegion(RegionReferenceDto region) {
120+
this.region = region;
121+
}
122+
123+
public DistrictReferenceDto getDistrict() {
124+
return district;
125+
}
126+
127+
public void setDistrict(DistrictReferenceDto district) {
128+
this.district = district;
129+
}
130+
131+
public CommunityReferenceDto getCommunity() {
132+
return community;
133+
}
134+
135+
public void setCommunity(CommunityReferenceDto community) {
136+
this.community = community;
137+
}
138+
139+
public UserReferenceDto getCreatingUser() {
140+
return creatingUser;
141+
}
142+
143+
public void setCreatingUser(UserReferenceDto creatingUser) {
144+
this.creatingUser = creatingUser;
145+
}
146146
}

‎sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ public interface Strings {
356356
String headingSamplesDeleted = "headingSamplesDeleted";
357357
String headingSaveNotification = "headingSaveNotification";
358358
String headingSaveUser = "headingSaveUser";
359+
String headingSelectCampaign = "headingSelectCampaign";
359360
String headingSelectSourceCase = "headingSelectSourceCase";
360361
String headingSetOutbreakStatus = "headingSetOutbreakStatus";
361362
String headingSignsAndSymptoms = "headingSignsAndSymptoms";

0 commit comments

Comments
 (0)