Merge branch 'develop'

specify · Mar 21, 2019 · e545364 · e545364
2 parents c66154f + f1bfa5a
commit e545364
Show file tree

Hide file tree

Showing 1,619 changed files with 42,388 additions and 25,601 deletions.
diff --git a/.install4j/i4jparams.conf b/.install4j/i4jparams.conf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config install4jVersion="5.0.8" install4jBuild="5311" type="windows" archive="false">
- <general applicationName="Specify" applicationVersion="6.6.06" mediaSetId="176" applicationId="5397-6897-2502-8965" status="LCOK" mediaName="Specify_windows" jreVersion="" minJavaVersion="1.6" publisherName="Biodiversity Research Center, University of Kansas" publisherURL="http://www.specifysoftware.org" jreShared="false" lzmaCompression="false" pack200Compression="false" installerType="1" addOnAppId="" suggestPreviousLocations="false" uninstallerFilename="uninstall" uninstallerDirectory="." defaultInstallationDirectory="{appdir}{/}Specify" />
+ <general applicationName="Specify" applicationVersion="6.7.02" mediaSetId="176" applicationId="5397-6897-2502-8965" status="LCOK" mediaName="Specify_windows" jreVersion="" minJavaVersion="1.6" publisherName="Biodiversity Research Center, University of Kansas" publisherURL="http://www.specifysoftware.org" jreShared="false" lzmaCompression="false" pack200Compression="false" installerType="1" addOnAppId="" suggestPreviousLocations="false" uninstallerFilename="uninstall" uninstallerDirectory="." defaultInstallationDirectory="{appdir}{/}Specify" />
  <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
  <variable id="en" name="English" messageFile="i4j_extf_0_zpmake.utf8" customLocalizationFile="i4j_extf_1_zpmake.utf8" />
  <variable id="pt" name="Portuguese" messageFile="i4j_extf_2_zpmake.utf8" customLocalizationFile="i4j_extf_3_zpmake.utf8" />
  </languages>
  <compilerVariables>
- <variable name="sys.version" value="6.6.06" />
+ <variable name="sys.version" value="6.7.02" />
  <variable name="sys.shortName" value="Specify" />
  <variable name="sys.fullName" value="Specify" />
  <variable name="sys.publisher" value="Biodiversity Research Center, University of Kansas" />
@@ -114,7 +114,7 @@
  </void>
  </void>
  <void property="subTitle">
- <string>Specify 6.6.06 includes the following changes:</string>
+ <string>Specify 6.7.02 includes the following changes:</string>
  </void>
  <void property="title">
  <string>New This Release</string>
@@ -207,7 +207,7 @@
  <java class="java.beans.XMLDecoder">
  <object class="com.install4j.runtime.beans.actions.desktop.RegisterAddRemoveAction">
  <void property="itemName">
- <string>Specify 6.6.06</string>
+ <string>Specify 6.7.02</string>
  </void>
  </object>
  </java>

diff --git a/.travis.yml b/.travis.yml
@@ -1,31 +1,26 @@
 language: java
 
-addons:
- ssh_known_hosts: demo.specifycloud.org
+env:
+ global:
+ secure: Qjz4NvuWa+YqhXgHPHXjkNOU7CHsrZM2j6JaLoCeU8iJlg+vq4OhRoceZKAwTRGTKB6bCRhoMlMN11U5KCVOYHzKFtPgmEuC0yrqSRtmFOtASQsi3b5ShK/bOtZhDhba9gF9dNHoLgPZQbOWweMzkXr84HbGMmlV3CIib4Enl3SMzDOZvZh9D3p4u5CSbutpTDHze6UfPDNmW9BmnZYHZIixdZa9z7C3E97yEYoBjmRQi+kKPfJgBnSq6dokdEpLvgZCZ0/59VG7b+gVt7yXAKzQCYG7oWutIZWEyizfAFggmESLDW8k6PYF6xckivsvSl3jovzdlCnyQuOYGDgiJDJWt4aL9i2coDnxjMVheA9olTAPwYWAvgJyk21Mb3qEStqa7j16BQffwPFcqVopbp1gOl1wD8x3ZX89CY0GafbVoML54uEvTOtNW2XBU9cL160SzfUJUlEe/K/t9XSmEynt+p8sNhFxrNiSIIwcT42nwaVlQk4migVTaU4O9qi7UJbmZxDOHrmnxmReWkgf0CprahCvTxGrWQQSmIQiIj6bRzPGOr0UifhxbGNbFbfK0VVoFsdAjOrXvOk0N1twrwtjtDjiF6xFvGPmfVLwaI88obLDpr97LgK0+DZjy1qKOxlXOTjkI9qfy+fHqsDzTyYq/wf77qXFDCXDMBEfOlg=
 
 cache:
  directories:
