Merge pull request #10 from EyeSeeTea/development

Release 0.2.1

i18n/ar.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-13T18:46:56.801Z\n"
+"POT-Creation-Date: 2023-07-14T16:28:01.835Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,3 +49,32 @@ msgstr ""
 
 msgid "Templates not found"
 msgstr ""
+
+msgid "Distributed under GNU GLPv3"
+msgstr ""
+
+msgid ""
+"Dashboard reports is a DHIS2 web application to generate word reports from a "
+"DHIS2 dashboard"
+msgstr ""
+
+msgid ""
+"This application has been funded by the Medecins Sans Frontières (MSF). The "
+"application has been developed by [EyeSeeTea SL](http://eyeseetea.com). "
+"Source code, documentation and release notes can be found at the [EyeSeetea "
+"GitHub Project Page](https://github.com/EyeSeeTea/dashboard-reports/)"
+msgstr ""
+
+msgid ""
+"If you wish to contribute to the development of Dashboard reports with new "
+"features, please contact [EyeSeeTea](mailto:[email protected])."
+msgstr ""
+
+msgid "About Dashboard reports"
+msgstr ""
+
+msgid "Médicos Sin Fronteras"
+msgstr ""
+
+msgid "EyeSeeTea"
+msgstr ""

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-06-13T18:46:56.801Z\n"
-"PO-Revision-Date: 2023-06-13T18:46:56.801Z\n"
+"POT-Creation-Date: 2023-07-14T16:28:01.835Z\n"
+"PO-Revision-Date: 2023-07-14T16:28:01.835Z\n"
 
 msgid "Select Dashboard"
 msgstr ""
@@ -49,3 +49,32 @@ msgstr ""
 
 msgid "Templates not found"
 msgstr ""
+
+msgid "Distributed under GNU GLPv3"
+msgstr ""
+
+msgid ""
+"Dashboard reports is a DHIS2 web application to generate word reports from "
+"a DHIS2 dashboard"
+msgstr ""
+
+msgid ""
+"This application has been funded by the Medecins Sans Frontières (MSF). The "
+"application has been developed by [EyeSeeTea SL](http://eyeseetea.com). "
+"Source code, documentation and release notes can be found at the [EyeSeetea "
+"GitHub Project Page](https://github.com/EyeSeeTea/dashboard-reports/)"
+msgstr ""
+
+msgid ""
+"If you wish to contribute to the development of Dashboard reports with new "
+"features, please contact [EyeSeeTea](mailto:[email protected])."
+msgstr ""
+
+msgid "About Dashboard reports"
+msgstr ""
+
+msgid "Médicos Sin Fronteras"
+msgstr ""
+
+msgid "EyeSeeTea"
+msgstr ""

i18n/es.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-13T18:46:56.801Z\n"
+"POT-Creation-Date: 2023-07-14T16:28:01.835Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,6 +50,35 @@ msgstr "Ayuda"
 msgid "Templates not found"
 msgstr ""
 
+msgid "Distributed under GNU GLPv3"
+msgstr ""
+
+msgid ""
+"Dashboard reports is a DHIS2 web application to generate word reports from a "
+"DHIS2 dashboard"
+msgstr ""
+
+msgid ""
+"This application has been funded by the Medecins Sans Frontières (MSF). The "
+"application has been developed by [EyeSeeTea SL](http://eyeseetea.com). "
+"Source code, documentation and release notes can be found at the [EyeSeetea "
+"GitHub Project Page](https://github.com/EyeSeeTea/dashboard-reports/)"
+msgstr ""
+
+msgid ""
+"If you wish to contribute to the development of Dashboard reports with new "
+"features, please contact [EyeSeeTea](mailto:[email protected])."
+msgstr ""
+
+msgid "About Dashboard reports"
+msgstr ""
+
+msgid "Médicos Sin Fronteras"
+msgstr ""
+
+msgid "EyeSeeTea"
+msgstr ""
+
 #~ msgid "Add"
 #~ msgstr "Añadir"
 

i18n/fr.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-13T18:46:56.801Z\n"
+"POT-Creation-Date: 2023-07-14T16:28:01.835Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,3 +49,32 @@ msgstr ""
 
 msgid "Templates not found"
 msgstr ""
