PTEROSOR/QUESTDB_website
10
0
Fork 0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-12-26 06:14:38 +01:00
Code Releases Activity

Merge branch 'master' into QUEST5

Browse Source
This commit is contained in:
Mickaël Véril 2020-08-26 15:14:53 +02:00
commit f04c1cf3dd
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
content/dataset.html
View File

@ -16,7 +16,6 @@ draft: false
<script src="/js/processingIndicator.js"></script> <script src="/js/processingIndicator.js"></script>
<script src="/js/noNan.js"></script> <script src="/js/noNan.js"></script>
<script src="/js/websiteFile.js"></script> <script src="/js/websiteFile.js"></script>
<script src="/js/getPublis.js"></script>
<script src="/js/DOICache.js"></script> <script src="/js/DOICache.js"></script>
<script src="/js/nestedCheckbox.js"></script> <script src="/js/nestedCheckbox.js"></script>
<script src="/js/selectSelectAll.js"></script> <script src="/js/selectSelectAll.js"></script>
@ -215,6 +214,7 @@ draft: false
selects.each(function() { selects.each(function() {
AllValsCache.set(this.name,getAllVals(this)) AllValsCache.set(this.name,getAllVals(this))
}) })
var AAllValsCache = Array.from(AllValsCache) var AAllValsCache = Array.from(AllValsCache)
var vals = uniq(window.dats.filter(d => { var vals = uniq(window.dats.filter(d => {
return AAllValsCache.every(([k,v]) => { return AAllValsCache.every(([k,v]) => {
@ -233,10 +233,15 @@ draft: false
if (name === "DOI") { if (name === "DOI") {
let newvals = [] let newvals = []
for (const val of vals) { for (const val of vals) {
for (const set of publis.sets.values()) { if (val==="") {
if (set.includes(val)) { newvals.push([""])
if (!newvals.some(v=>JSON.stringify(v)===JSON.stringify(set))) { }
newvals.push(set) else {
for (const set of publis.sets.values()) {
if (set.includes(val)) {
if (!newvals.some(v=>JSON.stringify(v)===JSON.stringify(set))) {
newvals.push(set)
}
} }
} }
} }

1
content/publications.html
View File

@ -10,7 +10,6 @@ draft: false
<script src="/js/getTextFromFile.js" type="text/javascript"></script> <script src="/js/getTextFromFile.js" type="text/javascript"></script>
<script src="/js/trueTypeOf.js" type="text/javascript"></script> <script src="/js/trueTypeOf.js" type="text/javascript"></script>
<script src="/js/uniq.js"></script> <script src="/js/uniq.js"></script>
<script src="/js/getPublis.js"></script>
<script src="/js/websiteFile.js"></script> <script src="/js/websiteFile.js"></script>
<script src="/js/numberUtils.js"></script> <script src="/js/numberUtils.js"></script>
<script src="/js/DebugMode.js"></script> <script src="/js/DebugMode.js"></script>

2
static/js/PubliDB.js
View File

@ -27,7 +27,7 @@ class publiDB {
return setname return setname
} }
if (supportUnknow && doi === "") { if (supportUnknow && doi === "") {
return UnknowSetName return publiDB.UnknowSetName
} }
return null return null
} }

7
static/js/getPublis.js
View File

@ -1,7 +0,0 @@
async function getPublis() {
const text = await getTextFromFileUrlAsync("/data/publis/index.yaml")
const myYaml=jsyaml.load(text);
myYaml.sets= ((myYaml.sets===null) ? new Map() : new Map(Object.entries(myYaml.sets)));
myYaml.others=((myYaml.others===null) ? new Map() : new Map(Object.entries(myYaml.others)));
return myYaml
}