From 633577e7266e696f108b7dc8d4b1b623e62c1435 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 1 Nov 2024 15:11:37 -0500 Subject: [PATCH 01/64] Update common.views.xml Restructures common.views.xml for the first time in years based on the linting done by Specify 7 Fixes #5311 --- config/common/common.views.xml | 12969 ++++++++++++++----------------- 1 file changed, 5690 insertions(+), 7279 deletions(-) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index 6748b3433be..5cc33b7738e 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -1,241 +1,158 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + The Collection Object form. + + + + + The Collection Object Type form. @@ -243,15 +160,13 @@ - - + The Collection Object Group form. - The Collection Object Group form. @@ -259,7 +174,6 @@ - The Collection Object Group Join form. @@ -267,7 +181,6 @@ - The Collection Object Group Type form. @@ -275,1241 +188,848 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Locality form. - - - - + + - - + + Gift display form - - - - + + - - - - - - - - - - - - - p,0px,190px,5px,130px,2px,141px,5px,110px,2px,140px,0px,15px,p:g - 135px,2px,200px,5px,135px,2px,153px,5px,125px,2px,153px,0px,15px,p:g - 130px,2px,220px,5px,153px,2px,189px,5px,133px,2px,189px,0px,15px,p:g - p,2px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + The Accession form. + + p,0px,190px,5px,130px,2px,141px,5px,110px,2px,140px,0px,15px,p:g + 135px,2px,200px,5px,135px,2px,153px,5px,125px,2px,153px,0px,15px,p:g + 130px,2px,220px,5px,153px,2px,189px,5px,133px,2px,189px,0px,15px,p:g + p,2px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - p,0px,190px,5px,130px,2px,141px,5px,110px,2px,140px,0px,15px,p:g - 135px,2px,200px,5px,135px,2px,156px,5px,125px,2px,150px,0px,15px,p:g - 130px,2px,220px,5px,153px,2px,189px,5px,133px,2px,189px,0px,15px,p:g - p,0px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AccessionDeaccession - - - - - - - p,0px,190px,5px,130px,2px,141px,5px,110px,2px,140px,0px,15px,p:g - 135px,2px,200px,5px,135px,2px,156px,5px,125px,2px,150px,0px,15px,p:g - 130px,2px,220px,5px,153px,2px,189px,5px,133px,2px,189px,0px,15px,p:g - p,0px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - AccessionAgent - - - - - - - 105px,2px,210px,5px,110px,2px,155px,243px,p:g - 135px,2px,230px,5px,98px,2px,155px,290px,p:g - 130px,2px,215px,5px,153px,2px,189px,336px,p:g - p,2px,p,5px,85px,2px,p:g(2),p:g - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,210px,515px,p:g - 135px,2px,230px,550px,p:g - 130px,2px,215px,685px,p:g - p,2px,p,p:g - - - - - - - - - - - - - - - - - - - AccessionItems - - - - - - - - 105px,2px,120px,5px,100px,2px,95px,5px,102px,2px,95px,5px,97px,2px,95px,p:g - 135px,2px,113px,5px,110px,2px,105px,5px,116px,2px,105px,5px,110px,2px,100px,p:g - 130px,2px,130px,5px,120px,2px,126px,5px,126px,2px,126px,5px,125px,2px,126px,p:g - p,2px,min(p;175px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2) - - - - - - - - - - - - - - - - - - - - - - 105px,2px,110px,5px,80px,2px,110px,5px,103px,2px,110px,5px,81px,2px,110px,0px,p:g - 115px,2px,129px,5px,72px,2px,129px,5px,110px,2px,129px,5px,80px,2px,129px,0px,p:g - 130px,2px,148px,5px,81px,2px,148px,5px,113px,2px,148px,5px,91px,2px,148px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,130px,5px,151px,2px,130px,5px,90px,2px,210px,0px,15px,p:g - 115px,2px,150px,5px,155px,2px,170px,5px,95px,2px,216px,0px,15px,p:g - 130px,2px,165px,5px,175px,2px,190px,5px,111px,2px,245px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g,0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,122px,5px,125px,2px,120px,10px,132px,5px,80px,2px,122px,0px,15px,p:g - 115px,2px,160px,5px,141px,2px,125px,10px,140px,15px,85px,2px,115px,0px,15px,p:g - 130px,2px,192px,5px,140px,2px,147px,10px,160px,5px,90px,2px,147px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),10px,p,5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BorrowAgent - - - - - - - 105px,2px,200px,5px,43px,2px,130px,345px,p:g - 115px,2px,220px,5px,75px,2px,125px,373px,p:g - 130px,2px,245px,5px,80px,2px,165px,413px,p:g - p,2px,p:g,5px:g,p,2px,p:g(2),p:g(4) - - - - - - - - - - - - - - - - - - - - - BorrowMaterial - - - - - - 105px,2px,120px,5px,70px,2px,90px,5px,122px,2px,90px,0px,5px,122px,2px,90px,p:g - 115px,2px,155px,5px,75px,2px,93px,5px,138px,2px,92px,0px,5px,134px,2px,92px,p:g - 130px,2px,165px,5px,85px,2px,100px,5px,155px,2px,109px,0px,5px,155px,2px,110px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,5px:g,p,2px,p:g(2) - - - - - - - - - - - - - - - - - - - - - - - - - - BorrowReturnMaterial - - - - - - 102px,2px,100px,5px,90px,2px,50px,0px:g,p:g - 120px,2px,120px,5px,110px,2px,80px,0px:g,p:g - 130px,2px,120px,5px,110px,2px,80px,0px:g,p:g - p,2px,p:g(2),5px,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - 100px,2px,126px,5px,75px,2px,210px,5px,90px,2px,210px,0px,p:g - 115px,2px,136px,5px,105px,2px,210px,5px,125px,2px,210px,0px,p:g - 130px,2px,171px,5px,105px,2px,260px,5px,90px,2px,260px,0px,p:g - p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,0px - - - - - - - - - - - - - - - - - - 100px,2px,291px,5px,100px,2px,110px,5px,100px,2px,110px,0px,p:g - 115px,2px,346px,5px,100px,2px,120px,5px,100px,2px,120px,0px,p:g - 130px,2px,421px,5px,105px,2px,130px,5px,100px,2px,130px,0px,15px,p:g - p,2px,p:g(4),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,291px,5px,100px,2px,110px,5px,100px,2px,110px,0px,15px,p:g - 115px,2px,346px,5px,100px,2px,120px,5px,100px,2px,120px,0px,15px,p:g - 130px,2px,421px,5px,105px,2px,130px,5px,100px,2px,130px,0px,15px,p:g - p,2px,p:g(4),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CollectionObjectProperty - - - - - - 100px,2px,195px,5px,215px,2px,308px - 105px,2px,210px,5px,220px,2px,363px - 115px,2px,230px,5px,240px,2px,423px - p,2px,p:g(2),5px:g,p,2px,p:g(4) - - - - - - - - - - - - - - - - - 105px,2px,210px,5px,100px,2px,98px,300px,p:g - 135px,2px,230px,5px,120px,2px,118px,325px,p:g - 130px,2px,215px,5px,140px,2px,138px,395px,p:g - p,2px,p:g,5px:g,p,2px,p:g,p:g(2),p:g - p,2dlu,p:g,2dlu,p:g - - - - - - - - - - - - - - - - - Collectors - - - - - - - - - - - p,5dlu,p:g,5dlu,p - - - - - - - - - - - - - - - - - - - - - - 100px,2px,610px,25px,90px,0px,p:g - 115px,2px,685px,25px,95px,0px,p:g - 130px,2px,705px,25px,95px,0px,p:g - p,2px,p:g(4),p:g,p,0px - - - - - - - - - - - - - - - - + + Collection Object Group Form @@ -2598,20 +1910,19 @@ - - - + + + - + - Collection Object Group Subform - 50px,2px,150px,5px,50px,2px,150px,5px,50px,2px,200px,2px,50px,p:g + 50px,2px,150px,5px,50px,2px,150px,5px,50px,2px,p:g @@ -2619,13 +1930,12 @@ - - - + + - The Collection Object Group Join Form @@ -2634,32 +1944,55 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + - - + - + - - + + + + + + + + + - + @@ -2698,7 +2031,6 @@ --> - The Collection Object Group Type Form @@ -2711,12 +2043,11 @@ - + - - + The Collection Object Type Form p,2px,p,2px,p,2px,p,2px,p,2px,p,p:g @@ -2732,104 +2063,72 @@ - - - - - - - 120px,2px,p,2px,120px,2px,p,2px,60px,2px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - CollectionObjectSub - - - - - - - 100px,2px,120px,5px,100px,2px,95px,5px,102px,2px,95px,5px,97px,2px,95px,p:g - 115px,2px,117px,5px,110px,2px,105px,5px,121px,2px,105px,5px,115px,2px,105px,p:g - 130px,2px,140px,5px,120px,2px,126px,5px,121px,2px,126px,5px,120px,2px,126px,p:g - p,2px,min(p;200px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2) - - - - - - - - - - - - - - - - - - - - - 200px,2px,p,10px,p,2px,p,2px,p,2px,200px,p:g - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,149px,5px,85px,2px,149px,5px,85px,2px,150px,2px,73px,2px,125px,0px,15px,p:g - 115px,2px,245px,5px,82px,2px,140px,5px,68px,2px,140px,2px,71px,2px,144px,0px,15px,p:g - 130px,2px,259px,5px,100px,2px,179px,5px,80px,2px,179px,2px,82px,2px,178px,0px,15px,p:g - p,2px,p:g(4),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),2px,p:g,2px,p:g(2),0px,p,p:g - - - + + + + Conservation Description + + 100px,2px,149px,5px,85px,2px,149px,5px,85px,2px,150px,2px,73px,2px,125px,0px,15px,p:g + 115px,2px,245px,5px,82px,2px,140px,5px,68px,2px,140px,2px,71px,2px,144px,0px,15px,p:g + 130px,2px,259px,5px,100px,2px,179px,5px,80px,2px,179px,2px,82px,2px,178px,0px,15px,p:g + p,2px,p:g(4),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),2px,p:g,2px,p:g(2),0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - 100px,2px,205px,5px,85px,2px,215px,5px,100px,2px,215px,0px,p:g - 115px,2px,210px,5px,120px,2px,210px,5px,140px,2px,210px,0px,p:g - 130px,2px,250px,5px,143px,2px,260px,5px,158px,2px,260px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g,5px:g,p,2px,p:g,0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,124px,5px,85px,2px,120px,5px,85px,2px,120px,2px,73px,2px,100px,0px,p:g - 115px,2px,205px,5px,82px,2px,120px,5px,68px,2px,120px,5px,68px,2px,120px,0px,p:g - 130px,2px,215px,5px,100px,2px,135px,5px,80px,2px,135px,2px,82px,2px,135px,0px,p:g - p,2px,p:g(4),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),2px,p:g,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,178px,5px,108px,2px,130px,5px,100px,2px,195px,0px,15px,p:g - 115px,2px,196px,2px,113px,2px,150px,2px,115px,5px,215px,0px,15px,p:g - 130px,2px,216px,2px,133px,2px,170px,2px,135px,5px,235px,0px,15px,p:g - p,2px,p:g,2px,p:g(2),5px,p:g,2px,p:g(2),5px:g,p,2px,p:g,0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ContainerBrief - - - - - - - 100px,2px,178px,5px,108px,2px,130px,5px,100px,2px,195px,0px,15px,p:g - 115px,2px,196px,2px,113px,2px,150px,2px,115px,5px,215px,0px,15px,p:g - 130px,2px,216px,2px,133px,2px,170px,2px,135px,5px,235px,0px,15px,p:g - p,2px,p:g,2px,p:g(2),5px,p:g,2px,p:g(2),5px:g,p,2px,p:g,0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 105px,0px,110px,5px,120px,2px,110px,5px,52px,2px,140px,5px,52px,2px,120px,0px,15px,p:g - 135px,2px,120px,5px,135px,2px,120px,5px,65px,2px,148px,5px,70px,2px,121px,0px,15px,p:g - 130px,2px,140px,5px,153px,2px,149px,5px,63px,2px,176px,5px,80px,2px,156px,0px,15px,p:g - p,2px,min(p;200px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DeaccessionAccession - - - - - - - 100px,2px,110px,5px,130px,2px,114px,5px,60px,2px,120px,5px,70px,2px,100px,p:g - 135px,2px,120px,5px,135px,2px,123px,5px,75px,2px,133px,5px,63px,2px,100px,p:g - 130px,2px,140px,5px,153px,2px,149px,5px,93px,2px,159px,5px,73px,2px,110px,p:g - p,2px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - 100px,2px,110px,5px,120px,2px,114px,5px,55px,2px,140px,5px,65px,2px,100px,0px,15px,p:g - 135px,2px,115px,5px,135px,2px,120px,5px,55px,2px,161px,5px,63px,2px,100px,0px,15px,p:g - 130px,2px,140px,5px,153px,2px,149px,5px,73px,2px,179px,5px,73px,2px,110px,0px,15px,p:g - p,2px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DeaccessionAgent - - - - - - - 105px,2px,310px,5px,110px,2px,155px,143px,p:g - 115px,2px,330px,5px,98px,2px,155px,190px,p:g - 130px,2px,315px,5px,153px,2px,189px,236px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g - - - - - - - - - - - - - - - - - - - - - 105px,2px,130px,5px,151px,2px,130px,5px,90px,2px,210px,0px,15px,p:g - 130px,2px,150px,5px,155px,2px,170px,5px,95px,2px,216px,0px,15px,p:g - 130px,2px,165px,5px,175px,2px,190px,5px,111px,2px,245px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g,5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,130px,5px,151px,2px,130px,5px,90px,2px,130px,70px,15px,p:g - 130px,2px,150px,5px,155px,2px,170px,5px,95px,2px,216px,0px,15px,p:g - 130px,2px,165px,5px,175px,2px,190px,5px,111px,2px,245px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g,5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - DeaccessionAgent - - - - - - - 100px,2px,310px,5px,110px,2px,155px,143px,p:g - 130px,2px,330px,5px,98px,2px,155px,190px,p:g - 130px,2px,415px,5px,153px,2px,189px,136px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g - - - - - - - - - - - - - - - - - - - DisposalPreparation - - - - - - - 105px,2px,120px,5px,80px,2px,120px,5px,120px,2px,130px,5px,73px,2px,56px,p:g - 130px,2px,112px,5px,95px,2px,90px,5px,130px,2px,158px,5px,53px,2px,81px,p:g - 130px,2px,141px,5px,110px,2px,145px,5px,153px,2px,175px,5px,90px,2px,75px,p:g - p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,5px,p:g,2px,p:g - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,130px,5px,151px,2px,130px,5px,90px,2px,130px,70px,15px,p:g - 130px,2px,145px,5px,155px,2px,140px,5px,95px,2px,146px,85px,0px,15px,p:g - 130px,2px,175px,5px,175px,2px,190px,5px,111px,2px,245px,0px,15px,p:g - p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,0px,p,p:g - - - - - - - - - - - - - - - - - - - - DisposalDeaccPreparation - - - - - - - 105px,2px,100px,5px,120px,2px,100px,5px,75px,2px,70px,5px,120px,2px,100px,p:g - 115px,2px,117px,5px,130px,2px,120px,5px,90px,2px,70px,5px,135px,2px,108px,p:g - 130px,2px,131px,5px,145px,2px,145px,5px,105px,2px,85px,5px,135px,2px,133px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g - - - - - - - - - - - - - - - - - - - - - 100px,2px,210px,5px,110px,2px,155px,243px,p:g - 115px,2px,230px,5px,98px,2px,155px,290px,p:g - 130px,2px,215px,5px,153px,2px,189px,336px,p:g - p,2px,p,5px,85px,2px,p:g(2),p:g - - - - - - - - - - - - - - - - - - - - Determination - - - - - - - - 100px,2px,210px,5px,76px,2px,200px,5px,90px,2px,140px,0px,p:g - 115px,2px,210px,5px,110px,2px,205px,5px,105px,2px,156px,0px,p:g - 130px,2px,253px,5px,95px,2px,238px,5px,140px,2px,185px,0px,p:g - p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,200px,5px,103px,2px,150px,265px,p:g - 115px,2px,230px,5px,73px,2px,155px,p:g - 130px,2px,215px,5px,80px,2px,165px,433px,p:g - p,2px,p:g,5px,100px,2px,p:g,p:g(2) - - - - - - - - - - - - - - - - - - - - - 105px,2px,210px,5px,100px,2px,98px,300px,p:g - 135px,2px,230px,5px,120px,2px,118px,325px,p:g - 130px,2px,215px,5px,140px,2px,138px,395px,p:g - p,2px,p:g,5px:g,p,2px,p:g,p:g(2),p:g - p,2dlu,p:g,2dlu,p:g - - - - - - - - - - - - - - - - - Determiners - - - - - - - - - - - p,5dlu,p:g,5dlu,p - - - - - - - - - - - - - - - - - - - - - - - 140px,2px,121px,5px,128px,2px,120px,5px,120px,2px,120px,0px,15px,p:g - 157px,2px,150px,2px,143px,2px,150px,2px,153px,5px,151px,0px,15px,p:g - 162px,2px,176px,2px,158px,2px,175px,2px,173px,5px,175px,0px,15px,p:g - p,2px,p:g,2px,p:g(2),5px,p:g,2px,p:g(2),5px:g,p,2px,p:g,0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,86px,2px,115px,5px,103px,2px,190px,5px,110px,2px,130px,0px,15px,p:g - 115px,2px,96px,2px,113px,2px,150px,2px,163px,5px,135px,2px,150px,0px,15px,p:g - 130px,2px,96px,2px,133px,2px,160px,2px,173px,5px,155px,2px,170px,0px,15px,p:g - p,2px,max(100px;p),2px,p:g(2),5px,p:g,2px,p:g,5px:g,p,2px,p:g,0px,15px,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,145px,5px,150px,2px,143px,5px,125px,2px,136px,0px,p:g - 115px,2px,157px,5px,168px,2px,165px,5px,150px,2px,138px,p:g - 130px,2px,177px,5px,178px,2px,185px,5px,180px,2px,158px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,200px,5px,103px,2px,150px,265px,p:g - 115px,2px,230px,5px,73px,2px,155px,p:g - 130px,2px,215px,5px,80px,2px,165px,433px,p:g - p,2px,p:g,5px,100px,2px,p:g,p:g(2) - - - - - - - - - - - - - - - - - - - - 100px,2px,76px,2px,100px,5px,108px,2px,130px,5px,100px,2px,195px,0px,10px,p:g - 115px,2px,66px,2px,113px,2px,140px,2px,133px,5px,125px,2px,210px,0px,10px,p:g - 130px,2px,76px,2px,123px,2px,160px,2px,153px,5px,145px,2px,230px,0px,10px,p:g - p,2px,p:g,2px,p:g(2),5px,p:g,2px,p:g(2),5px:g,p,2px,p:g,0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,170px,5px,125px,2px,150px,5px,96px,2px,170px,0px,15px,p,p:g - 115px,2px,185px,5px,150px,2px,165px,5px,101px,2px,185px,0px,15px,p,p:g - 130px,2px,204px,5px,170px,2px,183px,5px,126px,2px,203px,0px,15px,p,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ExchangeInPrep - - - - - - 105px,2px,105px,5px,130px,2px,115px,5px,125px,2px,101px,15px,120px,p:g - 115px,2px,137px,5px,135px,2px,130px,5px,133px,2px,81px,15px,155px,p:g - 130px,2px,151px,5px,155px,2px,145px,5px,155px,2px,95px,20px,165px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),15px,p:g - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,170px,5px,125px,2px,150px,5px,96px,2px,170px,0px,15px,p,p:g - 115px,2px,185px,5px,150px,2px,165px,5px,101px,2px,185px,0px,15px,p,p:g - 130px,2px,204px,5px,170px,2px,183px,5px,126px,2px,203px,0px,15px,p,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,170px,5px,125px,2px,150px,5px,96px,2px,170px,0px,15px,p,p:g - 115px,2px,185px,5px,150px,2px,165px,5px,101px,2px,185px,0px,15px,p,p:g - 130px,2px,204px,5px,170px,2px,183px,5px,126px,2px,203px,0px,15px,p,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ExchangeOutPrep - - - - - - 105px,2px,105px,5px,130px,2px,115px,5px,125px,2px,101px,15px,120px,p:g - 115px,2px,137px,5px,135px,2px,130px,5px,133px,2px,81px,15px,155px,p:g - 130px,2px,151px,5px,155px,2px,145px,5px,155px,2px,95px,20px,165px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),15px,p:g - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,170px,5px,115px,2px,150px,5px,96px,2px,170px,0px,10px,p,p:g - 115px,2px,185px,5px,150px,2px,165px,5px,101px,2px,185px,0px,15px,p,p:g - 130px,2px,214px,5px,170px,2px,183px,5px,126px,2px,203px,0px,15px,p,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2),0px,10px,p,p:g - - - - - - - - - - - - - - - - - - - - - - ExchangeOutDeaccPrep - - - - - - 105px,2px,100px,5px,115px,2px,110px,5px,75px,2px,70px,5px,120px,2px,100px,p:g - 115px,2px,117px,5px,130px,2px,120px,5px,90px,2px,70px,5px,135px,2px,108px,p:g - 130px,2px,131px,5px,145px,2px,135px,5px,105px,2px,85px,5px,135px,2px,143px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g - - - - - - - - - - - - - - - - - - - - - - 105px,2px,210px,5px,100px,2px,98px,300px,p:g - 135px,2px,230px,5px,120px,2px,118px,325px,p:g - 130px,2px,215px,5px,140px,2px,138px,395px,p:g - p,2px,p:g,5px:g,p,2px,p:g,p:g(2),p:g - p,2dlu,p:g,2dlu,p:g - - - - - - - - - - - - - - - - - PcrPersons - - - - - - - - - - - p,5dlu,p:g,5dlu,p - - - - - - - - - - - - - - - - - - - - - - 100px,2px,131px,5px,63px,2px,100px,5px,65px,2px,100px,5px,50px,2px,195px,0px,15px,p:g - 115px,2px,144px,5px,85px,2px,95px,5px,80px,2px,95px,5px,70px,2px,210px,0px,15px,p:g - 130px,2px,154px,5px,95px,2px,115px,5px,95px,2px,115px,5px,90px,2px,215px,0px,15px,p:g - p,2px,p:g(4),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g,0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,131px,5px,63px,2px,103px,2px,328px,5px,86px,0px,10px,p:g - 115px,2px,125px,5px,105px,2px,100px,2px,366px,5px,90px,0px,10px,p:g - 130px,2px,154px,5px,95px,2px,115px,2px,432px,5px,90px,0px,10px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g(2),p:g(2),0px,10px - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + The Disposal sub form. + + 105px,2px,130px,5px,151px,2px,130px,5px,90px,2px,130px,70px,15px,p:g + 130px,2px,150px,5px,155px,2px,170px,5px,95px,2px,216px,0px,15px,p:g + 130px,2px,165px,5px,175px,2px,190px,5px,111px,2px,245px,0px,15px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g,5px:g,p,2px,p:g(2),0px,p,p:g + + + + + + + + + + + + + + + + + The Agent subform for the disposal form. + DeaccessionAgent + + + The DisposalAgent subform for Disposal form. + + 100px,2px,310px,5px,110px,2px,155px,143px,p:g + 130px,2px,330px,5px,98px,2px,155px,190px,p:g + 130px,2px,415px,5px,153px,2px,189px,136px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g + + + + + + + + + + + + + + + + The Agent subform for the disposal form. + DisposalPreparation + + + The DisposalPreparation subform for Disposal form. + + 105px,2px,120px,5px,80px,2px,120px,5px,120px,2px,130px,5px,73px,2px,56px,p:g + 130px,2px,112px,5px,95px,2px,90px,5px,130px,2px,158px,5px,53px,2px,81px,p:g + 130px,2px,141px,5px,110px,2px,145px,5px,153px,2px,175px,5px,90px,2px,75px,p:g + p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,5px,p:g,2px,p:g + + + + + + + + + + + + + + + + + + The Disposal sub form. + + 105px,2px,130px,5px,151px,2px,130px,5px,90px,2px,130px,70px,15px,p:g + 130px,2px,145px,5px,155px,2px,140px,5px,95px,2px,146px,85px,0px,15px,p:g + 130px,2px,175px,5px,175px,2px,190px,5px,111px,2px,245px,0px,15px,p:g + p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,0px,p,p:g + + + + + + + + + + + + + + + + + The Agent subform for the disposal form. + DisposalDeaccPreparation + + + The DisposalPreparation subform for Disposal form. + + 105px,2px,100px,5px,120px,2px,100px,5px,75px,2px,70px,5px,120px,2px,100px,p:g + 115px,2px,117px,5px,130px,2px,120px,5px,90px,2px,70px,5px,135px,2px,108px,p:g + 130px,2px,131px,5px,145px,2px,145px,5px,105px,2px,85px,5px,135px,2px,133px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g + + + + + + + + + + + + + + + + The DisposalPreparation subform for Disposal form. + + 100px,2px,210px,5px,110px,2px,155px,243px,p:g + 115px,2px,230px,5px,98px,2px,155px,290px,p:g + 130px,2px,215px,5px,153px,2px,189px,336px,p:g + p,2px,p,5px,85px,2px,p:g(2),p:g + + + + + + + + + + + + + + + + Determination subform table for Collection Object form. + Determination + + + Determination subform for Collection Object form. + + 100px,2px,210px,5px,76px,2px,200px,5px,90px,2px,140px,0px,p:g + 115px,2px,210px,5px,110px,2px,205px,5px,105px,2px,156px,0px,p:g + 130px,2px,253px,5px,95px,2px,238px,5px,140px,2px,185px,0px,p:g + p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g(2),0px + + + + + + + + + + + + + + + + + + + + + + Locality + 105px,2px,200px,5px,103px,2px,150px,265px,p:g + 115px,2px,230px,5px,73px,2px,155px,p:g + 130px,2px,215px,5px,80px,2px,165px,433px,p:g + p,2px,p:g,5px,100px,2px,p:g,p:g(2) + + + + + + + + + + + - - - - - - - 100px,2px,131px,5px,63px,2px,103px,5px,416px,0px,p:g - 115px,2px,125px,5px,105px,2px,100px,5px,458px,0px,p:g - 130px,2px,154px,5px,95px,2px,115px,5px,520px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g(2),p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - FieldNotebookPage - - - - - - 100px,2px,195px,5px,115px,2px,131px,5px,140px,2px,130px,p:g - 115px,2px,200px,5px,138px,2px,140px,5px,168px,2px,140px,p:g - 130px,2px,220px,5px,158px,2px,160px,5px,188px,2px,160px,p:g - p,2px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2) - - - - - - - - - - - + + + + Determiners grid view for Determination form. + Determiners + + + The Determiners Icon Viewer + + + The Determiners form - UNKNOWN use in database. + + p,5dlu,p:g,5dlu,p + + + + + + + + + + + + + + + + + + DNA Sequence Form + + 140px,2px,121px,5px,128px,2px,120px,5px,120px,2px,120px,0px,15px,p:g + 157px,2px,150px,2px,143px,2px,150px,2px,153px,5px,151px,0px,15px,p:g + 162px,2px,176px,2px,158px,2px,175px,2px,173px,5px,175px,0px,15px,p:g + p,2px,p:g,2px,p:g(2),5px,p:g,2px,p:g(2),5px:g,p,2px,p:g,0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - 105px,2px,120px,5px,70px,2px,100px,5px,100px,2px,141px,15px,165px,0px,15px,p:g - 115px,2px,130px,5px,81px,2px,110px,5px,115px,2px,155px,15px,180px,0px,15px,p:g - 130px,2px,140px,5px,96px,2px,125px,5px,130px,2px,185px,10px,200px,0px,15px,p:g - p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p,0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + DNA Sequenc + + 105px,2px,145px,5px,150px,2px,143px,5px,125px,2px,136px,0px,p:g + 115px,2px,157px,5px,168px,2px,165px,5px,150px,2px,138px,p:g + 130px,2px,177px,5px,178px,2px,185px,5px,180px,2px,158px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - 105px,2px,130px,5px,60px,2px,100px,5px,100px,2px,141px,15px,165px,0px,15px,p:g - 115px,2px,146px,5px,75px,2px,100px,5px,115px,2px,155px,15px,180px,0px,15px,p:g - 130px,2px,160px,5px,86px,2px,115px,5px,130px,2px,185px,10px,200px,0px,15px,p:g - p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p,0px,p,p:g - - - - - - - - - - - - - - - - - - - - + + + + Locality + 105px,2px,200px,5px,103px,2px,150px,265px,p:g + 115px,2px,230px,5px,73px,2px,155px,p:g + 130px,2px,215px,5px,80px,2px,165px,433px,p:g + p,2px,p:g,5px,100px,2px,p:g,p:g(2) + + + + + + + + + + + - - - - - - - 105px,2px,130px,5px,60px,2px,100px,5px,100px,2px,141px,15px,165px,0px,15px,p:g - 115px,2px,146px,5px,75px,2px,100px,5px,115px,2px,155px,15px,180px,0px,15px,p:g - 130px,2px,160px,5px,86px,2px,115px,5px,130px,2px,185px,10px,200px,0px,15px,p:g - p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p,0px,p,p:g - - - - - - - - - - - - - - - - - GiftAgent - - - - - - - 105px,2px,250px,5px,90px,2px,126px,252px,p:g - 115px,2px,230px,5px,70px,2px,155px,p:g - 130px,2px,215px,5px,80px,2px,165px,433px,p:g - p,2px,p:g,5px:g,p,2px,p:g,p:g - - - - - - - - - - - - - - - - - - - - - GiftItems - - - - - - 105px,2px,115px,5px,80px,2px,80px,5px,140px,2px,130px,5px,69px,2px,90px,0px,p:g - 115px,2px,150px,5px,100px,2px,75px,5px,150px,2px,139px,5px,80px,2px,85px,0px,p:g - 130px,2px,160px,5px,96px,2px,100px,5px,160px,2px,170px,5px,90px,2px,103px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,130px,5px,60px,2px,100px,5px,100px,2px,141px,15px,155px,0px,10px,p:g - 115px,2px,146px,5px,75px,2px,100px,5px,115px,2px,155px,15px,180px,0px,15px,p:g - 130px,2px,160px,5px,86px,2px,125px,5px,130px,2px,185px,10px,200px,0px,15px,p:g - p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p,0px,p,p:g - - - - - - - - - - - - - + + + + ExchangeOut viewing form. + 105px,2px,170px,5px,125px,2px,150px,5px,96px,2px,170px,0px,15px,p,p:g + 115px,2px,185px,5px,150px,2px,165px,5px,101px,2px,185px,0px,15px,p,p:g + 130px,2px,204px,5px,170px,2px,183px,5px,126px,2px,203px,0px,15px,p,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2),0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - GiftDeaccItems - - - - - - 105px,2px,100px,5px,115px,2px,110px,5px,75px,2px,70px,5px,120px,2px,100px,p:g - 115px,2px,117px,5px,130px,2px,120px,5px,90px,2px,70px,5px,135px,2px,108px,p:g - 130px,2px,131px,5px,145px,2px,145px,5px,105px,2px,85px,5px,135px,2px,133px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g - - - - - - - - - - - - + + + + ExchangeOut sub form. + 105px,2px,170px,5px,125px,2px,150px,5px,96px,2px,170px,0px,15px,p,p:g + 115px,2px,185px,5px,150px,2px,165px,5px,101px,2px,185px,0px,15px,p,p:g + 130px,2px,204px,5px,170px,2px,183px,5px,126px,2px,203px,0px,15px,p,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2),0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - 100px,2px,142px,5px,89px,2px,80px,5px,70px,2px,83px,5px,45px,2px,195px,0px,15px,p:g - 115px,2px,115px,5px,94px,2px,110px,5px,90px,2px,110px,5px,65px,2px,195px,0px,15px,p:g - 130px,2px,p,5px,111px,2px,120px,5px,101px,2px,120px,5px,81px,2px,220px,0px,15px,p,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - p,2dlu,p,2dlu,p,2dlu,p,2dlu,200px,2dlu,p> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p - - - - - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,90px,5px,90px,2px,90px,5px,134px,2px,90px,5px,130px,2px,80px,0px,15px,p,p:g - 115px,2px,100px,5px,100px,2px,100px,5px,141px,2px,100px,5px,138px,2px,100px,0px,15px,p,p:g - 130px,2px,115px,5px,105px,2px,115px,5px,160px,2px,115px,5px,153px,2px,115px,0px,15px,p,p:g - p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2),0px,p,p:g - - - - - - - - - - - + + + + ExchangeOut sub form. + 105px,2px,170px,5px,115px,2px,150px,5px,96px,2px,170px,0px,10px,p,p:g + 115px,2px,185px,5px,150px,2px,165px,5px,101px,2px,185px,0px,15px,p,p:g + 130px,2px,214px,5px,170px,2px,183px,5px,126px,2px,203px,0px,15px,p,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2),0px,10px,p,p:g + + + + + + + + + + + + + + - - - - - - - LoanAgent - - - - - - - 105px,2px,200px,5px,103px,2px,150px,265px,p:g - 115px,2px,210px,5px,73px,2px,155px,355px,p:g - 130px,2px,240px,5px,80px,2px,165px,408px,p:g - p,2px,p:g,5px,100px,2px,p:g,p:g(2) - - - - - - - - + + + + Preparation subform table for Collection Object form. + ExchangeOutDeaccPrep + + + Loan viewing form. + 105px,2px,100px,5px,115px,2px,110px,5px,75px,2px,70px,5px,120px,2px,100px,p:g + 115px,2px,117px,5px,130px,2px,120px,5px,90px,2px,70px,5px,135px,2px,108px,p:g + 130px,2px,131px,5px,145px,2px,135px,5px,105px,2px,85px,5px,135px,2px,143px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g + + + + + + + + + + + + + - - - - - - - LoanItems - - - - - - 105px,2px,80px,5px,110px,2px,90px,5px,53px,2px,56px,5px,105px,2px,210px,p:g - 115px,2px,92px,5px,115px,2px,90px,5px,53px,2px,81px,5px,110px,2px,188px,p:g - 130px,2px,101px,5px,140px,2px,105px,5px,60px,2px,95px,5px,133px,2px,255px,p:g - p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,5px,p:g,2px,p:g(2) - - - - + + + + The Extractor form. + + 105px,2px,210px,5px,100px,2px,98px,300px,p:g + 135px,2px,230px,5px,120px,2px,118px,325px,p:g + 130px,2px,215px,5px,140px,2px,138px,395px,p:g + p,2px,p:g,5px:g,p,2px,p:g,p:g(2),p:g + p,2dlu,p:g,2dlu,p:g + + + + + + + + + + + + + + Extractors grid view for CollectingEvent form. + PcrPersons + + + The Extractors Icon Viewer + + + The Extractors form + + p,5dlu,p:g,5dlu,p + + + + + + + + + + + + + + + + + + Form For FieldNotebook + 100px,2px,131px,5px,63px,2px,100px,5px,65px,2px,100px,5px,50px,2px,195px,0px,15px,p:g + 115px,2px,144px,5px,85px,2px,95px,5px,80px,2px,95px,5px,70px,2px,210px,0px,15px,p:g + 130px,2px,154px,5px,95px,2px,115px,5px,95px,2px,115px,5px,90px,2px,215px,0px,15px,p:g + p,2px,p:g(4),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g,0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - 102px,2px,50px,5px,110px,2px,50px,0px:g,p:g - 120px,2px,80px,5px,120px,2px,80px,0px:g,p:g - 130px,2px,100px,5px,150px,2px,100px,0px:g,p:g - p,2px,p:g(2),5px,p,2px,p:g(2),0px - - - + + + + Form For FieldNotebookPage + 100px,2px,131px,5px,63px,2px,103px,2px,328px,5px,86px,0px,10px,p:g + 115px,2px,125px,5px,105px,2px,100px,2px,366px,5px,90px,0px,10px,p:g + 130px,2px,154px,5px,95px,2px,115px,2px,432px,5px,90px,0px,10px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g(2),p:g(2),0px,10px + + + + + + + + + + + + + + + + - - - - - - - - 100px,2px,90px,5px,90px,2px,90px,5px,105px,2px,126px,5px,105px,2px,98px,0px,15px,p:g - 115px,2px,120px,5px,94px,2px,100px,5px,115px,2px,110px,5px,125px,2px,115px,0px,15px,p:g - 130px,2px,120px,5px,116px,2px,120px,5px,137px,2px,120px,5px,146px,2px,120px,0px,15px,p:g - p,2px,p:g(3),5px:g,p,2px,p:g(3),5px:g,p,2px,p:g(3),5px:g,p,2px,p:g(3),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 105px,2px,200px,5px,103px,2px,150px,265px,p:g - 115px,2px,230px,5px,73px,2px,155px,p:g - 130px,2px,215px,5px,80px,2px,165px,433px,p:g - p,2px,p:g,5px,100px,2px,p:g,p:g(2) - - - + + + + Determination subform table for Collection Object form. + FieldNotebookPage + + + Sub Collecting Event + 100px,2px,195px,5px,115px,2px,131px,5px,140px,2px,130px,p:g + 115px,2px,200px,5px,138px,2px,140px,5px,168px,2px,140px,p:g + 130px,2px,220px,5px,158px,2px,160px,5px,188px,2px,160px,p:g + p,2px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2) + + + + + + + + + + + + + + + + + + + - - - - - - - 100px,2px,100px,5px,80px,2px,120px,5px,65px,2px,116px,5px,105px,2px,118px,p:g - 113px,2px,125px,5px,90px,2px,125px,5px,89px,2px,115px,5px,120px,2px,115px,0px,p:g - 130px,2px,120px,5px,116px,2px,140px,5px,117px,2px,120px,5px,146px,2px,120px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2) - - - - - - + + + + Gift viewing form. + 105px,2px,120px,5px,70px,2px,100px,5px,100px,2px,141px,15px,165px,0px,15px,p:g + 115px,2px,130px,5px,81px,2px,110px,5px,115px,2px,155px,15px,180px,0px,15px,p:g + 130px,2px,140px,5px,96px,2px,125px,5px,130px,2px,185px,10px,200px,0px,15px,p:g + p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p,0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - 89px,2px,100px,5px,p,2px,p,5px,p,2px,p,p:g - - - - - - - - - - - - - - - - - - p,2px,p,10px,p,2px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,2px,p,2px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MaterialSample - - - - - - - 120px,2px,144px,5px,140px,2px,144px,5px,139px,2px,144px,15px,p:g - 135px,2px,156px,5px,150px,2px,157px,5px,147px,2px,156px,15px,p:g - 150px,2px,185px,5px,172px,2px,185px,5px,165px,2px,184px,15px,p:g - p,2px,max(p;150px),5px:g,p,2px,p,5px:g,p,2px,151px,10px,p,p:g - - - - - - + + + + Gift viewing form. + 105px,2px,130px,5px,60px,2px,100px,5px,100px,2px,141px,15px,165px,0px,15px,p:g + 115px,2px,146px,5px,75px,2px,100px,5px,115px,2px,155px,15px,180px,0px,15px,p:g + 130px,2px,160px,5px,86px,2px,115px,5px,130px,2px,185px,10px,200px,0px,15px,p:g + p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p,0px,p,p:g + + + + + + + + + + + + + + + + + + + - - - - - - - OtherIdentifiers - - - - - - AgentIdentifiers - - - - - - - 100px,2px,473px,5px,120px,2px,125px,0px,15px,p:g - 115px,2px,510px,5px,85px,2px,198px,0px,15px,p:g - 130px,2px,530px,5px,105px,2px,218px,0px,15px,p:g - p,2px,473px,5px:g,p,2px,125px,0px,15px,p:g - - - - - - - + - - - - - - - - - - - - 100px,2px,473px,5px,120px,2px,125px,0px,15px,p:g - 115px,2px,510px,5px,120px,2px,198px,0px,15px,p:g - 130px,2px,530px,5px,105px,2px,218px,0px,15px,p:g - p,2px,473px,5px:g,p,2px,125px,0px,15px,p:g - - - - - - - - + + + + Gift viewing form. + 105px,2px,130px,5px,60px,2px,100px,5px,100px,2px,141px,15px,165px,0px,15px,p:g + 115px,2px,146px,5px,75px,2px,100px,5px,115px,2px,155px,15px,180px,0px,15px,p:g + 130px,2px,160px,5px,86px,2px,115px,5px,130px,2px,185px,10px,200px,0px,15px,p:g + p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p,0px,p,p:g + + + + + + + + - - - - - - - VoucherRelationship - - - - - - - 100px,2px,473px,5px,120px,2px,125px,0px,15px,p:g - 115px,2px,510px,5px,85px,2px,198px,0px,15px,p:g - 130px,2px,530px,5px,105px,2px,218px,0px,15px,p:g - p,2px,473px,5px:g,p,2px,125px,0px,15px,p:g - - - - - - - - + - - - - - - - - 105px,2px,210px,5px,100px,2px,98px,300px,p:g - 135px,2px,230px,5px,120px,2px,118px,325px,p:g - 130px,2px,215px,5px,140px,2px,138px,395px,p:g - p,2px,p:g,5px:g,p,2px,p:g,p:g(2),p:g - p,2dlu,p:g,2dlu,p:g - - - - - - - - - - - - - - - - - PcrPersons - - - - - - - - - - - p,5dlu,p:g,5dlu,p - - - + + + + {Preparation subform table for Gift form. + GiftItems + + + Gift viewing form. + 105px,2px,115px,5px,80px,2px,80px,5px,140px,2px,130px,5px,69px,2px,90px,0px,p:g + 115px,2px,150px,5px,100px,2px,75px,5px,150px,2px,139px,5px,80px,2px,85px,0px,p:g + 130px,2px,160px,5px,96px,2px,100px,5px,160px,2px,170px,5px,90px,2px,103px,0px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px + + + + + + + + + + + + + + + + + + + + + Gift viewing form. + 105px,2px,130px,5px,60px,2px,100px,5px,100px,2px,141px,15px,155px,0px,10px,p:g + 115px,2px,146px,5px,75px,2px,100px,5px,115px,2px,155px,15px,180px,0px,15px,p:g + 130px,2px,160px,5px,86px,2px,125px,5px,130px,2px,185px,10px,200px,0px,15px,p:g + p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p,0px,p,p:g + + + + + + + + + + + + - - - - - - - - - 100px,2px,p,2px,100px,2px,p,2px,60px,2px,p,p:g - - - - - - - - - - - - + + + + {Preparation subform table for Gift form. + GiftDeaccItems + + + Gift viewing form. + 105px,2px,100px,5px,115px,2px,110px,5px,75px,2px,70px,5px,120px,2px,100px,p:g + 115px,2px,117px,5px,130px,2px,120px,5px,90px,2px,70px,5px,135px,2px,108px,p:g + 130px,2px,131px,5px,145px,2px,145px,5px,105px,2px,85px,5px,135px,2px,133px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),p:g + + + + + + + + + + + + + - - - - - - - PreparationProperty - - - - - - 100px,2px,195px,5px,215px,2px,308px - 105px,2px,210px,5px,220px,2px,363px - 115px,2px,230px,5px,240px,2px,423px - p,2px,p:g(2),5px:g,p,2px,p:g(4) - - - - - - - + + + + The Info Request Collection Object form. + + + p + + + + + + + + + + + + + + + + + + + + + + + Loan viewing form. + 105px,2px,90px,5px,90px,2px,90px,5px,134px,2px,90px,5px,130px,2px,80px,0px,15px,p,p:g + 115px,2px,100px,5px,100px,2px,100px,5px,141px,2px,100px,5px,138px,2px,100px,0px,15px,p,p:g + 130px,2px,115px,5px,105px,2px,115px,5px,160px,2px,115px,5px,153px,2px,115px,0px,15px,p,p:g + p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px,p:g,2px,p:g(2),0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - 100px,2px,195px,5px,93px,2px,90px,5px,65px,2px,86px,5px,85px,2px,90px,0px,15px,p:g - 115px,2px,195px,5px,115px,2px,80px,5px,84px,2px,100px,5px,105px,2px,100px,0px,15px,p:g - 130px,2px,215px,5px,125px,2px,115px,5px,90px,2px,109px,5px,115px,2px,110px,0px,15px,p:g - p,2px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - + + + + Preparation subform table for Collection Object form. + LoanAgent + + + The loan form. + + 105px,2px,200px,5px,103px,2px,150px,265px,p:g + 115px,2px,210px,5px,73px,2px,155px,355px,p:g + 130px,2px,240px,5px,80px,2px,165px,408px,p:g + p,2px,p:g,5px,100px,2px,p:g,p:g(2) + + + + + + + + + + + + + + + + + Preparation subform table for Collection Object form. + LoanItems + + + Loan viewing form. + 105px,2px,80px,5px,110px,2px,90px,5px,53px,2px,56px,5px,105px,2px,210px,p:g + 115px,2px,92px,5px,115px,2px,90px,5px,53px,2px,81px,5px,110px,2px,188px,p:g + 130px,2px,101px,5px,140px,2px,105px,5px,60px,2px,95px,5px,133px,2px,255px,p:g + p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,5px,p:g,2px,p:g(2) + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - ProjectSub - - - - - - 100px,2px,195px,5px,93px,2px,90px,5px,65px,2px,86px,5px,85px,2px,90px,p:g - 115px,2px,200px,5px,110px,2px,80px,5px,84px,2px,100px,5px,105px,2px,100px,p:g - 130px,2px,215px,5px,125px,2px,115px,5px,90px,2px,109px,5px,115px,2px,110px,p:g - p,2px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px - - - - - + + + + + --> + + + + LoanReturnPreparation viewing form. + 102px,2px,50px,5px,110px,2px,50px,0px:g,p:g + 120px,2px,80px,5px,120px,2px,80px,0px:g,p:g + 130px,2px,100px,5px,150px,2px,100px,0px:g,p:g + p,2px,p:g(2),5px,p,2px,p:g(2),0px + + + + + + + + + + + + + + + + + + + + + + + + + + Locality + 100px,2px,90px,5px,90px,2px,90px,5px,105px,2px,126px,5px,105px,2px,98px,0px,15px,p:g + 115px,2px,120px,5px,94px,2px,100px,5px,115px,2px,110px,5px,125px,2px,115px,0px,15px,p:g + 130px,2px,120px,5px,116px,2px,120px,5px,137px,2px,120px,5px,146px,2px,120px,0px,15px,p:g + p,2px,p:g(3),5px:g,p,2px,p:g(3),5px:g,p,2px,p:g(3),5px:g,p,2px,p:g(3),0px,p,p:g + + + localityName.isNotEmpty() && geography.isNotEmpty() + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Locality + 105px,2px,200px,5px,103px,2px,150px,265px,p:g + 115px,2px,230px,5px,73px,2px,155px,p:g + 130px,2px,215px,5px,80px,2px,165px,433px,p:g + p,2px,p:g,5px,100px,2px,p:g,p:g(2) + + + + + + + + + + + + + + + LocalityDetail subform for Locality + 100px,2px,100px,5px,80px,2px,120px,5px,65px,2px,116px,5px,105px,2px,118px,p:g + 113px,2px,125px,5px,90px,2px,125px,5px,89px,2px,115px,5px,120px,2px,115px,0px,p:g + 130px,2px,120px,5px,116px,2px,140px,5px,117px,2px,120px,5px,146px,2px,120px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2) + + + + + + + + + + + + + - - - - - - - - 105px,2px,205px,5px,43px,2px,151px,329px,p:g - 115px,2px,210px,5px,63px,2px,166px,354px,p:g - 130px,2px,275px,5px,71px,2px,215px,332px,p:g - p,2px,p:g,5px:g,p,2px,p:g(2),p:g(6) - - - - - - - - - - - - - - + + + + OtherIdentifiers subform table for Collection Object form. + OtherIdentifiers + + + AgentIdentifiers subform table for Agent form. + AgentIdentifiers + + + subform on the Collection Object form. + + 100px,2px,473px,5px,120px,2px,125px,0px,15px,p:g + 115px,2px,510px,5px,85px,2px,198px,0px,15px,p:g + 130px,2px,530px,5px,105px,2px,218px,0px,15px,p:g + p,2px,473px,5px:g,p,2px,125px,0px,15px,p:g + + + + + + + + + + + + + - - - - - - - - 105px,2px,205px,531px,p:g - 115px,2px,210px,590px,p:g - 130px,2px,275px,625px,p:g - p,2px,p:g,p:g(6) - - - - - - - - - - - - - - - - - - 105px,2px,140px,5px,123px,2px,140px,5px,113px,2px,195px,0px,p:g - 131px,2px,172px,5px,118px,2px,170px,5px,106px,2px,210px,0px,p:g - 130px,2px,195px,5px,136px,2px,195px,5px,120px,2px,240px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g,0px - - - - - + + + + VoucherRelationship sub. + VoucherRelationship + + + VoucherRelationship + + 100px,2px,473px,5px,120px,2px,125px,0px,15px,p:g + 115px,2px,510px,5px,85px,2px,198px,0px,15px,p:g + 130px,2px,530px,5px,105px,2px,218px,0px,15px,p:g + p,2px,473px,5px:g,p,2px,125px,0px,15px,p:g + + + + + + + + + + + + + + + + + + + + + + Paleocontext form. + + 100px,2px,295px,5px,120px,2px,295px,0px,p:g + 115px,2px,324px,5px,145px,2px,324px,0px,p:g + 130px,2px,365px,5px,163px,2px,365px,0px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),0px + + + + + + + + + + + + + + + + + + + - - - - - - - - 200px,2px,p:g - - - - - - - - - - - - - - 100px,2px,195px,5px,59px,2px,195px,5px,67px,2px,195px,0px,p:g - 115px,2px,210px,5px,74px,2px,210px,5px,82px,2px,210px,0px,p:g - 130px,2px,241px,5px,87px,2px,241px,5px,101px,2px,241px,0px,p:g - p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,0px - - - - - - - - - - - - - - - - + + + + PrcPersons grid view for CollectingEvent form. + PcrPersons + + + The PcrPersons Icon Viewer + + + The PcrPerson form + + p,5dlu,p:g,5dlu,p + + + + + + + + + + + + + + + + + + Permit Form. + + 105px,2px,200px,5px,88px,2px,200px,5px,100px,2px,123px,0px,15px,p,p:g + 115px,2px,210px,5px,105px,2px,210px,5px,120px,2px,141px,0px,15px,p,p:g + 130px,2px,225px,5px,120px,2px,225px,5px,140px,2px,176px,0px,15px,p,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - 100px,2px,138px,5px,115px,2px,143px,5px,110px,2px,205px,0px,15px,p:g - 115px,2px,155px,5px,135px,2px,155px,5px,136px,2px,205px,0px,15px,p:g - 130px,2px,170px,5px,155px,2px,170px,5px,150px,2px,239px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g,0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,138px,5px,115px,2px,143px,5px,110px,2px,205px,0px,p:g - 115px,2px,155px,5px,135px,2px,155px,5px,136px,2px,205px,0px,p:g - 130px,2px,170px,5px,155px,2px,170px,5px,150px,2px,239px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g,0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,398px,5px,80px,2px,240px,0px,15px,p:g - 115px,2px,430px,5px,93px,2px,270px,0px,15px,p:g - 130px,2px,490px,5px,113px,2px,290px,0px,15px,p:g - p,2px,p:g(4),5px:g,p,2px,p:g(2),0px,15px,p:g - - - - - - - - - + + + + Permit subform for Acessions. + + 100px,2px,p,2px,100px,2px,p,2px,60px,2px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Preparation subform table for Collection Object form. + Preparation + + + Preparation for Collection Object form. + + 100px,2px,133px,5px,91px,2px,210px,5px,87px,2px,123px,2px,70px,p:g + 115px,2px,150px,5px,110px,2px,223px,5px,100px,2px,126px,2px,75px,p:g + 130px,2px,180px,5px,130px,2px,255px,5px,100px,2px,174px,2px,70px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g,5px:g,p,2px,p:g,10px,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + Form For PreparationAttributes + 100px,2px,195px,5px,215px,2px,308px + 105px,2px,210px,5px,220px,2px,363px + 115px,2px,230px,5px,240px,2px,423px + p,2px,p:g(2),5px:g,p,2px,p:g(4) + + + + + + + + + + + + + Preparation subform table for Collection Object form. + PreparationProperty + + + Form For PreparationProperty + 100px,2px,195px,5px,215px,2px,308px + 105px,2px,210px,5px,220px,2px,363px + 115px,2px,230px,5px,240px,2px,423px + p,2px,p:g(2),5px:g,p,2px,p:g(4) + + + + + + + - - - - - - - - - - - - 100px,2px,180px,5px,85px,2px,180px,5px,86px,2px,180px,10px,p:g - 115px,2px,195px,5px,92px,2px,200px,5px,96px,2px,200px,10px,p:g - 130px,2px,218px,5px,112px,2px,220px,5px,116px,2px,220px,10px,p:g - 100px,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),p - - - - - - - - - - + + + + + + + + - + + + + + + + + - - - - - - - p,3dlu,p,p:g - - - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - - - - - - - - - 100px,2px,113px,5px,80px,2px,113px,5px,90px,2px,113px,5px,80px,2px,113px,0px,p:g - 115px,2px,125px,5px,90px,2px,125px,5px,99px,2px,125px,5px,90px,2px,125px,0px,p:g - 130px,2px,130px,5px,115px,2px,130px,5px,127px,2px,130px,5px,115px,2px,130px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - + + + + + + + + - - + + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - 100px,2px,180px,5px,85px,2px,180px,5px,86px,2px,180px,15px,p:g - 115px,2px,195px,5px,92px,2px,200px,5px,96px,2px,203px,15px,p:g - 130px,2px,218px,5px,112px,2px,220px,5px,116px,2px,220px,15px,p:g - 100px,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),15px,p:g - - - - - - - - - - - - - - - - - - - - - 115px,2px,299px,5px,120px,2px,284px,10px,p:g - 135px,2px,305px,15px,120px,2px,338px,10px,p:g - 135px,2px,382px,15px,140px,2px,348px,10px,p:g - p,2px,p:g(2),5px,p:g,2px,p:g(2),10px - - - - - - + - - - - + + + + + + + + - - - - + + + + - - - + + + + + --> + + + + Form For Project + 100px,2px,195px,5px,93px,2px,90px,5px,65px,2px,86px,5px,85px,2px,90px,0px,15px,p:g + 115px,2px,195px,5px,115px,2px,80px,5px,84px,2px,100px,5px,105px,2px,100px,0px,15px,p:g + 130px,2px,215px,5px,125px,2px,115px,5px,90px,2px,109px,5px,115px,2px,110px,0px,15px,p:g + p,2px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Project Subform for Collection Object. + ProjectSub + + + Form For Project + 100px,2px,195px,5px,93px,2px,90px,5px,65px,2px,86px,5px,85px,2px,90px,p:g + 115px,2px,200px,5px,110px,2px,80px,5px,84px,2px,100px,5px,105px,2px,100px,p:g + 130px,2px,215px,5px,125px,2px,115px,5px,90px,2px,109px,5px,115px,2px,110px,p:g + p,2px,p:g,5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px + + + + + + + + + + + + + + + + + + The Accession form. + + 105px,2px,150px,5px,100px,2px,151px,5px,110px,2px,200px,0px,15px,p:g + 115px,2px,168px,5px,105px,2px,168px,5px,135px,2px,210px,0px,15px,p:g + 130px,2px,201px,5px,110px,2px,200px,5px,140px,2px,235px,0px,15px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g,0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The RA agent + + 105px,2px,205px,5px,43px,2px,151px,329px,p:g + 115px,2px,210px,5px,63px,2px,166px,354px,p:g + 130px,2px,275px,5px,71px,2px,215px,332px,p:g + p,2px,p:g,5px:g,p,2px,p:g(2),p:g(6) + + + + + + + + + + + + + + + + + Permit subform for AccessionAuthorization. + + 105px,2px,205px,531px,p:g + 115px,2px,210px,590px,p:g + 130px,2px,275px,625px,p:g + p,2px,p:g,p:g(6) + + + + + + + + + + + + + + + Shipment form. + 105px,2px,140px,5px,123px,2px,140px,5px,113px,2px,195px,0px,p:g + 131px,2px,172px,5px,118px,2px,170px,5px,106px,2px,210px,0px,p:g + 130px,2px,195px,5px,136px,2px,195px,5px,120px,2px,240px,0px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g,0px + + + + + + + + + + + + + + + + + + + + + + + + + + + Taxon Label Formatting Plugin Form + + 200px,2px,p:g + + + + + + + + + Stratigraphy subform within Collection Object form. + + 100px,2px,195px,5px,59px,2px,195px,5px,67px,2px,195px,0px,p:g + 115px,2px,210px,5px,74px,2px,210px,5px,82px,2px,210px,0px,p:g + 130px,2px,241px,5px,87px,2px,241px,5px,101px,2px,241px,0px,p:g + p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,0px + + + + + + + + + + + + + + + + + + + Form For Treatment Event + 100px,2px,138px,5px,115px,2px,143px,5px,110px,2px,205px,0px,15px,p:g + 115px,2px,155px,5px,135px,2px,155px,5px,136px,2px,205px,0px,15px,p:g + 130px,2px,170px,5px,155px,2px,170px,5px,150px,2px,239px,0px,15px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g,0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form For Treatment Event + 100px,2px,138px,5px,115px,2px,143px,5px,110px,2px,205px,0px,p:g + 115px,2px,155px,5px,135px,2px,155px,5px,136px,2px,205px,0px,p:g + 130px,2px,170px,5px,155px,2px,170px,5px,150px,2px,239px,0px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g,0px + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Institution Data Entry Form + 100px,2px,398px,5px,80px,2px,240px,0px,15px,p:g + 115px,2px,430px,5px,93px,2px,270px,0px,15px,p:g + 130px,2px,490px,5px,113px,2px,290px,0px,15px,p:g + p,2px,p:g(4),5px:g,p,2px,p:g(2),0px,15px,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Accession Items + ContentContact + + + The Collection Object Subform for Accessions. + + 100px,2px,150px,5px,90px,2px,220px + 115px,2px,160px,5px,110px,2px,240px + 130px,2px,180px,5px,120px,2px,286px + p,2px,p:g,5px:g,p,2px,p:g(2) + + + + + + + + + + + + Division Form. + + 100px,2px,361px,5px,70px,2px,80px,5px,80px,2px,120px,0px,p:g + 115px,2px,377px,5px,100px,2px,80px,5px,100px,2px,129px,0px,p:g + 130px,2px,396px,5px,100px,2px,120px,5px,120px,2px,150px,p:g + 100px,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Division Form. + + 100px,2px,361px,5px,70px,2px,80px,5px,80px,2px,120px,0px,15px,p:g + 115px,2px,377px,5px,100px,2px,80px,5px,100px,2px,129px,0px,15px,p:g + 130px,2px,396px,5px,100px,2px,120px,5px,120px,2px,150px,0px,15px,p:g + 100px,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,15px,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Discipline Data Entry Form + 100px,2px,180px,5px,85px,2px,180px,5px,86px,2px,180px,10px,p:g + 115px,2px,195px,5px,92px,2px,200px,5px,96px,2px,200px,10px,p:g + 130px,2px,218px,5px,112px,2px,220px,5px,116px,2px,220px,10px,p:g + 100px,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),p + + + + + + + + + + + + + + + + + Discipline Data Entry Form + p,3dlu,p,p:g + + + + + + + + + + + + + + + + + + + + + Address subform for Acessions. + 100px,2px,113px,5px,80px,2px,113px,5px,90px,2px,113px,5px,80px,2px,113px,0px,p:g + 115px,2px,125px,5px,90px,2px,125px,5px,99px,2px,125px,5px,90px,2px,125px,0px,p:g + 130px,2px,130px,5px,115px,2px,130px,5px,127px,2px,130px,5px,115px,2px,130px,0px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px + p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Discipline Data Entry Form + 100px,2px,180px,5px,85px,2px,180px,5px,86px,2px,180px,15px,p:g + 115px,2px,195px,5px,92px,2px,200px,5px,96px,2px,203px,15px,p:g + 130px,2px,218px,5px,112px,2px,220px,5px,116px,2px,220px,15px,p:g + 100px,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),15px,p:g + + + + + + + + + + + + + + + + + Collection Data Entry Form + 115px,2px,299px,5px,120px,2px,284px,10px,p:g + 135px,2px,305px,15px,120px,2px,338px,10px,p:g + 135px,2px,382px,15px,140px,2px,348px,10px,p:g + p,2px,p:g(2),5px,p:g,2px,p:g(2),10px + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Collection Grid View. + CollectionForGrid + + + Collection Grid View. + CollectionForGrid + + + Collection Data Entry Form + p,3dlu,p,4px,p,2px,p,f:p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Collection Data Entry Form + 115px,2px,299px,5px,120px,2px,284px,15px,p:g + 135px,2px,300px,15px,150px,2px,303px,15px,p:g + 135px,2px,300px,15px,150px,2px,430px,15px,p:g + p,2px,p:g(2),5px,p:g,2px,p:g(2),15px,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The FundingAgent form. + + 105px,2px,210px,5px,100px,2px,98px,300px,p:g + 135px,2px,230px,5px,120px,2px,118px,325px,p:g + 130px,2px,215px,5px,140px,2px,138px,395px,p:g + p,2px,p:g,5px:g,p,2px,p:g,p:g(2),p:g + p,2dlu,p:g,2dlu,p:g + + + + + + + + + + + + + FundingAgents grid view for CollectingTrip form. + FundingAgents + + + The FundingAgents Icon Viewer + + + The FundingAgents form - UNKNOWN use in database. + + p,5dlu,p:g,5dlu,p + + + + + + + + + + + + + + + + + + The Collection Object form. + + 100px,2px,195px,5px,96px,2px,50px,10px,150px,5px,94px,2px,176px,15px,p:g + 100px,2px,195px,5px,60px,2px,60px,10px,140px,5px,70px,2px,181px,15px,50px,2px,p:g + 130px,2px,215px,5px,128px,2px,105px,10px,145px,5px,138px,2px,195px,15px,p:g + p,2px,min(p;250px),5px:g,p,2px,p:g(2),10px,p:g(2),5px:g,p,2px,p:g,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The RelativeAge Table - p,2px,p,2px,p,2px,p,2px,p,2px,p,p:g + 80px,2px,150px,5px,80px,2px,150px,5px,50px,2px,50px,p:g + + @@ -8678,22 +7093,20 @@ - + - + - + - The RelativeAge Table RelativeAge - The RelativeAge Table @@ -8714,7 +7127,7 @@ - + @@ -8724,11 +7137,9 @@ - The AbsoluteAge Table AbsoluteAge - - - + + \ No newline at end of file From be1c730405f59c532d6d9ff6705336231a593b56 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 1 Nov 2024 15:14:07 -0500 Subject: [PATCH 02/64] Fix missing tag --- config/common/common.views.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index 5cc33b7738e..c44a21934a6 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -2828,6 +2828,7 @@ + From 1273738f0927b6320d1a365a959a2e0c146fcadc Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 1 Nov 2024 15:16:18 -0500 Subject: [PATCH 03/64] Remove mineral default --- config/common/common.views.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index c44a21934a6..4d0e91db156 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -1930,7 +1930,7 @@ - @@ -2828,7 +2828,7 @@ - + @@ -6992,8 +6992,8 @@ - - + + From 68b02533b7fa071fc215a371a9b909ad08014f01 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 14:56:56 -0600 Subject: [PATCH 04/64] Fix #2153 Fixes https://github.com/specify/specify7/issues/2153 --- config/bird/bird.views.xml | 3 - config/bird/manager/bird.views.xml | 3 - config/botany/botany.views.xml | 3 - config/botany/manager/botany.views.xml | 3 - config/fish/fish.views copy.xml | 1073 ----------------- config/fish/fish.views.xml | 3 - config/fish/manager/fish.views.xml | 3 - config/herpetology/herpetology.views.xml | 3 - .../herpetology/manager/herpetology.views.xml | 3 - config/invertebrate/invertebrate.views.xml | 3 - .../manager/invertebrate.views.xml | 3 - config/invertpaleo/manager/paleo.views.xml | 3 - config/invertpaleo/paleo.views.xml | 3 - config/mammal/mammal.views.xml | 3 - config/mammal/manager/mammal.views.xml | 3 - config/vertpaleo/manager/vertpaleo.views.xml | 3 - config/vertpaleo/vertpaleo.views.xml | 3 - 17 files changed, 1121 deletions(-) delete mode 100644 config/fish/fish.views copy.xml diff --git a/config/bird/bird.views.xml b/config/bird/bird.views.xml index b820edd4d5f..2f88f7c98f7 100644 --- a/config/bird/bird.views.xml +++ b/config/bird/bird.views.xml @@ -779,9 +779,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,195px,5px,96px,2px,50px,10px,150px,5px,94px,2px,176px,15px,p:g - 115px,2px,195px,5px,125px,2px,60px,10px,140px,5px,125px,2px,181px,15px,p:g - 130px,2px,215px,5px,128px,2px,105px,10px,145px,5px,138px,2px,195px,15px,p:g - p,2px,min(p;250px),5px:g,p,2px,p:g(2),10px,p:g,5px:g,p,2px,p:g,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Determination - - - - - - - 100px,2px,210px,5px,76px,2px,260px,5px,90px,2px,140px,0px,p:g - 115px,2px,210px,5px,110px,2px,255px,5px,105px,2px,156px,0px,p:g - 130px,2px,260px,5px,100px,2px,288px,5px,108px,2px,180px,0px,p:g - p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,130px,5px,55px,2px,130px,5px,104px,2px,130px,5px,85px,2px,130px,0px,p:g - 115px,2px,135px,5px,75px,2px,135px,5px,125px,2px,130px,5px,99px,2px,130px,0px,p:g - 130px,2px,155px,5px,75px,2px,155px,5px,130px,2px,150px,5px,109px,2px,155px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Preparation - - - - - - - 100px,2px,195px,5px,91px,2px,60px,5px,83px,2px,60px,5px,85px,2px,123px,2px,70px,p:g - 115px,2px,200px,5px,110px,2px,67px,5px,82px,2px,67px,5px,100px,2px,126px,2px,75px,p:g - 130px,2px,215px,5px,110px,2px,80px,5px,93px,2px,80px,5px,105px,2px,174px,2px,70px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,10px,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,200px,5px,90px,2px,210px,5px,96px,2px,115px,0px,15px,p:g - 115px,2px,240px,5px,100px,2px,215px,5px,106px,2px,125px,0px,15px,p:g - 130px,2px,246px,5px,115px,2px,270px,5px,110px,2px,145px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g,5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,108px,5px,75px,2px,108px,5px,80px,2px,108px,5px,85px,2px,140px,0px,p:g - 115px,2px,115px,5px,85px,2px,115px,5px,100px,2px,115px,5px,99px,2px,150px,0px,p:g - 130px,2px,145px,5px,93px,2px,145px,5px,93px,2px,125px,5px,99px,2px,179px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CollectionObjectSub - - - - - - - 100px,2px,120px,5px,100px,2px,98px,5px,95px,2px,98px,5px,95px,2px,98px,p:g - 115px,2px,152px,5px,107px,2px,100px,5px,110px,2px,100px,5px,110px,2px,100px,p:g - 130px,2px,150px,5px,127px,2px,121px,5px,120px,2px,121px,5px,119px,2px,121px,p:g - p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2) - - - - - - - - - - - - - - - - - - - AccessionItems - - - - - - - 105px,2px,120px,5px,100px,2px,95px,5px,102px,2px,95px,5px,97px,2px,95px,p:g - 115px,2px,117px,5px,110px,2px,105px,5px,121px,2px,105px,5px,116px,2px,105px,p:g - 130px,2px,130px,5px,118px,2px,130px,5px,121px,2px,130px,5px,120px,2px,130px,p:g - p,2px,min(p;150px),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2) - - - - - - - - - - - - - - - - - - - - 100px,2px,150px,5px,292px,2px,156px,120px,15px,p:g - 115px,2px,175px,5px,242px,2px,175px,201px,15px,p:g - 130px,2px,160px,5px,347px,2px,160px,226px,15px,p,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/fish/fish.views.xml b/config/fish/fish.views.xml index 74e6501bdb0..4f21f88595f 100644 --- a/config/fish/fish.views.xml +++ b/config/fish/fish.views.xml @@ -661,9 +661,6 @@ - - - Form.]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + The Workbench Form. + + + + + + + Report Properties Form. + + + + + + The Workbench Form. + + + + + + Taxon data entry form. + + + + + + + Taxon data entry form. + + + + + + + Subform within the Collection Object form. + + + + + + + Taxon data entry form. + + + + + + Geography data entry form. + + + + + + + Geography data entry form. + + + + + + Storage data entry form. + + + + + + + Storage data entry form. + + + + + + GeologicTimePeriod data entry form. + + + + + + + GeologicTimePeriod data entry form. + + + + + + + GeologicTimePeriod data entry form. + + + + + + + GeologicTimePeriod data entry form. + + + + + + LithoStrat data entry form. + + + + + + + Lithostrat subform. + + + + + + StorageTreeDefItem Form + + + + + + Root StorageTreeDefItem Form + + + + + + GeographyTreeDefItem Form + + + + + + Root GeographyTreeDefItem Form + + + + + + GeologicTimePeriodTreeDefItem Form + + + + + + Root GeologicTimePeriodTreeDefItem Form + + + + + + LithoStratTreeDefItem Form + + + + + + Root LithoStratTreeDefItem Form + + + + + + TaxonTreeDefItem Form + + + + + + Root TaxonTreeDefItem Form + + + + + + New Tree Definition Data Entry Form + + + + + + Symbiota Instance Data Entry Form + + + + + + The Object-Attachment View. + + + + + + + + + + + The Object-Attachment View. + + + + + + + The Collection Object-Attachment View. + + + + + + + + + + + The Attachment Image Attribute View. + + + + + + + The AttachmentMetadata subform. + + + + + + + PaleoContext subform within Collection Object form. + + + + + + + MorphBankView form. + + + + + + + - - - - - - - - p,3dlu,p,3dlu,p,3dlu,p,3dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,5dlu,p:g,5dlu,p - - - - - - - - - - - - - - - - - - - - - - - p,5dlu,p:g,5dlu,p - - - - - - - - - - - - - - - - - - - - - Address - - - - - - 100px,2px,118px,5px,70px,2px,118px,5px,90px,2px,118px,5px,70px,2px,118px,0px,p:g - 115px,2px,130px,5px,80px,2px,130px,5px,99px,2px,130px,5px,80px,2px,130px,0px,p:g - 130px,2px,145px,5px,90px,2px,145px,5px,117px,2px,145px,5px,90px,2px,145px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,125px,5px,75px,2px,128px,5px,80px,2px,140px,5px,90px,2px,29px,2px,35px,0px,15px,p:g - 115px,2px,146px,5px,85px,2px,140px,5px,90px,2px,149px,5px,100px,2px,35px,2px,35px,0px,15px,p:g - 130px,2px,150px,5px,85px,2px,160px,5px,105px,2px,164px,5px,120px,2px,45px,2px,48px,0px,15px,p:g - p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g,2px,p,0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - Collectors - - - - - - - p,5dlu,p:g,5dlu,p - - - - - - - - - - - - - - AgentVariant - - - - - - - 100px,2px,190px,5px,50px,2px,478px,p,p:g - 115px,2px,200px,5px,70px,2px,523px,p,p:g - 130px,2px,150px,5px,80px,2px,663px,p:g - p,2px,max(p;190px),5px,100px,2px,p:g - - - - - - - - - - - - - - - - - p,3dlu,p,p:g - - - - - - - - - - - - - - - - - - - - - GroupPersons - - - - - - - 60px,2px,p:g,2px - - - - - - - - - - - - + + + + + + + + + + + + + + + + + GroupPerson subform table for Agent form. + GroupPersons + + + The Group Person form. + + 60px,2px,p:g,2px + + + + + + + + + + + - - - - - - - - 60px,2px,p:g,2px - - - - - - - - - - - - - - - - - p,3dlu,p:g - - - - - - - - - - - - - - - - - Authors - - - - - - 100px,2px,102px,10px,86px,2px,102px,10px,86px,2px,150px,3px,p,p:g - 100px,2px,102px,10px,86px,2px,102px,10px,86px,2px,150px,3px,p,p:g - 130px,2px,102px,10px,p,2px,102px,10px,p,2px,150px,3px,p,p:g - p,2px,p:g,10px,p,2px,p:g,10px,p,2px,p:g,3px,p,p:g - - - - - - - - - - - - - - - - - - - - 100px,2px,240px,485px,p:g - 115px,2px,265px,535px,p:g - 130px,2px,250px,650px,p:g - p,2px,p,p:g - - - - - - - - - - - - - - - - - - - 100px,2px,473px,5px,120px,2px,125px,p:g - 115px,2px,460px,5px,150px,2px,183px,p:g - 130px,2px,518px,5px,180px,2px,195px,p:g - p,2px,p:g(4),5px:g,p,2px,p:g(2) - - - - - - - - - - - - - - - - - - 100px,2px,473px,5px,120px,2px,125px,15px,p:g - 115px,2px,460px,5px,150px,2px,183px,15px,p:g - 130px,2px,518px,5px,180px,2px,195px,15px,p:g - p,2px,p:g(4),5px:g,p,2px,p:g(2),p,p:g - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,473px,5px,120px,2px,125px,p:g - 115px,2px,460px,5px,150px,2px,183px,p:g - 130px,2px,518px,5px,180px,2px,195px,p:g - p,2px,p:g(4),5px:g,p,2px,p:g(2) - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p - - - - - - - - - - - - - - 100px,2px,170px,5px,90px,2px,150px,5px,140px,2px,161px,15px,p:g - 115px,2px,176px,5px,100px,2px,175px,5px,160px,2px,175px,15px,p:g - 130px,2px,208px,5px,100px,2px,208px,5px,175px,2px,195px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,170px,5px,90px,2px,150px,5px,140px,2px,161px - 115px,2px,186px,5px,90px,2px,165px,5px,165px,2px,180px,p:g - 130px,2px,203px,5px,100px,2px,203px,5px,185px,2px,195px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,2px,p:g - - - - - - - - - - - - - - - - - - - p,2px,p:g - - - - - - - - - - - - - - - - - - - - - - - p,2px,p - - + + + + The ReferenceWork form + 100px,2px,170px,5px,90px,2px,150px,5px,140px,2px,161px + 115px,2px,186px,5px,90px,2px,165px,5px,165px,2px,180px,p:g + 130px,2px,203px,5px,100px,2px,203px,5px,185px,2px,195px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2) + - - + + - - + + - - + + + + + + + + + + + + + + + + + + The WorkbenchTemplate form + p,2px,p:g + + + + + + + + + + + + + + The WorkbenchTemplate form + + p,2px,p:g + + + + + + + + + + + + + + + + + + Report Properties Form. + p,2px,p + + + + + + + + + + + + + - - - - - - p,2px,p:g - - - - - - - - - - - - - - 110px,2px,390px,325px,p:g - 115px,2px,425px,385px,p:g - 130px,2px,492px,408px,p:g - p,2px,p:g,p:g(2) - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,325px,5px,133px,2px,155px,10px,95px,15px,p:g - 115px,2px,375px,5px,143px,2px,160px,10px,105px,15px,p:g - 130px,2px,398px,5px,141px,2px,235px,10px,110px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),10px,p,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + isHybrid.isSelected() + isHybrid.isSelected() + parent.getValue() != null + + 100px,2px,325px,5px,133px,2px,155px,10px,95px,15px,p:g + 115px,2px,375px,5px,143px,2px,160px,10px,105px,15px,p:g + 130px,2px,398px,5px,141px,2px,235px,10px,110px,15px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),10px,p,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - 100px,2px,115px,5px,75px,2px,115px,5px,109px,2px,115px,5px,60px,2px,115px,0px,p:g - 115px,2px,120px,5px,95px,2px,120px,5px,130px,2px,120px,5px,74px,2px,120px,0px,p:g - 130px,2px,140px,5px,95px,2px,140px,5px,135px,2px,140px,5px,84px,2px,145px,0px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),5px:g,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,390px,5px,118px,2px,210px,p:g - 115px,2px,425px,5px,110px,2px,261px,p:g - 130px,2px,492px,5px,140px,2px,268px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2) - - - - - - - - - - - - - - - - - - - - - 100px,2px,323px,5px,135px,2px,160px,15px,85px,0px,15px,p,p:g - 115px,2px,340px,5px,155px,2px,178px,15px,105px,0px,15px,p,p:g - 130px,2px,373px,5px,170px,2px,220px,15px,115px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),25px,p,0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - + parent.getValue() != null + + 100px,2px,323px,5px,135px,2px,160px,15px,85px,0px,15px,p,p:g + 115px,2px,340px,5px,155px,2px,178px,15px,105px,0px,15px,p,p:g + 130px,2px,373px,5px,170px,2px,220px,15px,115px,0px,15px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),25px,p,0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - 100px,2px,725px,p:g - 115px,2px,800px,p:g - 130px,2px,900px,p:g - p,2px,p:g - - - - - - - - - - - - - - - - - - 100px,2px,355px,5px,120px,2px,253px,0px,15px,p:g - 115px,2px,375px,5px,130px,2px,288px,0px,15px,p:g - 130px,2px,458px,5px,145px,2px,290px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 100px,2px,355px,5px,120px,2px,253px,0px,15px,p:g + 115px,2px,375px,5px,130px,2px,288px,0px,15px,p:g + 130px,2px,458px,5px,145px,2px,290px,0px,15px,p:g + p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - 100px,2px,725px,0px,p:g - 115px,2px,800px,0px,p:g - 130px,2px,900px,0px,p:g - p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - 100px,2px,349px,5px,118px,2px,251px,0px,15px,p:g - 115px,2px,365px,5px,145px,2px,283px,0px,15px,p:g - 130px,2px,422px,5px,130px,2px,341px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,349px,5px,118px,2px,251px,0px,15px,p:g - 115px,2px,365px,5px,145px,2px,283px,0px,15px,p:g - 130px,2px,422px,5px,130px,2px,341px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,725px,0px,p:g - 115px,2px,800px,0px,p:g - 130px,2px,900px,0px,p:g - p,2px,p:g,0px - - - - - - - - - - - - - - - - - - 100px,2px,445px,5px,60px,2px,213px,0px,15px,p:g - 115px,2px,460px,5px,80px,2px,253px,0px,15px,p:g - 130px,2px,568px,5px,75px,2px,250px,0px,15px,p:g - p,2px,p:g(2),5px:g,p,2px,p:g(2),0px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100px,2px,725px,0px,p:g - 115px,2px,800px,0px,p:g - 130px,2px,900px,0px,p:g - p,2px,p:g(2),0px - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - p,2px,p:g(2),p - - - - - - - - - - - - - - - - - ​ - - - - - - - p,3dlu,p,6dlu,p - - - - - - - - - - - - - - - - - - - - - - - - - ObjectAttachment Form - - - - - ObjectAttachment Form - - - - - - - - - - - - - - - p,5dlu,p:g - - - - - - - - - - - - + p,5dlu,p:g + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,5dlu,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - p,2px,p:g - - - - - - - - - - - - - - - - - - - - - - - 80px,2dlu,p:g,5dlu,80px,2dlu,p:g - - - - - - - - - - - - - - - AttachmentMetadata - - - - - - - 90px,2px,p,2px,100px,2px,p,2px,60px,2px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - + 90px,2px,p,2px,100px,2px,p,2px,60px,2px,p,p:g + + + + + + + + + + + + + + + + + + + + Locality + - - p,5dlu,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + p,5dlu,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 688e4dc2842bc247dba124cf87e64758fdc9a4d2 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 15:27:51 -0600 Subject: [PATCH 06/64] Set `countAmt` min value to `0` Solves part of #1254 --- config/bird/bird.views.xml | 2 +- config/bird/manager/bird.views.xml | 2 +- config/botany/botany.views.xml | 2 +- config/botany/manager/botany.views.xml | 2 +- config/fish/fish.views.xml | 2 +- config/fish/guest/fish.views.xml | 2 +- config/fish/manager/fish.views.xml | 2 +- config/herpetology/herpetology.views.xml | 2 +- config/herpetology/manager/herpetology.views.xml | 2 +- config/invertebrate/invertebrate.views.xml | 2 +- config/invertebrate/manager/invertebrate.views.xml | 2 +- config/invertpaleo/guest/paleo.views.xml | 2 +- config/invertpaleo/manager/paleo.views.xml | 2 +- config/invertpaleo/paleo.views.xml | 2 +- config/mammal/mammal.views.xml | 2 +- config/mammal/manager/mammal.views.xml | 2 +- config/vertpaleo/guest/vertpaleo.views.xml | 2 +- config/vertpaleo/manager/vertpaleo.views.xml | 2 +- config/vertpaleo/vertpaleo.views.xml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/config/bird/bird.views.xml b/config/bird/bird.views.xml index 2f88f7c98f7..1ef6785ee2a 100644 --- a/config/bird/bird.views.xml +++ b/config/bird/bird.views.xml @@ -228,7 +228,7 @@ - + diff --git a/config/bird/manager/bird.views.xml b/config/bird/manager/bird.views.xml index 2f88f7c98f7..1ef6785ee2a 100644 --- a/config/bird/manager/bird.views.xml +++ b/config/bird/manager/bird.views.xml @@ -228,7 +228,7 @@ - + diff --git a/config/botany/botany.views.xml b/config/botany/botany.views.xml index 0dbb4fbd49b..54da199c819 100644 --- a/config/botany/botany.views.xml +++ b/config/botany/botany.views.xml @@ -248,7 +248,7 @@ - + diff --git a/config/botany/manager/botany.views.xml b/config/botany/manager/botany.views.xml index 0dbb4fbd49b..54da199c819 100644 --- a/config/botany/manager/botany.views.xml +++ b/config/botany/manager/botany.views.xml @@ -248,7 +248,7 @@ - + diff --git a/config/fish/fish.views.xml b/config/fish/fish.views.xml index 4f21f88595f..bc73597616c 100644 --- a/config/fish/fish.views.xml +++ b/config/fish/fish.views.xml @@ -239,7 +239,7 @@ - + diff --git a/config/fish/guest/fish.views.xml b/config/fish/guest/fish.views.xml index dbd18c56220..28e8555dd53 100644 --- a/config/fish/guest/fish.views.xml +++ b/config/fish/guest/fish.views.xml @@ -232,7 +232,7 @@ - + diff --git a/config/fish/manager/fish.views.xml b/config/fish/manager/fish.views.xml index 4f21f88595f..bc73597616c 100644 --- a/config/fish/manager/fish.views.xml +++ b/config/fish/manager/fish.views.xml @@ -239,7 +239,7 @@ - + diff --git a/config/herpetology/herpetology.views.xml b/config/herpetology/herpetology.views.xml index 82400e40966..b544dd65a1c 100644 --- a/config/herpetology/herpetology.views.xml +++ b/config/herpetology/herpetology.views.xml @@ -226,7 +226,7 @@ - + diff --git a/config/herpetology/manager/herpetology.views.xml b/config/herpetology/manager/herpetology.views.xml index 82400e40966..b544dd65a1c 100644 --- a/config/herpetology/manager/herpetology.views.xml +++ b/config/herpetology/manager/herpetology.views.xml @@ -226,7 +226,7 @@ - + diff --git a/config/invertebrate/invertebrate.views.xml b/config/invertebrate/invertebrate.views.xml index 5ce0f540ca1..3acf39edb0d 100644 --- a/config/invertebrate/invertebrate.views.xml +++ b/config/invertebrate/invertebrate.views.xml @@ -251,7 +251,7 @@ - + diff --git a/config/invertebrate/manager/invertebrate.views.xml b/config/invertebrate/manager/invertebrate.views.xml index 5ce0f540ca1..3acf39edb0d 100644 --- a/config/invertebrate/manager/invertebrate.views.xml +++ b/config/invertebrate/manager/invertebrate.views.xml @@ -251,7 +251,7 @@ - + diff --git a/config/invertpaleo/guest/paleo.views.xml b/config/invertpaleo/guest/paleo.views.xml index 47bd8f95d3d..83a39524cfa 100644 --- a/config/invertpaleo/guest/paleo.views.xml +++ b/config/invertpaleo/guest/paleo.views.xml @@ -271,7 +271,7 @@ - + diff --git a/config/invertpaleo/manager/paleo.views.xml b/config/invertpaleo/manager/paleo.views.xml index abd8215a5e8..850b034fb1e 100644 --- a/config/invertpaleo/manager/paleo.views.xml +++ b/config/invertpaleo/manager/paleo.views.xml @@ -281,7 +281,7 @@ - + diff --git a/config/invertpaleo/paleo.views.xml b/config/invertpaleo/paleo.views.xml index abd8215a5e8..850b034fb1e 100644 --- a/config/invertpaleo/paleo.views.xml +++ b/config/invertpaleo/paleo.views.xml @@ -281,7 +281,7 @@ - + diff --git a/config/mammal/mammal.views.xml b/config/mammal/mammal.views.xml index d5c70f987b2..3001fe4e831 100644 --- a/config/mammal/mammal.views.xml +++ b/config/mammal/mammal.views.xml @@ -227,7 +227,7 @@ - + diff --git a/config/mammal/manager/mammal.views.xml b/config/mammal/manager/mammal.views.xml index d5c70f987b2..3001fe4e831 100644 --- a/config/mammal/manager/mammal.views.xml +++ b/config/mammal/manager/mammal.views.xml @@ -227,7 +227,7 @@ - + diff --git a/config/vertpaleo/guest/vertpaleo.views.xml b/config/vertpaleo/guest/vertpaleo.views.xml index ee37fb6e310..fd3c27e0d82 100644 --- a/config/vertpaleo/guest/vertpaleo.views.xml +++ b/config/vertpaleo/guest/vertpaleo.views.xml @@ -271,7 +271,7 @@ - + diff --git a/config/vertpaleo/manager/vertpaleo.views.xml b/config/vertpaleo/manager/vertpaleo.views.xml index ee743d33686..ddf44f06e12 100644 --- a/config/vertpaleo/manager/vertpaleo.views.xml +++ b/config/vertpaleo/manager/vertpaleo.views.xml @@ -281,7 +281,7 @@ - + diff --git a/config/vertpaleo/vertpaleo.views.xml b/config/vertpaleo/vertpaleo.views.xml index ee743d33686..ddf44f06e12 100644 --- a/config/vertpaleo/vertpaleo.views.xml +++ b/config/vertpaleo/vertpaleo.views.xml @@ -281,7 +281,7 @@ - + From b6e2a38730cbddb734dfa53df027f14262b8dc5c Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 15:31:20 -0600 Subject: [PATCH 07/64] Update geology.views.xml --- config/geology/geology.views.xml | 489 +++++++++++++------------------ 1 file changed, 207 insertions(+), 282 deletions(-) diff --git a/config/geology/geology.views.xml b/config/geology/geology.views.xml index f4e74e49ecd..fe4a6a8dc17 100644 --- a/config/geology/geology.views.xml +++ b/config/geology/geology.views.xml @@ -10,20 +10,6 @@ - - CollectingEvent Form - - - - - - - CollectingEvent SubForm - - - - - The Collection Object form. @@ -113,6 +99,20 @@ + + CollectingEvent Form + + + + + + + CollectingEvent SubForm + + + + + @@ -126,17 +126,17 @@ - + - + - + - + @@ -160,14 +160,14 @@ --> - + - + @@ -179,56 +179,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - + + + - + - - - - - - + @@ -272,12 +246,12 @@ Determination subform table for Collection Object form. Determination - + Determination subform for Collection Object form. - 100px,2px,210px,5px,76px,2px,260px,5px,90px,2px,140px,0px,p:g - 115px,2px,210px,5px,110px,2px,255px,5px,105px,2px,156px,0px,p:g - 130px,2px,260px,5px,100px,2px,288px,5px,108px,2px,180px,0px,p:g + 100px,2px,210px,5px,76px,2px,200px,5px,90px,2px,140px,0px,p:g + 115px,2px,210px,5px,110px,2px,205px,5px,105px,2px,156px,0px,p:g + 130px,2px,253px,5px,95px,2px,238px,5px,140px,2px,185px,0px,p:g p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g(2),0px @@ -290,6 +264,10 @@ + + + + @@ -298,226 +276,12 @@ - - - - - Collecting Event - 100px,2px,210px,5px,75px,2px,210px,5px,90px,2px,186px,0px,p:g - 115px,2px,210px,5px,105px,2px,210px,5px,125px,2px,186px,0px,p:g - 130px,2px,260px,5px,85px,2px,260px,5px,115px,2px,216px,0px,p:g - p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g(2),0px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - Collecting Event - 100px,2px,200px,5px,90px,2px,210px,5px,96px,2px,115px,0px,15px,p:g - 115px,2px,240px,5px,100px,2px,215px,5px,106px,2px,125px,0px,15px,p:g - 130px,2px,251px,5px,130px,2px,270px,5px,130px,2px,130px,0px,15px,p:g - p,2px,max(p;190px),5px:g,p,2px,p,5px:g,p,2px,110px,p,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Preparation subform table for Collection Object form. Preparation @@ -535,7 +299,7 @@ - + @@ -547,8 +311,8 @@ - - + + @@ -1481,5 +1245,166 @@ --> + + Collecting Event + 100px,2px,200px,5px,90px,2px,210px,5px,96px,2px,115px,0px,15px,p:g + 115px,2px,240px,5px,100px,2px,215px,5px,106px,2px,125px,0px,15px,p:g + 130px,2px,251px,5px,130px,2px,270px,5px,130px,2px,130px,0px,15px,p:g + p,2px,max(p;190px),5px:g,p,2px,p,5px:g,p,2px,110px,p,p,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Collecting Event + 100px,2px,210px,5px,75px,2px,210px,5px,90px,2px,186px,0px,p:g + 115px,2px,210px,5px,105px,2px,210px,5px,125px,2px,186px,0px,p:g + 130px,2px,260px,5px,85px,2px,260px,5px,115px,2px,216px,0px,p:g + p,2px,p:g,5px:g,p,2px,p:g,5px:g,p,2px,p:g(2),0px + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 56c4059eeb414ec461c1c6bfb8032d62b160af06 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 15:46:26 -0600 Subject: [PATCH 08/64] Improve Pick List forms Fixes #1515 --- config/backstop/system.views.xml | 1099 ++++++++++++------------------ 1 file changed, 428 insertions(+), 671 deletions(-) diff --git a/config/backstop/system.views.xml b/config/backstop/system.views.xml index fa8073c45d1..665283f98a3 100644 --- a/config/backstop/system.views.xml +++ b/config/backstop/system.views.xml @@ -1,685 +1,442 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + New Tree Definition Data Entry Form + + + + + + The PrepType Object form. + + + + + + + The TypeSearchInfo Object form. + + + + + + The DataType Object form. + + + + + + + User Group form. + + + + + + + User form. + + + + + + + The CatalogNumberingScheme Object form. + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - 100px, 2px, p, p, p:g, f:p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Form for editing an PickList + + readOnly.isSelected() == false + items.getSelectedIndex() != -1 + title.isNotEmpty() && value.isNotEmpty() + dataObj.getCreated() == null + dataObj.getCreated() != null && processor.getNumUsed() == 0 + + 80px,2px,200px,2px,75px,2px,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - PickListItem - - - - - - - 100px, 2px, p:g - - - - - - - - - - - - - - - - - - - - p,3dlu,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6dlu,p - p,2dlu,p - - - - - - - - - - - - - - p,3dlu,p,2dlu,p:g - - - - - - - - - - - - - - - - - p,3dlu,p,p:g - - - - - - - - - - - - - - - - - - - - - p,3dlu,p,6px,p,6px,p,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p - p,2dlu,p,2dlu,p - - - - - - - - - - - - - - - - - - - p, 2px, p, p, p:g, f:250px:g - p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,f:p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,p:g - - - - - - - - - - - - - - - - - - - p,3dlu,p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - p,3dlu,f:p:g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - p,f:p:g - - - - - - - - - - - - - - - - - - - - - + + The CatalogNumberingScheme Search Form + + p,3dlu,p + p,2dlu,p,2dlu,p + + + + + + + + + + + + + The TypeSearchInfo Form + + p, 2px, p, p, p:g, f:250px:g + p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,f:p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ExcelExportInfo Form + p,3dlu,p:g + + + + + + + + + + + + + + ChangePassword Form + p,3dlu,p:g + + + + + + + + + + + + + + + + + + + + + + + CollectionRelType Form + p,3dlu,f:p:g + + + + + + + + + + + + + + + + + + + + + + + + + + + AddObjPrefs Data Entry Form + p,f:p:g + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8d0522eac8cd29f7a26580cc613517601bed641b Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 15:55:00 -0600 Subject: [PATCH 09/64] Add new Collection Relationship Type form Fixes #3120 --- config/backstop/system.views.xml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/config/backstop/system.views.xml b/config/backstop/system.views.xml index 665283f98a3..4543153dfc7 100644 --- a/config/backstop/system.views.xml +++ b/config/backstop/system.views.xml @@ -391,31 +391,23 @@ - - CollectionRelType Form - p,3dlu,f:p:g - + + The Collection Relationship Type form + 60px,2px,120px,2px,120px,2px,120px,2px,120px,2px,120px,p:g - - - - - - - - - - - + + - - + + + + - - + + From f60a4051581d47fa2e6a1d3261091ba420aaaa08 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:08:57 -0600 Subject: [PATCH 10/64] Fix Agent and AgentIdentifier form issues Fixes #364 and #4591 --- config/backstop/global.views.xml | 22 +++++++++++++++++----- config/common/common.views.xml | 18 +++++++++--------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index 5253028bf88..c60cb24df46 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -575,7 +575,7 @@ --> - + Agent subform for Acessions. 100px,2px,125px,5px,75px,2px,128px,5px,80px,2px,140px,5px,90px,2px,29px,2px,35px,0px,15px,p:g 115px,2px,146px,5px,85px,2px,140px,5px,90px,2px,149px,5px,100px,2px,35px,2px,35px,0px,15px,p:g @@ -585,7 +585,7 @@ - + @@ -605,11 +605,20 @@ - + + + + + + + + + + + - - + @@ -617,6 +626,9 @@ + + + diff --git a/config/common/common.views.xml b/config/common/common.views.xml index 4d0e91db156..270f4ab917f 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -783,13 +783,13 @@ - + Subform within the agent form. - - - - + + + + @@ -5337,9 +5337,9 @@ OtherIdentifiers subform table for Collection Object form. OtherIdentifiers - - AgentIdentifiers subform table for Agent form. - AgentIdentifiers + + AgentIdentifier subform table for Agent form. + AgentIdentifier subform on the Collection Object form. @@ -5374,7 +5374,7 @@ --> - + subform on the Agent form. 100px,2px,473px,5px,120px,2px,125px,0px,15px,p:g From 0ca1671130eae34df1c7d9829c6aa244d6b51b3a Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 17:37:35 -0600 Subject: [PATCH 11/64] Remove front-end limit on pick list items Fixes #1213 --- config/backstop/system.views.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/backstop/system.views.xml b/config/backstop/system.views.xml index 4543153dfc7..7410df38757 100644 --- a/config/backstop/system.views.xml +++ b/config/backstop/system.views.xml @@ -130,7 +130,7 @@ - + @@ -186,7 +186,7 @@ - + PrepType Data Entry Form p,3dlu,p,6dlu,p p,2dlu,p @@ -194,7 +194,7 @@ - + From 0dcd2f92a6262546b8b62ab28c8d2d7df1aed2f8 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 17:43:20 -0600 Subject: [PATCH 12/64] Remove hardcoded labels in the pick list form --- config/backstop/system.views.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/backstop/system.views.xml b/config/backstop/system.views.xml index 7410df38757..fbf5b50c369 100644 --- a/config/backstop/system.views.xml +++ b/config/backstop/system.views.xml @@ -117,7 +117,7 @@ - + @@ -125,11 +125,11 @@ - + - + From c9e509daaf2ba518a647168c11ea89bd81e51ac5 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 17:49:39 -0600 Subject: [PATCH 13/64] Fix TaxonAttribute form being misconfigured Fixes https://github.com/specify/specify6/issues/1229 --- config/backstop/global.views.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index c60cb24df46..18a6be8673f 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -180,11 +180,11 @@ - + Subform within the Collection Object form. - - + + @@ -1281,7 +1281,7 @@ - + @@ -1403,7 +1403,7 @@ --> - + Form For taxon Attribute 100px,2px,115px,5px,75px,2px,115px,5px,109px,2px,115px,5px,60px,2px,115px,0px,p:g 115px,2px,120px,5px,95px,2px,120px,5px,130px,2px,120px,5px,74px,2px,120px,0px,p:g From 5344210ba00718fdd3015d75b2978fc74d661cb1 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:00:46 -0600 Subject: [PATCH 14/64] Fix Taxon Tree Def form errors Fixes https://github.com/specify/specify7/issues/5210 This also sets a default tree separator value (, ) for names --- config/backstop/global.views.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index 18a6be8673f..a78f7cfa3b2 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -2264,7 +2264,7 @@ - + TaxonTreeDefItem Form p,3dlu,p,6dlu,p p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p,2dlu,p @@ -2291,15 +2291,15 @@ - + - + - + From 80c271a91cdf238f99534e2efac8ac9cec52cf4f Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:02:39 -0600 Subject: [PATCH 15/64] Fix IDs for Agent subviews Fixes https://github.com/specify/specify6/issues/1228 --- config/backstop/global.views.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index a78f7cfa3b2..70f469246da 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -612,7 +612,7 @@ - + @@ -621,7 +621,7 @@ - + From 4e7fe14761ae0bcd998a1f0c7ea547a348ce564f Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:06:07 -0600 Subject: [PATCH 16/64] Reformat DataObjFormatters using linter --- config/backstop/dataobj_formatters.xml | 1643 +++++++----------------- 1 file changed, 478 insertions(+), 1165 deletions(-) diff --git a/config/backstop/dataobj_formatters.xml b/config/backstop/dataobj_formatters.xml index fe6416625f7..80db1b67a46 100644 --- a/config/backstop/dataobj_formatters.xml +++ b/config/backstop/dataobj_formatters.xml @@ -1,1168 +1,481 @@ - - - - accessionNumber - - - - - - - - agent - role - - - - - - - - accession.accessionNumber - - - - - - - - address - address2 - city - state - postalCode - - - - - - - - lastName - - - lastName - firstName - - - lastName - - - lastName - - - - - - - - title - - - - - - - - schemeName - - - - - - - - agent - - - - - - - - receivedDate - - - - - - - - stationFieldNumber - locality.localityName - locality.geography.fullName - locality.latitude1 - locality.longitude1 - - - - - - - - - - - - - - stationFieldNumber - startDate - - - - - - - - - - - - - - collectingTripName - - - - - - - - collectionName - - - - - - - - catalogNumber - - - - - - - - name - - - - - - - - agent - - - - - - - - name - - - - - - - - name - - - - - - - - deaccessionNumber - - - - - - - - preferredTaxon.fullName - isCurrent - - - taxon.fullName - - - - - - - - name - - - - - - - - name - - - - - - - - primerDesignator - - - - - - - - agent - - - - - - - - pageNumber - pageSet.fieldNotebook.name - - - - - - - - agent - - - - - - - - - fullName - - - - - - - - name - - - - - - - - name - - - - - - - - name - - - - - - - - fullName - - - - - - - - journalName - - - - - - - - fullName - - - - - - - - name - - - - - - - - name - - - - - - - - loanNumber - - - - - - - - agent - role - - - - - - - - - - - - - loanPreparation.preparation.prepType - quantityResolved - - - - - - - - localityName - geography.fullName - latitude1 - longitude1 - - - - - - - - Latitude - symbol - DDDDDD - 1 - - - - - - - - Longitude - symbol - DDDDDD - 1 - - - - - - - - paleoContextName - - + - chronosStrat.fullName - lithoStrat.fullName - - - - - - - - permitNumber - - - - - - - - name - - - - - - - - prepType - countAmt - - - - - - - - title - - - - - - - - agent - - - - - - - - shipmentDate - shipmentNumber - shipmentMethod - - - - - - - - fullName - - - - - - - - name - - - - - - - - name - - - - - - - - fullName - - - - - - - - referenceWork - - - - - - - - name - - - - - - - - name - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + chronosStrat.fullName + lithoStrat.fullName + + + + + + + permitNumber + + + + + + + name + + + + + + + prepType + countAmt + + + + + + + title + + + + + + + agent + + + + + + + shipmentDate + shipmentNumber + shipmentMethod + + + + + + + fullName + + + + + + + name + + + + + + + name + + + + + + + fullName + + + + + + + referenceWork + + + + + + + name + + + + + + + name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 30e1039a879f9d0476fe3f15955e530d22548f81 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 08:50:05 -0600 Subject: [PATCH 17/64] Update models_by_table_id.py --- specifyweb/specify/models_by_table_id.py | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/specifyweb/specify/models_by_table_id.py b/specifyweb/specify/models_by_table_id.py index d09bd77f4ff..768f309c05e 100644 --- a/specifyweb/specify/models_by_table_id.py +++ b/specifyweb/specify/models_by_table_id.py @@ -201,21 +201,21 @@ 1010:'RolePolicy', 1011:'LibraryRolePolicy', 1012:'Spdataset', - 1013: 'LocalityUpdate', - 1014: 'LocalityUpdateRowResult', - 1015: 'Collectionobjecttype', - 1016: 'Collectionobjectgroup', - 1017: 'Collectionobjectgroupjoin', - 1018: 'Collectionobjectgrouptype', - 1019: 'Absoluteage', - 1020: 'Relativeage', - 1021: 'Absoluteageattachment', - 1022: 'Relativeageattachment', - 1023: 'Absoluteagecitation', - 1024: 'Relativeagecitation', - 1025: 'Tectonicunittreedef', - 1026: 'Tectonicunittreedefitem', - 1027: 'Tectonicunit', + 1013:'LocalityUpdate', + 1014:'LocalityUpdateRowResult', + 1015:'Collectionobjecttype', + 1016:'Collectionobjectgroup', + 1017:'Collectionobjectgroupjoin', + 1018:'Collectionobjectgrouptype', + 1019:'Absoluteage', + 1020:'Relativeage', + 1021:'Absoluteageattachment', + 1022:'Relativeageattachment', + 1023:'Absoluteagecitation', + 1024:'Relativeagecitation', + 1025:'Tectonicunittreedef', + 1026:'Tectonicunittreedefitem', + 1027:'Tectonicunit', } model_names_by_app = { From 5c62bdca24b44e3dc190febb4c8ee7aa54d35c8f Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 08:55:13 -0600 Subject: [PATCH 18/64] Fix Collection Rel Type form --- config/backstop/global.views.xml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index 70f469246da..9093d96a9b8 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -889,19 +889,23 @@ --> - - The Journal form - unknown use in schema - 100px,2px,473px,5px,120px,2px,125px,p:g - 115px,2px,460px,5px,150px,2px,183px,p:g - 130px,2px,518px,5px,180px,2px,195px,p:g - p,2px,p:g(4),5px:g,p,2px,p:g(2) - + + The Collection Relationship Type form + 60px,2px,120px,2px,120px,2px,120px,2px,120px,2px,120px,p:g - + + + + + + + + + - + From 16c61fce8d8d7152f3f2780cf549df87fe33d8a0 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 08:58:43 -0600 Subject: [PATCH 19/64] Add Collection and SpecifyUser to TypeSearches --- config/backstop/typesearch_def.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/backstop/typesearch_def.xml b/config/backstop/typesearch_def.xml index 0f8593e9f94..bd5b4347e54 100644 --- a/config/backstop/typesearch_def.xml +++ b/config/backstop/typesearch_def.xml @@ -33,6 +33,7 @@ SELECT %s1 FROM Container con WHERE %s2 AND con.collectionObjects.size = 0 ORDER BY name + @@ -53,6 +54,7 @@ + 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 From 0991a783b02c0f15328106a7e382d8c660e154e8 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:06:10 -0600 Subject: [PATCH 20/64] Add Institution and new instructions Improves TypeSearches by adding clarifying information for those who customize them --- config/backstop/typesearch_def.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config/backstop/typesearch_def.xml b/config/backstop/typesearch_def.xml index bd5b4347e54..4b53eb52cf2 100644 --- a/config/backstop/typesearch_def.xml +++ b/config/backstop/typesearch_def.xml @@ -1,10 +1,10 @@ @@ -44,6 +44,7 @@ + From 6ef80460c66c94db83398beb0b7c63feadbb7ed5 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:26:13 -0600 Subject: [PATCH 21/64] Add support for modifying tree direction Adds default forms for all tree definition items, including the ability to change full name direction! Fixes #5073 --- config/backstop/global.views.xml | 204 +++++++++++++++++++++++++++++++ 1 file changed, 204 insertions(+) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index 9093d96a9b8..67c564c6e96 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -388,6 +388,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -230,49 +237,17 @@ - + User Data Entry Form - p,3dlu,p,6px,p,6px,p,p:g + 30px,2px,100px,2px,30px,2px,100px,2px,p:g - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - - @@ -430,5 +405,31 @@ + + The SpAppResource Table + + 20px,2px,100px,2px,20px,2px,50px,2px,p:g + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From ce883832831ccdf42714e6e6253867720019f0f3 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 11:48:53 -0600 Subject: [PATCH 27/64] Hide system metadata for App Resources --- config/backstop/system.views.xml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/config/backstop/system.views.xml b/config/backstop/system.views.xml index a62e1d817aa..3d1b4af4b40 100644 --- a/config/backstop/system.views.xml +++ b/config/backstop/system.views.xml @@ -86,7 +86,6 @@ - @@ -429,6 +428,29 @@ + From 97b344bc13dbaef407899135647a2f7011cc8e7b Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:04:57 -0600 Subject: [PATCH 28/64] Add SpViewSetObj Form --- config/backstop/system.views.xml | 51 ++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/config/backstop/system.views.xml b/config/backstop/system.views.xml index 3d1b4af4b40..785ab4ba7b3 100644 --- a/config/backstop/system.views.xml +++ b/config/backstop/system.views.xml @@ -91,6 +91,12 @@ + + + + + + @@ -453,5 +459,50 @@ --> + + The SpViewSetObj Table + + 20px,2px,50px,2px,20px,2px,50px,2px,p:g + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8f32b2e29027204719a6d8228b08c6f8c1f010b5 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:07:00 -0600 Subject: [PATCH 29/64] Remove broken WebLinks Removes `FishBase` and `WEBLINK`, adds `ORCID`, `Bionomia`, and `Wikidata` --- config/common/weblinks.xml | 134 ++++++++++++++++++++----------------- 1 file changed, 71 insertions(+), 63 deletions(-) diff --git a/config/common/weblinks.xml b/config/common/weblinks.xml index b25ee36b291..b1506e28153 100644 --- a/config/common/weblinks.xml +++ b/config/common/weblinks.xml @@ -1,65 +1,73 @@ + - - MailTo - agent - Launches an email message window for sending an email. - ]]> - - - email - EMail - false - - - - - agent - email - - - - - FishBase - Displays a FishBase page for the Genus and Species - AMPspeciesname=]]> - - - genus - Genus - false - - - species - Species - false - - - - - - WEBLINK - - - ]]> - - - this - false - - - - - - AccessionNumber - accession - - ]]> - - - accessionNumber - false - - - - + + MailTo + Agent + Launches an email message window for sending an email. + mailto:<email> + + + email + Email + false + + + + + Agent + email + + + + + ORCID + Agent + orcid.com/<this> + + + this + This + false + + + + + Agent + + + + + Wikidata + Agent + wikidata.com/<this> + + + this + This + false + + + + + Agent + + + + + Bionomia + Agent + bionomia.com/<this> + + + this + This + false + + + + + Agent + + + \ No newline at end of file From aac4f6fdc1861cb921ec23b41b96df28be163607 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:09:48 -0600 Subject: [PATCH 30/64] Add AgentIdentifier table to WebLinks --- config/common/weblinks.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/common/weblinks.xml b/config/common/weblinks.xml index b1506e28153..5f3bd706f41 100644 --- a/config/common/weblinks.xml +++ b/config/common/weblinks.xml @@ -32,7 +32,8 @@ - Agent + AgentIdentifier + identifier @@ -49,7 +50,8 @@ - Agent + AgentIdentifier + identifier @@ -66,7 +68,8 @@ - Agent + AgentIdentifier + identifier From f4f12a892dc1118c8d7d706fb62f0579ea3f0827 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:12:51 -0600 Subject: [PATCH 31/64] Remove auto-generated views Removes autogenereated forms for SpecifyUser, CollectionRelType, and SpViewSetObj --- .../lib/components/FormParse/webOnlyViews.ts | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts index 17f3111aa5e..0ca7fab8afb 100644 --- a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts +++ b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts @@ -36,35 +36,6 @@ export const webOnlyViews = f.store(() => ], ], }, - SpecifyUser: autoGenerateViewDefinition( - tables.SpecifyUser, - 'form', - 'edit', - getFieldsForAutoView(tables.SpecifyUser, ['password', 'userType']) - ), - SpAppResource: autoGenerateViewDefinition( - tables.SpAppResource, - 'form', - 'edit', - getFieldsForAutoView(tables.SpAppResource, [ - 'allPermissionLevel', - 'groupPermissionLevel', - 'level', - 'ownerPermissionLevel', - 'version', - 'group', - 'spAppResourceDir', - 'spAppResourceDatas', - 'spReports', - ]) - ), - // Hide non-name fields - CollectionRelType: autoGenerateViewDefinition( - tables.CollectionRelType, - 'form', - 'edit', - ['name', 'leftSideCollection', 'rightSideCollection', 'remarks'] - ), CollectionRelationship: autoGenerateViewDefinition( tables.CollectionRelationship, 'form', @@ -77,13 +48,6 @@ export const webOnlyViews = f.store(() => 'edit', ['name'] ), - // Hide non-name fields - [spViewSetNameView]: autoGenerateViewDefinition( - tables.SpViewSetObj, - 'form', - 'edit', - ['name'] - ), [recordSetView]: autoGenerateViewDefinition( tables.RecordSet, 'form', From eabef1cd92fda9b37a644c4767eabc27e50ccb11 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:22:04 -0600 Subject: [PATCH 32/64] Add RecordSet Form Also enables users to transfer ownership of a record set --- config/backstop/system.views.xml | 24 +++++++++++++++++++ .../lib/components/FormParse/webOnlyViews.ts | 6 ----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/config/backstop/system.views.xml b/config/backstop/system.views.xml index 785ab4ba7b3..ab22418f811 100644 --- a/config/backstop/system.views.xml +++ b/config/backstop/system.views.xml @@ -97,6 +97,12 @@ + + + + + + @@ -504,5 +510,23 @@ --> + + The RecordSet Table + + p,2px,p,2px,p,2px,p,2px,p,2px,p,p:g + + + + + + + + + + + + + + \ No newline at end of file diff --git a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts index 0ca7fab8afb..83907ae4e05 100644 --- a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts +++ b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts @@ -48,12 +48,6 @@ export const webOnlyViews = f.store(() => 'edit', ['name'] ), - [recordSetView]: autoGenerateViewDefinition( - tables.RecordSet, - 'form', - 'edit', - ['name', 'remarks'] - ), } as const) ); From 5727f70361864277662fc38004825d908ea53b15 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:41:33 -0600 Subject: [PATCH 33/64] Update webOnlyViews.ts --- .../frontend/js_src/lib/components/FormParse/webOnlyViews.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts index 83907ae4e05..cb6a3b2cdca 100644 --- a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts +++ b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts @@ -4,7 +4,6 @@ import { ensure } from '../../utils/types'; import { tables } from '../DataModel/tables'; import { autoGenerateViewDefinition, - getFieldsForAutoView, } from '../Forms/generateFormDefinition'; import type { ParsedFormDefinition } from './index'; From d444c365020f1dd55612d62c33749cd0cdc093f7 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 19:45:12 +0000 Subject: [PATCH 34/64] Lint code with ESLint and Prettier Triggered by 5727f70361864277662fc38004825d908ea53b15 on branch refs/heads/issue-5311 --- .../frontend/js_src/lib/components/FormParse/webOnlyViews.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts index cb6a3b2cdca..c52f17928cc 100644 --- a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts +++ b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts @@ -2,9 +2,7 @@ import { f } from '../../utils/functools'; import type { IR } from '../../utils/types'; import { ensure } from '../../utils/types'; import { tables } from '../DataModel/tables'; -import { - autoGenerateViewDefinition, -} from '../Forms/generateFormDefinition'; +import { autoGenerateViewDefinition } from '../Forms/generateFormDefinition'; import type { ParsedFormDefinition } from './index'; /** From ea9f09c7dbf5bf1a6e9042c42800e6f796ca82e1 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 14:51:05 -0600 Subject: [PATCH 35/64] Add ability to transfer Query --- config/backstop/global.views.xml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index 67c564c6e96..9be2078e1a0 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -389,7 +389,6 @@ - @@ -398,7 +397,6 @@ - @@ -407,7 +405,6 @@ - @@ -416,7 +413,6 @@ - @@ -425,7 +421,6 @@ - @@ -434,7 +429,6 @@ - @@ -1215,18 +1209,19 @@ - + The Query form - - p,2px,p:g + 25px,2px,200px,2px,p:g + + + + From ef40867d74d187f62297a5b3b2d388f11b7b0831 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 14:51:33 -0600 Subject: [PATCH 36/64] Remove unnecessary separator --- config/backstop/dataobj_formatters.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/backstop/dataobj_formatters.xml b/config/backstop/dataobj_formatters.xml index f40550ab613..bc1603e51cb 100644 --- a/config/backstop/dataobj_formatters.xml +++ b/config/backstop/dataobj_formatters.xml @@ -445,7 +445,7 @@ - name + name From 5c6dc8848ac9ec749a6b445324de572a47ba5802 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:14:48 -0600 Subject: [PATCH 37/64] Add SpReport form --- config/backstop/system.views.xml | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/config/backstop/system.views.xml b/config/backstop/system.views.xml index ab22418f811..43ee64dd4fd 100644 --- a/config/backstop/system.views.xml +++ b/config/backstop/system.views.xml @@ -103,6 +103,12 @@ + + + + + + @@ -440,6 +446,17 @@ + + + + + + + + + + + - + New GeologicTimePeriod Node Form parent.getValue() != null @@ -1948,6 +1953,11 @@ + + + + + @@ -1984,7 +1994,7 @@ - + New LithoStrat Node Form parent.getValue() != null @@ -2006,6 +2016,11 @@ + + + + + From 426f58747472eccc6e9c2ff4f036acc10d21f74c Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:58:34 -0600 Subject: [PATCH 41/64] Fix XML mistakes Folding in work from https://github.com/specify/specify6/pull/1203 --- config/backstop/global.views.xml | 4 ++-- config/common/common.views.xml | 8 ++++---- specifyweb/context/data/viewset_0.xml | 4 ++-- specifyweb/context/data/viewset_4.xml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index 7bace5e73ba..191f89cb37d 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -367,7 +367,7 @@ - + The AttachmentMetadata subform. @@ -1190,7 +1190,7 @@ - + Report Properties Form. p,2px,p diff --git a/config/common/common.views.xml b/config/common/common.views.xml index 270f4ab917f..a1b25bcc3fc 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -116,14 +116,14 @@ - + CollectingTrip Form - + CollectingTrip Form @@ -2479,7 +2479,7 @@ - + Horizontal interpretation of the Deaccession form from inside the Accession form. DeaccessionAccession @@ -4641,7 +4641,7 @@ - + diff --git a/specifyweb/context/data/viewset_0.xml b/specifyweb/context/data/viewset_0.xml index 0617cd27c2f..a99cd8a09e4 100644 --- a/specifyweb/context/data/viewset_0.xml +++ b/specifyweb/context/data/viewset_0.xml @@ -44,7 +44,7 @@ - + CollectingTrip Form @@ -52,7 +52,7 @@ - + CollectingTrip Form diff --git a/specifyweb/context/data/viewset_4.xml b/specifyweb/context/data/viewset_4.xml index 6256d44289e..0de434fb099 100644 --- a/specifyweb/context/data/viewset_4.xml +++ b/specifyweb/context/data/viewset_4.xml @@ -122,7 +122,7 @@ - + CollectingTrip Form @@ -130,7 +130,7 @@ - + CollectingTrip Form From 1a43e7fc61f28035ede5130e522e1b7aece6e91e Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:00:49 -0600 Subject: [PATCH 42/64] Fix missing closing elements Fixes https://github.com/specify/specify6/issues/1223 --- config/backstop/global.views.xml | 2 +- config/common/common.views.xml | 4 ++-- config/invertebrate/invertebrate.views.xml | 4 ++-- config/invertebrate/manager/invertebrate.views.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index 191f89cb37d..61c588503a2 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -471,7 +471,7 @@ + --> + + --> + - + diff --git a/config/invertebrate/manager/invertebrate.views.xml b/config/invertebrate/manager/invertebrate.views.xml index 3acf39edb0d..d48e107424c 100644 --- a/config/invertebrate/manager/invertebrate.views.xml +++ b/config/invertebrate/manager/invertebrate.views.xml @@ -131,9 +131,9 @@ - + - + From c3ba544d1d0deddbf26be7947b1a8e295a103e22 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 8 Nov 2024 09:08:55 -0600 Subject: [PATCH 43/64] Add TectonicUnit form Also fixes issues with other tree def item form definitions --- config/backstop/global.views.xml | 191 +++++++++++++++++++++++-------- 1 file changed, 146 insertions(+), 45 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index 61c588503a2..f285852c8e1 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -436,6 +436,22 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -178,9 +187,6 @@ - - - From 818a0dec1b6abf6084c759ad6c86e316eaef67e4 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 13 Nov 2024 10:53:42 -0600 Subject: [PATCH 46/64] Update common.views.xml --- config/common/common.views.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index ad7b00bec37..eef67530aeb 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -6874,7 +6874,7 @@ - + @@ -7143,4 +7143,4 @@ AbsoluteAge - \ No newline at end of file + From cd5437212662288a4e5d5c91c7d14859320a7d22 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:33:41 -0600 Subject: [PATCH 47/64] Add Tectonic Unit field format --- config/backstop/dataobj_formatters.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/backstop/dataobj_formatters.xml b/config/backstop/dataobj_formatters.xml index bc1603e51cb..6cf71ee3297 100644 --- a/config/backstop/dataobj_formatters.xml +++ b/config/backstop/dataobj_formatters.xml @@ -485,6 +485,13 @@ + + + + fullName + + + From 0995dfef12ec06f5fcadf09a5973e3d854ac132a Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:36:26 -0600 Subject: [PATCH 48/64] Fix Record Set form not appearing --- .../lib/components/FormParse/webOnlyViews.ts | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts index 17f3111aa5e..349d3e00b7d 100644 --- a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts +++ b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts @@ -70,26 +70,7 @@ export const webOnlyViews = f.store(() => 'form', 'edit', ['collectionRelType', 'leftSide', 'rightSide'] - ), - [spAppResourceView]: autoGenerateViewDefinition( - tables.SpAppResource, - 'form', - 'edit', - ['name'] - ), - // Hide non-name fields - [spViewSetNameView]: autoGenerateViewDefinition( - tables.SpViewSetObj, - 'form', - 'edit', - ['name'] - ), - [recordSetView]: autoGenerateViewDefinition( - tables.RecordSet, - 'form', - 'edit', - ['name', 'remarks'] - ), + ) } as const) ); From e27f0563a0927e6eba6d832a5952ac9f8b8da376 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:18:22 -0600 Subject: [PATCH 49/64] Update index.test.ts --- .../js_src/lib/components/FormParse/__tests__/index.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/FormParse/__tests__/index.test.ts b/specifyweb/frontend/js_src/lib/components/FormParse/__tests__/index.test.ts index 570600e4100..77693cf8d0a 100644 --- a/specifyweb/frontend/js_src/lib/components/FormParse/__tests__/index.test.ts +++ b/specifyweb/frontend/js_src/lib/components/FormParse/__tests__/index.test.ts @@ -20,7 +20,7 @@ import { parseViewDefinition, resolveViewDefinition, } from '../index'; -import { spAppResourceView } from '../webOnlyViews'; +import { attachmentView } from '../webOnlyViews'; const { views, @@ -271,7 +271,7 @@ describe('fetchView', () => { await expect(fetchView(notFoundViewName)).resolves.toBeUndefined(); }); - const frontEndOnlyView = spAppResourceView; + const frontEndOnlyView = attachmentView; overrideAjax( formatUrl('/context/view.json', { name: frontEndOnlyView, quiet: '' }), viewDefinition, From e6486ca17192cae815820fe24c51d81620525826 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:27:51 -0600 Subject: [PATCH 50/64] Add view set --- .../lib/components/FormParse/webOnlyViews.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts index 349d3e00b7d..6d0c43f68d3 100644 --- a/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts +++ b/specifyweb/frontend/js_src/lib/components/FormParse/webOnlyViews.ts @@ -70,7 +70,20 @@ export const webOnlyViews = f.store(() => 'form', 'edit', ['collectionRelType', 'leftSide', 'rightSide'] - ) + ), + [spAppResourceView]: autoGenerateViewDefinition( + tables.SpAppResource, + 'form', + 'edit', + ['name'] + ), + // Hide non-name fields + [spViewSetNameView]: autoGenerateViewDefinition( + tables.SpViewSetObj, + 'form', + 'edit', + ['name'] + ), } as const) ); From 569a878045f710b38d39b259c0450f00315b3014 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 21 Nov 2024 09:35:31 -0600 Subject: [PATCH 51/64] Add `min=0` for Prep count --- config/bird/bird.views.xml | 2 +- config/bird/manager/bird.views.xml | 2 +- config/botany/botany.views.xml | 2 +- config/botany/manager/botany.views.xml | 2 +- config/common/common.views.xml | 2 +- config/fish/fish.views.xml | 2 +- config/fish/guest/fish.views.xml | 2 +- config/fish/manager/fish.views.xml | 2 +- config/geology/geology.views.xml | 2 +- config/herpetology/herpetology.views.xml | 2 +- config/herpetology/manager/herpetology.views.xml | 2 +- config/invertebrate/invertebrate.views.xml | 2 +- config/invertebrate/manager/invertebrate.views.xml | 2 +- config/invertpaleo/guest/paleo.views.xml | 2 +- config/invertpaleo/manager/paleo.views.xml | 2 +- config/invertpaleo/paleo.views.xml | 2 +- config/mammal/mammal.views.xml | 2 +- config/mammal/manager/mammal.views.xml | 2 +- config/vertpaleo/guest/vertpaleo.views.xml | 2 +- config/vertpaleo/manager/vertpaleo.views.xml | 2 +- config/vertpaleo/vertpaleo.views.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/config/bird/bird.views.xml b/config/bird/bird.views.xml index 1ef6785ee2a..af9c9f97992 100644 --- a/config/bird/bird.views.xml +++ b/config/bird/bird.views.xml @@ -764,7 +764,7 @@ - + diff --git a/config/bird/manager/bird.views.xml b/config/bird/manager/bird.views.xml index 1ef6785ee2a..af9c9f97992 100644 --- a/config/bird/manager/bird.views.xml +++ b/config/bird/manager/bird.views.xml @@ -764,7 +764,7 @@ - + diff --git a/config/botany/botany.views.xml b/config/botany/botany.views.xml index 54da199c819..da4e2a7f3a6 100644 --- a/config/botany/botany.views.xml +++ b/config/botany/botany.views.xml @@ -597,7 +597,7 @@ - + diff --git a/config/botany/manager/botany.views.xml b/config/botany/manager/botany.views.xml index 54da199c819..da4e2a7f3a6 100644 --- a/config/botany/manager/botany.views.xml +++ b/config/botany/manager/botany.views.xml @@ -597,7 +597,7 @@ - + diff --git a/config/common/common.views.xml b/config/common/common.views.xml index eef67530aeb..ce3582a18b5 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -5704,7 +5704,7 @@ - + diff --git a/config/fish/fish.views.xml b/config/fish/fish.views.xml index bc73597616c..fb863372ddc 100644 --- a/config/fish/fish.views.xml +++ b/config/fish/fish.views.xml @@ -646,7 +646,7 @@ - + diff --git a/config/fish/guest/fish.views.xml b/config/fish/guest/fish.views.xml index 28e8555dd53..085143272fa 100644 --- a/config/fish/guest/fish.views.xml +++ b/config/fish/guest/fish.views.xml @@ -646,7 +646,7 @@ - + diff --git a/config/fish/manager/fish.views.xml b/config/fish/manager/fish.views.xml index bc73597616c..fb863372ddc 100644 --- a/config/fish/manager/fish.views.xml +++ b/config/fish/manager/fish.views.xml @@ -646,7 +646,7 @@ - + diff --git a/config/geology/geology.views.xml b/config/geology/geology.views.xml index 65d121376f4..15724e7bfef 100644 --- a/config/geology/geology.views.xml +++ b/config/geology/geology.views.xml @@ -305,7 +305,7 @@ - + diff --git a/config/herpetology/herpetology.views.xml b/config/herpetology/herpetology.views.xml index b544dd65a1c..1080885f991 100644 --- a/config/herpetology/herpetology.views.xml +++ b/config/herpetology/herpetology.views.xml @@ -765,7 +765,7 @@ - + diff --git a/config/herpetology/manager/herpetology.views.xml b/config/herpetology/manager/herpetology.views.xml index b544dd65a1c..1080885f991 100644 --- a/config/herpetology/manager/herpetology.views.xml +++ b/config/herpetology/manager/herpetology.views.xml @@ -765,7 +765,7 @@ - + diff --git a/config/invertebrate/invertebrate.views.xml b/config/invertebrate/invertebrate.views.xml index d48e107424c..701e83365d9 100644 --- a/config/invertebrate/invertebrate.views.xml +++ b/config/invertebrate/invertebrate.views.xml @@ -789,7 +789,7 @@ - + diff --git a/config/invertebrate/manager/invertebrate.views.xml b/config/invertebrate/manager/invertebrate.views.xml index d48e107424c..701e83365d9 100644 --- a/config/invertebrate/manager/invertebrate.views.xml +++ b/config/invertebrate/manager/invertebrate.views.xml @@ -789,7 +789,7 @@ - + diff --git a/config/invertpaleo/guest/paleo.views.xml b/config/invertpaleo/guest/paleo.views.xml index 83a39524cfa..5f0399bd00a 100644 --- a/config/invertpaleo/guest/paleo.views.xml +++ b/config/invertpaleo/guest/paleo.views.xml @@ -635,7 +635,7 @@ - + diff --git a/config/invertpaleo/manager/paleo.views.xml b/config/invertpaleo/manager/paleo.views.xml index 850b034fb1e..478b36b93bd 100644 --- a/config/invertpaleo/manager/paleo.views.xml +++ b/config/invertpaleo/manager/paleo.views.xml @@ -639,7 +639,7 @@ - + diff --git a/config/invertpaleo/paleo.views.xml b/config/invertpaleo/paleo.views.xml index 850b034fb1e..478b36b93bd 100644 --- a/config/invertpaleo/paleo.views.xml +++ b/config/invertpaleo/paleo.views.xml @@ -639,7 +639,7 @@ - + diff --git a/config/mammal/mammal.views.xml b/config/mammal/mammal.views.xml index 3001fe4e831..557f533457f 100644 --- a/config/mammal/mammal.views.xml +++ b/config/mammal/mammal.views.xml @@ -766,7 +766,7 @@ - + diff --git a/config/mammal/manager/mammal.views.xml b/config/mammal/manager/mammal.views.xml index 3001fe4e831..557f533457f 100644 --- a/config/mammal/manager/mammal.views.xml +++ b/config/mammal/manager/mammal.views.xml @@ -766,7 +766,7 @@ - + diff --git a/config/vertpaleo/guest/vertpaleo.views.xml b/config/vertpaleo/guest/vertpaleo.views.xml index fd3c27e0d82..f29df21a145 100644 --- a/config/vertpaleo/guest/vertpaleo.views.xml +++ b/config/vertpaleo/guest/vertpaleo.views.xml @@ -637,7 +637,7 @@ - + diff --git a/config/vertpaleo/manager/vertpaleo.views.xml b/config/vertpaleo/manager/vertpaleo.views.xml index ddf44f06e12..f046bd8b179 100644 --- a/config/vertpaleo/manager/vertpaleo.views.xml +++ b/config/vertpaleo/manager/vertpaleo.views.xml @@ -640,7 +640,7 @@ - + diff --git a/config/vertpaleo/vertpaleo.views.xml b/config/vertpaleo/vertpaleo.views.xml index ddf44f06e12..f046bd8b179 100644 --- a/config/vertpaleo/vertpaleo.views.xml +++ b/config/vertpaleo/vertpaleo.views.xml @@ -640,7 +640,7 @@ - + From 8fe0bf161123fd863f8ccb1e550f63f556042780 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:05:46 -0600 Subject: [PATCH 52/64] Remove arbitrary default --- config/geology/geology.views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/geology/geology.views.xml b/config/geology/geology.views.xml index 15724e7bfef..9f8f45dae81 100644 --- a/config/geology/geology.views.xml +++ b/config/geology/geology.views.xml @@ -128,7 +128,7 @@ - + From 5b150d5cdc3be2a2aeb3c38d43b3b839f5bbf4cd Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:07:55 -0600 Subject: [PATCH 53/64] Fix Parent COG --- config/common/common.views.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index ce3582a18b5..9a06864a2c8 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -1912,7 +1912,7 @@ - + @@ -7143,4 +7143,4 @@ AbsoluteAge - + \ No newline at end of file From a2108ab50e85e7053eac5ed6d6db865c2a3fa302 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:08:31 -0600 Subject: [PATCH 54/64] Fix COJO children --- config/common/common.views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index 9a06864a2c8..acc35c8aafe 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -1932,7 +1932,7 @@ - + From 1805b60eab4cb7f20798dd561ff299e7eb1f0f71 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:11:52 -0600 Subject: [PATCH 55/64] Use conditional to check for no value in COJO --- config/common/common.views.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index acc35c8aafe..65d389a5347 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -1974,27 +1974,27 @@ - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d6b9e156a135ea667f462e4fe0f9d9518576ee41 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:10:41 -0600 Subject: [PATCH 57/64] Remove broken weblink config --- config/backstop/global.views.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index 867b178a05b..f9136af7988 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -1274,11 +1274,7 @@ - - - - - + From 16889a1d6a1dd69b45a8e4c6039d668de3f6243f Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:11:43 -0600 Subject: [PATCH 58/64] Update global.views.xml --- config/backstop/global.views.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/backstop/global.views.xml b/config/backstop/global.views.xml index f9136af7988..a2429e00b29 100644 --- a/config/backstop/global.views.xml +++ b/config/backstop/global.views.xml @@ -1769,7 +1769,7 @@ - + New Storage Node Form parent.getValue() != null @@ -1783,7 +1783,7 @@ - + From 4b56448d9771ecafacc3fd3ad336a3d4a1e97e49 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:10:20 -0600 Subject: [PATCH 59/64] Add COG Group View --- config/common/common.views.xml | 73 ++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 17 deletions(-) diff --git a/config/common/common.views.xml b/config/common/common.views.xml index cddc7a72b78..3ccd4103cac 100644 --- a/config/common/common.views.xml +++ b/config/common/common.views.xml @@ -179,6 +179,8 @@ + + @@ -947,6 +949,13 @@ + + The Collection Object Group Join form. + + + + + + + + + + + + + + @@ -1969,6 +1989,8 @@ + + @@ -1976,23 +1998,6 @@ - - - - - - - - - - - - - - - - - @@ -7164,5 +7169,39 @@ The AbsoluteAge Table AbsoluteAge + + The Collection Object Group Join Form Grid View + CollectionObjectGroupJoin (2) + + + The Collection Object Group Join Form + + 50px,2px,30px,5px,50px,2px,30px,5px,50px,2px,100px,0px,50px,2px,100px,p:g + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 54dcadfff3e7306b4fc295bc294d9cb03f41df9c Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:43:59 -0600 Subject: [PATCH 60/64] Add Tectonic Unit QCBX to PaleoContext --- config/geology/geology.views.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/geology/geology.views.xml b/config/geology/geology.views.xml index 9f8f45dae81..6d2839c9b59 100644 --- a/config/geology/geology.views.xml +++ b/config/geology/geology.views.xml @@ -407,6 +407,10 @@ + From a2bfb0f8599a19978c43407b217358def6727a46 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Mon, 2 Dec 2024 10:26:56 -0600 Subject: [PATCH 61/64] Update system.views.xml --- config/backstop/system.views.xml | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/config/backstop/system.views.xml b/config/backstop/system.views.xml index 43ee64dd4fd..159bddb5850 100644 --- a/config/backstop/system.views.xml +++ b/config/backstop/system.views.xml @@ -449,37 +449,20 @@ - + + + + + + + - From d188acac5480ee6a1ed43979395d28a78f1f7e23 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Mon, 2 Dec 2024 10:50:41 -0600 Subject: [PATCH 62/64] Set `specifyUser` to current user This applies when a new record set is created --- .../js_src/lib/components/QueryComboBox/index.tsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx b/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx index db97a422527..ae14dc608a6 100644 --- a/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx +++ b/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx @@ -100,6 +100,16 @@ export function QueryComboBox({ } ); } + if (field.name === 'specifyUser') { + const record = toTable(resource, 'RecordSet'); + record?.set( + 'specifyUser', + record?.get('specifyUser') ?? userInformation.resource_uri, + { + silent: true, + } + ); + } if (field.name === 'receivedBy') { const record = toTable(resource, 'LoanReturnPreparation'); record?.set( From 6bf9b1129aef5432ebf740e28adeb678c978bd10 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:54:17 +0000 Subject: [PATCH 63/64] Lint code with ESLint and Prettier Triggered by d188acac5480ee6a1ed43979395d28a78f1f7e23 on branch refs/heads/issue-5311 --- .../js_src/lib/components/QueryComboBox/index.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx b/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx index ae14dc608a6..9b8afe496bb 100644 --- a/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx +++ b/specifyweb/frontend/js_src/lib/components/QueryComboBox/index.tsx @@ -103,11 +103,11 @@ export function QueryComboBox({ if (field.name === 'specifyUser') { const record = toTable(resource, 'RecordSet'); record?.set( - 'specifyUser', - record?.get('specifyUser') ?? userInformation.resource_uri, - { - silent: true, - } + 'specifyUser', + record?.get('specifyUser') ?? userInformation.resource_uri, + { + silent: true, + } ); } if (field.name === 'receivedBy') { From e10958cb0209e980c0a33a5a9edeb73c7ccafb76 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Mon, 2 Dec 2024 10:54:52 -0600 Subject: [PATCH 64/64] Remove hard-coded names in Pick List form --- config/backstop/system.views.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/backstop/system.views.xml b/config/backstop/system.views.xml index 159bddb5850..f4e4a044e15 100644 --- a/config/backstop/system.views.xml +++ b/config/backstop/system.views.xml @@ -132,11 +132,11 @@ - + - + @@ -145,7 +145,7 @@ - +