+
+msgid "Distributed under GNU GLPv3"
+msgstr ""
+
+msgid ""
+"Dashboard reports is a DHIS2 web application to generate word reports from a "
+"DHIS2 dashboard"
+msgstr ""
+
+msgid ""
+"This application has been funded by the Medecins Sans Frontières (MSF). The "
+"application has been developed by [EyeSeeTea SL](http://eyeseetea.com). "
+"Source code, documentation and release notes can be found at the [EyeSeetea "
+"GitHub Project Page](https://github.com/EyeSeeTea/dashboard-reports/)"
+msgstr ""
+
+msgid ""
+"If you wish to contribute to the development of Dashboard reports with new "
+"features, please contact [EyeSeeTea](mailto:[email protected])."
+msgstr ""
+
+msgid "About Dashboard reports"
+msgstr ""
+
+msgid "Médicos Sin Fronteras"
+msgstr ""
+
+msgid "EyeSeeTea"
+msgstr ""

i18n/pt.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-13T18:46:56.801Z\n"
+"POT-Creation-Date: 2023-07-14T16:28:01.835Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,3 +49,32 @@ msgstr ""
 
 msgid "Templates not found"
 msgstr ""
+
+msgid "Distributed under GNU GLPv3"
+msgstr ""
+
+msgid ""
+"Dashboard reports is a DHIS2 web application to generate word reports from a "
+"DHIS2 dashboard"
+msgstr ""
+
+msgid ""
+"This application has been funded by the Medecins Sans Frontières (MSF). The "
+"application has been developed by [EyeSeeTea SL](http://eyeseetea.com). "
+"Source code, documentation and release notes can be found at the [EyeSeetea "
+"GitHub Project Page](https://github.com/EyeSeeTea/dashboard-reports/)"
+msgstr ""
+
+msgid ""
+"If you wish to contribute to the development of Dashboard reports with new "
+"features, please contact [EyeSeeTea](mailto:[email protected])."
+msgstr ""
+
+msgid "About Dashboard reports"
+msgstr ""
+
+msgid "Médicos Sin Fronteras"
+msgstr ""
+
+msgid "EyeSeeTea"
+msgstr ""

package.json

@@ -1,7 +1,7 @@
 {
     "name": "dashboard-reports",
     "description": "Dashboard Reports",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
@@ -36,6 +36,7 @@
         "purify-ts-extra-codec": "0.6.0",
         "react": "17.0.2",
         "react-dom": "17.0.2",
+        "react-markdown": "8.0.7",
         "react-router-dom": "5.2.0",
         "react-scripts": "4.0.3",
         "styled-components": "5.3.5",

src/domain/entities/Dashboard.ts

@@ -101,6 +101,7 @@ export class Dashboard {
                 };
             })
             .uniqBy("reportId")
+            .sortBy(dashboard => dashboard.reportTitle)
             .value();
     }
 

src/webapp/components/markdown/MarkdownViewer.tsx

@@ -0,0 +1,68 @@
+import React from "react";
+import ReactMarkdown from "react-markdown";
+import styled from "styled-components";
+
+export const SimpleMarkdownViewer: React.FC<{ className?: string; source: string; center?: boolean }> = ({
+    className,
+    source,
+}) => <ReactMarkdown className={className}>{source}</ReactMarkdown>;
+
+export const MarkdownViewer = styled(SimpleMarkdownViewer)`
+    color: white;
+    padding: 5px 20px 0 20px;
+    text-align-last: ${props => (props.center ? "center" : "unset")};
+    h1 {
+        font-size: 32px;
+        line-height: 47px;
+        font-weight: 300;
+        margin: 0px 0px 30px 0px;
+    }
+    p {
+        font-size: 17px;
+        font-weight: 300;
+        line-height: 28px;
+        text-align: justify;
+    }
+    img {
+        max-width: 100%;
+        border-radius: 1em;
+        user-drag: none;
+    }
+    video {
+        max-width: 100%;
+        user-drag: none;
+    }
+    a {
+        color: white;
+    }
+    details > summary {
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        outline: none;
+        list-style: none;
+        list-style-type: none;
+        font-size: 33px;
+        font-weight: 100;
+        text-align: left;
+        user-select: none;
+    }
+    details > summary::-webkit-details-marker {
+        display: none;
+    }
+    details > summary::before {
+        content: url(./img/note.svg);
+        margin-right: 20px;
+        top: 3px;
+        position: relative;
+    }
+    details > summary::after {
+        content: "keyboard_arrow_down";
+        font-size: 35px;
+        margin-left: 10px;
+        font-family: "Material Icons";
+    }
+    details[open] > summary::after {
+        transform: rotate(180deg);
+    }
+`;