-  - install4j5
+ - install4j7.0.7
 
 install:
- - |
-  if [ ! -d install4j5/bin ];
-  then
-  wget https://download-keycdn.ej-technologies.com/install4j/install4j_unix_5_1_15.tar.gz;
-  tar -zxvf install4j_unix_5_1_15.tar.gz;
-  fi
+- |
+ if [ ! -d install4j7.0.7/bin ];
+ then
+ wget https://download-keycdn.ej-technologies.com/install4j/install4j_unix_7_0_7.tar.gz
+ tar -zxvf install4j_unix_7_0_7.tar.gz;
+ fi
 
 before_script:
-- openssl aes-256-cbc -K $encrypted_aa8174fba226_key -iv $encrypted_aa8174fba226_iv
- -in travis-ci_rsa.enc -out /tmp/travis-ci_rsa -d
-- eval "$(ssh-agent -s)"
-- chmod 600 /tmp/travis-ci_rsa
-- ssh-add /tmp/travis-ci_rsa
-- ssh -L11862:localhost:11862 -N [email protected] &
-- install4j5/bin/install4jc --license=FLOAT:localhost
+- install4j7.0.7/bin/install4jc --license=$INSTALL4J_LICENSE
 
 script:
-- ant package-all -Dinstall4j.dir=./install4j5
+- ant package-all -Dinstall4j.dir=./install4j7.0.7
 
 deploy:
  provider: releases
@@ -34,9 +29,9 @@ deploy:
  secure: jnxl2c9Az/DPHS8ghxPfdEH/fsgexvhEW4NHBjJILNptWSfx72+23bsUhp7SRxKgJgq3MXaB6e7hpiDJxah18yI7Og6WNBblWzkQJMeJrHvLn6vsLIAGCaUhy1gy3seZwvzCwFm/GKuZyTOUwP3TYMfda464uvc9zZLpthTJQ1Q54b8i/25eivhyuBdGm9vE4lT9jE5Xk09xrRzlOcznZMXTIDwdAtxj6UcRtxzLcT2WuIWyL+y+PVEKWy8Po6eyJT1rX0ST5y6GA25ZN3HfZXCVgDVWpNCYdcDpYKy63+pwFE397ielXh7QY3XI/0gftpSonXvrDNEsj0G8BSUNvBVcAKTzMemOpbTgqdvdpSeDeKm0+c1+07jRGcP84n5typBcrvP6nUzZRDzdxqjWHthnDpl0fHZaFSQhCrG2qYytUW2q78V5WrPA403uBwENFLalIheGPXvPB5VLGMRiv4zFIUgqpFKT5zLZ0dIL0L1bAQ0kqJ1RAvSUa74nUwgymaPwMlcD+4aB0heaPnOGvakJzhxCkv4HoHdYG7FIP9wTrJCA5aKaMFrRhlx3ZbEX4UjT3NP/ppdI0nd+pZcRcOYCbvcItaQ7DtwR53Ksq8WfVbaUsm9cqDZuaMBv/OskCUESpA0yNlXVdvF0U+hMNnKO5I4mHpGruM4rImPVhAk=
  file_glob: true
  file:
-  - packages/internal/Specify*
-  - packages/external/Specify*
-  - packages/external/updates.xml
+ - packages/internal/Specify*
+ - packages/external/Specify*
+ - packages/external/updates.xml
  skip_cleanup: true
  on:
  repo: specify/specify6

diff --git a/build.xml b/build.xml
@@ -22,7 +22,7 @@
  <fail unless="specify.SPECIFY_VERSION">Specify version not set.</fail>
 
  <property name="packages.dir" value="packages" />
