PTEROSOR/QUESTDB_website
10
0
Fork 0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-12-25 05:43:46 +01:00
Code Releases Activity

Delete TBE method and replace with TBE as method name

Browse Source
This commit is contained in:
Mickaël Véril 2019-11-25 14:00:17 +01:00
parent 70c579da02
commit f0cd5eeb8b
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/data.js
View File

@ -107,13 +107,12 @@ class dataFileBase {
this.comment = null this.comment = null
this.code = null this.code = null
this.method = null this.method = null
this.TBEmethod=null
this.excitations = [] this.excitations = []
this.DOI = null this.DOI = null
this.sourceFile=null this.sourceFile=null
} }
get isTBE(){ get isTBE(){
return this.TBEmethod!==null; return this.method.name="TBE"
} }
static async loadAsync(file) { static async loadAsync(file) {
switch (trueTypeOf(file)) { switch (trueTypeOf(file)) {
@ -146,9 +145,6 @@ class dataFileBase {
case "doi": case "doi":
dat.DOI = new DOI(value); dat.DOI = new DOI(value);
break; break;
case "tbemethod":
dat.TBEmethod=new method.fromString(value)
break;
default: default:
} }
} }

7
tools/lib/data.py
View File

@ -22,13 +22,12 @@ class dataFileBase(object):
self.comment = '' self.comment = ''
self.code = None self.code = None
self.method = None self.method = None
self.TBECorrMethod=None
self.excitations = [] self.excitations = []
self.DOI = '' self.DOI = ''
@property @property
def IsTBE(): def IsTBE(self):
return self.TBECorrMethod is not None return self.method.name=="TBE"
@staticmethod @staticmethod
def GetFileType(): def GetFileType():
@ -129,8 +128,6 @@ class dataFileBase(object):
dic["Comment"]=self.comment dic["Comment"]=self.comment
dic["code"]="" if self.code is None else self.code.toDataString() dic["code"]="" if self.code is None else self.code.toDataString()
dic["method"]="" if self.method is None else self.method.toDataString() dic["method"]="" if self.method is None else self.method.toDataString()
if self.TBECorrMethod is not None:
dic["TBECorrMethod"]=self.TBECorrMethod.toDataString()
dic["DOI"]="" if self.DOI is None else self.DOI dic["DOI"]="" if self.DOI is None else self.DOI
return dic return dic