Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update default form definitions for Geo #5367

Merged
merged 74 commits into from
Dec 3, 2024
+9,560 −13,440
Merged

Update default form definitions for Geo #5367

Show file tree
Hide file tree
Changes from 69 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
633577e
Update common.views.xml
grantfitzsimmons Nov 1, 2024
be1c730
Fix missing tag
grantfitzsimmons Nov 1, 2024
1273738
Remove mineral default
grantfitzsimmons Nov 1, 2024
25695e9
Merge branch 'production' into issue-5311
grantfitzsimmons Nov 6, 2024
68b0253
Fix #2153
grantfitzsimmons Nov 6, 2024
53d8c74
Make Hybrid Parent Taxon fields conditional
grantfitzsimmons Nov 6, 2024
688e4dc
Set `countAmt` min value to `0`
grantfitzsimmons Nov 6, 2024
b6e2a38
Update geology.views.xml
grantfitzsimmons Nov 6, 2024
56c4059
Improve Pick List forms
grantfitzsimmons Nov 6, 2024
8d0522e
Add new Collection Relationship Type form
grantfitzsimmons Nov 6, 2024
f60a405
Fix Agent and AgentIdentifier form issues
grantfitzsimmons Nov 6, 2024
0ca1671
Remove front-end limit on pick list items
grantfitzsimmons Nov 6, 2024
0dcd2f9
Remove hardcoded labels in the pick list form
grantfitzsimmons Nov 6, 2024
c9e509d
Fix TaxonAttribute form being misconfigured
grantfitzsimmons Nov 6, 2024
5344210
Fix Taxon Tree Def form errors
grantfitzsimmons Nov 7, 2024
80c271a
Fix IDs for Agent subviews
grantfitzsimmons Nov 7, 2024
4e7fe14
Reformat DataObjFormatters using linter
grantfitzsimmons Nov 7, 2024
30e1039
Update models_by_table_id.py
grantfitzsimmons Nov 7, 2024
5c62bdc
Fix Collection Rel Type form
grantfitzsimmons Nov 7, 2024
16c61fc
Add Collection and SpecifyUser to TypeSearches
grantfitzsimmons Nov 7, 2024
0991a78
Add Institution and new instructions
grantfitzsimmons Nov 7, 2024
6ef8046
Add support for modifying tree direction
grantfitzsimmons Nov 7, 2024
73bcc7d
Add Specify User to DataObjFormatters
grantfitzsimmons Nov 7, 2024
4bf9823
Add COT, COG, and COJO to DataObjFormatters
grantfitzsimmons Nov 7, 2024
3eedd33
Add AgentIdentifier to DataObjFormatters
grantfitzsimmons Nov 7, 2024
dbd7a44
Add COG and COGT to TypeSearches
grantfitzsimmons Nov 7, 2024
c0afac8
Update Specify User and add SpAppResource forms
grantfitzsimmons Nov 7, 2024
ce88383
Hide system metadata for App Resources
grantfitzsimmons Nov 7, 2024
97b344b
Add SpViewSetObj Form
grantfitzsimmons Nov 7, 2024
8f32b2e
Remove broken WebLinks
grantfitzsimmons Nov 7, 2024
aac4f6f
Add AgentIdentifier table to WebLinks
grantfitzsimmons Nov 7, 2024
f4f12a8
Remove auto-generated views
grantfitzsimmons Nov 7, 2024
eabef1c
Add RecordSet Form
grantfitzsimmons Nov 7, 2024
9273339
Merge branch 'production' into issue-5311
grantfitzsimmons Nov 7, 2024
5727f70
Update webOnlyViews.ts
grantfitzsimmons Nov 7, 2024
d444c36
Lint code with ESLint and Prettier
grantfitzsimmons Nov 7, 2024
ea9f09c
Add ability to transfer Query
grantfitzsimmons Nov 7, 2024
ef40867
Remove unnecessary separator
grantfitzsimmons Nov 7, 2024
5c6dc88
Add SpReport form
grantfitzsimmons Nov 7, 2024
d8be687
Add auto-generated forms back
grantfitzsimmons Nov 7, 2024
5edf852
Lint code with ESLint and Prettier
grantfitzsimmons Nov 7, 2024
9afc988
Add preferred name to Chronostrat and Lithostrat
grantfitzsimmons Nov 7, 2024
426f587
Fix XML mistakes
grantfitzsimmons Nov 7, 2024
1a43e7f
Fix missing closing elements
grantfitzsimmons Nov 7, 2024
c3ba544
Add TectonicUnit form
grantfitzsimmons Nov 8, 2024
ed507c0
Improve *TreeDefItem form
grantfitzsimmons Nov 8, 2024
4ff0562
Add PC options for shared/embedded
grantfitzsimmons Nov 8, 2024
6524dc2
Merge branch 'production' into issue-5311
grantfitzsimmons Nov 8, 2024
818a0de
Update common.views.xml
grantfitzsimmons Nov 13, 2024
862f115
Merge branch 'production' into issue-5311
grantfitzsimmons Nov 14, 2024
b3287d5
Merge branch 'production' into issue-5311
grantfitzsimmons Nov 20, 2024
cd54372
Add Tectonic Unit field format
grantfitzsimmons Nov 20, 2024
0995dfe
Fix Record Set form not appearing
grantfitzsimmons Nov 20, 2024
e27f056
Update index.test.ts
grantfitzsimmons Nov 20, 2024
e6486ca
Add view set
grantfitzsimmons Nov 20, 2024
569a878
Add `min=0` for Prep count
grantfitzsimmons Nov 21, 2024
c44b8c1
Merge branch 'production' into issue-5311
grantfitzsimmons Nov 21, 2024
58527cf
Merge branch 'production' into issue-5311
grantfitzsimmons Nov 21, 2024
39d69d7
Merge branch 'production' into issue-5311
grantfitzsimmons Nov 22, 2024
8fe0bf1
Remove arbitrary default
grantfitzsimmons Nov 22, 2024
5b150d5
Fix Parent COG
grantfitzsimmons Nov 22, 2024
a2108ab
Fix COJO children
grantfitzsimmons Nov 22, 2024
1805b60
Use conditional to check for no value in COJO
grantfitzsimmons Nov 22, 2024
cf768ae
Add conditionals to render CO/COG children separately
grantfitzsimmons Nov 22, 2024
d6b9e15
Remove broken weblink config
grantfitzsimmons Nov 22, 2024
16889a1
Update global.views.xml
grantfitzsimmons Nov 22, 2024
4b56448
Add COG Group View
grantfitzsimmons Nov 22, 2024
54dcadf
Add Tectonic Unit QCBX to PaleoContext
grantfitzsimmons Nov 22, 2024
9bb6c21
Merge branch 'production' into issue-5311
grantfitzsimmons Dec 2, 2024
a2bfb0f
Update system.views.xml
grantfitzsimmons Dec 2, 2024
d188aca
Set `specifyUser` to current user
grantfitzsimmons Dec 2, 2024
6bf9b11
Lint code with ESLint and Prettier
grantfitzsimmons Dec 2, 2024
e10958c
Remove hard-coded names in Pick List form
grantfitzsimmons Dec 2, 2024
4bac65a
Merge branch 'issue-5311' of https://github.com/specify/specify7 into…
grantfitzsimmons Dec 2, 2024
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,695 changes: 530 additions & 1,165 deletions config/backstop/dataobj_formatters.xml
View file
Open in desktop

