Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Add Specify 6.8.03 Static Files to Specify 7 #5266

Merged
merged 42 commits into from
Oct 28, 2024
Merged

Add Specify 6.8.03 Static Files to Specify 7 #5266

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
075f0dd
add Specify6.8.03 config file to Specify7
acwhite211 Sep 10, 2024
364d82f
change THICK_CLIENT_LOCATION in settings
acwhite211 Sep 10, 2024
249894d
filter out unused files in Specify 7
acwhite211 Sep 16, 2024
b85a3b8
config nginx.conf and docker-compose.yml for new config location
acwhite211 Sep 16, 2024
db71e30
more config files to filter out
acwhite211 Sep 18, 2024
8f4fca3
init common geo forms
acwhite211 Sep 18, 2024
c456c29
Remove invalid compose project `specify6`
grantfitzsimmons Sep 19, 2024
43a518d
Remove JRXML files
grantfitzsimmons Sep 19, 2024
9b73b01
Merge branch 'issue-4828' of https://github.com/specify/specify7 into…
grantfitzsimmons Sep 19, 2024
217f6de
add specify 6.8.03 jar to config
acwhite211 Sep 24, 2024
2bb01e3
use bind mount instead of named volume for config
acwhite211 Sep 24, 2024
62d01d1
DEFAULT_SPECIFY_JAR_PATH
acwhite211 Sep 24, 2024
5f8b600
remove unused accessions files
acwhite211 Sep 25, 2024
799430e
add back specify_datamodel.xml
acwhite211 Sep 25, 2024
c6fed09
remove specify jar dependency
acwhite211 Sep 27, 2024
4784aa9
add all specify.jar items into directory
acwhite211 Sep 27, 2024
0accbad
Revert "add all specify.jar items into directory"
acwhite211 Sep 27, 2024
36b3cca
Revert "remove specify jar dependency"
acwhite211 Sep 27, 2024
f5c472f
let GitHub search for specify.jar 🤷
acwhite211 Sep 27, 2024
bf27c6e
wat
acwhite211 Sep 27, 2024
96d10ce
create geology.views.xml
acwhite211 Sep 27, 2024
73ba508
Update geology.views.xml
grantfitzsimmons Sep 28, 2024
afe9684
Update geology.views.xml
grantfitzsimmons Sep 28, 2024
8534551
Update geology.views.xml
grantfitzsimmons Sep 28, 2024
d64f31b
Add COGs to Common Views, migrate Geology views
grantfitzsimmons Oct 2, 2024
66b24d6
Add Geology viewset registry
melton-jason Oct 4, 2024
6bda868
Merge branch 'production' into issue-4828
grantfitzsimmons Oct 4, 2024
489d70f
Add geology discipline to Specify 7 list of disciplines
melton-jason Oct 4, 2024
acfe52e
Remove unused Specify 7 files
melton-jason Oct 6, 2024
ad9871f
Remove unused/deleted views and appresources from registries
melton-jason Oct 6, 2024
4188f95
Improve COJO form and add COG subform
grantfitzsimmons Oct 16, 2024
3f23633
Update docker-compose.yml
acwhite211 Oct 22, 2024
d310c01
Revert default THICK_CLIENT_LOCATION
acwhite211 Oct 22, 2024
d40cde9
Add Absolute Age & Relative Age forms
grantfitzsimmons Oct 22, 2024
4b0ca10
edit DEFAULT_SPECIFY_JAR_PATH
acwhite211 Oct 23, 2024
37a6a94
COPY config location in Dockerfile
acwhite211 Oct 23, 2024
b3b63f0
new find_jar
acwhite211 Oct 23, 2024
6610588
config symlink
acwhite211 Oct 23, 2024
0cd53f3
dockerfile bug fix
acwhite211 Oct 23, 2024
40de4b4
copy specify-config into static-files volume
acwhite211 Oct 24, 2024
f2349cb
remove unused lines
acwhite211 Oct 24, 2024
71b3573
Merge branch 'production' into issue-4828
acwhite211 Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
111 changes: 111 additions & 0 deletions config/accessions/accession_report.jrxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created using JasperAssistant (http://www.jasperassistant.com) -->
<!DOCTYPE jasperReport PUBLIC "-//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">

<jasperReport name="Accessions" language="java" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="30" bottomMargin="30">
<property name="com.jasperassistant.designer.GridWidth" value="12"/>
<property name="com.jasperassistant.designer.GridHeight" value="12"/>
<property name="com.jasperassistant.designer.DataSource" value="accessions"/>
<property name="com.jasperassistant.designer.SnapToGrid" value="false"/>
<property name="com.jasperassistant.designer.Grid" value="false"/>
<import value="java.util.*"/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="net.sf.jasperreports.engine.data.*"/>
<parameter name="itemnum" class="java.lang.String">
</parameter>
<queryString><![CDATA[select * from accession where (AccessionID $P!{itemnum})]]></queryString>
<field name="DateAccessioned" class="java.util.Date">
</field>
<field name="DateReceived" class="java.util.Date">
</field>
<field name="Number" class="java.lang.String">
</field>
<field name="Remarks" class="java.lang.String">
</field>
<field name="Status" class="java.lang.String">
</field>
<field name="Text1" class="java.lang.String">
</field>
<field name="Type" class="java.lang.String">
</field>
<title>
<band height="17">
<staticText>
<reportElement positionType="Float" x="82" y="1" width="80" height="14"/>
<textElement textAlignment="Center">
<font isBold="true"/>
</textElement>
<text><![CDATA[Accessioned]]></text>
</staticText>
<staticText>
<reportElement positionType="Float" x="162" y="1" width="80" height="14"/>
<textElement textAlignment="Center">
<font isBold="true"/>
</textElement>
<text><![CDATA[Received]]></text>
</staticText>
<staticText>
<reportElement positionType="Float" x="244" y="1" width="80" height="14"/>
<textElement textAlignment="Center">
<font isBold="true"/>
</textElement>
<text><![CDATA[Received]]></text>
</staticText>
<staticText>
<reportElement positionType="Float" x="0" y="1" width="80" height="14"/>
<textElement textAlignment="Center">
<font isBold="true"/>
</textElement>
<text><![CDATA[Number]]></text>
</staticText>
<staticText>
<reportElement positionType="Float" x="412" y="1" width="80" height="14"/>
<textElement textAlignment="Center">
<font isBold="true"/>
</textElement>
<text><![CDATA[Remarks]]></text>
</staticText>
<staticText>
<reportElement positionType="Float" x="326" y="1" width="80" height="14"/>
<textElement textAlignment="Center">
<font isBold="true"/>
</textElement>
<text><![CDATA[Type]]></text>
</staticText>
</band>
</title>
<detail>
<band height="17">
<textField>
<reportElement positionType="Float" x="0" y="1" width="80" height="14"/>
<textElement/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{Number}]]></textFieldExpression>
</textField>
<textField pattern="MM/dd/yyyy">
<reportElement positionType="Float" x="82" y="1" width="80" height="14"/>
<textElement textAlignment="Center"/>
<textFieldExpression class="java.util.Date"><![CDATA[$F{DateAccessioned}]]></textFieldExpression>
</textField>
<textField pattern="MM/dd/yyyy">
<reportElement positionType="Float" x="162" y="1" width="80" height="14"/>
<textElement textAlignment="Center"/>
<textFieldExpression class="java.util.Date"><![CDATA[$F{DateReceived}]]></textFieldExpression>
</textField>
<textField>
<reportElement positionType="Float" x="244" y="1" width="80" height="14"/>
<textElement textAlignment="Center"/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{Status}]]></textFieldExpression>
</textField>
<textField>
<reportElement positionType="Float" x="326" y="1" width="80" height="14"/>
<textElement textAlignment="Center"/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{Type}]]></textFieldExpression>
</textField>
<textField>
<reportElement positionType="Float" x="412" y="1" width="143" height="14"/>
<textElement/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{Remarks}]]></textFieldExpression>
</textField>
</band>
</detail>
</jasperReport>
Loading
Loading