From 4fc9116e5611a60c02c6b35806187761808cfc2e Mon Sep 17 00:00:00 2001 From: Jutta Schnabel <jschnabel@km3net.de> Date: Sat, 17 Oct 2020 00:46:41 +0200 Subject: [PATCH] edits for summary page --- index.rst | 2 +- make_documents.py | 13 +++++++++---- pages/Detector.md | 3 ++- pages/Infrastructure.md | 2 +- pages/ScienceTargets.md | 3 ++- pages/Usecase_KM3NeT.md | 2 +- pages/Using_templates.md | 3 ++- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/index.rst b/index.rst index 5a3d9cd..3180fef 100644 --- a/index.rst +++ b/index.rst @@ -6,7 +6,7 @@ Welcome to Open Science @KM3NeT! .. toctree:: :maxdepth: 2 - Fair data <pages/FAIR> + pages/FAIR pages/ScienceTargets pages/Infrastructure pages/Detector diff --git a/make_documents.py b/make_documents.py index 9b7402a..a824375 100644 --- a/make_documents.py +++ b/make_documents.py @@ -6,7 +6,7 @@ def adapt_file(filename): inline = f.readline() while inline: if inline.find("pages/")>-1 and inline.find(".md")>-1: - inline.replace(".md", ".rst") + inline.replace(".md", ".html") newversion += inline inline = f.readline() with open(filename, "w") as f: @@ -22,12 +22,14 @@ def fulltext_from_filelist(filelistname, onlystatus = "", adapt_files = True): with open(infilename, "r") as ftext: addtext = ftext.read() infotext = addtext[addtext.find("---")+3:addtext.find("---", 5)].split("\n") - status, author = "", "" + status, author, reviewer = "", "" for line in infotext: if line.find("status:")> -1: status = line[8:len(line)] if line.find("Author")> -1: author = line[8:len(line)] + f line.find("Reviewer")> -1: + reviewer = line[8:len(line)] takeit = True if onlystatus: takeit = False @@ -38,8 +40,10 @@ def fulltext_from_filelist(filelistname, onlystatus = "", adapt_files = True): fulltext += addtext[addtext.find("---", 5)+3:len(addtext)] + "\n" overview["filename"].append(infilename) overview["author"].append(author) + overview["reviewer"].append(reviewer) overview["status"].append(status) if adapt_files: + print ("Redoing file", infilename) adapt_file(infilename) infilename = f.readline().rstrip("\n") @@ -57,12 +61,13 @@ with open("Deliverable_4-9.md", "w") as f: with open("statuspage.md", "w") as f: status = "## Current page status\n\n" - status += "| Filename | Author | Status |\n" - status += "| -------- | ------ | ------ |\n" + status += "| Filename | Author | Reviewer | Status |\n" + status += "| -------- | ------ | -------- | ------ |\n" for stats in (status1, status2): for i in range(len(stats["filename"])): status += "| " + stats["filename"][i] \ + " | " + stats["author"][i] \ + + " | " + stats["reviewer"][i] \ + " | " + stats["status"][i] + " |\n" f.write(status) diff --git a/pages/Detector.md b/pages/Detector.md index 373e592..dda66e1 100644 --- a/pages/Detector.md +++ b/pages/Detector.md @@ -1,7 +1,8 @@ --- Title: Detector and Data Taking Author: Jannik -status: reviewed (Tamas) +status: reviewed +Reviewer: Tamas Comment: Mainly based on LoI --- diff --git a/pages/Infrastructure.md b/pages/Infrastructure.md index 9829e8a..2697ff5 100644 --- a/pages/Infrastructure.md +++ b/pages/Infrastructure.md @@ -10,7 +10,7 @@ status: review The KM3NeT Open Science System seamlessly integrates with the computing environment of the KM3NeT collaboration, providing data, software and documentation to all relevant parts of the scientific analysis workflow. - + ## Open Science Products diff --git a/pages/ScienceTargets.md b/pages/ScienceTargets.md index 92f7606..51d91fe 100644 --- a/pages/ScienceTargets.md +++ b/pages/ScienceTargets.md @@ -1,7 +1,8 @@ --- Title: Scientific targets Author: Jannik -status: reviewed (Tamas) +status: reviewed +Reviewer: Tamas Comment: Mainly based on LoI and Infradev Grant Agreement --- diff --git a/pages/Usecase_KM3NeT.md b/pages/Usecase_KM3NeT.md index 04b1f53..5d3609c 100644 --- a/pages/Usecase_KM3NeT.md +++ b/pages/Usecase_KM3NeT.md @@ -5,7 +5,7 @@ Topics: - short description analysis - data description - linking to notebooks & background -status: unedited +status: draft --- # KM3NeT Use Case diff --git a/pages/Using_templates.md b/pages/Using_templates.md index c6ce549..ec7ae04 100644 --- a/pages/Using_templates.md +++ b/pages/Using_templates.md @@ -6,7 +6,8 @@ Topics: - guidelines - git analysis template description - guidelines -status: reviewed (Jannik) +Reviewer: Jannik +status: reviewed --- # Using templates -- GitLab