Update default form definitions for Geo

config/backstop/typesearch_def.xml

@@ -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="">
@@ -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
@@ -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=""/>
@@ -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=""/>
@@ -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
@@ -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>

config/bird/bird.views.xml

@@ -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"/>                    
@@ -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"/>

config/bird/manager/bird.views.xml

@@ -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"/>                    
@@ -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"/>

config/botany/botany.views.xml

@@ -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"/>                    
@@ -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"/>

config/botany/manager/botany.views.xml

@@ -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"/>                    
@@ -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"/>