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

Commit 1c3da68

Browse files
author
barnabartha
committed
Merge branch 'development' into feature-3253-SendSMSToCases
2 parents 31bb6e7 + b878a59 commit 1c3da68

3 files changed

Lines changed: 37 additions & 33 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,8 @@ private void updateDatabase(EntityManager entityManager, String schemaFileName)
586586
continue;
587587
}
588588

589+
// escape for hibernate
590+
// note: This will also escape ':' in pure strings, where a replacement may cause problems
589591
nextLine = nextLine.replaceAll(":", "\\\\:");
590592

591593
// Add the line to the StringBuilder

‎sormas-backend/src/main/resources/sql/sormas_schema.sql‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5764,8 +5764,8 @@ EXECUTE
57645764
overlay(overlay(overlay(
57655765
substring(upper(REPLACE(CAST(CAST(md5(CAST(random() AS text) || CAST(clock_timestamp() AS text)) AS uuid) AS text), ''-'', '''')), 0, 30)
57665766
placing ''-'' from 7) placing ''-'' from 14) placing ''-'' from 21) as exposure_uuid,
5767-
' || epidata_startdate_field_name || '::timestamp as startdate,
5768-
' || epidata_enddate_field_name || '::timestamp as enddate,
5767+
CAST (' || epidata_startdate_field_name || ' AS timestamp) as startdate,
5768+
CAST (' || epidata_enddate_field_name || ' AS timestamp) as enddate,
57695769
' || epidata_description_field_name || ' as description,
57705770
' || epidata_locationinfo_field_name || ' as locationinfo
57715771
FROM epidata WHERE ' || epidata_field_name || ' = ''YES'';
@@ -5784,36 +5784,38 @@ ALTER FUNCTION migrate_epidata(text, text, text, text, text, text, text, text) O
57845784

57855785
UPDATE epidata SET areainfectedanimals = 'YES', eatingrawanimals = 'YES' WHERE eatingrawanimalsininfectedarea = 'YES';
57865786

5787-
SELECT migrate_epidata('processingconfirmedcasefluidunsafe', 'handlingsamples', 'YES', 'WORK');
5788-
SELECT migrate_epidata('percutaneouscaseblood', 'percutaneous', 'YES', 'WORK');
5789-
SELECT migrate_epidata('directcontactdeadunsafe', 'physicalcontactwithbody', 'YES', 'BURIAL');
5790-
SELECT migrate_epidata('processingsuspectedcasesampleunsafe', 'handlingsamples', 'YES', 'WORK');
5791-
SELECT migrate_epidata('sickdeadanimals', 'animalcondition', 'DEAD', 'ANIMAL_CONTACT', 'sickdeadanimalsdate', 'sickdeadanimalsdate', 'sickdeadanimalsdetails', 'sickdeadanimalslocation');
5792-
SELECT migrate_epidata('eatingrawanimals', 'eatingrawanimalproducts', 'YES', 'ANIMAL_CONTACT', 'null', 'null', 'eatingrawanimalsdetails', 'null');
5793-
SELECT migrate_epidata('rodents', 'typeofanimal', 'RODENT', 'ANIMAL_CONTACT');
5794-
SELECT migrate_epidata('bats', 'typeofanimal', 'BAT', 'ANIMAL_CONTACT');
5795-
SELECT migrate_epidata('primates', 'typeofanimal', 'PRIMATE', 'ANIMAL_CONTACT');
5796-
SELECT migrate_epidata('swine', 'typeofanimal', 'SWINE', 'ANIMAL_CONTACT');
5797-
SELECT migrate_epidata('birds', 'typeofanimal', 'POULTRY', 'ANIMAL_CONTACT');
5798-
SELECT migrate_epidata('rabbits', 'typeofanimal', 'RABBIT', 'ANIMAL_CONTACT');
5799-
SELECT migrate_epidata('cattle', 'typeofanimal', 'CATTLE', 'ANIMAL_CONTACT');
5800-
SELECT migrate_epidata('dogs', 'typeofanimal', 'DOG', 'ANIMAL_CONTACT');
5801-
SELECT migrate_epidata('cats', 'typeofanimal', 'CAT', 'ANIMAL_CONTACT');
5802-
SELECT migrate_epidata('canidae', 'typeofanimal', 'CANIDAE', 'ANIMAL_CONTACT');
5803-
SELECT migrate_epidata('camels', 'typeofanimal', 'CAMEL', 'ANIMAL_CONTACT');
5804-
SELECT migrate_epidata('snakes', 'typeofanimal', 'SNAKE', 'ANIMAL_CONTACT');
5805-
SELECT migrate_epidata('tickbite', 'typeofanimal', 'TICK', 'ANIMAL_CONTACT');
5806-
SELECT migrate_epidata('fleabite', 'typeofanimal', 'FLEA', 'ANIMAL_CONTACT');
5807-
SELECT migrate_epidata('otheranimals', 'typeofanimal', 'OTHER', 'ANIMAL_CONTACT');
5808-
SELECT migrate_epidata('waterbody', 'bodyofwater', 'YES', 'OTHER', 'null', 'null', 'waterbodydetails', 'null');
5809-
SELECT migrate_epidata('visitedhealthfacility', 'habitationtype', 'MEDICAL', 'HABITATION');
5810-
SELECT migrate_epidata('visitedanimalmarket', 'animalmarket', 'YES', 'OTHER');
5811-
SELECT migrate_epidata('areaconfirmedcases', 'riskarea', 'YES', 'TRAVEL');
5812-
SELECT migrate_epidata('kindofexposurebite', 'animalcontacttype', 'BITE', 'ANIMAL_CONTACT');
5813-
SELECT migrate_epidata('kindofexposuretouch', 'animalcontacttype', 'TOUCH', 'ANIMAL_CONTACT');
5814-
SELECT migrate_epidata('kindofexposurescratch', 'animalcontacttype', 'SCRATCH', 'ANIMAL_CONTACT');
5815-
SELECT migrate_epidata('kindofexposurelick', 'animalcontacttype', 'LICK', 'ANIMAL_CONTACT');
5816-
SELECT migrate_epidata('kindofexposureother', 'animalcontacttype', 'OTHER', 'ANIMAL_CONTACT');
5787+
DO $$ BEGIN
5788+
PERFORM migrate_epidata('processingconfirmedcasefluidunsafe', 'handlingsamples', 'YES', 'WORK');
5789+
PERFORM migrate_epidata('percutaneouscaseblood', 'percutaneous', 'YES', 'WORK');
5790+
PERFORM migrate_epidata('directcontactdeadunsafe', 'physicalcontactwithbody', 'YES', 'BURIAL');
5791+
PERFORM migrate_epidata('processingsuspectedcasesampleunsafe', 'handlingsamples', 'YES', 'WORK');
5792+
PERFORM migrate_epidata('sickdeadanimals', 'animalcondition', 'DEAD', 'ANIMAL_CONTACT', 'sickdeadanimalsdate', 'sickdeadanimalsdate', 'sickdeadanimalsdetails', 'sickdeadanimalslocation');
5793+
PERFORM migrate_epidata('eatingrawanimals', 'eatingrawanimalproducts', 'YES', 'ANIMAL_CONTACT', 'null', 'null', 'eatingrawanimalsdetails', 'null');
5794+
PERFORM migrate_epidata('rodents', 'typeofanimal', 'RODENT', 'ANIMAL_CONTACT');
5795+
PERFORM migrate_epidata('bats', 'typeofanimal', 'BAT', 'ANIMAL_CONTACT');
5796+
PERFORM migrate_epidata('primates', 'typeofanimal', 'PRIMATE', 'ANIMAL_CONTACT');
5797+
PERFORM migrate_epidata('swine', 'typeofanimal', 'SWINE', 'ANIMAL_CONTACT');
5798+
PERFORM migrate_epidata('birds', 'typeofanimal', 'POULTRY', 'ANIMAL_CONTACT');
5799+
PERFORM migrate_epidata('rabbits', 'typeofanimal', 'RABBIT', 'ANIMAL_CONTACT');
5800+
PERFORM migrate_epidata('cattle', 'typeofanimal', 'CATTLE', 'ANIMAL_CONTACT');
5801+
PERFORM migrate_epidata('dogs', 'typeofanimal', 'DOG', 'ANIMAL_CONTACT');
5802+
PERFORM migrate_epidata('cats', 'typeofanimal', 'CAT', 'ANIMAL_CONTACT');
5803+
PERFORM migrate_epidata('canidae', 'typeofanimal', 'CANIDAE', 'ANIMAL_CONTACT');
5804+
PERFORM migrate_epidata('camels', 'typeofanimal', 'CAMEL', 'ANIMAL_CONTACT');
5805+
PERFORM migrate_epidata('snakes', 'typeofanimal', 'SNAKE', 'ANIMAL_CONTACT');
5806+
PERFORM migrate_epidata('tickbite', 'typeofanimal', 'TICK', 'ANIMAL_CONTACT');
5807+
PERFORM migrate_epidata('fleabite', 'typeofanimal', 'FLEA', 'ANIMAL_CONTACT');
5808+
PERFORM migrate_epidata('otheranimals', 'typeofanimal', 'OTHER', 'ANIMAL_CONTACT');
5809+
PERFORM migrate_epidata('waterbody', 'bodyofwater', 'YES', 'OTHER', 'null', 'null', 'waterbodydetails', 'null');
5810+
PERFORM migrate_epidata('visitedhealthfacility', 'habitationtype', 'MEDICAL', 'HABITATION');
5811+
PERFORM migrate_epidata('visitedanimalmarket', 'animalmarket', 'YES', 'OTHER');
5812+
PERFORM migrate_epidata('areaconfirmedcases', 'riskarea', 'YES', 'TRAVEL');
5813+
PERFORM migrate_epidata('kindofexposurebite', 'animalcontacttype', 'BITE', 'ANIMAL_CONTACT');
5814+
PERFORM migrate_epidata('kindofexposuretouch', 'animalcontacttype', 'TOUCH', 'ANIMAL_CONTACT');
5815+
PERFORM migrate_epidata('kindofexposurescratch', 'animalcontacttype', 'SCRATCH', 'ANIMAL_CONTACT');
5816+
PERFORM migrate_epidata('kindofexposurelick', 'animalcontacttype', 'LICK', 'ANIMAL_CONTACT');
5817+
PERFORM migrate_epidata('kindofexposureother', 'animalcontacttype', 'OTHER', 'ANIMAL_CONTACT');
5818+
END $$;
58175819

58185820
DROP TABLE IF EXISTS id_map;
58195821

‎sormas-ui/src/main/java/de/symeda/sormas/ui/document/DocumentListComponent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private void reload() {
122122

123123
private Component toComponent(DocumentDto document) {
124124
HorizontalLayout res = new HorizontalLayout();
125-
res.setSpacing(false);
125+
res.setSpacing(true);
126126
res.setMargin(false);
127127
res.setWidth(100, Unit.PERCENTAGE);
128128

0 commit comments

Comments
 (0)