Add Specify 6.8.03 Static Files to Specify 7 #5266
There are no files selected for viewing
|
There was a problem hiding this comment. I actually don't think Specify 7 accesses any file in the specify7/specifyweb/context/app_resource.py Lines 26 to 41 in 2a0b516 So it will never be accessed when determining the file path: specify7/specifyweb/context/app_resource.py Lines 88 to 103 in 2a0b516 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <files> | ||
| <file level="0" mimetype="text/xml" name="SearchConfig" description="SearchConfig" file="search_config.xml"/> | ||
|
|
||
| <file level="3" mimetype="text/xml" name="StartUpPanel" description="StartUpPanel" file="startup_panel.xml"/> | ||
| <file level="3" mimetype="text/xml" name="StatisticsPanel" description="StatisticsPanel" file="statistics_panel.xml"/> | ||
| <file level="3" mimetype="text/xml" name="StatsSummaryPanel" description="StatsSummaryPanel" file="stats_summary_panel.xml"/> | ||
| <file level="3" mimetype="text/xml" name="DataEntryTaskInit" description="DataEntryTaskInit" file="dataentry_task.xml"/> | ||
|
|
||
| <!-- Labels and Reports --> | ||
| <file level="3" mimetype="jrxml/label" name="accession_report.jrxml" description="Accession Report" file="accession_report.jrxml" metadata="tableid=7;reqrs=true;"/> | ||
| <file level="3" mimetype="jrxml/label" name="accessions_inprocess.jrxml" description="In-Progress Report" file="accessions_inprocess.jrxml" metadata="tableid=7;reqrs=false;"/> | ||
| <file level="3" mimetype="jrxml/label" name="permit_report.jrxml" description="Permit Report" file="permit_report.jrxml" metadata="tableid=6;reqrs=true;"/> | ||
| </files> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <views> | ||
| <view name="Accession" title="Accession" viewset="Accession Views" view="Accession" iconname="Accession" tooltip="Create a New Accession"/> | ||
| <view name="Agent" title="Agent" viewset="Accession Views" view="Agent" iconname="Agent" tooltip="Create a New Agent"/> | ||
| <view name="Permit" title="Permit" viewset="Accession Views" view="Permit" iconname="Permit" tooltip="Create a New Permit"/> | ||
| </views> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <files> | ||
| <file type="user" name="Accession Views" title="Accessions" file="accessions.views.xml"/> | ||
| </files> |
|
There was a problem hiding this comment. while this file is used at the moment, could we refactor back-end to not use app_resources.xml files? e.g aren't all UIFormatters XML files of the same name, thus removing the need for this file? it seems that this file is used at present to tell specify what files are defined in a given folder - wouldn't it be better to simply check if the file is present on the file system? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <files> | ||
| <file level="0" mimetype="text/xml" name="UIFormatters" description="UIFormatters" file="uiformatters.xml"/> | ||
| <file level="0" mimetype="text/xml" name="DialogDefs" description="DialogDefs" file="dialog_defs.xml"/> | ||
| <file level="0" mimetype="text/xml" name="DataObjFormatters" description="DataObjFormatters" file="dataobj_formatters.xml"/> | ||
| <file level="0" mimetype="text/xml" name="SearchConfig" description="SearchConfig" file="search_config.xml"/> | ||
| <file level="0" mimetype="text/xml" name="Statistics" description="Statistics" file="statistics.xml"/> | ||
| <file level="0" mimetype="text/xml" name="PrefsPanelDef" description="PrefsPanelDef" file="prefs_panel_def.xml"/> | ||
| <file level="0" mimetype="text/xml" name="TypeSearches" description="TypeSearches" file="typesearch_def.xml"/> | ||
| <file level="0" mimetype="text/xml" name="CollStats" description="CollStats" file="collstats.xml"/> | ||
| </files> |
|
There was a problem hiding this comment. This file shouldn't be needed: Specify 7 has its own implementation for statistics. There was a problem hiding this comment. Just in case they need a hint on how to run some oddly defined SQL queries 😂 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <statistics> | ||
| <tables> | ||
| <table class="edu.ku.brc.specify.datamodel.CollectionObject"/> | ||
| <table class="edu.ku.brc.specify.datamodel.CollectingEvent"/> | ||
| <table class="edu.ku.brc.specify.datamodel.Determination"/> | ||
| <table class="edu.ku.brc.specify.datamodel.DNASequence"/> | ||
| <table class="edu.ku.brc.specify.datamodel.Geography"/> | ||
| <table class="edu.ku.brc.specify.datamodel.GeologicTimePeriod"/> | ||
| <table class="edu.ku.brc.specify.datamodel.Locality"/> | ||
| <table class="edu.ku.brc.specify.datamodel.PaleoContext"/> | ||
| <table class="edu.ku.brc.specify.datamodel.Preparation"/> | ||
| <table class="edu.ku.brc.specify.datamodel.LithoStrat"/> | ||
| <table class="edu.ku.brc.specify.datamodel.Taxon"/> | ||
| </tables> | ||
| <stats> | ||
| <stat name="num_co" desc="Number of Collection Objects"> | ||
| <![CDATA[SELECT count(*) FROM collectionobject WHERE CollectionMemberID = COLMEMID]]> | ||
| </stat> | ||
| <stat name="num_co_dna" desc="Number of DNA Sequences associated with CollectionObjects"> | ||
| <![CDATA[SELECT count(*) FROM dnasequence d inner join collectionobject co on co.CollectionObjectID = d.CollectionObjectID WHERE d.CollectionMemberID = COLMEMID]]> | ||
| </stat> | ||
| <stat name="num_ms_dna" desc="Number of DNA Sequences associated with MaterialSamples"> | ||
| <![CDATA[SELECT count(*) FROM dnasequence d inner join materialsample ms on ms.MaterialSampleID = d.MaterialSampleID WHERE d.CollectionMemberID = COLMEMID]]> | ||
| </stat> | ||
| <stat name="num_txu" desc="Number of Taxon Used"> | ||
| <![CDATA[SELECT COUNT(DISTINCT d.TaxonID) FROM determination d INNER JOIN taxon t ON t.TaxonID = d.TaxonID WHERE d.CollectionMemberID = COLMEMID AND d.IsCurrent <> 0 AND t.IsAccepted <> 0]]> | ||
| </stat> | ||
| <stat name="num_tx" desc="Number of Taxon"> | ||
| <![CDATA[SELECT count(*) FROM taxon WHERE TaxonTreeDefID = TAXTREEDEFID]]> | ||
| </stat> | ||
| <stat name="num_geo" desc="Number of Geography"> | ||
| <![CDATA[SELECT count(*) FROM geography WHERE GeographyTreeDefID = GEOTREEDEFID]]> | ||
| </stat> | ||
| <stat name="num_geou" desc="Number of Geography Used"> | ||
| <![CDATA[SELECT COUNT(DISTINCT g.GeographyID) FROM locality l INNER JOIN geography g ON g.GeographyID = l.GeographyID WHERE l.DisciplineID = DSPLNID AND g.IsAccepted <> 0]]> | ||
| </stat> | ||
| <stat name="num_loc" desc="Number of Localities"> | ||
| <![CDATA[SELECT count(*) FROM locality WHERE DisciplineID = DSPLNID]]> | ||
| </stat> | ||
| <stat name="num_locgr" desc="Number of Georef'ed Localities"> | ||
| <![CDATA[SELECT count(*) FROM locality WHERE DisciplineID = DSPLNID AND Latitude1 is not NULL AND Longitude1 is not NULL]]> | ||
| </stat> | ||
| <stat name="num_preps" desc="Number of Preparations"> | ||
| <![CDATA[SELECT count(*) FROM preparation WHERE CollectionMemberID = COLMEMID]]> | ||
| </stat> | ||
| <stat name="num_prpcnt" desc="Total Number of Preparations Counts"> | ||
| <![CDATA[SELECT SUM(CountAmt) FROM preparation WHERE CollectionMemberID = COLMEMID]]> | ||
| </stat> | ||
| <stat name="num_litho" desc="Number of Litho Stratigraphy"> | ||
| <![CDATA[SELECT count(*) FROM lithostrat WHERE LithoStratTreeDefID = LITHOTREEDEFID]]> | ||
| </stat> | ||
| <!-- | ||
| <stat name="num_lithou" desc="Number of Litho Stratigraphy Used"> | ||
| <![CDATA[SELECT COUNT(DISTINCT l.LithoStratID) FROM paleocontext p INNER JOIN lithostrat l ON l.LithoStratID = p.LithoStratID WHERE p.CollectionMemberID = 4 AND l.IsAccepted <> 0]]> | ||
| </stat> --> | ||
| <stat name="num_gtp" desc="Number of Chronostratigraphy"> | ||
| <![CDATA[SELECT count(*) FROM geologictimeperiod WHERE GeologicTimePeriodTreeDefID = GTPTREEDEFID]]> | ||
| </stat> | ||
| <!-- | ||
| <stat name="num_gtpu" desc="Number of Chronostratigraphy Used"> | ||
| <![CDATA[SELECT COUNT(DISTINCT g.GeologicTimePeriodID) FROM paleocontext p INNER JOIN geologictimeperiod g ON g.GeologicTimePeriodID = p.ChronosStratID WHERE p.CollectionMemberID = 4 AND g.IsAccepted <> 0]]> | ||
| </stat> --> | ||
| </stats> | ||
| </statistics> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file shouldn't be needed (included in the accessions disciplines. See #5266 (comment))