- <property name="install4j.dir" value="${user.home}/install4j5" />
+ <property name="install4j.dir" value="${user.home}/install4j7.0.7" />
  <property name="packaging.dir" value="packaging"/>
 
  <!-- Needed for building help search index -->
@@ -286,7 +286,7 @@
  <copy overwrite="true" file="${build.root}/${jar.name}-mac.jar" tofile="${installer.dir}/${jar.name}.jar" />
 
  <exec executable="${install4j.dir}/bin/install4jc">
- <arg value="--quiet"/>
+ <!-- <arg value="-\-quiet"/> -->
  <arg value="--faster"/>
 
  <arg value="--win-keystore-password=${win-keystore-password}" />
@@ -314,7 +314,7 @@
  <copy overwrite="true" file="${build.root}/${jar.name}-nonmac.jar" tofile="${installer.dir}/${jar.name}.jar" />
 
  <exec executable="${install4j.dir}/bin/install4jc">
- <arg value="--quiet"/>
+ <!-- <arg value="-\-quiet"/> -->
  <arg value="--faster"/>
 
  <arg value="--win-keystore-password=${win-keystore-password}" />
@@ -331,7 +331,7 @@
  <move file="@{packages.dir}/updates.xml" tofile="@{packages.dir}/updates.xml.winlinfull"/>
 
  <exec executable="${install4j.dir}/bin/install4jc">
- <arg value="--quiet"/>
+ <!-- <arg value="-\-quiet"/> -->
  <arg value="--faster"/>
 
  <arg value="--win-keystore-password=${win-keystore-password}" />

diff --git a/config/backstop/dialog_defs.xml b/config/backstop/dialog_defs.xml
@@ -50,6 +50,7 @@
  <dialog type="display" view="Collection" name="Collection" class="edu.ku.brc.specify.datamodel.Collection" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="Collector" name="CollectorDisplay" class="edu.ku.brc.specify.datamodel.Collector" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="CollectionObject" name="CollectionObject" class="edu.ku.brc.specify.datamodel.CollectionObject" helpcontext="CBXQViewEdit"/>
+ <dialog type="display" view="CollectionObjectProperty" name="CollectionObjectPropertyDisplay" class="edu.ku.brc.specify.datamodel.CollectionObjectProperty" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="CollectionRelationship" name="CollectionRelationshipLeft" class="edu.ku.brc.specify.datamodel.CollectionRelationship" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="CollectionRelType" name="CollectionRelType" class="edu.ku.brc.specify.datamodel.CollectionRelType" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="CollectingEvent" name="CollectingEvent" class="edu.ku.brc.specify.datamodel.CollectingEvent" helpcontext="CBXQViewEdit"/>
@@ -65,6 +66,7 @@
  <dialog type="display" view="FundingAgent" name="FundingAgentDisplay" class="edu.ku.brc.specify.datamodel.FundingAgent" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="ChronosStrat" name="ChronosStratDisplay" class="edu.ku.brc.specify.datamodel.GeologicTimePeriod" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="Geography" name="GeographyDisplay" class="edu.ku.brc.specify.datamodel.Geography" helpcontext="CBXQViewEdit"/>
+ <dialog type="display" view="VoucherRelationship" name="VoucherRelationshipDisplay" class="edu.ku.brc.specify.datamodel.VoucherRelationship" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="GiftAgent" name="GiftAgentDisplay" class="edu.ku.brc.specify.datamodel.GiftAgent" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="GiftItems" name="GiftItemsDisplay" class="edu.ku.brc.specify.datamodel.GiftPreparation" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="GroupPerson" name="GroupPersonDisplay" class="edu.ku.brc.specify.datamodel.GroupPerson" helpcontext="CBXQViewEdit"/>
@@ -78,6 +80,7 @@
  <dialog type="display" view="PaleoContext" name="PaleoContextDisplay" class="edu.ku.brc.specify.datamodel.PaleoContext" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="Permit" name="PermitDisplay" class="edu.ku.brc.specify.datamodel.Permit" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="Preparation" name="PreparationDisplay" class="edu.ku.brc.specify.datamodel.Preparation" helpcontext="CBXQViewEdit"/>