Large diffs are not rendered by default.

4,972 changes: 2,277 additions & 2,695 deletions config/backstop/global.views.xml
View file
Open in desktop

Large diffs are not rendered by default.

1,232 changes: 558 additions & 674 deletions config/backstop/system.views.xml
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions config/backstop/typesearch_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

NOTE: This HQL and if you add in your own query you must prefix all the field names with the table abbreviations.
Also, you should/must use the table abbreviations that are defined in the specify_schema.xml
PLEASE KEEP THEM IN ALPHABETICAL ORDER!
Table IDs are defined in this list: https://github.com/specify/specify7/blob/production/specifyweb/specify/models_by_table_id.py
The `displaycols` attribute is ignored and the Table Format is used instead.
The HQL queries cannot be custom defined in this file and will be ignored.

-->
<typesearches>
<typesearch tableid="7" name="AccessionCO" searchfield="accessionNumber" displaycols="accessionNumber" format="%s" dataobjformatter="">
Expand All @@ -24,6 +24,8 @@
<typesearch tableid="97" name="CatAutoNumberingScheme" searchfield="schemeName" displaycols="schemeName" format="%s" dataobjformatter=""/>
<typesearch tableid="46" name="ChronosStrat" searchfield="name" displaycols="fullName" format="%s" dataobjformatter=""/>
<typesearch tableid="1" name="CollectionObject" searchfield="catalogNumber" displaycols="catalogNumber" uifieldformatter="CatalogNumber" dataobjformatter="CollectionObject"/>
<typesearch tableid="1016" name="CollectionObjectGroup" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="1018" name="CollectionObjectGroupType" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="98" name="CollectionRelType" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="10" name="CollectingEvent" searchfield="stationFieldNumber" displaycols="stationFieldNumber,startDate,loc.localityName,geo.fullName" format="%s; %s; %s; %s" dataobjformatter="">
SELECT %s1 FROM CollectingEvent ce LEFT JOIN ce.locality loc LEFT JOIN loc.geography geo JOIN ce.discipline as dsp WHERE dsp.disciplineId = DSPLNID AND %s2 ORDER BY stationFieldNumber
Expand All @@ -33,6 +35,7 @@
SELECT %s1 FROM Container con WHERE %s2 AND con.collectionObjects.size = 0 ORDER BY name
</typesearch>
<typesearch tableid="87" name="CollectingTrip" searchfield="collectingTripName" displaycols="collectingTripName" format="%s" dataobjformatter=""/>
<typesearch tableid="23" name="Collection" searchfield="collectionName" displaycols="collectionName" format="%s" dataobjformatter=""/>
<typesearch tableid="34" name="Disposal" searchfield="disposalNumber" displaycols="disposalNumber" format="%s" dataobjformatter="Disposal"/>
<typesearch tableid="26" name="Discipline" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="96" name="Division" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
Expand All @@ -43,6 +46,7 @@
</typesearch>
<typesearch tableid="3" name="Geography" searchfield="name" displaycols="fullName" format="%s" dataobjformatter="Geography"/>
<typesearch tableid="46" name="GeologicTimePeriod" searchfield="name" displaycols="fullName" format="%s" dataobjformatter=""/>
<typesearch tableid="94" name="Institution" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="51" name="Journal" searchfield="journalName" displaycols="journalName" format="%s" dataobjformatter=""/>
<typesearch tableid="163" name="Deaccession" searchfield="deaccessionNumber" displaycols="deaccessionNumber" format="%s" dataobjformatter="Deaccession"/>
<typesearch tableid="100" name="LithoStrat" searchfield="name" displaycols="fullName" format="%s" dataobjformatter=""/>
Expand All @@ -53,6 +57,7 @@
<typesearch tableid="69" name="ReferenceWork" searchfield="title" displaycols="title" format="%s" dataobjformatter=""/>
<typesearch tableid="70" name="RepositoryAgreement" searchfield="repositoryAgreementNumber" displaycols="repositoryAgreementNumber" format="%s" dataobjformatter=""/>
<typesearch tableid="58" name="Storage" searchfield="name" displaycols="fullName" format="%s" dataobjformatter=""/>
<typesearch tableid="72" name="SpecifyUser" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="32" name="PaleoContext" searchfield="paleoContextName,cs.fullName,ls.fullName" displaycols="paleoContextName,cs.fullName,cse.fullName,ls.fullName" format="%s, %s, %s, %s"
dataobjformatter="PaleoContext">
SELECT %s1 FROM PaleoContext pc LEFT JOIN pc.chronosStrat cs LEFT JOIN cs.definition csd LEFT JOIN pc.chronosStratEnd cse LEFT JOIN cse.definition csed LEFT JOIN pc.lithoStrat ls LEFT JOIN ls.definition lsd WHERE pc.discipline.disciplineId = DSPLNID AND (pc.chronosStrat IS NULL OR csd.geologicTimePeriodTreeDefId=GTPTREEDEFID) AND (pc.chronosStratEnd IS NULL OR csed.geologicTimePeriodTreeDefId=GTPTREEDEFID) AND (pc.lithoStrat IS NULL OR lsd.lithoStratTreeDefId=LITHOTREEDEFID) AND %s2 ORDER BY pc.paleoContextName,cs.fullName,cse.fullName,ls.fullName
Expand All @@ -64,7 +69,6 @@
<typesearch tableid="65" name="PrepType" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="4" name="Taxon" searchfield="fullName" displaycols="fullName" format="%s" dataobjformatter="Taxon"/>
<typesearch tableid="77" name="TaxonTreeDefItem" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="1025" name="TectonicUnitTreeDef" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="1026" name="TectonicUnitTreeDefItem" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="1027" name="TectonicUnit" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
</typesearches>
7 changes: 2 additions & 5 deletions config/bird/bird.views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
<cell type="label" labelfor="cdv"/>
<cell type="field" id="cdv" name="catalogedDateVerbatim" uitype="text"/>
<cell type="label" labelfor="ca"/>
<cell type="field" id="ca" name="countAmt" uitype="text"/>
<cell type="field" id="ca" name="countAmt" initialize="min=0" uitype="text"/>
</row>
<row>
<cell type="subview" id="7" name="collectionObjectCitations" viewname="CollectionObjectCitation" colspan="15"/>
Expand Down Expand Up @@ -764,7 +764,7 @@
<cell type="label" labelfor="7"/>
<cell type="field" id="7" name="prepType" uitype="combobox" picklist="PrepType"/>
<cell type="label" labelfor="3"/>
<cell type="field" id="3" name="countAmt" uitype="text"/>
<cell type="field" id="3" name="countAmt" uitype="text" initialize="min=0"/>
<cell type="label" label="Current Count:" initialize="align=right"/>
<cell type="field" id="ti" name="actualCountAmt" uitype="text" readonly="true"/>
<cell type="field" id="isOnLoan" name="isOnLoan" uitype="checkbox" label="IS_ON_LOAN" readonly="true"/>
Expand All @@ -779,9 +779,6 @@
<cell type="label" labelfor="4"/>
<cell type="field" id="4" name="storage" uitype="querycbx" initialize="name=Storage" colspan="3"/>
</row>
<row>
<cell type="subview" viewname="DeaccessionPreparation2" id="deaccprep" name="deaccessionPreparations" colspan="12"/>
</row>
<!--<row>
<cell type="label" labelfor="desc"/>
<cell type="field" id="desc" name="description" uitype="text"/>
Expand Down
7 changes: 2 additions & 5 deletions config/bird/manager/bird.views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
<cell type="label" labelfor="cdv"/>
<cell type="field" id="cdv" name="catalogedDateVerbatim" uitype="text"/>
<cell type="label" labelfor="ca"/>
<cell type="field" id="ca" name="countAmt" uitype="text"/>
<cell type="field" id="ca" name="countAmt" initialize="min=0" uitype="text"/>
</row>
<row>
<cell type="subview" id="7" name="collectionObjectCitations" viewname="CollectionObjectCitation" colspan="15"/>
Expand Down Expand Up @@ -764,7 +764,7 @@
<cell type="label" labelfor="7"/>
<cell type="field" id="7" name="prepType" uitype="combobox" picklist="PrepType"/>
<cell type="label" labelfor="3"/>
<cell type="field" id="3" name="countAmt" uitype="text"/>
<cell type="field" id="3" name="countAmt" uitype="text" initialize="min=0"/>
<cell type="label" label="Current Count:" initialize="align=right"/>
<cell type="field" id="ti" name="actualCountAmt" uitype="text" readonly="true"/>
<cell type="field" id="isOnLoan" name="isOnLoan" uitype="checkbox" label="IS_ON_LOAN" readonly="true"/>
Expand All @@ -779,9 +779,6 @@
<cell type="label" labelfor="4"/>
<cell type="field" id="4" name="storage" uitype="querycbx" initialize="name=Storage" colspan="3"/>
</row>
<row>
<cell type="subview" viewname="DeaccessionPreparation2" id="deaccprep" name="deaccessionPreparations" colspan="12"/>
</row>
<!--<row>
<cell type="label" labelfor="desc"/>
<cell type="field" id="desc" name="description" uitype="text"/>
Expand Down
7 changes: 2 additions & 5 deletions config/botany/botany.views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
<cell type="label" labelfor="cdv"/>
<cell type="field" id="cdv" name="catalogedDateVerbatim" uitype="text"/>
<cell type="label" labelfor="ca"/>
<cell type="field" id="ca" name="countAmt" uitype="text"/>
<cell type="field" id="ca" name="countAmt" initialize="min=0" uitype="text"/>
</row>
<row>
<cell type="subview" id="7" name="collectionObjectCitations" viewname="CollectionObjectCitation" colspan="15"/>
Expand Down Expand Up @@ -597,7 +597,7 @@
<cell type="label" labelfor="7"/>
<cell type="field" id="7" name="prepType" uitype="combobox" picklist="PrepType"/>
<cell type="label" labelfor="3"/>
<cell type="field" id="3" name="countAmt" uitype="text"/>
<cell type="field" id="3" name="countAmt" uitype="text" initialize="min=0"/>
<cell type="label" label="Current Count:" initialize="align=right"/>
<cell type="field" id="ti" name="actualCountAmt" uitype="text" readonly="true"/>
<cell type="field" id="isOnLoan" name="isOnLoan" uitype="checkbox" label="IS_ON_LOAN" readonly="true"/>
Expand All @@ -612,9 +612,6 @@
<cell type="label" labelfor="4"/>
<cell type="field" id="4" name="storage" uitype="querycbx" initialize="name=Storage" colspan="3"/>
</row>
<row>
<cell type="subview" viewname="DeaccessionPreparation2" id="deaccprep" name="deaccessionPreparations" colspan="12"/>
</row>
<!--<row>
<cell type="label" labelfor="desc"/>
<cell type="field" id="desc" name="description" uitype="text"/>
Expand Down
7 changes: 2 additions & 5 deletions config/botany/manager/botany.views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
<cell type="label" labelfor="cdv"/>
<cell type="field" id="cdv" name="catalogedDateVerbatim" uitype="text"/>
<cell type="label" labelfor="ca"/>
<cell type="field" id="ca" name="countAmt" uitype="text"/>
<cell type="field" id="ca" name="countAmt" initialize="min=0" uitype="text"/>
</row>
<row>
<cell type="subview" id="7" name="collectionObjectCitations" viewname="CollectionObjectCitation" colspan="15"/>
Expand Down Expand Up @@ -597,7 +597,7 @@
<cell type="label" labelfor="7"/>
<cell type="field" id="7" name="prepType" uitype="combobox" picklist="PrepType"/>
<cell type="label" labelfor="3"/>
<cell type="field" id="3" name="countAmt" uitype="text"/>
<cell type="field" id="3" name="countAmt" uitype="text" initialize="min=0"/>
<cell type="label" label="Current Count:" initialize="align=right"/>
<cell type="field" id="ti" name="actualCountAmt" uitype="text" readonly="true"/>
<cell type="field" id="isOnLoan" name="isOnLoan" uitype="checkbox" label="IS_ON_LOAN" readonly="true"/>
Expand All @@ -612,9 +612,6 @@
<cell type="label" labelfor="4"/>
<cell type="field" id="4" name="storage" uitype="querycbx" initialize="name=Storage" colspan="3"/>
</row>
<row>
<cell type="subview" viewname="DeaccessionPreparation2" id="deaccprep" name="deaccessionPreparations" colspan="12"/>
</row>
<!--<row>
<cell type="label" labelfor="desc"/>
<cell type="field" id="desc" name="description" uitype="text"/>
Expand Down
Loading