Skip to content

Commit 5ac1064

Browse files
raulbobraulbob
authored
Merge pull request #13512 from SORMAS-Foundation/bugfix-13511_android_app_symptoms_crash
#13511 - Updated symptoms to the web version
2 parents 5d70cf6 + dd5ab44 commit 5ac1064

File tree

2 files changed

+199
-0
lines changed

2 files changed

+199
-0
lines changed

‎sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3179,9 +3179,33 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
31793179
getDao(UserRole.class)
31803180
.executeRaw("ALTER TABLE userroles ADD COLUMN restrictAccessToAssignedEntities boolean NOT NULL DEFAULT false;");
31813181

3182+
case 359:
3183+
currentVersion = 359;
3184+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN apnoea varchar(255);");
3185+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN arthritis varchar(255);");
3186+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN asymptomatic varchar(255);");
3187+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN clinicalpresentationstatus varchar(255);");
3188+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN coughingbouts varchar(255);");
3189+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN coughsprovokevomiting varchar(255);");
3190+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN dateofonsetknown varchar(255);");
3191+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN diagnosis varchar(255);");
3192+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN hemorrhagicrash varchar(255);");
3193+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN majorsite varchar(255);");
3194+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN meningitis varchar(255);");
3195+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN minorsite varchar(255);");
3196+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN nocturnalcough varchar(255);");
3197+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN otherclinicalpresentation varchar(255);");
3198+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN otherclinicalpresentationtext varchar(255);");
3199+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN othermajorsitedetails varchar(255);");
3200+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN otherminorsitedetails varchar(255);");
3201+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN septicaemia varchar(255);");
3202+
getDao(Symptoms.class).executeRaw("ALTER TABLE symptoms ADD COLUMN whoopsound varchar(255);");
3203+
31823204
// ATTENTION: break should only be done after last version
31833205
break;
31843206

3207+
3208+
31853209
default:
31863210
throw new IllegalStateException("onUpgrade() with unknown oldVersion " + oldVersion);
31873211
}

‎sormas-app/app/src/main/java/de/symeda/sormas/app/backend/symptoms/Symptoms.java

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
import com.j256.ormlite.field.DatabaseField;
2929
import com.j256.ormlite.table.DatabaseTable;
3030

