diff --git a/CHANGELOG.md b/CHANGELOG.md index a62c239..7973427 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # easyNWK Version History +## version 2.1.0, released 26 Feb 2024 + +* (feature) create or duplicate network maps to document change over time [#118](https://github.com/fhstp/easynwk-web/issues/118) + * warning: new JSON file format (network maps saved in previous versions can be opened in 2.1.0) + ## version 2.0.6, released 25 Aug 2023 * (feature) zoom with brushbox, mouse wheel, and sector labels [#103](https://github.com/fhstp/easynwk-web/issues/103) diff --git a/package-lock.json b/package-lock.json index fc7651e..1fa3a22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "easynwk", - "version": "2.0.4", + "version": "2.0.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "easynwk", - "version": "2.0.4", + "version": "2.0.6", "dependencies": { "@fortawesome/fontawesome-svg-core": "^1.2.35", "@fortawesome/free-solid-svg-icons": "^5.15.3", diff --git a/package.json b/package.json index 977a91a..e221968 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "easynwk", - "version": "2.0.6", + "version": "2.1.0", "private": true, "author": "Alexander Rind (https://github.com/alex-rind/)", "repository": "https://github.com/fhstp/easynwk-web/", diff --git a/public/Rosa_Braunsteigl-Mueller.json b/public/Rosa_Braunsteigl-Mueller.json index 960a4b3..45d005c 100644 --- a/public/Rosa_Braunsteigl-Mueller.json +++ b/public/Rosa_Braunsteigl-Mueller.json @@ -1,157 +1,167 @@ -{ - "ego": { - "name": "Rosa Braunsteigl-Müller", - "currentGender": "weiblich", - "age": "45", - "note": "lorem ipsum" - }, - "alteri": [ - { - "id": 11, - "name": "Ewald", - "role": "Familienangehörige*r", - "roleDefault": true, - "human": true, - "currentGender": "nicht festgelegt", - "genderDefault": true, - "age": "", - "note": "", - "deceased": false, - "edgeType": 1, - "edgeTypeByUser": -1, - "angle": 82.59647651462154, - "distance": 61.56025977017402 - }, - { - "id": 10, - "name": "Josefine", - "role": "Großtante", - "roleDefault": false, - "human": true, - "currentGender": "weiblich", - "genderDefault": false, - "age": "86", - "note": "", - "deceased": false, - "edgeType": "0", - "edgeTypeByUser": "0", - "angle": 63.66630822906832, - "distance": 78.41498418743308 - }, - { - "id": 9, - "name": "Strolchi", - "role": "Hund", - "roleDefault": false, - "human": false, - "currentGender": "nicht festgelegt", - "genderDefault": true, - "age": "", - "note": "", - "deceased": false, - "edgeType": 0, - "edgeTypeByUser": -1, - "angle": 32.91800440620509, - "distance": 49.93474976494444 - }, - { - "id": 8, - "name": "Susi", - "role": "Studienkolleg*in", - "contactOfPartner": false, - "human": true, - "currentGender": "weiblich", - "age": "27", - "note": "", - "edgeType": 1, - "angle": -131.1060924804431, - "distance": 42.31366368839073 - }, - { - "id": 7, - "name": "Dr. Maier", - "role": "Ärzt*in", - "contactOfPartner": false, - "human": true, - "currentGender": "nicht festgelegt", - "age": "", - "note": "", - "edgeType": 1, - "angle": -50.92234207573893, - "distance": 93.73453583270009 - }, - { - "id": 5, - "name": "Hubert", - "role": "Vater", - "contactOfPartner": false, - "human": true, - "currentGender": "männlich", - "age": "", - "note": "", - "deceased": true, - "edgeType": 0, - "angle": 70, - "distance": 103 - }, - { - "id": 4, - "name": "Lara", - "role": "Freund*in", - "contactOfPartner": false, - "human": true, - "currentGender": "divers", - "age": "34", - "note": "", - "edgeType": 2, - "angle": 137.52753497925326, - "distance": 75.01518991342189 - }, - { - "id": 3, - "name": "Max", - "role": "Studienkolleg*in", - "contactOfPartner": false, - "human": true, - "currentGender": "nicht festgelegt", - "age": "", - "note": "", - "edgeType": 1, - "angle": -114.86833156298106, - "distance": 71.90407620902847 - }, - { - "id": 2, - "name": "Richard", - "role": "Lebensgefährt*in", - "contactOfPartner": false, - "human": true, - "currentGender": "männlich", - "age": "", - "note": "", - "edgeType": 1, - "angle": 15.195768445698295, - "distance": 19.709025754817713 - }, +{ + "versions": [ { "id": 1, - "name": "Maria", - "role": "Mutter", - "contactOfPartner": false, - "human": true, - "currentGender": "weiblich", - "age": "", - "note": "", - "edgeType": 1, - "angle": 30.051411748698495, - "distance": 27.853551485665644 + "title": "Erstgespräch", + "date": "2024-02-26", + "nwk": { + "ego": { + "name": "Rosa Braunsteigl-Müller", + "currentGender": "weiblich", + "age": "45", + "note": "lorem ipsum" + }, + "alteri": [ + { + "id": 11, + "name": "Ewald", + "role": "Familienangehörige*r", + "roleDefault": true, + "human": true, + "currentGender": "nicht festgelegt", + "genderDefault": true, + "age": "", + "note": "", + "deceased": false, + "edgeType": 1, + "edgeTypeByUser": -1, + "angle": 82.59647651462154, + "distance": 61.56025977017402 + }, + { + "id": 10, + "name": "Josefine", + "role": "Großtante", + "roleDefault": false, + "human": true, + "currentGender": "weiblich", + "genderDefault": false, + "age": "86", + "note": "", + "deceased": false, + "edgeType": "0", + "edgeTypeByUser": "0", + "angle": 63.66630822906832, + "distance": 78.41498418743308 + }, + { + "id": 9, + "name": "Strolchi", + "role": "Hund", + "roleDefault": false, + "human": false, + "currentGender": "nicht festgelegt", + "genderDefault": true, + "age": "", + "note": "", + "deceased": false, + "edgeType": 0, + "edgeTypeByUser": -1, + "angle": 32.91800440620509, + "distance": 49.93474976494444 + }, + { + "id": 8, + "name": "Susi", + "role": "Studienkolleg*in", + "contactOfPartner": false, + "human": true, + "currentGender": "weiblich", + "age": "27", + "note": "", + "edgeType": 1, + "angle": -131.1060924804431, + "distance": 42.31366368839073 + }, + { + "id": 7, + "name": "Dr. Maier", + "role": "Ärzt*in", + "contactOfPartner": false, + "human": true, + "currentGender": "nicht festgelegt", + "age": "", + "note": "", + "edgeType": 1, + "angle": -50.92234207573893, + "distance": 93.73453583270009 + }, + { + "id": 5, + "name": "Hubert", + "role": "Vater", + "contactOfPartner": false, + "human": true, + "currentGender": "männlich", + "age": "", + "note": "", + "deceased": true, + "edgeType": 0, + "angle": 70, + "distance": 103 + }, + { + "id": 4, + "name": "Lara", + "role": "Freund*in", + "contactOfPartner": false, + "human": true, + "currentGender": "divers", + "age": "34", + "note": "", + "edgeType": 2, + "angle": 137.52753497925326, + "distance": 75.01518991342189 + }, + { + "id": 3, + "name": "Max", + "role": "Studienkolleg*in", + "contactOfPartner": false, + "human": true, + "currentGender": "nicht festgelegt", + "age": "", + "note": "", + "edgeType": 1, + "angle": -114.86833156298106, + "distance": 71.90407620902847 + }, + { + "id": 2, + "name": "Richard", + "role": "Lebensgefährt*in", + "contactOfPartner": false, + "human": true, + "currentGender": "männlich", + "age": "", + "note": "", + "edgeType": 1, + "angle": 15.195768445698295, + "distance": 19.709025754817713 + }, + { + "id": 1, + "name": "Maria", + "role": "Mutter", + "contactOfPartner": false, + "human": true, + "currentGender": "weiblich", + "age": "", + "note": "", + "edgeType": 1, + "angle": 30.051411748698495, + "distance": 27.853551485665644 + } + ], + "connections": [ + { "id1": 1, "id2": 4 }, + { "id1": 1, "id2": 2 }, + { "id1": 1, "id2": 10 }, + { "id1": 11, "id2": 10 }, + { "id1": 11, "id2": 1 } + ] + } } ], - "connections": [ - { "id1": 1, "id2": 4 }, - { "id1": 1, "id2": 2 }, - { "id1": 1, "id2": 10 }, - { "id1": 11, "id2": 10 }, - { "id1": 11, "id2": 1 } - ] + "currentVersion": 1 } diff --git a/src/components/ComparisonOptionsPanel.vue b/src/components/ComparisonOptionsPanel.vue new file mode 100644 index 0000000..e11ac57 --- /dev/null +++ b/src/components/ComparisonOptionsPanel.vue @@ -0,0 +1,271 @@ + + + + + diff --git a/src/components/ComparisonSlider.vue b/src/components/ComparisonSlider.vue new file mode 100644 index 0000000..d2f8c38 --- /dev/null +++ b/src/components/ComparisonSlider.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/src/components/NetworkMap.vue b/src/components/NetworkMap.vue index 42dce6e..10d1a8a 100644 --- a/src/components/NetworkMap.vue +++ b/src/components/NetworkMap.vue @@ -1,10 +1,11 @@