diff options
author | gebele <gebele@in-silico.ch> | 2018-04-03 14:26:14 +0000 |
---|---|---|
committer | gebele <gebele@in-silico.ch> | 2018-04-03 14:26:14 +0000 |
commit | 781596de9a647e8422778bb3ec4019903bf84e06 (patch) | |
tree | ac6d1c8b02c9fe2e8e45dc21eaebb5f40846339e /qmrf_report.rb | |
parent | 7c1898e64c8a789786becdb6305a74e5c5c27c07 (diff) | |
parent | ca94d4b7e8ad0cab13e66be7a34b0cde21948c69 (diff) |
fixed merge from development
Diffstat (limited to 'qmrf_report.rb')
-rw-r--r-- | qmrf_report.rb | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/qmrf_report.rb b/qmrf_report.rb index e5fbdf3..a031305 100644 --- a/qmrf_report.rb +++ b/qmrf_report.rb @@ -27,24 +27,22 @@ def qmrf_report id # Date of QMRF 2.1 report.value "qmrf_date", "#{Time.now.strftime('%d %B %Y')}" - # QMRF author(s) and contact details 2.1 + # QMRF author(s) and contact details 2.2 report.change_catalog :authors_catalog, :firstauthor, {:name => "Christoph Helma", :affiliation => "in silico toxicology gmbh", :contact => "Rastatterstr. 41, CH-4057 Basel", :email => "info@in-silico.ch", :number => "1", :url => "www.in-silico.ch"} report.ref_catalog :qmrf_authors, :authors_catalog, :firstauthor - if prediction_model.species =~ /TD50/ - # Date of QMRF update(s) 2.3 - report.value "qmrf_date_revision", "#{Time.parse("2014-12-05").strftime('%d %B %Y')}" - # QMRF update(s) 2.4 - report.value "qmrf_revision", "Q29-44-39-423" + # Date of QMRF update(s) 2.3 + if prediction_model.name =~ /TD50|multiple/ + report.value "qmrf_date_revision", "2014-12-05" end - - if prediction_model.species =~ /Rodent/ - # Date of QMRF update(s) 2.3 - report.value "qmrf_date_revision", "#{Time.parse("2014-12-05").strftime('%d %B %Y')}" - # QMRF update(s) 2.4 - report.value "qmrf_revision", "Q28-43-38-420" + + # Date of QMRF update(s) 2.4 + if prediction_model.name =~ /TD50/ + report.value "qmrf_revision", "Q29-44-39-423" + elsif prediction_model.name =~ /multiple/ + report.value "qmrf_revision", "Q28-43-38-420" end - + # Model developer(s) and contact details 2.5 report.change_catalog :authors_catalog, :modelauthor, {:name => "Christoph Helma", :affiliation => "in silico toxicology gmbh", :contact => "Rastatterstr. 41, CH-4057 Basel", :email => "info@in-silico.ch", :number => "1", :url => "www.in-silico.ch"} report.ref_catalog :model_authors, :authors_catalog, :modelauthor |