+ <dialog type="display" view="PreparationProperty" name="PreparationPropertyDisplay" class="edu.ku.brc.specify.datamodel.PreparationProperty" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="ProjectSub" name="ProjectSubDisplay" class="edu.ku.brc.specify.datamodel.Project" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="ReferenceWork" name="ReferenceWorkDisplay" class="edu.ku.brc.specify.datamodel.ReferenceWork" helpcontext="CBXQViewEdit"/>
  <dialog type="display" view="RepositoryAgreement" name="RepositoryAgreementDisplay" class="edu.ku.brc.specify.datamodel.RepositoryAgreement" helpcontext="CBXQViewEdit"/>

diff --git a/config/backstop/preferences.views.xml b/config/backstop/preferences.views.xml
@@ -540,19 +540,6 @@
  </rows>
  </cell>
  </row>
- <row>
- <cell type="separator" label="USAGE_STATS" colspan="4"/>
- </row>
- <row>
- <cell type="panel" id="stats" name="stats" coldef="p,10px,p" rowdef="p" colspan="4">
- <rows>
- <row>
- <cell type="field" id="3" name="usage_tracking.send_stats" uitype="checkbox" label="SEND_USAGE"/>
- <cell type="field" id="9" name="usage_tracking.send_isa_stats" uitype="checkbox" label="ISA_SEND_STATS"/>
- </row>
- </rows>
- </cell>
- </row>
  <row>
  <cell type="separator" label="OPENGL_WW" colspan="4"/>
  </row>

diff --git a/config/backstop/search.views.xml b/config/backstop/search.views.xml
@@ -65,7 +65,7 @@
  resourcelabels="false">
  <desc><![CDATA[The Permit Search Form]]></desc>
  <altviews>
- <altview name="PermitSearch" viewdef="PermitSearch" mode="edit" validated="true" default="true"/>
+ <altview name="PermitSearch" viewdef="PermitSearch" mode="edit" validated="false" default="true"/>
  </altviews>
  </view>
 
@@ -476,7 +476,7 @@ Good: <cell type="field" name="FieldNum" ...>
  </row>
  <row>
  <cell type="label" labelfor="1"/>
- <cell type="field" id="1" name="appraisalDate" uitype="formattedtext" isrequired="true" uifieldformatter="Date" default="today"/>
+ <cell type="field" id="1" name="appraisalDate" uitype="formattedtext" isrequired="true" uifieldformatter="SearchDate" default="today"/>
  <cell type="label" labelfor="2"/>
  <cell type="field" id="2" name="appraisalNumber" uitype="text"/>
  </row>
@@ -672,7 +672,7 @@ Good: <cell type="field" name="FieldNum" ...>
  </row>
  <row>
  <cell type="label" labelfor="3"/>
- <cell type="field" id="3" name="ScanDate" uitype="formattedtext" uifieldformatter="Date" initialize="ispartial=true;"/>
+ <cell type="field" id="3" name="ScanDate" uitype="formattedtext" uifieldformatter="SearchDate" initialize="ispartial=true;"/>
  </row>
  </rows>
  </viewdef>
@@ -723,33 +723,35 @@ Good: <cell type="field" name="FieldNum" ...>
  <rows>
  <row>
  <cell type="label" labelfor="1"/>
- <cell type="field" id="1" name="PermitNumber" uitype="text" isrequired="true"/>
+ <cell type="field" id="1" name="PermitNumber" uitype="text" isrequired="false"/>
 
  <cell type="label" labelfor="2"/>
  <cell type="field" id="2" name="Type" uitype="combobox"/>
  </row>
  <row>
  <cell type="label" label="Issued By Last Name"/>
- <cell type="field" id="3" name="issuedBy.LastName" uitype="text"/>
+ <cell type="field" id="3" name="LastName" uitype="text"/>
 
+ <!-- this field is currently not searched in the search_config.xml permit query >
  <cell type="label" label="Issued To Last Name"/>
  <cell type="field" id="4" name="issuedTo.LastName" uitype="text"/>
+ -->
  </row>
 
  <row>
  <cell type="label" labelfor="5"/>
- <cell type="field" id="5" name="issuedDate" uitype="formattedtext" uifieldformatter="Date"/>
- 
+ <cell type="field" id="5" name="IssuedDate" uitype="formattedtext" uifieldformatter="SearchDate"/>
+
  <cell type="label" labelfor="6"/>