31+
import de.symeda.sormas.api.symptoms.ClinicalPresentationStatus;
3132
import de.symeda.sormas.api.symptoms.CongenitalHeartDiseaseType;
33+
import de.symeda.sormas.api.symptoms.DiagnosisType;
34+
import de.symeda.sormas.api.symptoms.InfectionSite;
3235
import de.symeda.sormas.api.symptoms.SymptomState;
3336
import de.symeda.sormas.api.symptoms.TemperatureSource;
3437
import de.symeda.sormas.api.utils.YesNoUnknown;
@@ -87,6 +90,49 @@ public class Symptoms extends PseudonymizableAdo {
8790
@Column
8891
private Integer glasgowComaScale;
8992

93+
@Enumerated(EnumType.STRING)
94+
private SymptomState apnoea;
95+
@Enumerated(EnumType.STRING)
96+
private SymptomState arthritis;
97+
@Enumerated(EnumType.STRING)
98+
private SymptomState asymptomatic;
99+
100+
@Enumerated(EnumType.STRING)
101+
private SymptomState coughingBouts;
102+
@Enumerated(EnumType.STRING)
103+
private SymptomState coughsProvokeVomiting;
104+
@Enumerated(EnumType.STRING)
105+
private YesNoUnknown dateOfOnsetKnown;
106+
@Enumerated(EnumType.STRING)
107+
private DiagnosisType diagnosis;
108+
@Enumerated(EnumType.STRING)
109+
private SymptomState hemorrhagicRash;
110+
@Enumerated(EnumType.STRING)
111+
private InfectionSite majorSite;
112+
@Enumerated(EnumType.STRING)
113+
private SymptomState meningitis;
114+
@Enumerated(EnumType.STRING)
115+
private InfectionSite minorSite;
116+
@Enumerated(EnumType.STRING)
117+
private SymptomState nocturnalCough;
118+
@Enumerated(EnumType.STRING)
119+
private SymptomState otherClinicalPresentation;
120+
@Enumerated(EnumType.STRING)
121+
private SymptomState septicaemia;
122+
@Enumerated(EnumType.STRING)
123+
private SymptomState whoopSound;
124+
125+
@Column
126+
private String otherClinicalPresentationText;
127+
128+
@Column
129+
private String otherMajorSiteDetails;
130+
131+
@Column
132+
private String otherMinorSiteDetails;
133+
134+
135+
90136
@Enumerated(EnumType.STRING)
91137
private SymptomState fever;
92138
@Enumerated(EnumType.STRING)
@@ -425,6 +471,8 @@ public class Symptoms extends PseudonymizableAdo {
425471
private SymptomState urinaryRetention;
426472
@Enumerated(EnumType.STRING)
427473
private SymptomState shivering;
474+
@Enumerated(EnumType.STRING)
475+
private ClinicalPresentationStatus clinicalPresentationStatus;
428476

429477
@Override
430478
public String getI18nPrefix() {
@@ -479,6 +527,125 @@ public void setHeartRate(Integer heartRate) {
479527
this.heartRate = heartRate;
480528
}
481529

530+
public SymptomState getApnoea() {
531+
return apnoea;
532+
}
533+
534+
public void setApnoea(SymptomState apnoea) {
535+
this.apnoea = apnoea;
536+
}
537+
538+
public SymptomState getArthritis() {
539+
return arthritis;
540+
}
541+
542+
public void setArthritis(SymptomState arthritis) {
543+
this.arthritis = arthritis;
544+
}
545+
546+
public SymptomState getAsymptomatic() {
547+
return asymptomatic;
548+
}
549+
550+
public void setAsymptomatic(SymptomState asymptomatic) {
551+
this.asymptomatic = asymptomatic;
552+
}
553+
554+
public SymptomState getCoughingBouts() {
555+
return coughingBouts;
556+
}
557+
public void setCoughingBouts(SymptomState coughingBouts) {
558+
this.coughingBouts = coughingBouts;
559+
}
560+
561+
public SymptomState getCoughsProvokeVomiting() {
562+
return coughsProvokeVomiting;
563+
}
564+
565+
public void setCoughsProvokeVomiting(SymptomState coughsProvokeVomiting) {
566+
this.coughsProvokeVomiting = coughsProvokeVomiting;
567+
}
568+
569+
public YesNoUnknown getDateOfOnsetKnown() {
570+
return dateOfOnsetKnown;
571+
}
572+
573+
public void setDateOfOnsetKnown(YesNoUnknown dateOfOnsetKnown) {
574+
this.dateOfOnsetKnown = dateOfOnsetKnown;
575+
}
576+
577+
public DiagnosisType getDiagnosis() {
578+
return diagnosis;
579+
}
580+
581+
public void setDiagnosis(DiagnosisType diagnosis) {
582+
this.diagnosis = diagnosis;
583+
}
584+
585+
public SymptomState getHemorrhagicRash() {
586+
return hemorrhagicRash;
587+
}
588+
589+
public void setHemorrhagicRash(SymptomState hemorrhagicRash) {
590+
this.hemorrhagicRash = hemorrhagicRash;
591+
}
592+
593+
public InfectionSite getMajorSite() {
594+
return majorSite;
595+
}
596+
597+
public void setMajorSite(InfectionSite majorSite) {
598+
this.majorSite = majorSite;
599+
}
600+
601+
public SymptomState getMeningitis() {
602+
return meningitis;
603+
}
604+
605+
public void setMeningitis(SymptomState meningitis) {
606+
this.meningitis = meningitis;
607+
}
608+
609+
public InfectionSite getMinorSite() {
610+
return minorSite;
611+
}
612+
613+
public void setMinorSite(InfectionSite minorSite) {
614+
this.minorSite = minorSite;
615+
}
616+
617+
public void getNocturnalCough(SymptomState nocturnalCough) {
618+
this.nocturnalCough = nocturnalCough;
619+
}
620+
621+
public SymptomState getNocturnalCough() {
622+
return nocturnalCough;
623+
}
624+
625+
public SymptomState getOtherClinicalPresentation() {
626+
return otherClinicalPresentation;
627+
}
628+
629+
public void setOtherClinicalPresentation(SymptomState otherClinicalPresentation) {
630+
this.otherClinicalPresentation = otherClinicalPresentation;
631+
}
632+
633+
public SymptomState getSepticaemia() {
634+
return septicaemia;
635+
}
636+
637+
public void setSepticaemia(SymptomState septicaemia) {
638+
this.septicaemia = septicaemia;
639+
}
640+
641+
public SymptomState getWhoopSound() {
642+
return whoopSound;
643+
}
644+
645+
public void setWhoopSound(SymptomState whoopSound) {
646+
this.whoopSound = whoopSound;
647+
}
648+
482649
public SymptomState getFever() {
483650
return fever;
484651
}
@@ -1870,4 +2037,12 @@ public SymptomState getShivering() {
18702037
public void setShivering(SymptomState shivering) {
18712038
this.shivering = shivering;
18722039
}
2040+
2041+
public ClinicalPresentationStatus getClinicalPresentationStatus() {
2042+
return clinicalPresentationStatus;
2043+
}
2044+
2045+
public void setClinicalPresentationStatus(ClinicalPresentationStatus clinicalPresentationStatus) {
2046+
this.clinicalPresentationStatus = clinicalPresentationStatus;
2047+
}
18732048
}

0 commit comments

Comments
 (0)