Skip to content
This repository has been archived by the owner on Jan 31, 2022. It is now read-only.

Commit

Permalink
Release: 1.23.3 (#69)
Browse files Browse the repository at this point in the history
  • Loading branch information
data4life-web authored Jan 14, 2021
1 parent f0e142d commit b87eb42
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 10 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "infection-risk-assessment-app",
"private": true,
"version": "1.23.2",
"version": "1.23.3",
"description": "Assessing the risk of contagious viral infections (COVID-19)",
"scripts": {
"analyze": "stencil build",
Expand Down
20 changes: 17 additions & 3 deletions src/components/app-root/app-root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,26 @@ export class AppRoot {
APP_RECOMMENDATIONS_ID
) as HTMLD4lAccordionElement;
if (element) {
element.open = true;
element.scrollIntoView({
const scrollOptions = {
behavior: 'smooth',
block: 'start',
inline: 'nearest',
});
} as ScrollIntoViewOptions;
// https://caniuse.com/mdn-api_resizeobserver
// @ts-ignore
if (window.ResizeObserver) {
// @ts-ignore
const resizeObserver = new ResizeObserver(() => {
element.scrollIntoView(scrollOptions);
resizeObserver.unobserve(element);
});
// CC-515 wait for opening so scroll into view has correct position
resizeObserver.observe(element);
element.open = true;
} else {
element.open = true;
element.scrollIntoView(scrollOptions);
}
} else {
this.history.push(`${ROUTES.SUMMARY}#${APP_RECOMMENDATIONS_ID}`, {
openAppRecommendationsAccordion: true,
Expand Down
4 changes: 4 additions & 0 deletions src/components/input-date/input-date.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
State,
} from '@stencil/core';
import { Question } from '../../global/questions';
import isDevice from '../../global/utils/isDevice';

// TODO: https://github.com/gesundheitscloud/infection-risk-assessment/pull/76
// This is only a temporary fix. This should be moved/handled differently
Expand Down Expand Up @@ -54,6 +55,9 @@ export class InputDate {
new Date().getMonth() + 1
).padStart(2, '0')}-${String(new Date().getDate()).padStart(2, '0')}`}
/>
{isDevice.ios && (
<div class="input-date__help">{i18next.t('input_date_help_info')}</div>
)}
</div>
) : (
<div>
Expand Down
3 changes: 2 additions & 1 deletion src/global/i18n/de.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/global/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,13 @@
"imprint_content": "[TRANSLATION/CONTENT needed for translation key: imprint_content]",
"imprint_content_bmg": "<strong> Publisher of the website: </strong> \n Federal Ministry of Health (BMG) \n Unit L7 \"Press, Internet, Social Networks\" \n\n First office: Rochusstraße 1, 53123 Bonn \n Second office: Friedrichstrasse 108, 10117 Berlin (Mitte) \n\n Telephone: 030 18441-0 (nationwide local rate) \n Fax: 030 18441-4900 \n Email: <a href=\"mailto:[email protected]\">[email protected] (dot) de</a> \n\n Responsible and contact person: Press spokesperson Hanno Kautz \n\n<strong> Disclaimer </strong> \nThe links on these pages to the content of third-party websites have been created by the online editorial staff of the BMG to the best of their knowledge and with the greatest possible care, and merely enable access to these external offers. Special attention was paid to the trustworthiness of third parties and the accuracy and legality of the external offers.\n\nHowever, since the content of internet pages is dynamic and can change at any time, it is not always possible to check all content to which a link has been created on a case-by-case basis. The BMG therefore expressly does not adopt as its own the content of third-party Internet sites that are linked to its own internet presence. For damages resulting from the use or non-use of external offers, the respective provider of the page to which reference is made is exclusively liable.\n\n<strong> Linking rules </strong> \n\nWe are pleased if you want to link to our site. This permission can be revoked at any time and is only valid if you comply with the following rules:\n\nThe hyperlink can refer to the start page <a href=\"https://www.zusammengegencorona.de/\"> </a> or to a single subpage of the offer. The linked page must be reloaded completely and must not be placed in a frame. \n\nThe use of the BMG logo requires special permission.\n\n<strong> Publishing </strong> \n\nIn principle, it is possible to quote free of charge from publications and papers of the ministry unchanged and in the factual context, provided that a correct citation and indication of source is ensured. The permission to reprint does not include any additional permission required on the basis of third-party rights of use. Insofar as necessary, this was obtained exclusively for publication by the BMG.\n\n<strong> Images </strong> \nThe image material on the internet pages and within the BMG's newsletter is licensed for the BMG. Any further use and publication of the images by third parties is only possible on the basis of the licensing terms of the author.\n\n<strong> Laws and regulations </strong> \nThe legal bases published in this internet offer are carefully compiled, but make no claim to be up-to-date, factually correct or complete. A corresponding guarantee is not assumed. Laws and ordinances are only valid and apply according to their current version published in the relevant official publication.\n\n<strong> Operations </strong> \nD4L data4life gGmbH \n<a href=\"https://www.data4life.care/\">www.data4life.care</a>",
"imprint_content_bzga": "",
"imprint_content_d4l": "D4L data4life gGmbH\nCharlottenstraße 109 \n14467 Potsdam\nGermany\n\nPhone <a href=\"tel:004933198229981\">0049 331 98229 981</a>\n(Freephone Europe) 00800 83646 700\n(Freephone USA) 1 888 882 0956\n\nE-Mail <a href=\"[email protected]\">[email protected]</a>\nManaging Director: Christian-Cornelius Weiß\nRegistration Court: Amtsgericht Potsdam\nRegister No.: HRB 30667\nResponsible for the content pursuant to § 55 para. 2 of the German Interstate Broadcasting Treaty:\nD4L data4life gGmbH, address as above",
"imprint_content_d4l": "D4L data4life gGmbH\nCharlottenstraße 109 \n14467 Potsdam\nGermany\n\nPhone <a href=\"tel:004933198229981\">0049 331 98229 981</a>\n(Freephone Europe) 00800 83646 700\n(Freephone USA) 1 888 882 0956\n\nEmail <a href=\"[email protected]\">[email protected]</a>\nManaging Director: Christian-Cornelius Weiß\nRegistration Court: Amtsgericht Potsdam\nRegister No.: HRB 30667\nResponsible for the content pursuant to § 55 para. 2 of the German Interstate Broadcasting Treaty:\nD4L data4life gGmbH, address as above",
"imprint_content_rki": "<strong>Provider </strong>\n<strong>(responsible in terms of Art. 5 Para. 1 TMG, Art. 55 Para. 1 RStV, DS-GVO, BDSG)</strong>\n\nRobert Koch-Institut\nNordufer 20\n13353 Berlin\n\nvertreten durch den Präsidenten\n\n<strong>Contact</strong>\nEmail: <a href=\"mailto:info@rki\">[email protected]</a>\nPhone: <a href=\"tel:004930187540\">030 18754 - 0</a>\n\n<strong>Responsible in terms of Art. 55 Para. 2 RStV</strong>\n\nPatrick Schmich, Leitung FG21,\nGeneral-Pape-Straße 62-66\n12101 Berlin\n\n<strong>Hosting</strong>\nD4L data4life gGmbH, Charlottenstraße 109, 14467 Potsdam, Germany, supports us as a data processor in the operation and further development of the web application. We have concluded an agreement in accordance with Art. 28 Para. 3 DS-GVO. \n\n<strong>Sales tax number – Identification number</strong>\nDE 165 893 43<a href=\"mailto:[email protected]\">",
"imprint_headline": "Imprint",
"input_date_error": "Invalid date. Please try again.",
"input_date_error_future": "The date must not be in the future.",
"input_date_help": "Ensure that you enter a full date in the DD MM YYYY format that isn’t in the future. For example, 13 10 2020",
"input_date_help_info": "Date can’t be in the future.",
"input_date_label": "Please enter the date",
"input_date_label_day": "Day",
"input_date_label_month": "Month",
Expand Down
17 changes: 17 additions & 0 deletions src/global/utils/isDevice.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const NAVIGATOR_PLATFORMS = {
ios: 'iPad|iPhone|iPod',
};

/**
* Helper function to detect current device platform using User Agent sniffing
* @param {String} platform selected platform as part of the navigator platforms config
*/
const isDevice = (platform: string) => {
const regExTestCase = new RegExp(NAVIGATOR_PLATFORMS[platform]);

return !!navigator.platform && regExTestCase.test(navigator.platform);
};

export default {
ios: isDevice('ios'),
};

0 comments on commit b87eb42

Please sign in to comment.