- <cell type="field" id="6" name="renewalDate" uitype="formattedtext" uifieldformatter="Date"/>
+ <cell type="field" id="6" name="RenewalDate" uitype="formattedtext" uifieldformatter="SearchDate"/>
  </row>
 
  <row>
  <cell type="label" labelfor="7"/>
- <cell type="field" id="7" name="startDate" uitype="formattedtext" uifieldformatter="Date"/>
+ <cell type="field" id="7" name="StartDate" uitype="formattedtext" uifieldformatter="SearchDate"/>
 
  <cell type="label" labelfor="8"/>
- <cell type="field" id="8" name="endDate" uitype="formattedtext" uifieldformatter="Date"/>
+ <cell type="field" id="8" name="EndDate" uitype="formattedtext" uifieldformatter="SearchDate"/>
  </row>
 
  </rows>
@@ -954,7 +956,7 @@ Good: <cell type="field" name="FieldNum" ...>
  </row>
  <row>
  <cell type="label" labelfor="2"/>
- <cell type="field" id="2" name="StartDate" isrequired="false" uitype="formattedtext" uifieldformatter="Date"/>
+ <cell type="field" id="2" name="StartDate" isrequired="false" uitype="formattedtext" uifieldformatter="SearchDate"/>
  </row>
  </rows>
  </viewdef>
@@ -1097,8 +1099,8 @@ Good: <cell type="field" name="FieldNum" ...>
 
  <rows>
  <row>
- <cell type="label" labelfor="pcn"/>
- <cell type="field" id="pcn" name="PaleoContextName" isrequired="false" uitype="text"/>
+ <cell type="label" label="Paleo Context Name"/>
+ <cell type="field" id="pcn" name="pc.PaleoContextName" isrequired="false" uitype="text"/>
  </row>
  <row>
  <cell type="label" labelfor="cs"/>

diff --git a/config/backstop/search_config.xml b/config/backstop/search_config.xml
@@ -1724,25 +1724,25 @@ SELECT cn.ContainerID,
  agent.FirstName, 
  agent.LastName, 
  agent.EMail, 
- address.Address, 
- address.City, 
- address.State, 
- address.Postalcode, 
- address.Country
+ addresses.Address,
+ addresses.City,
+ addresses.State,
+ addresses.Postalcode,
+ addresses.Country
  FROM agent 
- LEFT JOIN address ON agent.AgentID = address.AgentID
+ LEFT JOIN address addresses ON agent.AgentID = addresses.AgentID
  WHERE (agent.DivisionID = DIVID) AND (%s) GROUP BY agent.AgentID]]>
  </sql>
  <captions>
  <caption tableid="5" col="AgentID" visible="false"/>
  <caption tableid="5" col="FirstName"/>
  <caption tableid="5" col="LastName"/>
  <caption tableid="5" col="EMail"/>
- <caption tableid="8" col="Address"/>
- <caption tableid="8" col="City"/>
- <caption tableid="8" col="State"/>
- <caption tableid="8" col="Postalcode"/>
- <caption tableid="8" col="Country"/>
+ <caption tableid="8" col="addresses.Address"/>
+ <caption tableid="8" col="addresses.City"/>
+ <caption tableid="8" col="addresses.State"/>
+ <caption tableid="8" col="addresses.Postalcode"/>
+ <caption tableid="8" col="addresses.Country"/>
  </captions>
  </detailView>
  </table>

diff --git a/config/backstop/typesearch_def.xml b/config/backstop/typesearch_def.xml
@@ -53,7 +53,7 @@
  <typesearch tableid="58" name="Storage" searchfield="name" displaycols="fullName" format="%s" dataobjformatter=""/>
  <typesearch tableid="32" name="PaleoContext" searchfield="paleoContextName,cs.fullName,ls.fullName" displaycols="paleoContextName,cs.fullName,cse.fullName,ls.fullName" format="%s, %s, %s, %s" 
  dataobjformatter="PaleoContext">
- SELECT %s1 FROM PaleoContext pc LEFT JOIN pc.chronosStrat cs 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
+ 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
  </typesearch>
  <typesearch tableid="6" name="Permit" searchfield="permitNumber" displaycols="permitNumber" format="%s" dataobjformatter=""/>
  <typesearch tableid="65" name="PrepType" searchfield="name" displaycols="name" format="%s" dataobjformatter=""/>