Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
828b294
fix: remove guest/manager for herp and fish
grantfitzsimmons Jan 30, 2026
6ea1c54
fix(defaults): redundant insect resources
grantfitzsimmons Jan 30, 2026
2341370
fix(defaults): remove redundant invert resources
grantfitzsimmons Jan 30, 2026
ab95119
fix(defaults): remove redundant invertpaleo resources
grantfitzsimmons Jan 30, 2026
1b9fe65
fix(defaults): remove redundant mammal resources
grantfitzsimmons Jan 30, 2026
3613d80
fix(defaults): remove redundant vertpaleo resources
grantfitzsimmons Jan 30, 2026
91996bc
fix(defaults): remove redundant bird resources
grantfitzsimmons Jan 30, 2026
430330d
fix(defaults): remove broken link
grantfitzsimmons Jan 30, 2026
01d4698
fix(defaults): remove redundant botany resources
grantfitzsimmons Jan 30, 2026
93fd776
fix(defaults): remove missing resources
grantfitzsimmons Jan 30, 2026
b40e349
Merge branch 'issue-2931-2' into app-resources
grantfitzsimmons Jan 30, 2026
ed365d7
fix(defaults): remove pointless remarks
grantfitzsimmons Jan 30, 2026
2460c50
fix(defaults): Empty rank names
grantfitzsimmons Jan 30, 2026
dc6c55a
feat(defaults): add geology schema overrides
grantfitzsimmons Jan 30, 2026
68d48dc
feat(defaults): update default field descriptions
grantfitzsimmons Jan 30, 2026
baee165
fix(defaults): improve geology defaults
grantfitzsimmons Jan 30, 2026
58d7b3b
Update schema_overrides.json
grantfitzsimmons Jan 30, 2026
6248d54
Merge branch 'issue-2931-2' into app-resources
grantfitzsimmons Jan 30, 2026
d72d02d
Merge branch 'issue-2931-2' into app-resources
grantfitzsimmons Feb 2, 2026
d01fe26
Merge branch 'issue-2931-2' into app-resources
grantfitzsimmons Feb 3, 2026
187057f
fix(defaults): remove invalid viewdef
grantfitzsimmons Feb 3, 2026
20ed96d
feat(defaults): add GeoSpecify picklist defaults
grantfitzsimmons Feb 3, 2026
98bf35f
fix(defaults): correct attribute rel defaults
grantfitzsimmons Feb 3, 2026
6b41906
refactor(defaults): simplify geology overrides
grantfitzsimmons Feb 3, 2026
6a36181
feat(tests): add schema overrides validation
grantfitzsimmons Feb 3, 2026
cb96d68
fix(defaults): fix failing test
grantfitzsimmons Feb 3, 2026
9344ab6
feat(defaults): add geology defaults
grantfitzsimmons Feb 3, 2026
59fe055
feat(defaults): update geology schema and forms
grantfitzsimmons Feb 3, 2026
433981f
fix(defaults): solve remaining geo discrepancies
grantfitzsimmons Feb 3, 2026
aeb49ab
fix(forms): hide paleomap
grantfitzsimmons Feb 3, 2026
c950ecd
Merge branch 'issue-2931-2' into app-resources
grantfitzsimmons Feb 3, 2026
2a3d835
fix(forms): update default collection form
grantfitzsimmons Feb 3, 2026
7c3090b
feat(defaults): add geology picklists
grantfitzsimmons Feb 3, 2026
bf5612d
fix: remove `CollObjPrepMeth` picklists
grantfitzsimmons Feb 3, 2026
907b134
fix(defaults): improve COG descs
grantfitzsimmons Feb 3, 2026
cd0e850
fix(defaults): hide precision date fields
grantfitzsimmons Feb 3, 2026
87bd625
feat(defaults): update conservevent for geo
grantfitzsimmons Feb 3, 2026
64cd4ea
feat(defaults): hide datatype
grantfitzsimmons Feb 3, 2026
6d41651
fix(defaults): hide hybrid parents by default
grantfitzsimmons Feb 3, 2026
3b7d5f7
feat(defaults): add geo taxon form
grantfitzsimmons Feb 3, 2026
039ba3d
fix(defaults): improve taxon form
grantfitzsimmons Feb 3, 2026
a7041e1
feat(defaults): update *agent forms
grantfitzsimmons Feb 3, 2026
fb12e04
feat(defaults): add mineral fields to taxon
grantfitzsimmons Feb 3, 2026
ee170c6
refactor(defaults): cleanup schema overrides
grantfitzsimmons Feb 4, 2026
d6da77f
refactor(defaults): cleanup main schema
grantfitzsimmons Feb 4, 2026
de64679
refactor(defaults): move name and desc first
grantfitzsimmons Feb 4, 2026
d5e29d7
Merge branch 'issue-2931-2' into app-resources
grantfitzsimmons Feb 4, 2026
d488508
fix(defaults): resolve insect issues
grantfitzsimmons Feb 4, 2026
d939d0f
fix(defaults): resolve mammal issues
grantfitzsimmons Feb 4, 2026
2995201
fix(defaults): misc fixes
grantfitzsimmons Feb 4, 2026
b990f73
fix(defaults): resolve botany issues
grantfitzsimmons Feb 4, 2026
ddc3caa
fix(defaults): resolve bird issues
grantfitzsimmons Feb 4, 2026
1a1c1ef
fix(defaults): resolve vertpaleo issues
grantfitzsimmons Feb 4, 2026
2fa7169
fix(defaults): resolve vertpaleo issues
grantfitzsimmons Feb 4, 2026
d641822
fix(defaults): fix collection and disc forms
grantfitzsimmons Feb 4, 2026
febdf3b
Merge branch 'issue-2931-2' into app-resources
grantfitzsimmons Feb 4, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/bird/app_resources.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<files>
<file level="3" mimetype="text/xml" name="DataEntryTaskInit" description="DataEntryTaskInit" file="dataentry_task.xml"/>
<file level="3" mimetype="text/xml" name="ExpressSearchConfig" description="ExpressSearchConfig" file="es_config.xml"/>
</files>
5 changes: 0 additions & 5 deletions config/bird/guest/app_resources.xml

