diff --git a/db/1.wpd.sys_config.sql b/db/1.wpd.sys_config.sql index bf32ff8..9f7ba65 100644 --- a/db/1.wpd.sys_config.sql +++ b/db/1.wpd.sys_config.sql @@ -1,6 +1,7 @@ DO $$ BEGIN - INSERT INTO users(email, firstname, surname, active) VALUES ('admin@wpd.com', 'admin', 'wpd', 1); + INSERT INTO roles(name, active) VALUES ('ROLE_ADMIN', 1); + INSERT INTO roles(name, active) VALUES ('ROLE_CLIENT', 1); INSERT INTO formsorigins(id, name, active) VALUES (DEFAULT, 'OFICIAL', 1); INSERT INTO formsorigins(id, name, active) VALUES (DEFAULT, 'WP6.MobileApp', 1); diff --git a/db/wp6.sample.floodzones-river-rain-api.json b/db/wp6.sample.capabilities-api.json similarity index 91% rename from db/wp6.sample.floodzones-river-rain-api.json rename to db/wp6.sample.capabilities-api.json index 6411857..eeac0c3 100644 --- a/db/wp6.sample.floodzones-river-rain-api.json +++ b/db/wp6.sample.capabilities-api.json @@ -1,6 +1,5 @@ JSON intended to get all forms - - +https: //waterproofing.geog.uni-heidelberg.de/api/hot/capability { "responseTimestamp": "2021-08-05T19:23:50.126Z", "responseData": { @@ -25,16 +24,16 @@ JSON intended to get all forms "name": "Pluviometers", "description": "Pluviometers Form" }, - { + { "code": "RAIN_FORM", "name": "Rain", "description": "Rain zones Form" - }, - { + }, + { "code": "RIVERFLOOD_FORM", "name": "River Flood", "description": "River Flood Form" - }, + }, { "code": "PLUVIOMETERS_REGISTRATION", "name": "Pluviometer registration", @@ -43,4 +42,4 @@ JSON intended to get all forms ] }, "success": true -} +} \ No newline at end of file diff --git a/db/wp6.sample.forms-fields-answers.json b/db/wp6.sample.forms-fields-answers.json index d6adf88..3e3b905 100644 --- a/db/wp6.sample.forms-fields-answers.json +++ b/db/wp6.sample.forms-fields-answers.json @@ -1,21 +1,24 @@ This example for floodzones also applies for river and rain. All fields are equal. - - +ws: //waterproofing.geog.uni-heidelberg.de/wss/hot/data?type=FLOODZONES_FORM { -"responseData": { - "array_to_json": [{ - "formcode": "FLOODZONES_FORM", - "formsanswersuserinformer": "admin@wpd.com", - "filds": [{ - "fieldsanswerssituation": "intransitavel", - "fieldsanswerslatitude": 4.750550953715424, - "fieldsanswerslongitude": -74.1179903701844, - "fieldsanswerseventaddress": "Rua dos bobos, 81", - "fieldsanswerseventdate": "11-08-2021", - "fieldsanswerseventtime": "21:52", - "fielsanswercomment": "users description about the current event", - "fieldsanswerimages": "base64" - }] - }] + "responseData": { + "array_to_json": [ + { + "formcode": "FLOODZONES_FORM", + "formsanswersuserinformer": "admin@wpd.com", + "filds": [ + { + "fieldsanswerssituation": "intransitavel", + "fieldsanswerslatitude": 4.750550953715424, + "fieldsanswerslongitude": -74.1179903701844, + "fieldsanswerseventaddress": "Rua dos bobos, 81", + "fieldsanswerseventdate": "11-08-2021", + "fieldsanswerseventtime": "21:52", + "fielsanswercomment": "users description about the current event", + "fieldsanswerimages": "base64" + } + ] + } + ] } -} +} \ No newline at end of file diff --git a/db/wp6.sample.pluviometer-api.json b/db/wp6.sample.pluviometer-api.json index 98c6a5a..09551aa 100644 --- a/db/wp6.sample.pluviometer-api.json +++ b/db/wp6.sample.pluviometer-api.json @@ -1,18 +1,19 @@ JSON intended to display pluviometer icons on map - - +ws: //waterproofing.geog.uni-heidelberg.de/wss/hot/data?type=PLUVIOMETERS_FORM { "responseData": { - "array_to_json": [{ - "formcode": "PLUVIOMETERS_FORM", - "formsanswersuserinformer": "admin@wpd.com", - "fieldsanswerslatitude": 4.750550953715424, - "fieldsanswerslongitude": -74.1179903701844 - }, + "array_to_json": [ + { + "formcode": "PLUVIOMETERS_FORM", + "formsanswersuserinformer": "admin@wpd.com", + "fieldsanswerslatitude": 4.750550953715424, + "fieldsanswerslongitude": -74.1179903701844 + }, "formcode": "PLUVIOMETERS_FORM", "formsanswersuserinformer": "admin222@wpd.com", "fieldsanswerslatitude": 4.23876482872188, "fieldsanswerslongitude": -79.1179903701844 - }] - } + } + ] } +} \ No newline at end of file diff --git a/db/wp6.sample.pluviometer-forms-api.json b/db/wp6.sample.pluviometer-forms-api.json index 34c803c..2caa364 100644 --- a/db/wp6.sample.pluviometer-forms-api.json +++ b/db/wp6.sample.pluviometer-forms-api.json @@ -1,18 +1,21 @@ JSON intended to insert pluviometer forms data into datalake - - +ws: //waterproofing.geog.uni-heidelberg.de/wss/hot/data?type=PLUVIOMETERS_FORM { "responseData": { - "array_to_json": [{ - "formcode": "PLUVIOMETERS_FORM", - "formsanswersuserinformer": "admin@wpd.com", - "fias": [{ - "fieldsanswersdate": "11/02", - "fieldsanswersrainamount": 5, - "fieldsanswerseventtime": "21:52", - "fielsanswerimages" : "base64", - "fielsanswercomment": "users description about the current event" - }] - }] + "array_to_json": [ + { + "formcode": "PLUVIOMETERS_FORM", + "formsanswersuserinformer": "admin@wpd.com", + "fias": [ + { + "fieldsanswersdate": "11/02", + "fieldsanswersrainamount": 5, + "fieldsanswerseventtime": "21:52", + "fielsanswerimages": "base64", + "fielsanswercomment": "users description about the current event" + } + ] + } + ] } -} +} \ No newline at end of file diff --git a/db/wp6.sample.pluviometer-modal-api.json b/db/wp6.sample.pluviometer-modal-api.json index 46e7a1a..cdc34a2 100644 --- a/db/wp6.sample.pluviometer-modal-api.json +++ b/db/wp6.sample.pluviometer-modal-api.json @@ -1,27 +1,51 @@ JSON intended to display pluviometer data on modal - - +ws: //waterproofing.geog.uni-heidelberg.de/wss/hot/data?type=PLUVIOMETERS_FORM { "responseData": { - "array_to_json": [{ - "formcode": "PLUVIOMETERS_FORM", - "formsanswersuserinformer": "admin@wpd.com", - "fias": [{ - "username" : "Fulano", - "userrole" : "Professor", - "institutionname": "E.E. Vicente Leporace", - "address" : "Rua Nassau", - "images" : "base64", - "pluviometerformsanswers" : [ - {"fieldsanswersdate": "11/02", "fieldsanswersrainamount": 5}, - {"fieldsanswersdate": "10/02", "fieldsanswersrainamount": 5}, - {"fieldsanswersdate": "9/02", "fieldsanswersrainamount": 5}, - {"fieldsanswersdate": "8/02", "fieldsanswersrainamount": 5}, - {"fieldsanswersdate": "7/02", "fieldsanswersrainamount": 5}, - {"fieldsanswersdate": "6/02", "fieldsanswersrainamount": 5}, - {"fieldsanswersdate": "2/02", "fieldsanswersrainamount": 5} + "array_to_json": [ + { + "formcode": "PLUVIOMETERS_FORM", + "formsanswersuserinformer": "admin@wpd.com", + "fias": [ + { + "username": "Fulano", + "userrole": "Professor", + "institutionname": "E.E. Vicente Leporace", + "address": "Rua Nassau", + "images": "base64", + "pluviometerformsanswers": [ + { + "fieldsanswersdate": "11/02", + "fieldsanswersrainamount": 5 + }, + { + "fieldsanswersdate": "10/02", + "fieldsanswersrainamount": 5 + }, + { + "fieldsanswersdate": "9/02", + "fieldsanswersrainamount": 5 + }, + { + "fieldsanswersdate": "8/02", + "fieldsanswersrainamount": 5 + }, + { + "fieldsanswersdate": "7/02", + "fieldsanswersrainamount": 5 + }, + { + "fieldsanswersdate": "6/02", + "fieldsanswersrainamount": 5 + }, + { + "fieldsanswersdate": "2/02", + "fieldsanswersrainamount": 5 + } + ] + } ] - }] - }] + } + ] } -} +} \ No newline at end of file diff --git a/db/wp6.sample.pluviometer-register-api.json b/db/wp6.sample.pluviometer-register-api.json index fad8071..7a71b29 100644 --- a/db/wp6.sample.pluviometer-register-api.json +++ b/db/wp6.sample.pluviometer-register-api.json @@ -1,20 +1,23 @@ This JSON is used to insert Pluviometer data into datalake - - +ws: //waterproofing.geog.uni-heidelberg.de/wss/hot/data?type=PLUVIOMETERS_REGISTRATION { -"responseData": { - "array_to_json": [{ - "formcode": "PLUVIOMETERS_REGISTRATION", - "formsanswersuserinformer": "admin@wpd.com", - "filds": [{ - "fieldsanswerslatitude": 4.750550953715424, - "fieldsanswerslongitude": -74.1179903701844, - "fieldsanswerseventaddress": "Rua dos bobos, 81", - "fieldsanswerseventdate": "11-08-2021", - "fieldsanswerseventtime": "21:52", - "fieldsanswersinstitutename": "E. E. Vagner", - "fieldsanswerrinstitutetype": "Escola" - }] - }] + "responseData": { + "array_to_json": [ + { + "formcode": "PLUVIOMETERS_REGISTRATION", + "formsanswersuserinformer": "admin@wpd.com", + "filds": [ + { + "fieldsanswerslatitude": 4.750550953715424, + "fieldsanswerslongitude": -74.1179903701844, + "fieldsanswerseventaddress": "Rua dos bobos, 81", + "fieldsanswerseventdate": "11-08-2021", + "fieldsanswerseventtime": "21:52", + "fieldsanswersinstitutename": "E. E. Vagner", + "fieldsanswerrinstitutetype": "Escola" + } + ] + } + ] } -} +} \ No newline at end of file diff --git a/db/wpd.erd.pdf b/db/wpd.erd.pdf index 4c4f2ce..45ff4d7 100644 Binary files a/db/wpd.erd.pdf and b/db/wpd.erd.pdf differ