Skip to content

Commit

Permalink
Merge pull request #138 from fhstp/version_foreign_merged
Browse files Browse the repository at this point in the history 
create or duplicate network maps to document change over time #118
  • Loading branch information
@alex-rind
alex-rind committed Feb 26, 2024
2 parents 5e278f9 + 359d564 commit 92a53e3
Show file tree
Hide file tree
Showing 19 changed files with 994 additions and 199 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -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/",
Expand Down
314 changes: 162 additions & 152 deletions public/Rosa_Braunsteigl-Mueller.json
View file
Original file line number Diff line number Diff line change
@@ -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
}
Loading

0 comments on commit 92a53e3

Please sign in to comment.