Skip to content

Commit

Permalink
Merge pull request #5448 from specify/issue-5447
Browse files Browse the repository at this point in the history
  • Loading branch information
@grantfitzsimmons
grantfitzsimmons authored Dec 12, 2024
2 parents 674d5b4 + 2a87af1 commit c75cf54
Show file tree
Hide file tree
Showing 4 changed files with 224 additions and 175 deletions.
2 changes: 1 addition & 1 deletion config/backstop/global.views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2858,7 +2858,7 @@
</row>
<row>
<cell type="label" labelfor="acceptedParent"/>
<cell type="field" id="acceptedParent" uitype="querycbx" initialize="name=Taxon;title=Taxon;editbtn=false;newbtn=false" name="acceptedParent" colspan="5"/>
<cell type="field" id="acceptedParent" uitype="querycbx" initialize="name=TectonicUnit;editbtn=false;newbtn=false" name="acceptedParent" colspan="5"/>
<cell type="field" id="isAccepted" uitype="checkbox" name="isAccepted" default="true"/>
</row>
<row>
Expand Down
6 changes: 3 additions & 3 deletions config/backstop/typesearch_def.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +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="1026" name="TectonicUnitTreeDefItem" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
<typesearch tableid="1027" name="TectonicUnit" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
</typesearches>
<typesearch tableid="1027" name="TectonicUnit" searchfield="fullName" displaycols="fullName" format="%s" dataobjformatter="TectonicUnit"/>
<typesearch tableid="1026" name="TectonicUnitTreeDefItem" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>
</typesearches>
64 changes: 51 additions & 13 deletions config/common/common.views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -952,8 +952,17 @@
<view name="CollectionObjectGroupJoin_GridView" class="edu.ku.brc.specify.datamodel.CollectionObjectGroupJoin" busrules="edu.ku.brc.specify.datamodel.busrules.CollectionObjectGroupJoinBusRules" resourcelabels="false">
<desc>The Collection Object Group Join form.</desc>
<altviews>
<altview name="CollectionObjectGroupJoin View" viewdef="CollectionObjectGroupJoin (2)" mode="view" default="true"/>
<altview name="CollectionObjectGroupJoin Edit" viewdef="CollectionObjectGroupJoin (2)" mode="edit"/>
<altview name="CollectionObjectGroupJoin View" viewdef="CollectionObjectGroupJoin_GridView" mode="view" default="true"/>
<altview name="CollectionObjectGroupJoin Edit" viewdef="CollectionObjectGroupJoin_GridView" mode="edit"/>
</altviews>
</view>
<view name="CollectionObjectGroupJoin_Sub" class="edu.ku.brc.specify.datamodel.CollectionObjectGroupJoin" busrules="edu.ku.brc.specify.datamodel.busrules.CollectionObjectGroupJoinBusRules" resourcelabels="false">
<desc>The Collection Object Group Join form.</desc>
<altviews>
<altview name="CollectionObjectGroupJoin View" viewdef="CollectionObjectGroupJoin_Sub" mode="view" default="true"/>
<altview name="CollectionObjectGroupJoin Edit" viewdef="CollectionObjectGroupJoin_Sub" mode="edit"/>
<altview name="CollectionObjectGroupJoin Table View" viewdef="CollectionObjectGroupJoin_Sub Table" mode="view" validated="false"/>
<altview name="CollectionObjectGroupJoin Table Edit" viewdef="CollectionObjectGroupJoin_Sub Table" mode="edit" validated="false"/>
</altviews>
</view>
</views>
Expand Down Expand Up @@ -1920,11 +1929,12 @@
<cell type="field" id="name" name="name" uitype="text"/>
<cell type="label" labelfor="cogType"/>
<cell type="field" id="cogType" name="cogType" uitype="combobox"/>
<cell type="label" label="Parent COG"/>
<cell type="field" id="parentCojo" name="parentCog" uitype="querycbx"/>
</row>
<row>
<cell type="subview" id="cojo" name="children" uitype="subview" defaulttype="table" colspan="13"/>
<cell type="subview" viewname="CollectionObjectGroupJoin_Sub" id="cog_cog_join" name="cojo" colspan="14"/>
</row>
<row>
<cell type="subview" id="cojo" name="children" uitype="subview" initialize="sortfield=-isPrimary" defaulttype="table" colspan="13"/>
</row>
</rows>
</viewdef>
Expand Down Expand Up @@ -6903,7 +6913,7 @@
</row>
<row>
<cell type="label" label="Catalog Number Format Name" initialize="align=right"/>
<cell type="field" id="4" name="catalogNumFormatName" uitype="text" readonly="true"/>
<cell type="field" id="4" name="catalogNumFormatName" uitype="text" readonly="false"/>
<cell type="label" labelfor="2"/>
<cell type="field" id="2" name="code" uitype="text" isrequired="false"/>
</row>
Expand Down Expand Up @@ -7034,6 +7044,14 @@
<cell type="label" labelfor="5"/>
<cell type="field" id="5" uitype="plugin" name="this" initialize="name=PartialDateUI;df=catalogedDate;tp=catalogedDatePrecision" uifieldformatter="Date"/>
</row>
<row>
<cell type="label" labelfor="21"/>
<cell type="field" id="21" name="collectingEvent" uitype="querycbx" colspan="12"/>
</row>
<row>
<cell type="label" labelfor="43"/>
<cell type="field" id="43" name="paleoContext" uitype="querycbx" colspan="12"/>
</row>
<row>
<cell type="separator" label="Collection Object Metadata" colspan="18"/>
</row>
Expand All @@ -7046,7 +7064,7 @@
<cell type="panel" colspan="3">
<row>
<cell type="label" label="Collection Object Attributes"/>
<cell type="subview" id="colObjAttr" name="collectionObjectAttribute" viewname="MineralAttributes" initialize="btn=true;align=left;verticalAlign=center" colspan="18"/>
<cell type="subview" id="colObjAttr" name="collectionObjectAttribute" viewname="AllAttributes" initialize="btn=true;align=left;verticalAlign=center" colspan="18"/>
</row>
<rows condition="text8=Mineral">
<row>
Expand All @@ -7073,8 +7091,8 @@
</row>
</rows>
</cell>
<cell type="label" label="Collecting Event"/>
<cell type="subview" viewname="CollectingEventSub" id="21" name="collectingEvent" initialize="btn=true;align=left;verticalAlign=center" colspan="1" rows="5"/>
<!-- <cell type="label" label="Collecting Event"/>
<cell type="subview" viewname="CollectingEventSub" id="21" name="collectingEvent" initialize="btn=true;align=left;verticalAlign=center" colspan="1" rows="5"/> -->
<cell type="label" label="Geologic Context"/>
<cell type="subview" uitype="querycbx" id="pcsh" name="paleoContext" initialize="name=PaleoContext;btn=true;align=left;verticalAlign=center" colspan="1"/>
<cell type="label" label="Relative Ages"/>
Expand Down Expand Up @@ -7173,19 +7191,19 @@
</viewdef>
<viewdef name="CollectionObjectGroupJoin Table" class="edu.ku.brc.specify.datamodel.CollectionObjectGroupJoin" type="formtable" gettable="edu.ku.brc.af.ui.forms.DataGetterForObj" settable="edu.ku.brc.af.ui.forms.DataSetterForObj">
<desc>The Collection Object Group Join Form Grid View</desc>
<definition>CollectionObjectGroupJoin (2)</definition>
<definition>CollectionObjectGroupJoin_GridView</definition>
</viewdef>
<viewdef name="CollectionObjectGroupJoin (2)" class="edu.ku.brc.specify.datamodel.CollectionObjectGroupJoin" type="form" gettable="edu.ku.brc.af.ui.forms.DataGetterForObj" settable="edu.ku.brc.af.ui.forms.DataSetterForObj">
<viewdef name="CollectionObjectGroupJoin_GridView" class="edu.ku.brc.specify.datamodel.CollectionObjectGroupJoin" type="form" gettable="edu.ku.brc.af.ui.forms.DataGetterForObj" settable="edu.ku.brc.af.ui.forms.DataSetterForObj">
<desc>The Collection Object Group Join Form</desc>
<enableRules/>
<columnDef>50px,2px,30px,5px,50px,2px,30px,5px,50px,2px,100px,0px,50px,2px,100px,p:g</columnDef>
<rowDef auto="true" cell="p" sep="2px"/>
<rows>
<row>
<cell type="label" labelfor="1"/>
<cell type="field" id="1" name="isPrimary" uitype="checkbox" default="false"/>
<cell type="field" id="1" name="isPrimary" uitype="checkbox" default="false" readonly="true"/>
<cell type="label" labelfor="2"/>
<cell type="field" id="2" name="isSubstrate" uitype="checkbox" default="false"/>
<cell type="field" id="2" name="isSubstrate" uitype="checkbox" default="false" readonly="true"/>
<cell type="label" labelfor="5"/>
<cell type="field" id="5" name="childCo" uitype="querycbx" readonly="true" colspan="3"/>
<!-- Collection Object Details -->
Expand All @@ -7205,5 +7223,25 @@
</row>
</rows>
</viewdef>
<viewdef name="CollectionObjectGroupJoin_Sub" class="edu.ku.brc.specify.datamodel.CollectionObjectGroupJoin" type="form" gettable="edu.ku.brc.af.ui.forms.DataGetterForObj" settable="edu.ku.brc.af.ui.forms.DataSetterForObj">
<desc>The Collection Object Group Join Form</desc>
<enableRules/>
<columnDef>70px,2px,30px,5px,70px,2px,30px,2px,70px,2px,500px,,p:g</columnDef>
<rowDef auto="true" cell="p" sep="2px"/>
<rows>
<row>
<cell type="label" labelfor="1"/>
<cell type="field" id="1" name="isPrimary" uitype="checkbox" default="false" readonly="true"/>
<cell type="label" labelfor="2"/>
<cell type="field" id="2" name="isSubstrate" uitype="checkbox" default="false" readonly="true"/>
<cell type="label" labelfor="5"/>
<cell type="field" id="5" name="parentCog" uitype="querycbx" colspan="3"/>
</row>
</rows>
</viewdef>
<viewdef name="CollectionObjectGroupJoin_Sub Table" class="edu.ku.brc.specify.datamodel.CollectionObjectGroupJoin" type="formtable" gettable="edu.ku.brc.af.ui.forms.DataGetterForObj" settable="edu.ku.brc.af.ui.forms.DataSetterForObj">
<desc>The Collection Object Group Join Form Grid View</desc>
<definition>CollectionObjectGroupJoin_GridView</definition>
</viewdef>
</viewdefs>
</viewset>
Loading

0 comments on commit c75cf54

Please sign in to comment.