This file was deleted.

342 changes: 0 additions & 342 deletions config/bird/guest/bird.views.xml

This file was deleted.

4 changes: 0 additions & 4 deletions config/bird/guest/viewset_registry.xml

This file was deleted.

4 changes: 0 additions & 4 deletions config/bird/manager/app_resources.xml

This file was deleted.

913 changes: 0 additions & 913 deletions config/bird/manager/bird.views.xml

This file was deleted.

4 changes: 0 additions & 4 deletions config/bird/manager/viewset_registry.xml

This file was deleted.

195 changes: 22 additions & 173 deletions config/bird/schema_overrides.json
Original file line number Diff line number Diff line change
@@ -1,184 +1,33 @@
{
"collectingevent": {
"items": [
{
"stationFieldNumber": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "Field Number",
"desc": "Field Number"
}
},
{
"method": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "Method",
"desc": "Method"
}
}
],
"format": null,
"ishidden": false,
"isuiformatter": null,
"picklistname": null,
"type": null,
"aggregator": null,
"defaultui": null,
"name": "Collecting Event",
"desc": "Collecting Event"
"desc": "Collecting Event",
"items": [
{"stationFieldNumber": {"ishidden": false, "name": "Field Number", "desc": "Field Number"}},
{"method": {"ishidden": false, "name": "Method", "desc": "Method"}},
{ "endtime": { "ishidden": false } },
{ "starttime": { "ishidden": false } }
]
},
"collectionobjectattribute": {
"items": [
{
"text5": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "Stomach",
"desc": "Stomach"
}
},
{
"text3": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "ReproCondition",
"desc": "ReproCondition"
}
},
{
"text6": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "Gonads",
"desc": "Gonads"
}
},
{
"text8": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "Weight",
"desc": "Weight"
}
},
{
"text2": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "Sex",
"desc": "Sex"
}
},
{
"text4": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "Body",
"desc": "Body"
}
},
{
"text1": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "LifeStage",
"desc": "LifeStage"
}
},
{
"text7": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "Molt",
"desc": "Molt"
}
}
],
"format": null,
"ishidden": false,
"isuiformatter": null,
"picklistname": null,
"type": null,
"aggregator": null,
"defaultui": null,
"name": "Collection Object Attribute",
"desc": "Collection Object Attribute"
"desc": "Collection Object Attribute",
"items": [
{"text5": {"ishidden": false, "name": "Stomach", "desc": "Stomach"}},
{"text3": {"ishidden": false, "name": "ReproCondition", "desc": "ReproCondition"}},
{"text6": {"ishidden": false, "name": "Gonads", "desc": "Gonads"}},
{"text8": {"ishidden": false, "name": "Weight", "desc": "Weight"}},
{"text2": {"ishidden": false, "name": "Sex", "desc": "Sex"}},
{"text4": {"ishidden": false, "name": "Body", "desc": "Body"}},
{"text1": {"ishidden": false, "name": "LifeStage", "desc": "LifeStage"}},
{"text7": {"ishidden": false, "name": "Molt", "desc": "Molt"}}
]
},
"determination": {
"items": [
{
"typeStatusName": {
"format": null,
"ishidden": false,
"isuiformatter": false,
"picklistname": null,
"type": null,
"isrequired": false,
"weblinkname": null,
"name": "Type Status",
"desc": "Type Status"
}
}
],
"format": null,
"ishidden": false,
"isuiformatter": null,
"picklistname": null,
"type": null,
"aggregator": null,
"defaultui": null,
"name": "Determination",
"desc": "Determination"
"desc": "Determination",
"items": [
{"typeStatusName": {"ishidden": false, "name": "Type Status", "desc": "Type Status"}}
]
}
}
18 changes: 0 additions & 18 deletions config/botany/dataentry_task.xml

This file was deleted.

4 changes: 0 additions & 4 deletions config/botany/guest/app_resources.xml

This file was deleted.

Loading
Loading