Skip to content

Commit

Permalink
Merge pull request #13 from legiongis/upgrade_to_6.2.4
Browse files Browse the repository at this point in the history 
Upgrade to 6.2.4
  • Loading branch information
@mradamcox
mradamcox authored Aug 5, 2023
2 parents 9f90e66 + 9e53487 commit a3799d6
Show file tree
Hide file tree
Showing 16 changed files with 1,027 additions and 676 deletions.
39 changes: 21 additions & 18 deletions pkg/graphs/resource_models/Actor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Title",
"nodegroup_id": "14c19f18-430a-11ec-934a-080027c2283b",
"sortorder": 2,
Expand Down Expand Up @@ -61,7 +61,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Correspondence",
"nodegroup_id": "167ab58a-3e3f-11ec-934a-080027c2283b",
"sortorder": 8,
Expand Down Expand Up @@ -157,7 +157,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Inspector Information",
"nodegroup_id": "a591c2a6-32a8-11ec-82e5-080027c2283b",
"sortorder": 7,
Expand Down Expand Up @@ -509,6 +509,7 @@
{
"card_id": "71bf0b76-30f9-11ec-82e5-080027c2283b",
"config": {
"defaultResourceInstance": [],
"label": "Related Contact",
"placeholder": ""
},
Expand Down Expand Up @@ -916,23 +917,25 @@
"functions_x_graphs": [
{
"config": {
"description": {
"nodegroup_id": "eec41032-22d6-11ec-82e5-080027c2283b",
"string_template": "<Actor Type>"
},
"map_popup": {
"nodegroup_id": "",
"string_template": ""
},
"name": {
"nodegroup_id": "f024722e-2230-11ec-82e5-080027c2283b",
"string_template": "<Name>"
"descriptor_types": {
"description": {
"nodegroup_id": "eec41032-22d6-11ec-82e5-080027c2283b",
"string_template": "<Actor Type>"
},
"map_popup": {
"nodegroup_id": "",
"string_template": ""
},
"name": {
"nodegroup_id": "f024722e-2230-11ec-82e5-080027c2283b",
"string_template": "<Name>"
}
},
"triggering_nodegroups": []
},
"function_id": "60000000-0000-0000-0000-000000000001",
"graph_id": "e5441dd9-222f-11ec-82e5-080027c2283b",
"id": "2e88e21f-30f2-11ec-82e5-080027c2283b"
"id": "00e25e73-5928-11ec-a804-ddb67dfceb92"
}
],
"graphid": "e5441dd9-222f-11ec-82e5-080027c2283b",
Expand Down Expand Up @@ -1539,9 +1542,9 @@
}
],
"metadata": {
"db": "PostgreSQL 12.8 (Ubuntu 12.8-1.pgdg18.04+1) on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0, 64-bit",
"git hash": "439f58509 2021-10-26 14:45:09 -0700",
"db": "PostgreSQL 12.15 (Ubuntu 12.15-1.pgdg20.04+1) on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 9.4.0-1ubuntu1~20.04.1) 9.4.0, 64-bit",
"git hash": "fatal: detected dubious ownership in repository at '/opt/app/arches'",
"os": "Linux",
"os version": "4.15.0-158-generic"
"os version": "6.2.9-x86_64-linode160"
}
}
40 changes: 21 additions & 19 deletions pkg/graphs/resource_models/Advocacy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Contacts",
"nodegroup_id": "5b4a3fe8-3690-11ec-934a-080027c2283b",
"sortorder": 7,
Expand Down Expand Up @@ -151,7 +151,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Tags",
"nodegroup_id": "712e5142-3c02-11ec-934a-080027c2283b",
"sortorder": 8,
Expand Down Expand Up @@ -215,7 +215,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Threat",
"nodegroup_id": "c4db22e8-368f-11ec-934a-080027c2283b",
"sortorder": 5,
Expand Down Expand Up @@ -844,23 +844,25 @@
"functions_x_graphs": [
{
"config": {
"description": {
"nodegroup_id": "d3f6d80c-3690-11ec-934a-080027c2283b",
"string_template": "<Status>"
},
"map_popup": {
"nodegroup_id": "d3f6d80c-3690-11ec-934a-080027c2283b",
"string_template": "<Status>"
},
"name": {
"nodegroup_id": "9a55a994-368f-11ec-934a-080027c2283b",
"string_template": "<Project Name>"
"descriptor_types": {
"description": {
"nodegroup_id": "d3f6d80c-3690-11ec-934a-080027c2283b",
"string_template": "<Status>"
},
"map_popup": {
"nodegroup_id": "d3f6d80c-3690-11ec-934a-080027c2283b",
"string_template": "<Status>"
},
"name": {
"nodegroup_id": "9a55a994-368f-11ec-934a-080027c2283b",
"string_template": "<Project Name>"
}
},
"triggering_nodegroups": []
},
"function_id": "60000000-0000-0000-0000-000000000001",
"graph_id": "2ebb83cb-368f-11ec-934a-080027c2283b",
"id": "d27dc7ee-3b21-11ec-934a-080027c2283b"
"id": "02eaf357-5928-11ec-a804-ddb67dfceb92"
}
],
"graphid": "2ebb83cb-368f-11ec-934a-080027c2283b",
Expand Down Expand Up @@ -890,7 +892,7 @@
"parentnodegroup_id": null
},
{
"cardinality": "1",
"cardinality": "n",
"legacygroupid": null,
"nodegroupid": "7019a203-368f-11ec-934a-080027c2283b",
"parentnodegroup_id": null
Expand Down Expand Up @@ -1384,9 +1386,9 @@
}
],
"metadata": {
"db": "PostgreSQL 12.8 (Ubuntu 12.8-1.pgdg18.04+1) on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0, 64-bit",
"git hash": "439f58509 2021-10-26 14:45:09 -0700",
"db": "PostgreSQL 12.15 (Ubuntu 12.15-1.pgdg20.04+1) on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 9.4.0-1ubuntu1~20.04.1) 9.4.0, 64-bit",
"git hash": "fatal: detected dubious ownership in repository at '/opt/app/arches'",
"os": "Linux",
"os version": "4.15.0-158-generic"
"os version": "6.2.9-x86_64-linode160"
}
}
57 changes: 31 additions & 26 deletions pkg/graphs/resource_models/Easement Inspection.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Grounds",
"nodegroup_id": "24598818-22ef-11ec-82e5-080027c2283b",
"sortorder": 1,
Expand Down Expand Up @@ -48,7 +48,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Inspection Context",
"nodegroup_id": "2e02039c-3102-11ec-82e5-080027c2283b",
"sortorder": 1,
Expand All @@ -74,7 +74,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Feature",
"nodegroup_id": "c3b8c00e-22ef-11ec-82e5-080027c2283b",
"sortorder": null,
Expand Down Expand Up @@ -106,7 +106,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Room",
"nodegroup_id": "b526a8ec-22ec-11ec-82e5-080027c2283b",
"sortorder": 2,
Expand All @@ -132,7 +132,7 @@
"helptext": "<p>This is where you can record all the observations you make of a particular building on the easement property.</p>\n\n<p>Because some easements have multiple buildings to inspect, you can add as many buildings as you need. In the &quot;Building Name&quot; field, identify which building being observed.</p>\n\n<p>Enter observations for Roofs &amp; Chimneys and each Facade.</p>\n",
"helptitle": "Building Observation Help",
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Building",
"nodegroup_id": "5ea38782-22ec-11ec-82e5-080027c2283b",
"sortorder": 0,
Expand All @@ -151,7 +151,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Fa\u00e7ades",
"nodegroup_id": "5ea38785-22ec-11ec-82e5-080027c2283b",
"sortorder": 1,
Expand Down Expand Up @@ -183,7 +183,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Inspection Summary",
"nodegroup_id": "8662f9dc-3103-11ec-82e5-080027c2283b",
"sortorder": 2,
Expand Down Expand Up @@ -215,7 +215,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Observations",
"nodegroup_id": "9cad5a04-22e7-11ec-82e5-080027c2283b",
"sortorder": 3,
Expand All @@ -234,7 +234,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Roofs and Chimneys",
"nodegroup_id": "5ea3877f-22ec-11ec-82e5-080027c2283b",
"sortorder": 0,
Expand Down Expand Up @@ -266,7 +266,7 @@
"helptext": null,
"helptitle": null,
"instructions": null,
"is_editable": true,
"is_editable": false,
"name": "Signed Agreement",
"nodegroup_id": "fceeadf2-22e5-11ec-82e5-080027c2283b",
"sortorder": 4,
Expand Down Expand Up @@ -946,6 +946,7 @@
{
"card_id": "2e02039e-3102-11ec-82e5-080027c2283b",
"config": {
"defaultResourceInstance": [],
"label": "Easement",
"placeholder": ""
},
Expand All @@ -959,6 +960,7 @@
{
"card_id": "2e02039e-3102-11ec-82e5-080027c2283b",
"config": {
"defaultResourceInstance": [],
"label": "Inspector",
"placeholder": ""
},
Expand Down Expand Up @@ -990,6 +992,7 @@
{
"card_id": "2e02039e-3102-11ec-82e5-080027c2283b",
"config": {
"defaultResourceInstance": [],
"label": "Stakeholders Present",
"placeholder": ""
},
Expand Down Expand Up @@ -1529,28 +1532,30 @@
"functions_x_graphs": [
{
"config": {
"description": {
"nodegroup_id": "8662f9dc-3103-11ec-82e5-080027c2283b",
"string_template": "<Flag>, <Overall Rating>, <General Condition>, <Recommendations>"
},
"map_popup": {
"nodegroup_id": "8662f9dc-3103-11ec-82e5-080027c2283b",
"string_template": "<Flag>, <Overall Rating>, <General Condition>, <Recommendations>"
},
"name": {
"nodegroup_id": "2e02039c-3102-11ec-82e5-080027c2283b",
"string_template": "<Easement>, <Inspection Date>"
"descriptor_types": {
"description": {
"nodegroup_id": "8662f9dc-3103-11ec-82e5-080027c2283b",
"string_template": "<Flag>, <Overall Rating>, <General Condition>, <Recommendations>"
},
"map_popup": {
"nodegroup_id": "8662f9dc-3103-11ec-82e5-080027c2283b",
"string_template": "<Flag>, <Overall Rating>, <General Condition>, <Recommendations>"
},
"name": {
"nodegroup_id": "2e02039c-3102-11ec-82e5-080027c2283b",
"string_template": "<Easement>, <Inspection Date>"
}
},
"triggering_nodegroups": []
},
"function_id": "60000000-0000-0000-0000-000000000001",
"graph_id": "06642595-22e4-11ec-82e5-080027c2283b",
"id": "579715c3-3106-11ec-82e5-080027c2283b"
"id": "06e907e2-5928-11ec-a804-ddb67dfceb92"
}
],
"graphid": "06642595-22e4-11ec-82e5-080027c2283b",
"iconclass": "fa fa-stethoscope",
"is_editable": true,
"is_editable": false,
"isactive": true,
"isresource": true,
"jsonldcontext": null,
Expand Down Expand Up @@ -2551,9 +2556,9 @@
}
],
"metadata": {
"db": "PostgreSQL 12.8 (Ubuntu 12.8-1.pgdg18.04+1) on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0, 64-bit",
"git hash": "439f58509 2021-10-26 14:45:09 -0700",
"db": "PostgreSQL 12.15 (Ubuntu 12.15-1.pgdg20.04+1) on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 9.4.0-1ubuntu1~20.04.1) 9.4.0, 64-bit",
"git hash": "fatal: detected dubious ownership in repository at '/opt/app/arches'",
"os": "Linux",
"os version": "4.15.0-158-generic"
"os version": "6.2.9-x86_64-linode160"
}
}
Loading

0 comments on commit a3799d6

Please sign in to comment.