From 28572e2b073ef091bba09257950ae4c961999ae0 Mon Sep 17 00:00:00 2001 From: Joseph Date: Wed, 5 Feb 2020 11:11:27 -0500 Subject: [PATCH 01/16] Start Open research --- _data/forms/config-research.yml | 28 + _data/research/ansible.yml | 37 ++ _data/research/debezium.yml | 39 ++ _data/research/docker.yml | 52 ++ _data/research/elasticsearch.yml | 51 ++ _data/schemaResearch.yaml | 35 ++ _includes/footer.html | 4 + _includes/form/presets/selectResearch.html | 21 + _json/research.json | 5 + _pages/en/open-research-form.html | 10 + _pages/en/open-research-schema.html | 15 + _pages/en/open-researches.html | 16 + _pages/fr/recherche-libre-formulaire.html | 10 + _pages/fr/recherche-libre-schema.html | 15 + _pages/fr/recherches-libres.html | 16 + assets/js/src/researchForm.js | 480 ++++++++++++++++++ coverage/clover.xml | 30 ++ coverage/coverage-final.json | 3 + .../lcov-report/assets/js/src/date.js.html | 143 ++++++ coverage/lcov-report/assets/js/src/index.html | 111 ++++ .../assets/js/src/test-export.js.html | 98 ++++ coverage/lcov-report/base.css | 224 ++++++++ coverage/lcov-report/block-navigation.js | 79 +++ coverage/lcov-report/date.js.html | 143 ++++++ coverage/lcov-report/favicon.png | Bin 0 -> 540 bytes coverage/lcov-report/index.html | 126 +++++ coverage/lcov-report/prettify.css | 1 + coverage/lcov-report/prettify.js | 2 + coverage/lcov-report/sort-arrow-sprite.png | Bin 0 -> 209 bytes coverage/lcov-report/sorter.js | 170 +++++++ coverage/lcov-report/test-export.js.html | 98 ++++ coverage/lcov.info | 46 ++ cypress/integration/unit-tests/date.spec.js | 68 +++ 33 files changed, 2176 insertions(+) create mode 100644 _data/forms/config-research.yml create mode 100644 _data/research/ansible.yml create mode 100644 _data/research/debezium.yml create mode 100644 _data/research/docker.yml create mode 100644 _data/research/elasticsearch.yml create mode 100644 _data/schemaResearch.yaml create mode 100644 _includes/form/presets/selectResearch.html create mode 100644 _json/research.json create mode 100644 _pages/en/open-research-form.html create mode 100644 _pages/en/open-research-schema.html create mode 100644 _pages/en/open-researches.html create mode 100644 _pages/fr/recherche-libre-formulaire.html create mode 100644 _pages/fr/recherche-libre-schema.html create mode 100644 _pages/fr/recherches-libres.html create mode 100644 assets/js/src/researchForm.js create mode 100644 coverage/clover.xml create mode 100644 coverage/coverage-final.json create mode 100644 coverage/lcov-report/assets/js/src/date.js.html create mode 100644 coverage/lcov-report/assets/js/src/index.html create mode 100644 coverage/lcov-report/assets/js/src/test-export.js.html create mode 100644 coverage/lcov-report/base.css create mode 100644 coverage/lcov-report/block-navigation.js create mode 100644 coverage/lcov-report/date.js.html create mode 100644 coverage/lcov-report/favicon.png create mode 100644 coverage/lcov-report/index.html create mode 100644 coverage/lcov-report/prettify.css create mode 100644 coverage/lcov-report/prettify.js create mode 100644 coverage/lcov-report/sort-arrow-sprite.png create mode 100644 coverage/lcov-report/sorter.js create mode 100644 coverage/lcov-report/test-export.js.html create mode 100644 coverage/lcov.info create mode 100644 cypress/integration/unit-tests/date.spec.js diff --git a/_data/forms/config-research.yml b/_data/forms/config-research.yml new file mode 100644 index 000000000..8f49b30b3 --- /dev/null +++ b/_data/forms/config-research.yml @@ -0,0 +1,28 @@ +--- + +id: research + +formGroups: + - preset: empty + title: administrations + param: {start: true} + - preset: adminCode + - preset: selectResearch + - preset: description + - preset: category + - preset: tags + - preset: homepageURL + param: {type: url} + - preset: licences + param: {more: true} + - preset: team + - preset: empty + title: uses + param: {start: true} + - preset: contact + param: {phone: false} + - widget: string + title: date + param: {type: date, rule: dateISO} + - preset: empty + - preset: empty diff --git a/_data/research/ansible.yml b/_data/research/ansible.yml new file mode 100644 index 000000000..3545e59e4 --- /dev/null +++ b/_data/research/ansible.yml @@ -0,0 +1,37 @@ +--- +schemaVersion: '1.0' +description: + whatItDoes: + en: Ansible is an IT automation tool. + fr: Ansible est un outil d'automatisation informatique. +category: '43232200' +homepageURL: + en: 'https://www.ansible.com/' + fr: 'https://www.ansible.com/' +researchAcronym: ansible +licences: + - URL: + en: 'https://github.com/ansible/ansible/blob/devel/COPYING' + fr: 'https://github.com/ansible/ansible/blob/devel/COPYING' + spdxID: GPL-3.0-only +name: + en: Ansible + fr: Ansible +tags: + en: + - Application platform + fr: + - Plateforme applicative +researchOrg: + en: + - Test + fr: + - Test +administrations: + - adminCode: city-of-montreal-qc + uses: + - contact: + email: libre@ville.montreal.qc.ca + date: + started: '2017-06-30' + metadataLastUpdated: '2019-05-06' diff --git a/_data/research/debezium.yml b/_data/research/debezium.yml new file mode 100644 index 000000000..fbbb44dca --- /dev/null +++ b/_data/research/debezium.yml @@ -0,0 +1,39 @@ +--- +schemaVersion: '1.0' +description: + whatItDoes: + en: Debezium is an open source distributed platform for change data capture. + fr: >- + Debezium est une platforme distribuée d'une ressource ouverte pour la + capture de données modifiées. +category: '43232300' +homepageURL: + en: 'https://debezium.io/' + fr: 'https://debezium.io/' +researchAcronym: debezium +licences: + - URL: + en: 'https://github.com/debezium/debezium/blob/master/LICENSE.txt' + fr: 'https://github.com/debezium/debezium/blob/master/LICENSE.txt' + spdxID: Apache-2.0 +name: + en: Debezium + fr: Debezium +tags: + en: + - Incremental management of data + fr: + - Gestion incrementale des données +researchOrg: + en: + - Test + fr: + - Test +administrations: + - adminCode: city-of-montreal-qc + uses: + - contact: + email: libre@ville.montreal.qc.ca + date: + started: '2017-06-30' + metadataLastUpdated: '2019-05-10' diff --git a/_data/research/docker.yml b/_data/research/docker.yml new file mode 100644 index 000000000..8461c0faf --- /dev/null +++ b/_data/research/docker.yml @@ -0,0 +1,52 @@ +--- +schemaVersion: '1.0' +description: + whatItDoes: + en: >- + Performs operating-system-level virtualization also known as + containerization + fr: >- + Effectue une virtualisation au niveau du système d'exploitation, également + appelée conteneurisation +category: '43233000' +homepageURL: + en: 'https://www.docker.com' + fr: 'https://www.docker.com' +researchAcronym: docker +licences: + - URL: + en: 'https://www.docker.com/legal/components-licenses' + fr: 'https://www.docker.com/legal/components-licenses' + spdxID: Apache-2.0 +name: + en: Docker + fr: Docker +tags: + en: + - Container platform + - Development + - Infrastructure + fr: + - Plate-forme de conteneur + - Développement + - Infrastructure +researchOrg: + en: + - Test + fr: + - Test +administrations: + - adminCode: statcan + uses: + - contact: + email: michael.goit@canada.ca + date: + started: '2019-05-06' + metadataLastUpdated: '2019-05-13' + - adminCode: tbs-sct + uses: + - contact: + email: ilia.salem@tbs-sct.gc.ca + date: + started: '2019-05-06' + metadataLastUpdated: '2019-05-13' diff --git a/_data/research/elasticsearch.yml b/_data/research/elasticsearch.yml new file mode 100644 index 000000000..390b100e3 --- /dev/null +++ b/_data/research/elasticsearch.yml @@ -0,0 +1,51 @@ +--- +schemaVersion: '1.0' +description: + whatItDoes: + en: >- + Elasticsearch is a distributed, RESTful search and analytics engine + capable of solving a growing number of use cases. + fr: >- + Elasticsearch est un moteur de recherche et d'analyse RESTful distribué, + conçu pour répondre à une multitude de cas d'utilisation. +category: '43232300' +homepageURL: + en: 'https://www.elastic.co/products/elasticsearch' + fr: 'https://www.elastic.co/fr/products/elasticsearch' +researchAcronym: elasticsearch +licences: + - URL: + en: >- + https://www.elastic.co/guide/en/elasticsearch/hadoop/current/license.html + fr: >- + https://www.elastic.co/guide/en/elasticsearch/hadoop/current/license.html + spdxID: Apache-2.0 +name: + en: Elasticsearch + fr: Elasticsearch +tags: + en: + - Web site + fr: + - Site web +researchOrg: + en: + - Test + fr: + - Test +administrations: + - adminCode: tc + uses: + - contact: + email: irina.krasteleva@tc.gc.ca + name: Irina Krasteleva + date: + started: '2019-05-06' + metadataLastUpdated: '2019-05-13' + - adminCode: city-of-montreal-qc + uses: + - contact: + email: libre@ville.montreal.qc.ca + date: + started: '2017-06-30' + metadataLastUpdated: '2019-05-10' diff --git a/_data/schemaResearch.yaml b/_data/schemaResearch.yaml new file mode 100644 index 000000000..a31c21757 --- /dev/null +++ b/_data/schemaResearch.yaml @@ -0,0 +1,35 @@ +--- +schemaVersion: str() +adminCode: str() +projects: + - contact: + email: str() + name: str(required=False) + phone: str(required=False) + category: str() + date: + closed: str() + started: str() + metadataLastUpdated: str() + description: + whatItDoes: + en: str() + fr: str() + howItWorks: + en: str(required=False) + fr: str(required=False) + name: + en: str() + fr: str() + partners: + - adminCode: str(required=False) + email: str(required=False) + name: str(required=False) + tags: + en: + - str(required=False) + fr: + - str(required=False) + team: + en: str(required=False) + fr: str(required=False) diff --git a/_includes/footer.html b/_includes/footer.html index 905c88951..809e2a536 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -73,6 +73,10 @@

{{ site.data.i18n.general.footer.AboutSite[page.lang] }}

{%- endif %} +{%- if page.ref == "researchForm" -%} + + +{%- endif %} {%- if page.ref == "partnershipForm" -%} diff --git a/_includes/form/presets/selectResearch.html b/_includes/form/presets/selectResearch.html new file mode 100644 index 000000000..fe4153fb1 --- /dev/null +++ b/_includes/form/presets/selectResearch.html @@ -0,0 +1,21 @@ +{%- assign title = "researchAcronym" -%} +{%- assign group = "select" -%} +{%- assign research_arr = "" | split: ',' -%} +{%- for research in site.data.research -%} + {%- assign research_arr = research_arr | push: research[1].researchAcronym -%} +{%- endfor %} +{%- assign research_arr = research_arr | sort_natural -%} +
+ {% include form/components/label-group.html id=include.id title=title group=group param=site.data.forms.param.required_false %} + +
+ +{% include form/components/group.html id=include.id title=title -%} + +{%- include form/presets/name.html id=include.id -%} + diff --git a/_json/research.json b/_json/research.json new file mode 100644 index 000000000..077145169 --- /dev/null +++ b/_json/research.json @@ -0,0 +1,5 @@ +--- +permalink: /research.json +--- + +{{ site.data.research | jsonify }} \ No newline at end of file diff --git a/_pages/en/open-research-form.html b/_pages/en/open-research-form.html new file mode 100644 index 000000000..9acac3ea1 --- /dev/null +++ b/_pages/en/open-research-form.html @@ -0,0 +1,10 @@ +--- +layout: form +ref: researchForm +lang: en +permalink: /en/open-research-form.html +config: config-research +--- + +

Open Research Form

+

Fill out this form to add or update information on research done by Canadian public administrations. Please note that some fields are required in both English and French languages, as to support the collaboration and sharing of open source solutions between all provinces and territories across Canada.

diff --git a/_pages/en/open-research-schema.html b/_pages/en/open-research-schema.html new file mode 100644 index 000000000..852485934 --- /dev/null +++ b/_pages/en/open-research-schema.html @@ -0,0 +1,15 @@ +--- +layout: schema +ref: researchSchema +lang: en +permalink: /en/open-research-schema.html +config: config-research +--- + +

Metadata Schema for Open Research

+

The metadata schema for {{ site.data.i18n.general.nav.research[page.lang] }}.

+

Data files are hosted on GitHub.

+ +

Version 1.0

+

Mandatory fields are marked with "mandatory".

+

We've created an example file with only mandatory fields you can use to get started.

diff --git a/_pages/en/open-researches.html b/_pages/en/open-researches.html new file mode 100644 index 000000000..285741962 --- /dev/null +++ b/_pages/en/open-researches.html @@ -0,0 +1,16 @@ +--- +layout: default +ref: research +lang: en +permalink: /en/open-researches.html +--- + +

Open Research

+

Open research refers to any research where anyone with relevant expertise is allowed to contribute and the resulting data is available to everyone online.

+

Search the catalog for research by different levels of Canadian public administrations.

+

You may also add a research or update its data using using the Open Research Form.

+

Need help? Check our user guide on how to use the Open Resource Exchange platform.

+ +{% include researchTable.html %} + +

Data is also made available in JSON format for open data and use in other applications.

\ No newline at end of file diff --git a/_pages/fr/recherche-libre-formulaire.html b/_pages/fr/recherche-libre-formulaire.html new file mode 100644 index 000000000..f6fd40db2 --- /dev/null +++ b/_pages/fr/recherche-libre-formulaire.html @@ -0,0 +1,10 @@ +--- +layout: form +ref: researchForm +lang: fr +permalink: /fr/recherche-libre-formulaire.html +config: config-research +--- + +

Formulaire de recherche libre

+

Remplissez ce formulaire pour ajouter ou modifier des données sur les recherches libres utilisés par les administrations publiques canadiennes. Veuillez noter que quelques champs sont requis dans les deux langues Français et Anglais, afin de promouvoir la collaboration et la partage de solutions ouvertes à travers tout le Canada.

diff --git a/_pages/fr/recherche-libre-schema.html b/_pages/fr/recherche-libre-schema.html new file mode 100644 index 000000000..9393f2c92 --- /dev/null +++ b/_pages/fr/recherche-libre-schema.html @@ -0,0 +1,15 @@ +--- +layout: schema +ref: researchSchema +lang: fr +permalink: /fr/recherche-libre-schema.html +config: config-research +--- + +

Schéma de métadonnées pour les recherches libres

+

Le schéma de métadonnées pour les {{ site.data.i18n.general.nav.research[page.lang] }}.

+

Les données sont hébergés sur GitHub.

+ +

Version 1.0

+

Les champs obligatoires sont marqués avec "obligatoire".

+

Nous avons créé un fichier exemple avec seulement les champs obligatoires que vous pouvez utiliser pour commencer.

diff --git a/_pages/fr/recherches-libres.html b/_pages/fr/recherches-libres.html new file mode 100644 index 000000000..3f04c8bba --- /dev/null +++ b/_pages/fr/recherches-libres.html @@ -0,0 +1,16 @@ +--- +layout: default +ref: research +lang: fr +permalink: /fr/recherches-libres.html +--- + +

Recherches libres

+

Une recherche libre est une recherche ou tout individu ou organisation ayant une expertise appropriée peux contribuer et toutes les données résultantes sont disponibles au public.

+

Consultez la liste des recherches libres utilisés par les administrations publiques canadiennes.

+

Vous pouvez ajouter une recherche ou modifier ses informations en utilisant le Formulaire des Recherches Libres.

+

Besoin d’aide? Consultez la documentation sur comment utiliser la plateforme Échange de Ressources Ouvert.

+ +{% include researchTable.html %} + +

Les données sont aussi rendu disponible en format JSON pour utilisation dans d'autres applications.

diff --git a/assets/js/src/researchForm.js b/assets/js/src/researchForm.js new file mode 100644 index 000000000..af8e6d72d --- /dev/null +++ b/assets/js/src/researchForm.js @@ -0,0 +1,480 @@ +/* + global + YamlWriter jsyaml + USERNAME REPO_NAME PRBOT_URL + getTagsEN getTagsFR resetTags addTags + submitInit submitConclusion + getAdminObject getAdminCode hideNewAdminForm slugify + addMoreLicences resetMoreGroup fillLicenceField + getToday addMoreGroup +*/ + +const researchSelect = $('.page-researchForm #researchAcronymselect'); +const adminSelect = $('.page-researchForm #adminCode'); + +$(document).ready(function() { + $('#prbotSubmitresearchForm').click(function() { + if (submitInit()) { + if ($('#ennewAdminName').val() != '') submitResearchFormNewAdmin(); + else submitResearchForm(); + } + }); + + researchSelect.change(function() { + selectResearch(); + if (adminSelect.val() != '') selectAdmin(); + }); + + adminSelect.change(function() { + selectAdmin(); + }); + + $('#formReset').click(function() { + $('#validation').trigger('reset'); + resetTags(); + hideNewAdminForm(); + resetMoreGroup($('#addMorelicences')); + }); +}); + +function getresearchObject() { + // Mandatory fields + let researchObject = { + schemaVersion: '1.0', + description: { + whatItDoes: { + en: $('#endescriptionwhatItDoes').val(), + fr: $('#frdescriptionwhatItDoes').val() + } + }, + homepageURL: { + en: $('#enhomepageURL').val(), + fr: $('#frhomepageURL').val() + }, + licences: [], + name: { + en: $('#enname').val(), + fr: $('#frname').val() + }, + researchAcronym: $('#researchAcronym') + .val() + .toUpperCase(), + researchOrg: { + en: $('#enresearchOrg').val(), + fr: $('#frresearchOrg').val() + }, + tags: { + en: getTagsEN(), + fr: getTagsFR() + }, + administrations: [ + { + adminCode: getAdminCode(), + contact: { + email: $('#contactemail').val() + }, + date: { + created: $('#date').val(), + metadataLastUpdated: getToday() + }, + references: [], + status: $('#status').val() + } + ] + }; + + // More-groups + addMoreLicences(researchObject); + $('#addMorereference ul.list-unstyled > li').each(function(i) { + let id = + $(this).attr('data-index') == '0' ? '' : $(this).attr('data-index'); + researchObject.administrations[0].references[i] = { + URL: { + en: $('#enreferenceURL' + id).val(), + fr: $('#frreferenceURL' + id).val() + }, + name: { + en: $('#enreferencename' + id).val(), + fr: $('#frreferencename' + id).val() + } + }; + }); + + // Optional fields + if ( + $('#endescriptionhowItWorks').val() || + $('#frdescriptionhowItWorks').val() + ) { + researchObject.description.howItWorks = {}; + if ($('#endescriptionhowItWorks').val()) + researchObject.description.howItWorks.en = $( + '#endescriptionhowItWorks' + ).val(); + if ($('#frdescriptionhowItWorks').val()) + researchObject.description.howItWorks.fr = $( + '#frdescriptionhowItWorks' + ).val(); + } + + if ($('#contactname').val()) { + researchObject.administrations[0].contact.name = $('#contactname').val(); + } + + if ($('#enteam').val() || $('#frteam').val()) { + researchObject.administrations[0].team = {}; + if ($('#enteam').val()) + researchObject.administrations[0].team.en = $('#enteam').val(); + if ($('#frteam').val()) + researchObject.administrations[0].team.fr = $('#frteam').val(); + } + + return researchObject; +} + +function submitResearchForm() { + let submitButton = document.getElementById('prbotSubmitresearchForm'); + let resetButton = document.getElementById('formReset'); + submitButton.disabled = true; + resetButton.disabled = true; + + let researchObject = getresearchObject(); + console.log('TCL: submitResearchForm -> researchObject', researchObject); + let fileWriter = new YamlWriter(USERNAME, REPO_NAME); + let file = `_data/research/${researchObject.researchAcronym.toLowerCase()}.yml`; + + fileWriter + .merge(file, researchObject, 'administrations', 'adminCode') + .then(result => { + return fetch( + PRBOT_URL, + getConfigUpdate(result, file, researchObject.researchAcronym) + ); + }) + .catch(err => { + if (err.status == 404) { + return fetch(PRBOT_URL, getConfigNew(researchObject, file)); + } else throw err; + }) + .then(response => { + let url = + $('html').attr('lang') == 'en' + ? './open-researches.html' + : './recherches-libres.html'; + submitConclusion(response, submitButton, resetButton, url); + }); +} + +function getConfigUpdate(result, file, code) { + return { + body: JSON.stringify({ + user: USERNAME, + repo: REPO_NAME, + title: `Updated the ${code} research file`, + description: 'Authored by: ' + $('#submitteremail').val() + '\n', + commit: 'Committed by ' + $('#submitteremail').val(), + author: { + name: $('#submitterusername').val(), + email: $('#submitteremail').val() + }, + files: [ + { + path: file, + content: '---\n' + jsyaml.dump(result) + } + ] + }), + method: 'POST' + }; +} + +function getConfigNew(researchObject, file) { + return { + body: JSON.stringify({ + user: USERNAME, + repo: REPO_NAME, + title: 'Created the research file for ' + researchObject.researchAcronym, + description: 'Authored by: ' + $('#submitteremail').val() + '\n', + commit: 'Committed by ' + $('#submitteremail').val(), + author: { + name: $('#submitterusername').val(), + email: $('#submitteremail').val() + }, + files: [ + { + path: file, + content: '---\n' + jsyaml.dump(researchObject) + } + ] + }), + method: 'POST' + }; +} + +function submitResearchFormNewAdmin() { + let submitButton = document.getElementById('prbotSubmitresearchForm'); + let resetButton = document.getElementById('formReset'); + submitButton.disabled = true; + resetButton.disabled = true; + + let researchObject = getresearchObject(); + let adminObject = getAdminObject(); + + let researchName = researchObject.researchAcronym.toLowerCase(); + let adminName = slugify( + $('#ennewAdminName').val() + '-' + $('#provinceSelect').val() + ); + + let fileWriter = new YamlWriter(USERNAME, REPO_NAME); + let researchFile = `_data/research/${researchName}.yml`; + let adminFile = `_data/administrations/${$('#orgLevel').val()}.yml`; + + fileWriter + .mergeAdminFile(adminFile, adminObject, '', 'code') + .then(adminResult => { + fileWriter + .merge(researchFile, researchObject, 'administrations', 'adminCode') + .then(researchResult => { + return fetch( + PRBOT_URL, + getConfigUpdateResearchNewAdmin( + researchName, + adminName, + researchFile, + adminFile, + researchResult, + adminResult + ) + ); + }) + .catch(err => { + if (err.status == 404) { + return fetch( + PRBOT_URL, + getConfigNewResearchNewAdmin( + researchName, + adminName, + researchFile, + adminFile, + researchObject, + adminResult + ) + ); + } else throw err; + }) + .then(response => { + let url = + $('html').attr('lang') == 'en' + ? './open-researches.html' + : './recherches-libres.html'; + submitConclusion(response, submitButton, resetButton, url); + }); + }) + .catch(err => { + if (err.status == 404) console.log('File not Found'); + else throw err; + }); +} + +function getConfigUpdateResearchNewAdmin( + researchName, + adminName, + researchFile, + adminFile, + researchResult, + adminObject +) { + return { + body: JSON.stringify({ + user: USERNAME, + repo: REPO_NAME, + title: + 'Updated research file for ' + + researchName + + ' and created ' + + adminName + + ' in administration file', + description: 'Authored by: ' + $('#submitteremail').val() + '\n', + commit: 'Committed by ' + $('#submitteremail').val(), + author: { + name: $('#submitterusername').val(), + email: $('#submitteremail').val() + }, + files: [ + { + path: researchFile, + content: '---\n' + jsyaml.dump(researchResult) + }, + { + path: adminFile, + content: '---\n' + jsyaml.dump(adminObject) + } + ] + }), + method: 'POST' + }; +} + +function getConfigNewResearchNewAdmin( + researchName, + adminName, + researchFile, + adminFile, + researchObject, + adminObject +) { + return { + body: JSON.stringify({ + user: USERNAME, + repo: REPO_NAME, + title: + 'Creaded research file for ' + + researchName + + ' and created ' + + adminName + + ' in administration file', + description: 'Authored by: ' + $('#submitteremail').val() + '\n', + commit: 'Committed by ' + $('#submitteremail').val(), + author: { + name: $('#submitterusername').val(), + email: $('#submitteremail').val() + }, + files: [ + { + path: researchFile, + content: '---\n' + jsyaml.dump(researchObject) + }, + { + path: adminFile, + content: '---\n' + jsyaml.dump(adminObject) + } + ] + }), + method: 'POST' + }; +} + +function selectResearch() { + let value = researchSelect.val(); + $.getJSON('http://localhost:4000/ore-ero/research.json', function(result) { + if (result[value]) { + addValueToFieldsResearch(result[value]); + $('#adminCode').focus(); + } else if (value == '') { + resetFieldsResearch(); + } else { + alert('Error retrieving the data'); + } + }); +} + +function addValueToFieldsResearch(obj) { + resetFieldsResearch(); + + $('#researchAcronym') + .val(obj.researchAcronym) + .prop('disabled', true); + $('#enname') + .val(obj.name.en) + .prop('disabled', true); + $('#frname') + .val(obj.name.fr) + .prop('disabled', true); + + $('#endescriptionwhatItDoes').val(obj.description.whatItDoes.en); + $('#frdescriptionwhatItDoes').val(obj.description.whatItDoes.fr); + if (obj.description.howItWorks) { + if (obj.description.howItWorks.en) + $('#endescriptionhowItWorks').val(obj.description.howItWorks.en); + if (obj.description.howItWorks.fr) + $('#frdescriptionhowItWorks').val(obj.description.howItWorks.fr); + } + $('#enhomepageURL').val(obj.homepageURL.en); + $('#frhomepageURL').val(obj.homepageURL.fr); + $('#enresearchOrg').val(obj.researchOrg.en); + $('#frresearchOrg').val(obj.researchOrg.fr); + fillLicenceField(obj.licences); + + addTags(obj); +} + +function resetFieldsResearch() { + $('#researchAcronym') + .val('') + .prop('disabled', false); + $('#enname') + .val('') + .prop('disabled', false); + $('#frname') + .val('') + .prop('disabled', false); + $('#endescriptionwhatItDoes').val(''); + $('#frdescriptionwhatItDoes').val(''); + $('#endescriptionhowItWorks').val(''); + $('#frdescriptionhowItWorks').val(''); + $('#enhomepageURL').val(''); + $('#frhomepageURL').val(''); + $('#enspecURL').val(''); + $('#frspecURL').val(''); + $('#enresearchOrg').val(''); + $('#frresearchOrg').val(''); + resetMoreGroup($('#addMorelicences')); + resetTags(); +} + +function selectAdmin() { + let research = researchSelect.val(); + let administration = adminSelect.val(); + $.getJSON('http://localhost:4000/ore-ero/research.json', function(result) { + if (result[research]) { + for (let i = 0; i < result[research].administrations.length; i++) { + if (result[research].administrations[i].adminCode == administration) { + addValueToFieldsAdmin(result[research].administrations[i]); + break; + } else { + resetFieldsAdmin(); + } + } + } else { + resetFieldsAdmin(); + } + }); +} + +function addValueToFieldsAdmin(obj) { + resetFieldsAdmin(); + + $('#contactemail').val(obj.contact.email); + if (obj.contact.name) $('#contactname').val(obj.contact.name); + + $('#date').val(obj.date.created); + + obj.references.forEach(function(reference, i) { + let id; + if (i == 0) id = ''; + else { + id = i; + addMoreGroup($('#addMorereference')); + } + $('#enreferenceURL' + id).val(reference.URL.en); + $('#frreferenceURL' + id).val(reference.URL.fr); + $('#enreferencename' + id).val(reference.name.en); + $('#frreferencename' + id).val(reference.name.fr); + }); + + $('#status').val(obj.status); + + if (obj.team) { + if (obj.team.en) $('#enteam').val(obj.team.en); + if (obj.team.fr) $('#frteam').val(obj.team.fr); + } +} + +function resetFieldsAdmin() { + $('#contactemail').val(''); + $('#contactname').val(''); + $('#date').val(''); + resetMoreGroup($('#addMorereference')); + $('#status').val(''); + $('#enteam').val(''); + $('#frteam').val(''); +} diff --git a/coverage/clover.xml b/coverage/clover.xml new file mode 100644 index 000000000..be48be7b4 --- /dev/null +++ b/coverage/clover.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json new file mode 100644 index 000000000..3832cdcaa --- /dev/null +++ b/coverage/coverage-final.json @@ -0,0 +1,3 @@ +{"C:\\Users\\josep\\Documents\\mtl-ore-ero\\ore-ero\\_site\\assets\\js\\src\\date.js": {"path":"C:\\Users\\josep\\Documents\\mtl-ore-ero\\ore-ero\\_site\\assets\\js\\src\\date.js","statementMap":{"0":{"start":{"line":4,"column":10},"end":{"line":4,"column":20}},"1":{"start":{"line":6,"column":14},"end":{"line":6,"column":30}},"2":{"start":{"line":7,"column":12},"end":{"line":7,"column":23}},"3":{"start":{"line":9,"column":2},"end":{"line":17,"column":4}},"4":{"start":{"line":20,"column":0},"end":{"line":22,"column":2}},"5":{"start":{"line":21,"column":2},"end":{"line":21,"column":20}}},"fnMap":{"0":{"name":"getToday","decl":{"start":{"line":3,"column":9},"end":{"line":3,"column":17}},"loc":{"start":{"line":3,"column":20},"end":{"line":18,"column":1}},"line":3},"1":{"name":"(anonymous_1)","decl":{"start":{"line":20,"column":23},"end":{"line":20,"column":24}},"loc":{"start":{"line":20,"column":29},"end":{"line":22,"column":1}},"line":20}},"branchMap":{"0":{"loc":{"start":{"line":12,"column":5},"end":{"line":12,"column":26}},"type":"cond-expr","locations":[{"start":{"line":12,"column":18},"end":{"line":12,"column":21}},{"start":{"line":12,"column":24},"end":{"line":12,"column":26}}],"line":12},"1":{"loc":{"start":{"line":15,"column":5},"end":{"line":15,"column":24}},"type":"cond-expr","locations":[{"start":{"line":15,"column":16},"end":{"line":15,"column":19}},{"start":{"line":15,"column":22},"end":{"line":15,"column":24}}],"line":15}},"s":{"0":2,"1":2,"2":2,"3":2,"4":1,"5":2},"f":{"0":2,"1":2},"b":{"0":[2,0],"1":[0,2]},"_coverageSchema":"1a1c01bbd47fc00a2c39e90264f33305004495a9","hash":"4780dfb14b07f8575e0cd0f457bfff7894094207"} +,"C:\\Users\\josep\\Documents\\mtl-ore-ero\\ore-ero\\assets\\js\\src\\date.js": {"path":"C:\\Users\\josep\\Documents\\mtl-ore-ero\\ore-ero\\assets\\js\\src\\date.js","statementMap":{"0":{"start":{"line":4,"column":10},"end":{"line":4,"column":20}},"1":{"start":{"line":6,"column":14},"end":{"line":6,"column":30}},"2":{"start":{"line":7,"column":12},"end":{"line":7,"column":23}},"3":{"start":{"line":9,"column":2},"end":{"line":17,"column":4}},"4":{"start":{"line":20,"column":0},"end":{"line":22,"column":2}},"5":{"start":{"line":21,"column":2},"end":{"line":21,"column":20}}},"fnMap":{"0":{"name":"getToday","decl":{"start":{"line":3,"column":9},"end":{"line":3,"column":17}},"loc":{"start":{"line":3,"column":20},"end":{"line":18,"column":1}},"line":3},"1":{"name":"(anonymous_1)","decl":{"start":{"line":20,"column":23},"end":{"line":20,"column":24}},"loc":{"start":{"line":20,"column":29},"end":{"line":22,"column":1}},"line":20}},"branchMap":{"0":{"loc":{"start":{"line":12,"column":5},"end":{"line":12,"column":26}},"type":"cond-expr","locations":[{"start":{"line":12,"column":18},"end":{"line":12,"column":21}},{"start":{"line":12,"column":24},"end":{"line":12,"column":26}}],"line":12},"1":{"loc":{"start":{"line":15,"column":5},"end":{"line":15,"column":24}},"type":"cond-expr","locations":[{"start":{"line":15,"column":16},"end":{"line":15,"column":19}},{"start":{"line":15,"column":22},"end":{"line":15,"column":24}}],"line":15}},"s":{"0":2,"1":2,"2":2,"3":2,"4":1,"5":2},"f":{"0":2,"1":2},"b":{"0":[2,0],"1":[0,2]},"_coverageSchema":"1a1c01bbd47fc00a2c39e90264f33305004495a9","hash":"e1a039540a21d9299ab75c93035f92c220b48c5c"} +} diff --git a/coverage/lcov-report/assets/js/src/date.js.html b/coverage/lcov-report/assets/js/src/date.js.html new file mode 100644 index 000000000..66ad91b75 --- /dev/null +++ b/coverage/lcov-report/assets/js/src/date.js.html @@ -0,0 +1,143 @@ + + + + + + Code coverage report for assets/js/src/date.js + + + + + + + + + +
+
+

All files / assets/js/src date.js

+
+ +
+ 100% + Statements + 6/6 +
+ + +
+ 50% + Branches + 2/4 +
+ + +
+ 100% + Functions + 2/2 +
+ + +
+ 100% + Lines + 6/6 +
+ + +
+

+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +

+
+
+ 

+
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22 
+ 
+ 
+2x
+ 
+2x
+2x
+ 
+2x
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+1x
+2x
+ 
/* exported getToday */
+ 
+function getToday() {
+  let d = new Date();
+ 
+  let month = d.getMonth() + 1;
+  let day = d.getDate();
+ 
+  return (
+    d.getFullYear() +
+    '-' +
+    (month < 10 ? '0' : '') +
+    month +
+    '-' +
+    (day < 10 ? '0' : '') +
+    day
+  );
+};
+ 
+exports.testGetToday = () => {
+  return getToday();
+};
+ +
+
+
+ Code coverage generated by + istanbul + at Fri Jan 31 2020 10:56:43 GMT-0500 (GMT-05:00) +
+ + + + + + + + \ No newline at end of file diff --git a/coverage/lcov-report/assets/js/src/index.html b/coverage/lcov-report/assets/js/src/index.html new file mode 100644 index 000000000..5dc5cac9c --- /dev/null +++ b/coverage/lcov-report/assets/js/src/index.html @@ -0,0 +1,111 @@ + + + + + + Code coverage report for assets/js/src + + + + + + + + + +
+
+

All files assets/js/src

+
+ +
+ 100% + Statements + 6/6 +
+ + +
+ 50% + Branches + 2/4 +
+ + +
+ 100% + Functions + 2/2 +
+ + +
+ 100% + Lines + 6/6 +
+ + +
+

+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileStatementsBranchesFunctionsLines
date.js +
+ 		100%6/650%2/4100%2/2100%6/6
+
+
+
+
+ Code coverage generated by + istanbul + at Fri Jan 31 2020 10:56:43 GMT-0500 (GMT-05:00) +
+ + + + + + + + \ No newline at end of file diff --git a/coverage/lcov-report/assets/js/src/test-export.js.html b/coverage/lcov-report/assets/js/src/test-export.js.html new file mode 100644 index 000000000..3a5958102 --- /dev/null +++ b/coverage/lcov-report/assets/js/src/test-export.js.html @@ -0,0 +1,98 @@ + + + + + + Code coverage report for assets/js/src/test-export.js + + + + + + + + + +
+
+

All files / assets/js/src test-export.js

+
+ +
+ 100% + Statements + 3/3 +
+ + +
+ 100% + Branches + 0/0 +
+ + +
+ 100% + Functions + 1/1 +
+ + +
+ 100% + Lines + 3/3 +
+ + +
+

+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +

+
+
+ 

+
1
+2
+3
+4
+5
+6
+7 
+1x
+ 
+1x
+1x
+ 
+ 
// import getToday from './date'
+const { getToday } = require('./date');
+ 
+exports.test = () => {
+    return getToday();
+}
+ 
+ +
+
+
+ Code coverage generated by + istanbul + at Tue Jan 28 2020 13:26:57 GMT-0500 (GMT-05:00) +
+ + + + + + + + \ No newline at end of file diff --git a/coverage/lcov-report/base.css b/coverage/lcov-report/base.css new file mode 100644 index 000000000..f418035b4 --- /dev/null +++ b/coverage/lcov-report/base.css @@ -0,0 +1,224 @@ +body, html { + margin:0; padding: 0; + height: 100%; +} +body { + font-family: Helvetica Neue, Helvetica, Arial; + font-size: 14px; + color:#333; +} +.small { font-size: 12px; } +*, *:after, *:before { + -webkit-box-sizing:border-box; + -moz-box-sizing:border-box; + box-sizing:border-box; + } +h1 { font-size: 20px; margin: 0;} +h2 { font-size: 14px; } +pre { + font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace; + margin: 0; + padding: 0; + -moz-tab-size: 2; + -o-tab-size: 2; + tab-size: 2; +} +a { color:#0074D9; text-decoration:none; } +a:hover { text-decoration:underline; } +.strong { font-weight: bold; } +.space-top1 { padding: 10px 0 0 0; } +.pad2y { padding: 20px 0; } +.pad1y { padding: 10px 0; } +.pad2x { padding: 0 20px; } +.pad2 { padding: 20px; } +.pad1 { padding: 10px; } +.space-left2 { padding-left:55px; } +.space-right2 { padding-right:20px; } +.center { text-align:center; } +.clearfix { display:block; } +.clearfix:after { + content:''; + display:block; + height:0; + clear:both; + visibility:hidden; + } +.fl { float: left; } +@media only screen and (max-width:640px) { + .col3 { width:100%; max-width:100%; } + .hide-mobile { display:none!important; } +} + +.quiet { + color: #7f7f7f; + color: rgba(0,0,0,0.5); +} +.quiet a { opacity: 0.7; } + +.fraction { + font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace; + font-size: 10px; + color: #555; + background: #E8E8E8; + padding: 4px 5px; + border-radius: 3px; + vertical-align: middle; +} + +div.path a:link, div.path a:visited { color: #333; } +table.coverage { + border-collapse: collapse; + margin: 10px 0 0 0; + padding: 0; +} + +table.coverage td { + margin: 0; + padding: 0; + vertical-align: top; +} +table.coverage td.line-count { + text-align: right; + padding: 0 5px 0 20px; +} +table.coverage td.line-coverage { + text-align: right; + padding-right: 10px; + min-width:20px; +} + +table.coverage td span.cline-any { + display: inline-block; + padding: 0 5px; + width: 100%; +} +.missing-if-branch { + display: inline-block; + margin-right: 5px; + border-radius: 3px; + position: relative; + padding: 0 4px; + background: #333; + color: yellow; +} + +.skip-if-branch { + display: none; + margin-right: 10px; + position: relative; + padding: 0 4px; + background: #ccc; + color: white; +} +.missing-if-branch .typ, .skip-if-branch .typ { + color: inherit !important; +} +.coverage-summary { + border-collapse: collapse; + width: 100%; +} +.coverage-summary tr { border-bottom: 1px solid #bbb; } +.keyline-all { border: 1px solid #ddd; } +.coverage-summary td, .coverage-summary th { padding: 10px; } +.coverage-summary tbody { border: 1px solid #bbb; } +.coverage-summary td { border-right: 1px solid #bbb; } +.coverage-summary td:last-child { border-right: none; } +.coverage-summary th { + text-align: left; + font-weight: normal; + white-space: nowrap; +} +.coverage-summary th.file { border-right: none !important; } +.coverage-summary th.pct { } +.coverage-summary th.pic, +.coverage-summary th.abs, +.coverage-summary td.pct, +.coverage-summary td.abs { text-align: right; } +.coverage-summary td.file { white-space: nowrap; } +.coverage-summary td.pic { min-width: 120px !important; } +.coverage-summary tfoot td { } + +.coverage-summary .sorter { + height: 10px; + width: 7px; + display: inline-block; + margin-left: 0.5em; + background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent; +} +.coverage-summary .sorted .sorter { + background-position: 0 -20px; +} +.coverage-summary .sorted-desc .sorter { + background-position: 0 -10px; +} +.status-line { height: 10px; } +/* yellow */ +.cbranch-no { background: yellow !important; color: #111; } +/* dark red */ +.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 } +.low .chart { border:1px solid #C21F39 } +.highlighted, +.highlighted .cstat-no, .highlighted .fstat-no, .highlighted .cbranch-no{ + background: #C21F39 !important; +} +/* medium red */ +.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE } +/* light red */ +.low, .cline-no { background:#FCE1E5 } +/* light green */ +.high, .cline-yes { background:rgb(230,245,208) } +/* medium green */ +.cstat-yes { background:rgb(161,215,106) } +/* dark green */ +.status-line.high, .high .cover-fill { background:rgb(77,146,33) } +.high .chart { border:1px solid rgb(77,146,33) } +/* dark yellow (gold) */ +.status-line.medium, .medium .cover-fill { background: #f9cd0b; } +.medium .chart { border:1px solid #f9cd0b; } +/* light yellow */ +.medium { background: #fff4c2; } + +.cstat-skip { background: #ddd; color: #111; } +.fstat-skip { background: #ddd; color: #111 !important; } +.cbranch-skip { background: #ddd !important; color: #111; } + +span.cline-neutral { background: #eaeaea; } + +.coverage-summary td.empty { + opacity: .5; + padding-top: 4px; + padding-bottom: 4px; + line-height: 1; + color: #888; +} + +.cover-fill, .cover-empty { + display:inline-block; + height: 12px; +} +.chart { + line-height: 0; +} +.cover-empty { + background: white; +} +.cover-full { + border-right: none !important; +} +pre.prettyprint { + border: none !important; + padding: 0 !important; + margin: 0 !important; +} +.com { color: #999 !important; } +.ignore-none { color: #999; font-weight: normal; } + +.wrapper { + min-height: 100%; + height: auto !important; + height: 100%; + margin: 0 auto -48px; +} +.footer, .push { + height: 48px; +} diff --git a/coverage/lcov-report/block-navigation.js b/coverage/lcov-report/block-navigation.js new file mode 100644 index 000000000..c7ff5a5ca --- /dev/null +++ b/coverage/lcov-report/block-navigation.js @@ -0,0 +1,79 @@ +/* eslint-disable */ +var jumpToCode = (function init() { + // Classes of code we would like to highlight in the file view + var missingCoverageClasses = ['.cbranch-no', '.cstat-no', '.fstat-no']; + + // Elements to highlight in the file listing view + var fileListingElements = ['td.pct.low']; + + // We don't want to select elements that are direct descendants of another match + var notSelector = ':not(' + missingCoverageClasses.join('):not(') + ') > '; // becomes `:not(a):not(b) > ` + + // Selecter that finds elements on the page to which we can jump + var selector = + fileListingElements.join(', ') + + ', ' + + notSelector + + missingCoverageClasses.join(', ' + notSelector); // becomes `:not(a):not(b) > a, :not(a):not(b) > b` + + // The NodeList of matching elements + var missingCoverageElements = document.querySelectorAll(selector); + + var currentIndex; + + function toggleClass(index) { + missingCoverageElements + .item(currentIndex) + .classList.remove('highlighted'); + missingCoverageElements.item(index).classList.add('highlighted'); + } + + function makeCurrent(index) { + toggleClass(index); + currentIndex = index; + missingCoverageElements.item(index).scrollIntoView({ + behavior: 'smooth', + block: 'center', + inline: 'center' + }); + } + + function goToPrevious() { + var nextIndex = 0; + if (typeof currentIndex !== 'number' || currentIndex === 0) { + nextIndex = missingCoverageElements.length - 1; + } else if (missingCoverageElements.length > 1) { + nextIndex = currentIndex - 1; + } + + makeCurrent(nextIndex); + } + + function goToNext() { + var nextIndex = 0; + + if ( + typeof currentIndex === 'number' && + currentIndex < missingCoverageElements.length - 1 + ) { + nextIndex = currentIndex + 1; + } + + makeCurrent(nextIndex); + } + + return function jump(event) { + switch (event.which) { + case 78: // n + case 74: // j + goToNext(); + break; + case 66: // b + case 75: // k + case 80: // p + goToPrevious(); + break; + } + }; +})(); +window.addEventListener('keydown', jumpToCode); diff --git a/coverage/lcov-report/date.js.html b/coverage/lcov-report/date.js.html new file mode 100644 index 000000000..aff1f37af --- /dev/null +++ b/coverage/lcov-report/date.js.html @@ -0,0 +1,143 @@ + + + + + + Code coverage report for date.js + + + + + + + + + +
+
+

All files date.js

+
+ +
+ 16.67% + Statements + 1/6 +
+ + +
+ 0% + Branches + 0/4 +
+ + +
+ 0% + Functions + 0/2 +
+ + +
+ 16.67% + Lines + 1/6 +
+ + +
+

+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +

+
+
+ 

+
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+1x
+ 
+ 
/* exported getToday */
+ 
+function getToday() {
+  let d = new Date();
+ 
+  let month = d.getMonth() + 1;
+  let day = d.getDate();
+ 
+  return (
+    d.getFullYear() +
+    '-' +
+    (month < 10 ? '0' : '') +
+    month +
+    '-' +
+    (day < 10 ? '0' : '') +
+    day
+  );
+};
+ 
+exports.testGetToday = () => {
+  return getToday();
+};
+ +
+
+
+ Code coverage generated by + istanbul + at Tue Jan 28 2020 13:23:54 GMT-0500 (GMT-05:00) +
+ + + + + + + + \ No newline at end of file diff --git a/coverage/lcov-report/favicon.png b/coverage/lcov-report/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..6691817834a957c938e7f09640a37a645fb31457 GIT binary patch literal 540 zcmV+%0^|LOP)wSzy{h>9elhJ=8GnBQmf?)AI(^#wDA_`!QTxaXXE&bjxo zTGCc%V|W`}Lwz0rDO*qBbGY-M@aNENIZ1rK?nOAibaC*vb%CF;I_~lkJawax%_+1J zLn(#pv_v{f0`v`Cfp6()7MB(>IoTAiQdKxgxX?VyV&KVZ7b$vn<8|Z<9$35C+G_8SH0x6Y(xB&~bmn%r}ceRwbc0000 + + + + Code coverage report for All files + + + + + + + + + +
+
+

All files

+
+ +
+ 100% + Statements + 12/12 +
+ + +
+ 50% + Branches + 4/8 +
+ + +
+ 100% + Functions + 4/4 +
+ + +
+ 100% + Lines + 12/12 +
+ + +
+

+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileStatementsBranchesFunctionsLines
_site/assets/js/src +
+ 		100%6/650%2/4100%2/2100%6/6
assets/js/src +
+ 		100%6/650%2/4100%2/2100%6/6
+
+
+
+
+ Code coverage generated by + istanbul + at Fri Jan 31 2020 10:56:43 GMT-0500 (GMT-05:00) +
+ + + + + + + + \ No newline at end of file diff --git a/coverage/lcov-report/prettify.css b/coverage/lcov-report/prettify.css new file mode 100644 index 000000000..b317a7cda --- /dev/null +++ b/coverage/lcov-report/prettify.css @@ -0,0 +1 @@ +.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee} diff --git a/coverage/lcov-report/prettify.js b/coverage/lcov-report/prettify.js new file mode 100644 index 000000000..b3225238f --- /dev/null +++ b/coverage/lcov-report/prettify.js @@ -0,0 +1,2 @@ +/* eslint-disable */ +window.PR_SHOULD_USE_CONTINUATION=true;(function(){var h=["break,continue,do,else,for,if,return,while"];var u=[h,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var p=[u,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var l=[p,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var x=[p,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var R=[x,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"];var r="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes";var w=[p,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var s="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var I=[h,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var f=[h,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var H=[h,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var A=[l,R,w,s+I,f,H];var e=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/;var C="str";var z="kwd";var j="com";var O="typ";var G="lit";var L="pun";var F="pln";var m="tag";var E="dec";var J="src";var P="atn";var n="atv";var N="nocode";var M="(?:^^\\.?|[+-]|\\!|\\!=|\\!==|\\#|\\%|\\%=|&|&&|&&=|&=|\\(|\\*|\\*=|\\+=|\\,|\\-=|\\->|\\/|\\/=|:|::|\\;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\@|\\[|\\^|\\^=|\\^\\^|\\^\\^=|\\{|\\||\\|=|\\|\\||\\|\\|=|\\~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function k(Z){var ad=0;var S=false;var ac=false;for(var V=0,U=Z.length;V122)){if(!(al<65||ag>90)){af.push([Math.max(65,ag)|32,Math.min(al,90)|32])}if(!(al<97||ag>122)){af.push([Math.max(97,ag)&~32,Math.min(al,122)&~32])}}}}af.sort(function(av,au){return(av[0]-au[0])||(au[1]-av[1])});var ai=[];var ap=[NaN,NaN];for(var ar=0;arat[0]){if(at[1]+1>at[0]){an.push("-")}an.push(T(at[1]))}}an.push("]");return an.join("")}function W(al){var aj=al.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var ah=aj.length;var an=[];for(var ak=0,am=0;ak=2&&ai==="["){aj[ak]=X(ag)}else{if(ai!=="\\"){aj[ak]=ag.replace(/[a-zA-Z]/g,function(ao){var ap=ao.charCodeAt(0);return"["+String.fromCharCode(ap&~32,ap|32)+"]"})}}}}return aj.join("")}var aa=[];for(var V=0,U=Z.length;V=0;){S[ac.charAt(ae)]=Y}}var af=Y[1];var aa=""+af;if(!ag.hasOwnProperty(aa)){ah.push(af);ag[aa]=null}}ah.push(/[\0-\uffff]/);V=k(ah)})();var X=T.length;var W=function(ah){var Z=ah.sourceCode,Y=ah.basePos;var ad=[Y,F];var af=0;var an=Z.match(V)||[];var aj={};for(var ae=0,aq=an.length;ae=5&&"lang-"===ap.substring(0,5);if(am&&!(ai&&typeof ai[1]==="string")){am=false;ap=J}if(!am){aj[ag]=ap}}var ab=af;af+=ag.length;if(!am){ad.push(Y+ab,ap)}else{var al=ai[1];var ak=ag.indexOf(al);var ac=ak+al.length;if(ai[2]){ac=ag.length-ai[2].length;ak=ac-al.length}var ar=ap.substring(5);B(Y+ab,ag.substring(0,ak),W,ad);B(Y+ab+ak,al,q(ar,al),ad);B(Y+ab+ac,ag.substring(ac),W,ad)}}ah.decorations=ad};return W}function i(T){var W=[],S=[];if(T.tripleQuotedStrings){W.push([C,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(T.multiLineStrings){W.push([C,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{W.push([C,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(T.verbatimStrings){S.push([C,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var Y=T.hashComments;if(Y){if(T.cStyleComments){if(Y>1){W.push([j,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{W.push([j,/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}S.push([C,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,null])}else{W.push([j,/^#[^\r\n]*/,null,"#"])}}if(T.cStyleComments){S.push([j,/^\/\/[^\r\n]*/,null]);S.push([j,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(T.regexLiterals){var X=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");S.push(["lang-regex",new RegExp("^"+M+"("+X+")")])}var V=T.types;if(V){S.push([O,V])}var U=(""+T.keywords).replace(/^ | $/g,"");if(U.length){S.push([z,new RegExp("^(?:"+U.replace(/[\s,]+/g,"|")+")\\b"),null])}W.push([F,/^\s+/,null," \r\n\t\xA0"]);S.push([G,/^@[a-z_$][a-z_$@0-9]*/i,null],[O,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[F,/^[a-z_$][a-z_$@0-9]*/i,null],[G,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[F,/^\\[\s\S]?/,null],[L,/^.[^\s\w\.$@\'\"\`\/\#\\]*/,null]);return g(W,S)}var K=i({keywords:A,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function Q(V,ag){var U=/(?:^|\s)nocode(?:\s|$)/;var ab=/\r\n?|\n/;var ac=V.ownerDocument;var S;if(V.currentStyle){S=V.currentStyle.whiteSpace}else{if(window.getComputedStyle){S=ac.defaultView.getComputedStyle(V,null).getPropertyValue("white-space")}}var Z=S&&"pre"===S.substring(0,3);var af=ac.createElement("LI");while(V.firstChild){af.appendChild(V.firstChild)}var W=[af];function ae(al){switch(al.nodeType){case 1:if(U.test(al.className)){break}if("BR"===al.nodeName){ad(al);if(al.parentNode){al.parentNode.removeChild(al)}}else{for(var an=al.firstChild;an;an=an.nextSibling){ae(an)}}break;case 3:case 4:if(Z){var am=al.nodeValue;var aj=am.match(ab);if(aj){var ai=am.substring(0,aj.index);al.nodeValue=ai;var ah=am.substring(aj.index+aj[0].length);if(ah){var ak=al.parentNode;ak.insertBefore(ac.createTextNode(ah),al.nextSibling)}ad(al);if(!ai){al.parentNode.removeChild(al)}}}break}}function ad(ak){while(!ak.nextSibling){ak=ak.parentNode;if(!ak){return}}function ai(al,ar){var aq=ar?al.cloneNode(false):al;var ao=al.parentNode;if(ao){var ap=ai(ao,1);var an=al.nextSibling;ap.appendChild(aq);for(var am=an;am;am=an){an=am.nextSibling;ap.appendChild(am)}}return aq}var ah=ai(ak.nextSibling,0);for(var aj;(aj=ah.parentNode)&&aj.nodeType===1;){ah=aj}W.push(ah)}for(var Y=0;Y=S){ah+=2}if(V>=ap){Z+=2}}}var t={};function c(U,V){for(var S=V.length;--S>=0;){var T=V[S];if(!t.hasOwnProperty(T)){t[T]=U}else{if(window.console){console.warn("cannot override language handler %s",T)}}}}function q(T,S){if(!(T&&t.hasOwnProperty(T))){T=/^\s*]*(?:>|$)/],[j,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[L,/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);c(g([[F,/^[\s]+/,null," \t\r\n"],[n,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[m,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[P,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[L,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);c(g([],[[n,/^[\s\S]+/]]),["uq.val"]);c(i({keywords:l,hashComments:true,cStyleComments:true,types:e}),["c","cc","cpp","cxx","cyc","m"]);c(i({keywords:"null,true,false"}),["json"]);c(i({keywords:R,hashComments:true,cStyleComments:true,verbatimStrings:true,types:e}),["cs"]);c(i({keywords:x,cStyleComments:true}),["java"]);c(i({keywords:H,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);c(i({keywords:I,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);c(i({keywords:s,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);c(i({keywords:f,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);c(i({keywords:w,cStyleComments:true,regexLiterals:true}),["js"]);c(i({keywords:r,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);c(g([],[[C,/^[\s\S]+/]]),["regex"]);function d(V){var U=V.langExtension;try{var S=a(V.sourceNode);var T=S.sourceCode;V.sourceCode=T;V.spans=S.spans;V.basePos=0;q(U,T)(V);D(V)}catch(W){if("console" in window){console.log(W&&W.stack?W.stack:W)}}}function y(W,V,U){var S=document.createElement("PRE");S.innerHTML=W;if(U){Q(S,U)}var T={langExtension:V,numberLines:U,sourceNode:S};d(T);return S.innerHTML}function b(ad){function Y(af){return document.getElementsByTagName(af)}var ac=[Y("pre"),Y("code"),Y("xmp")];var T=[];for(var aa=0;aa=0){var ah=ai.match(ab);var am;if(!ah&&(am=o(aj))&&"CODE"===am.tagName){ah=am.className.match(ab)}if(ah){ah=ah[1]}var al=false;for(var ak=aj.parentNode;ak;ak=ak.parentNode){if((ak.tagName==="pre"||ak.tagName==="code"||ak.tagName==="xmp")&&ak.className&&ak.className.indexOf("prettyprint")>=0){al=true;break}}if(!al){var af=aj.className.match(/\blinenums\b(?::(\d+))?/);af=af?af[1]&&af[1].length?+af[1]:true:false;if(af){Q(aj,af)}S={langExtension:ah,sourceNode:aj,numberLines:af};d(S)}}}if(X]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]); diff --git a/coverage/lcov-report/sort-arrow-sprite.png b/coverage/lcov-report/sort-arrow-sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..03f704a609c6fd0dbfdac63466a7d7c958b5cbf3 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^>_9Bd!3HEZxJ@+%Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>Jii$m5978H@?Fn+^JD|Y9yzj{W`447Gxa{7*dM7nnnD-Lb z6^}Hx2)'; + } + } + return cols; + } + // attaches a data attribute to every tr element with an object + // of data values keyed by column name + function loadRowData(tableRow) { + var tableCols = tableRow.querySelectorAll('td'), + colNode, + col, + data = {}, + i, + val; + for (i = 0; i < tableCols.length; i += 1) { + colNode = tableCols[i]; + col = cols[i]; + val = colNode.getAttribute('data-value'); + if (col.type === 'number') { + val = Number(val); + } + data[col.key] = val; + } + return data; + } + // loads all row data + function loadData() { + var rows = getTableBody().querySelectorAll('tr'), + i; + + for (i = 0; i < rows.length; i += 1) { + rows[i].data = loadRowData(rows[i]); + } + } + // sorts the table using the data for the ith column + function sortByIndex(index, desc) { + var key = cols[index].key, + sorter = function(a, b) { + a = a.data[key]; + b = b.data[key]; + return a < b ? -1 : a > b ? 1 : 0; + }, + finalSorter = sorter, + tableBody = document.querySelector('.coverage-summary tbody'), + rowNodes = tableBody.querySelectorAll('tr'), + rows = [], + i; + + if (desc) { + finalSorter = function(a, b) { + return -1 * sorter(a, b); + }; + } + + for (i = 0; i < rowNodes.length; i += 1) { + rows.push(rowNodes[i]); + tableBody.removeChild(rowNodes[i]); + } + + rows.sort(finalSorter); + + for (i = 0; i < rows.length; i += 1) { + tableBody.appendChild(rows[i]); + } + } + // removes sort indicators for current column being sorted + function removeSortIndicators() { + var col = getNthColumn(currentSort.index), + cls = col.className; + + cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, ''); + col.className = cls; + } + // adds sort indicators for current column being sorted + function addSortIndicators() { + getNthColumn(currentSort.index).className += currentSort.desc + ? ' sorted-desc' + : ' sorted'; + } + // adds event listeners for all sorter widgets + function enableUI() { + var i, + el, + ithSorter = function ithSorter(i) { + var col = cols[i]; + + return function() { + var desc = col.defaultDescSort; + + if (currentSort.index === i) { + desc = !currentSort.desc; + } + sortByIndex(i, desc); + removeSortIndicators(); + currentSort.index = i; + currentSort.desc = desc; + addSortIndicators(); + }; + }; + for (i = 0; i < cols.length; i += 1) { + if (cols[i].sortable) { + // add the click event handler on the th so users + // dont have to click on those tiny arrows + el = getNthColumn(i).querySelector('.sorter').parentElement; + if (el.addEventListener) { + el.addEventListener('click', ithSorter(i)); + } else { + el.attachEvent('onclick', ithSorter(i)); + } + } + } + } + // adds sorting functionality to the UI + return function() { + if (!getTable()) { + return; + } + cols = loadColumns(); + loadData(); + addSortIndicators(); + enableUI(); + }; +})(); + +window.addEventListener('load', addSorting); diff --git a/coverage/lcov-report/test-export.js.html b/coverage/lcov-report/test-export.js.html new file mode 100644 index 000000000..713f95b37 --- /dev/null +++ b/coverage/lcov-report/test-export.js.html @@ -0,0 +1,98 @@ + + + + + + Code coverage report for test-export.js + + + + + + + + + +
+
+

All files test-export.js

+
+ +
+ 100% + Statements + 3/3 +
+ + +
+ 100% + Branches + 0/0 +
+ + +
+ 100% + Functions + 1/1 +
+ + +
+ 100% + Lines + 3/3 +
+ + +
+

+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +

+
+
+ 

+
1
+2
+3
+4
+5
+6
+7 
+1x
+ 
+1x
+1x
+ 
+ 
// import getToday from './date'
+const { getToday } = require('./date');
+ 
+exports.test = () => {
+    return getToday();
+}
+ 
+ +
+
+
+ Code coverage generated by + istanbul + at Tue Jan 28 2020 13:23:54 GMT-0500 (GMT-05:00) +
+ + + + + + + + \ No newline at end of file diff --git a/coverage/lcov.info b/coverage/lcov.info new file mode 100644 index 000000000..3a68270ac --- /dev/null +++ b/coverage/lcov.info @@ -0,0 +1,46 @@ +TN: +SF:_site\assets\js\src\date.js +FN:3,getToday +FN:20,(anonymous_1) +FNF:2 +FNH:2 +FNDA:2,getToday +FNDA:2,(anonymous_1) +DA:4,2 +DA:6,2 +DA:7,2 +DA:9,2 +DA:20,1 +DA:21,2 +LF:6 +LH:6 +BRDA:12,0,0,2 +BRDA:12,0,1,0 +BRDA:15,1,0,0 +BRDA:15,1,1,2 +BRF:4 +BRH:2 +end_of_record +TN: +SF:assets\js\src\date.js +FN:3,getToday +FN:20,(anonymous_1) +FNF:2 +FNH:2 +FNDA:2,getToday +FNDA:2,(anonymous_1) +DA:4,2 +DA:6,2 +DA:7,2 +DA:9,2 +DA:20,1 +DA:21,2 +LF:6 +LH:6 +BRDA:12,0,0,2 +BRDA:12,0,1,0 +BRDA:15,1,0,0 +BRDA:15,1,1,2 +BRF:4 +BRH:2 +end_of_record diff --git a/cypress/integration/unit-tests/date.spec.js b/cypress/integration/unit-tests/date.spec.js new file mode 100644 index 000000000..2f9976252 --- /dev/null +++ b/cypress/integration/unit-tests/date.spec.js @@ -0,0 +1,68 @@ +/// +/* global cy, context, it, before, expect, date */ + +context('date.js', () => { + const now = new Date(); + const output = (now.getFullYear() + + '-' + + ((now.getMonth() + 1) < 10 ? '0' : '') + + (now.getMonth() + 1) + + '-' + + ((now.getDate()) < 10 ? '0' : '') + + (now.getDate()) + ); + + before(() => { + cy.visit('http://localhost:4000/ore-ero/en/open-researches.html'); + }); + + it('Loads the script', () => { + cy.window().should('have.property', 'Date'); + }); + + it('It should call and return Date.now()', () => { + cy.window().then(win => { + let value = win.date.getToday(); + expect(value).to.equal(output); + }); + }); + + it('It should not equal to day time', () => { + // cy.window().then(win => { + // let value = { + // a: 'A', + // b: 'B' + // }; + + // win.DeepObject.set(value, 'a', 'sweet!'); + // expect(value.a).to.equal('sweet!'); + // }); + cy.window().then(win => { + const outputDate = new Date(Date.now());; + expect(getToday()).not.toEqual(outputDate); + }); + }); + + // it("Returns undefined if it doesn't exist", () => { + // cy.window().then(win => { + // let value = win.date.getToday(); + // expect(value).to.equal(undefined); + // }); + // }); + + // it('Adds new object', () => { + // // cy.window().then(win => { + // // let innerValue = { + // // b: 'B' + // // }; + // // let value = { + // // a: { + // // a: 'A' + // // } + // // }; + + // // win.DeepObject.set(value, 'b', innerValue); + // // expect(value.b.b).to.equal('B'); + // // }); + // }); +}); \ No newline at end of file From c639fd232ab361bc556bce3214344ee2fdd2fbd5 Mon Sep 17 00:00:00 2001 From: Joseph Date: Wed, 5 Feb 2020 11:22:25 -0500 Subject: [PATCH 02/16] Minor update --- _includes/researchTable.html | 191 +++++++++++++++++++ _includes/schema/presets/selectResearch.html | 2 + 2 files changed, 193 insertions(+) create mode 100644 _includes/researchTable.html create mode 100644 _includes/schema/presets/selectResearch.html diff --git a/_includes/researchTable.html b/_includes/researchTable.html new file mode 100644 index 000000000..3bd000914 --- /dev/null +++ b/_includes/researchTable.html @@ -0,0 +1,191 @@ +
+ + +
+
+

{{ site.data.i18n.tables.filterOptions[page.lang] }}

 +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + +
+ + + + + + + + + + + + + + + {%- for researches in site.data.research -%} + {%- assign research = researches[1] -%} + + + + + + + + + + + {%- endfor -%} + +
{{ site.data.i18n.tables.research[page.lang] }}{{ site.data.i18n.tables.category[page.lang] }}{{ site.data.i18n.tables.description[page.lang] }}{{ site.data.i18n.tables.licence[page.lang] }}(s){{ site.data.i18n.tables.tag[page.lang] }}{{ site.data.i18n.tables.usage[page.lang] }}{{ site.data.i18n.tables.homepage[page.lang] }}{{ site.data.i18n.form.presets.orgLevel.title[page.lang] }}
{{ research.name[page.lang] }} + {{ site.data.i18n.categories[research.category][page.lang] }} + {{ research.description.whatItDoes[page.lang] }} + {%- for licence in research.licences -%} + {{ licence.spdxID }}  + {%- endfor -%} + + {%- for tag in research.tags[page.lang] -%} + {{ tag }}  + {%- endfor -%} + {{ research.administrations.size }}{{ research.homepageURL[page.lang] | remove: "https://" | rstrip }} + {%- for administration in research.administrations -%} + {%- for levels in site.data.i18n.administrations -%} + {%- assign govLevel = levels[0] -%} + {%- assign admin = site.data.administrations[govLevel] | where: "code": administration.adminCode -%} + {%- if admin[0] != nil -%} + {{ site.data.i18n.administrations[govLevel].value }}  + {%- endif -%} + {%- endfor -%} + {% endfor %} +
+
+ + + {%- for researches in site.data.research -%} + {%- assign research = researches[1] -%} +
+
+

{{ research.name[page.lang] }}

+
+
+

Description:

+

{{ research.description.whatItDoes[page.lang] }}

+

{{ site.data.i18n.tables.tag[page.lang] }}(s):

+
    + {%- for tag in research.tags[page.lang] -%} +
  • {{ tag }}
    •   + {%- endfor -%} +
+
+
{{ site.data.i18n.tables.lightbox.beingUsed[page.lang] }}
+
Contact:
+
+ {%- for administration in research.administrations -%} +
+
+ {%- for levels in site.data.i18n.administrations -%} + {%- assign govLevel = levels[0] -%} + {%- assign admin = site.data.administrations[govLevel] | where: "code", administration.adminCode -%} + {{ admin[0].name[page.lang] }} + {%- endfor -%} +
+
+ {%- for use in administration.uses -%} + {{ use.contact.email }}
+ {%- endfor -%} +
+
+ {%- endfor -%} +
+
+
+ {{ site.data.i18n.tables.lightbox.website[page.lang] }} +
+
+
+
+ + {{ research.homepageURL[page.lang] }} + +
+
+
+
+ {%- endfor -%} + +
+ \ No newline at end of file diff --git a/_includes/schema/presets/selectResearch.html b/_includes/schema/presets/selectResearch.html new file mode 100644 index 000000000..b48f632b3 --- /dev/null +++ b/_includes/schema/presets/selectResearch.html @@ -0,0 +1,2 @@ +{% include schema/widgets/string.html id=include.id title="researchAcronym" -%} +{%- include schema/widgets/string-i18n.html id=include.id title="name" -%} From 05c4f24506acbe40847b3cd857529e14d9141c17 Mon Sep 17 00:00:00 2001 From: Joseph Date: Wed, 5 Feb 2020 12:03:10 -0500 Subject: [PATCH 03/16] Multiples changes on file in open research --- _data/i18n/form.yml | 57 ++++++++++++++++++++++++++++++++++++++++++ _data/i18n/general.yml | 6 +++++ _includes/header.html | 1 + _pages/en/index.html | 23 +++++++++++++++++ _pages/fr/index.html | 17 +++++++++++++ 5 files changed, 104 insertions(+) diff --git a/_data/i18n/form.yml b/_data/i18n/form.yml index cb7f0f508..fbc3e8f5e 100644 --- a/_data/i18n/form.yml +++ b/_data/i18n/form.yml @@ -709,3 +709,60 @@ partnership: title: en: Informations about each project fr: Information à propos de chacun des projects + +# Future project form specifics +research: + name: + title: + en: Project Name + fr: Nom du projet + label: + en: + en: English project name + fr: Nom du projet en anglais + fr: + en: French project name + fr: Nom du projet en français + schema: + en: Project Name + fr: Nom du projet + labels: + select: + en: If you wish to update information of a research that already exists in our library, please select it below + fr: Si vous souhaitez mettre à jour les données d'une recherche déjà ajouté au catalogue, veuillez le sélectionner de la liste + infobulle: + en: Add the name of the open research + fr: Ajouter le nom de la recherche libre + date: + title: + en: Started using + fr: Date de début d'utilisation + label: + en: Started using + fr: Date de début d'utilisation + infobulle: + en: Select the date when the public administration started contributing to the research. + fr: Choisir la date lorsque l'administration publique a commencé à contribuer à la recherche. + researchAcronym: + title: + en: Research Acronym + fr: Acronyme de la recherche + label: + en: Research Acronym + fr: Acronyme de la recherche + labels: + select: + en: If you wish to update information of a research that already exists in our library, please select it below + fr: Si vous souhaitez mettre à jour les données d'une norme ajoutée déjà au catalogue, veuillez la sélectionner de la liste + infobulle: + en: Enter the short name or acronym for the new reseach. + fr: Entrer l'acronyme de la recherche ouverte. + administrations: *administrations + uses: + title: + en: Informations about research participants + fr: Information à propos des participants à la recherche + infobulle: + en: Information concerning the participations on this research + fr: Information à propos des participations à cette recherche + \ No newline at end of file diff --git a/_data/i18n/general.yml b/_data/i18n/general.yml index da4248193..0d1cc0124 100644 --- a/_data/i18n/general.yml +++ b/_data/i18n/general.yml @@ -68,6 +68,12 @@ nav: link: en: https://www.canada.ca/en.html fr: https://www.canada.ca/fr.html + research: + en: Open Research + fr: Recherche Libre + link: + en: ./open-researches.html + fr: ./recherches-libres.html footer: AboutGovernment: diff --git a/_includes/header.html b/_includes/header.html index 993504d26..60b1cfc7e 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -45,6 +45,7 @@

Menu

  • {{ site.data.i18n.general.nav.code[page.lang] }}
  • {{ site.data.i18n.general.nav.software[page.lang] }}
    • +
  • {{ site.data.i18n.general.nav.research[page.lang] }}
  • {{ site.data.i18n.general.nav.standard[page.lang] }}
  • {{ site.data.i18n.general.nav.partnership[page.lang] }}
  • {{ site.data.i18n.general.nav.doc[page.lang] }}
    • diff --git a/_pages/en/index.html b/_pages/en/index.html index 59fee8ee5..e98866909 100644 --- a/_pages/en/index.html +++ b/_pages/en/index.html @@ -87,6 +87,29 @@

    Services

    + + + +
    +
    +
    +
    Open Source Research
     +
    +
    +
    + +
    +
    +

    Search open source research used by Canadian public administrations.

    +
    +
    +
    +
    + + + + +
    diff --git a/_pages/fr/index.html b/_pages/fr/index.html index 9a4044ad9..444638e0b 100644 --- a/_pages/fr/index.html +++ b/_pages/fr/index.html @@ -87,6 +87,23 @@

    Services

    + +
    +
    +
    +
    Recherches Libres
     +
    +
    +
    + +
    +
    +

    Consultez les recherches libres utilisés par les niveaux du Gouvernement Canadien..

    +
    +
    +
    +
    +
    From c6cb0ec027951be84be83438d690944220840b23 Mon Sep 17 00:00:00 2001 From: Joseph Date: Wed, 5 Feb 2020 12:14:25 -0500 Subject: [PATCH 04/16] Remove Link --- _includes/researchTable.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/_includes/researchTable.html b/_includes/researchTable.html index 3bd000914..2c42befe8 100644 --- a/_includes/researchTable.html +++ b/_includes/researchTable.html @@ -176,13 +176,7 @@

    {{ research.name[page.lang] }}

    >
    -
    -
    - - {{ research.homepageURL[page.lang] }} - -
    -
    + {%- endfor -%} From 110c9de9178efade4c9e993504942c4549cd9632 Mon Sep 17 00:00:00 2001 From: Joseph Date: Wed, 5 Feb 2020 13:22:01 -0500 Subject: [PATCH 05/16] Update travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4cec06da8..0a35a6f44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ script: - yamale -s schemaSoftware.yaml _data/software - yamale -s schemaStandard.yaml _data/standard - yamale -s schemaPartnership.yaml _data/partnership +- yamale -s schemaResearch.yaml _data/research - npm test - yamllint -d configYamlLint.yml _data From 96fc6b4758434a109fc1730b8e837b35bcabb397 Mon Sep 17 00:00:00 2001 From: Joseph Date: Wed, 5 Feb 2020 13:51:02 -0500 Subject: [PATCH 06/16] Remove cypress folder and coverage --- coverage/clover.xml | 30 --- coverage/coverage-final.json | 3 - .../lcov-report/assets/js/src/date.js.html | 143 ----------- coverage/lcov-report/assets/js/src/index.html | 111 --------- .../assets/js/src/test-export.js.html | 98 -------- coverage/lcov-report/base.css | 224 ------------------ coverage/lcov-report/block-navigation.js | 79 ------ coverage/lcov-report/date.js.html | 143 ----------- coverage/lcov-report/favicon.png | Bin 540 -> 0 bytes coverage/lcov-report/index.html | 126 ---------- coverage/lcov-report/prettify.css | 1 - coverage/lcov-report/prettify.js | 2 - coverage/lcov-report/sort-arrow-sprite.png | Bin 209 -> 0 bytes coverage/lcov-report/sorter.js | 170 ------------- coverage/lcov-report/test-export.js.html | 98 -------- coverage/lcov.info | 46 ---- cypress/integration/unit-tests/date.spec.js | 68 ------ 17 files changed, 1342 deletions(-) delete mode 100644 coverage/clover.xml delete mode 100644 coverage/coverage-final.json delete mode 100644 coverage/lcov-report/assets/js/src/date.js.html delete mode 100644 coverage/lcov-report/assets/js/src/index.html delete mode 100644 coverage/lcov-report/assets/js/src/test-export.js.html delete mode 100644 coverage/lcov-report/base.css delete mode 100644 coverage/lcov-report/block-navigation.js delete mode 100644 coverage/lcov-report/date.js.html delete mode 100644 coverage/lcov-report/favicon.png delete mode 100644 coverage/lcov-report/index.html delete mode 100644 coverage/lcov-report/prettify.css delete mode 100644 coverage/lcov-report/prettify.js delete mode 100644 coverage/lcov-report/sort-arrow-sprite.png delete mode 100644 coverage/lcov-report/sorter.js delete mode 100644 coverage/lcov-report/test-export.js.html delete mode 100644 coverage/lcov.info delete mode 100644 cypress/integration/unit-tests/date.spec.js diff --git a/coverage/clover.xml b/coverage/clover.xml deleted file mode 100644 index be48be7b4..000000000 --- a/coverage/clover.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json deleted file mode 100644 index 3832cdcaa..000000000 --- a/coverage/coverage-final.json +++ /dev/null @@ -1,3 +0,0 @@ -{"C:\\Users\\josep\\Documents\\mtl-ore-ero\\ore-ero\\_site\\assets\\js\\src\\date.js": {"path":"C:\\Users\\josep\\Documents\\mtl-ore-ero\\ore-ero\\_site\\assets\\js\\src\\date.js","statementMap":{"0":{"start":{"line":4,"column":10},"end":{"line":4,"column":20}},"1":{"start":{"line":6,"column":14},"end":{"line":6,"column":30}},"2":{"start":{"line":7,"column":12},"end":{"line":7,"column":23}},"3":{"start":{"line":9,"column":2},"end":{"line":17,"column":4}},"4":{"start":{"line":20,"column":0},"end":{"line":22,"column":2}},"5":{"start":{"line":21,"column":2},"end":{"line":21,"column":20}}},"fnMap":{"0":{"name":"getToday","decl":{"start":{"line":3,"column":9},"end":{"line":3,"column":17}},"loc":{"start":{"line":3,"column":20},"end":{"line":18,"column":1}},"line":3},"1":{"name":"(anonymous_1)","decl":{"start":{"line":20,"column":23},"end":{"line":20,"column":24}},"loc":{"start":{"line":20,"column":29},"end":{"line":22,"column":1}},"line":20}},"branchMap":{"0":{"loc":{"start":{"line":12,"column":5},"end":{"line":12,"column":26}},"type":"cond-expr","locations":[{"start":{"line":12,"column":18},"end":{"line":12,"column":21}},{"start":{"line":12,"column":24},"end":{"line":12,"column":26}}],"line":12},"1":{"loc":{"start":{"line":15,"column":5},"end":{"line":15,"column":24}},"type":"cond-expr","locations":[{"start":{"line":15,"column":16},"end":{"line":15,"column":19}},{"start":{"line":15,"column":22},"end":{"line":15,"column":24}}],"line":15}},"s":{"0":2,"1":2,"2":2,"3":2,"4":1,"5":2},"f":{"0":2,"1":2},"b":{"0":[2,0],"1":[0,2]},"_coverageSchema":"1a1c01bbd47fc00a2c39e90264f33305004495a9","hash":"4780dfb14b07f8575e0cd0f457bfff7894094207"} -,"C:\\Users\\josep\\Documents\\mtl-ore-ero\\ore-ero\\assets\\js\\src\\date.js": {"path":"C:\\Users\\josep\\Documents\\mtl-ore-ero\\ore-ero\\assets\\js\\src\\date.js","statementMap":{"0":{"start":{"line":4,"column":10},"end":{"line":4,"column":20}},"1":{"start":{"line":6,"column":14},"end":{"line":6,"column":30}},"2":{"start":{"line":7,"column":12},"end":{"line":7,"column":23}},"3":{"start":{"line":9,"column":2},"end":{"line":17,"column":4}},"4":{"start":{"line":20,"column":0},"end":{"line":22,"column":2}},"5":{"start":{"line":21,"column":2},"end":{"line":21,"column":20}}},"fnMap":{"0":{"name":"getToday","decl":{"start":{"line":3,"column":9},"end":{"line":3,"column":17}},"loc":{"start":{"line":3,"column":20},"end":{"line":18,"column":1}},"line":3},"1":{"name":"(anonymous_1)","decl":{"start":{"line":20,"column":23},"end":{"line":20,"column":24}},"loc":{"start":{"line":20,"column":29},"end":{"line":22,"column":1}},"line":20}},"branchMap":{"0":{"loc":{"start":{"line":12,"column":5},"end":{"line":12,"column":26}},"type":"cond-expr","locations":[{"start":{"line":12,"column":18},"end":{"line":12,"column":21}},{"start":{"line":12,"column":24},"end":{"line":12,"column":26}}],"line":12},"1":{"loc":{"start":{"line":15,"column":5},"end":{"line":15,"column":24}},"type":"cond-expr","locations":[{"start":{"line":15,"column":16},"end":{"line":15,"column":19}},{"start":{"line":15,"column":22},"end":{"line":15,"column":24}}],"line":15}},"s":{"0":2,"1":2,"2":2,"3":2,"4":1,"5":2},"f":{"0":2,"1":2},"b":{"0":[2,0],"1":[0,2]},"_coverageSchema":"1a1c01bbd47fc00a2c39e90264f33305004495a9","hash":"e1a039540a21d9299ab75c93035f92c220b48c5c"} -} diff --git a/coverage/lcov-report/assets/js/src/date.js.html b/coverage/lcov-report/assets/js/src/date.js.html deleted file mode 100644 index 66ad91b75..000000000 --- a/coverage/lcov-report/assets/js/src/date.js.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - Code coverage report for assets/js/src/date.js - - - - - - - - - -
    -
    -

    All files / assets/js/src date.js

    -
    - -
    - 100% - Statements - 6/6 -
    - - -
    - 50% - Branches - 2/4 -
    - - -
    - 100% - Functions - 2/2 -
    - - -
    - 100% - Lines - 6/6 -
    - - -
    -

    - Press n or j to go to the next uncovered block, b, p or k for the previous block. -

    -
    -
    - 
    
-
    1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22 
- 
- 
-2x
- 
-2x
-2x
- 
-2x
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-1x
-2x
- 
    /* exported getToday */
- 
-function getToday() {
-  let d = new Date();
- 
-  let month = d.getMonth() + 1;
-  let day = d.getDate();
- 
-  return (
-    d.getFullYear() +
-    '-' +
-    (month < 10 ? '0' : '') +
-    month +
-    '-' +
-    (day < 10 ? '0' : '') +
-    day
-  );
-};
- 
-exports.testGetToday = () => {
-  return getToday();
-};
    - -
    -
    -
    - Code coverage generated by - istanbul - at Fri Jan 31 2020 10:56:43 GMT-0500 (GMT-05:00) -
    - - - - - - - - \ No newline at end of file diff --git a/coverage/lcov-report/assets/js/src/index.html b/coverage/lcov-report/assets/js/src/index.html deleted file mode 100644 index 5dc5cac9c..000000000 --- a/coverage/lcov-report/assets/js/src/index.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Code coverage report for assets/js/src - - - - - - - - - -
    -
    -

    All files assets/js/src

    -
    - -
    - 100% - Statements - 6/6 -
    - - -
    - 50% - Branches - 2/4 -
    - - -
    - 100% - Functions - 2/2 -
    - - -
    - 100% - Lines - 6/6 -
    - - -
    -

    - Press n or j to go to the next uncovered block, b, p or k for the previous block. -

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    FileStatementsBranchesFunctionsLines
    date.js -
    -     		100%6/650%2/4100%2/2100%6/6
    -
    -
    -
    -
    - Code coverage generated by - istanbul - at Fri Jan 31 2020 10:56:43 GMT-0500 (GMT-05:00) -
    - - - - - - - - \ No newline at end of file diff --git a/coverage/lcov-report/assets/js/src/test-export.js.html b/coverage/lcov-report/assets/js/src/test-export.js.html deleted file mode 100644 index 3a5958102..000000000 --- a/coverage/lcov-report/assets/js/src/test-export.js.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - Code coverage report for assets/js/src/test-export.js - - - - - - - - - -
    -
    -

    All files / assets/js/src test-export.js

    -
    - -
    - 100% - Statements - 3/3 -
    - - -
    - 100% - Branches - 0/0 -
    - - -
    - 100% - Functions - 1/1 -
    - - -
    - 100% - Lines - 3/3 -
    - - -
    -

    - Press n or j to go to the next uncovered block, b, p or k for the previous block. -

    -
    -
    - 
    
-
    1
-2
-3
-4
-5
-6
-7 
-1x
- 
-1x
-1x
- 
- 
    // import getToday from './date'
-const { getToday } = require('./date');
- 
-exports.test = () => {
-    return getToday();
-}
- 
    - -
    -
    -
    - Code coverage generated by - istanbul - at Tue Jan 28 2020 13:26:57 GMT-0500 (GMT-05:00) -
    - - - - - - - - \ No newline at end of file diff --git a/coverage/lcov-report/base.css b/coverage/lcov-report/base.css deleted file mode 100644 index f418035b4..000000000 --- a/coverage/lcov-report/base.css +++ /dev/null @@ -1,224 +0,0 @@ -body, html { - margin:0; padding: 0; - height: 100%; -} -body { - font-family: Helvetica Neue, Helvetica, Arial; - font-size: 14px; - color:#333; -} -.small { font-size: 12px; } -*, *:after, *:before { - -webkit-box-sizing:border-box; - -moz-box-sizing:border-box; - box-sizing:border-box; - } -h1 { font-size: 20px; margin: 0;} -h2 { font-size: 14px; } -pre { - font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace; - margin: 0; - padding: 0; - -moz-tab-size: 2; - -o-tab-size: 2; - tab-size: 2; -} -a { color:#0074D9; text-decoration:none; } -a:hover { text-decoration:underline; } -.strong { font-weight: bold; } -.space-top1 { padding: 10px 0 0 0; } -.pad2y { padding: 20px 0; } -.pad1y { padding: 10px 0; } -.pad2x { padding: 0 20px; } -.pad2 { padding: 20px; } -.pad1 { padding: 10px; } -.space-left2 { padding-left:55px; } -.space-right2 { padding-right:20px; } -.center { text-align:center; } -.clearfix { display:block; } -.clearfix:after { - content:''; - display:block; - height:0; - clear:both; - visibility:hidden; - } -.fl { float: left; } -@media only screen and (max-width:640px) { - .col3 { width:100%; max-width:100%; } - .hide-mobile { display:none!important; } -} - -.quiet { - color: #7f7f7f; - color: rgba(0,0,0,0.5); -} -.quiet a { opacity: 0.7; } - -.fraction { - font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace; - font-size: 10px; - color: #555; - background: #E8E8E8; - padding: 4px 5px; - border-radius: 3px; - vertical-align: middle; -} - -div.path a:link, div.path a:visited { color: #333; } -table.coverage { - border-collapse: collapse; - margin: 10px 0 0 0; - padding: 0; -} - -table.coverage td { - margin: 0; - padding: 0; - vertical-align: top; -} -table.coverage td.line-count { - text-align: right; - padding: 0 5px 0 20px; -} -table.coverage td.line-coverage { - text-align: right; - padding-right: 10px; - min-width:20px; -} - -table.coverage td span.cline-any { - display: inline-block; - padding: 0 5px; - width: 100%; -} -.missing-if-branch { - display: inline-block; - margin-right: 5px; - border-radius: 3px; - position: relative; - padding: 0 4px; - background: #333; - color: yellow; -} - -.skip-if-branch { - display: none; - margin-right: 10px; - position: relative; - padding: 0 4px; - background: #ccc; - color: white; -} -.missing-if-branch .typ, .skip-if-branch .typ { - color: inherit !important; -} -.coverage-summary { - border-collapse: collapse; - width: 100%; -} -.coverage-summary tr { border-bottom: 1px solid #bbb; } -.keyline-all { border: 1px solid #ddd; } -.coverage-summary td, .coverage-summary th { padding: 10px; } -.coverage-summary tbody { border: 1px solid #bbb; } -.coverage-summary td { border-right: 1px solid #bbb; } -.coverage-summary td:last-child { border-right: none; } -.coverage-summary th { - text-align: left; - font-weight: normal; - white-space: nowrap; -} -.coverage-summary th.file { border-right: none !important; } -.coverage-summary th.pct { } -.coverage-summary th.pic, -.coverage-summary th.abs, -.coverage-summary td.pct, -.coverage-summary td.abs { text-align: right; } -.coverage-summary td.file { white-space: nowrap; } -.coverage-summary td.pic { min-width: 120px !important; } -.coverage-summary tfoot td { } - -.coverage-summary .sorter { - height: 10px; - width: 7px; - display: inline-block; - margin-left: 0.5em; - background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent; -} -.coverage-summary .sorted .sorter { - background-position: 0 -20px; -} -.coverage-summary .sorted-desc .sorter { - background-position: 0 -10px; -} -.status-line { height: 10px; } -/* yellow */ -.cbranch-no { background: yellow !important; color: #111; } -/* dark red */ -.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 } -.low .chart { border:1px solid #C21F39 } -.highlighted, -.highlighted .cstat-no, .highlighted .fstat-no, .highlighted .cbranch-no{ - background: #C21F39 !important; -} -/* medium red */ -.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE } -/* light red */ -.low, .cline-no { background:#FCE1E5 } -/* light green */ -.high, .cline-yes { background:rgb(230,245,208) } -/* medium green */ -.cstat-yes { background:rgb(161,215,106) } -/* dark green */ -.status-line.high, .high .cover-fill { background:rgb(77,146,33) } -.high .chart { border:1px solid rgb(77,146,33) } -/* dark yellow (gold) */ -.status-line.medium, .medium .cover-fill { background: #f9cd0b; } -.medium .chart { border:1px solid #f9cd0b; } -/* light yellow */ -.medium { background: #fff4c2; } - -.cstat-skip { background: #ddd; color: #111; } -.fstat-skip { background: #ddd; color: #111 !important; } -.cbranch-skip { background: #ddd !important; color: #111; } - -span.cline-neutral { background: #eaeaea; } - -.coverage-summary td.empty { - opacity: .5; - padding-top: 4px; - padding-bottom: 4px; - line-height: 1; - color: #888; -} - -.cover-fill, .cover-empty { - display:inline-block; - height: 12px; -} -.chart { - line-height: 0; -} -.cover-empty { - background: white; -} -.cover-full { - border-right: none !important; -} -pre.prettyprint { - border: none !important; - padding: 0 !important; - margin: 0 !important; -} -.com { color: #999 !important; } -.ignore-none { color: #999; font-weight: normal; } - -.wrapper { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -48px; -} -.footer, .push { - height: 48px; -} diff --git a/coverage/lcov-report/block-navigation.js b/coverage/lcov-report/block-navigation.js deleted file mode 100644 index c7ff5a5ca..000000000 --- a/coverage/lcov-report/block-navigation.js +++ /dev/null @@ -1,79 +0,0 @@ -/* eslint-disable */ -var jumpToCode = (function init() { - // Classes of code we would like to highlight in the file view - var missingCoverageClasses = ['.cbranch-no', '.cstat-no', '.fstat-no']; - - // Elements to highlight in the file listing view - var fileListingElements = ['td.pct.low']; - - // We don't want to select elements that are direct descendants of another match - var notSelector = ':not(' + missingCoverageClasses.join('):not(') + ') > '; // becomes `:not(a):not(b) > ` - - // Selecter that finds elements on the page to which we can jump - var selector = - fileListingElements.join(', ') + - ', ' + - notSelector + - missingCoverageClasses.join(', ' + notSelector); // becomes `:not(a):not(b) > a, :not(a):not(b) > b` - - // The NodeList of matching elements - var missingCoverageElements = document.querySelectorAll(selector); - - var currentIndex; - - function toggleClass(index) { - missingCoverageElements - .item(currentIndex) - .classList.remove('highlighted'); - missingCoverageElements.item(index).classList.add('highlighted'); - } - - function makeCurrent(index) { - toggleClass(index); - currentIndex = index; - missingCoverageElements.item(index).scrollIntoView({ - behavior: 'smooth', - block: 'center', - inline: 'center' - }); - } - - function goToPrevious() { - var nextIndex = 0; - if (typeof currentIndex !== 'number' || currentIndex === 0) { - nextIndex = missingCoverageElements.length - 1; - } else if (missingCoverageElements.length > 1) { - nextIndex = currentIndex - 1; - } - - makeCurrent(nextIndex); - } - - function goToNext() { - var nextIndex = 0; - - if ( - typeof currentIndex === 'number' && - currentIndex < missingCoverageElements.length - 1 - ) { - nextIndex = currentIndex + 1; - } - - makeCurrent(nextIndex); - } - - return function jump(event) { - switch (event.which) { - case 78: // n - case 74: // j - goToNext(); - break; - case 66: // b - case 75: // k - case 80: // p - goToPrevious(); - break; - } - }; -})(); -window.addEventListener('keydown', jumpToCode); diff --git a/coverage/lcov-report/date.js.html b/coverage/lcov-report/date.js.html deleted file mode 100644 index aff1f37af..000000000 --- a/coverage/lcov-report/date.js.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - Code coverage report for date.js - - - - - - - - - -
    -
    -

    All files date.js

    -
    - -
    - 16.67% - Statements - 1/6 -
    - - -
    - 0% - Branches - 0/4 -
    - - -
    - 0% - Functions - 0/2 -
    - - -
    - 16.67% - Lines - 1/6 -
    - - -
    -

    - Press n or j to go to the next uncovered block, b, p or k for the previous block. -

    -
    -
    - 
    
-
    1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-1x
- 
- 
    /* exported getToday */
- 
-function getToday() {
-  let d = new Date();
- 
-  let month = d.getMonth() + 1;
-  let day = d.getDate();
- 
-  return (
-    d.getFullYear() +
-    '-' +
-    (month < 10 ? '0' : '') +
-    month +
-    '-' +
-    (day < 10 ? '0' : '') +
-    day
-  );
-};
- 
-exports.testGetToday = () => {
-  return getToday();
-};
    - -
    -
    -
    - Code coverage generated by - istanbul - at Tue Jan 28 2020 13:23:54 GMT-0500 (GMT-05:00) -
    - - - - - - - - \ No newline at end of file diff --git a/coverage/lcov-report/favicon.png b/coverage/lcov-report/favicon.png deleted file mode 100644 index 6691817834a957c938e7f09640a37a645fb31457..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 540 zcmV+%0^|LOP)wSzy{h>9elhJ=8GnBQmf?)AI(^#wDA_`!QTxaXXE&bjxo zTGCc%V|W`}Lwz0rDO*qBbGY-M@aNENIZ1rK?nOAibaC*vb%CF;I_~lkJawax%_+1J zLn(#pv_v{f0`v`Cfp6()7MB(>IoTAiQdKxgxX?VyV&KVZ7b$vn<8|Z<9$35C+G_8SH0x6Y(xB&~bmn%r}ceRwbc0000 - - - - Code coverage report for All files - - - - - - - - - -
    -
    -

    All files

    -
    - -
    - 100% - Statements - 12/12 -
    - - -
    - 50% - Branches - 4/8 -
    - - -
    - 100% - Functions - 4/4 -
    - - -
    - 100% - Lines - 12/12 -
    - - -
    -

    - Press n or j to go to the next uncovered block, b, p or k for the previous block. -

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    FileStatementsBranchesFunctionsLines
    _site/assets/js/src -
    -     		100%6/650%2/4100%2/2100%6/6
    assets/js/src -
    -     		100%6/650%2/4100%2/2100%6/6
    -
    -
    -
    -
    - Code coverage generated by - istanbul - at Fri Jan 31 2020 10:56:43 GMT-0500 (GMT-05:00) -
    - - - - - - - - \ No newline at end of file diff --git a/coverage/lcov-report/prettify.css b/coverage/lcov-report/prettify.css deleted file mode 100644 index b317a7cda..000000000 --- a/coverage/lcov-report/prettify.css +++ /dev/null @@ -1 +0,0 @@ -.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee} diff --git a/coverage/lcov-report/prettify.js b/coverage/lcov-report/prettify.js deleted file mode 100644 index b3225238f..000000000 --- a/coverage/lcov-report/prettify.js +++ /dev/null @@ -1,2 +0,0 @@ -/* eslint-disable */ -window.PR_SHOULD_USE_CONTINUATION=true;(function(){var h=["break,continue,do,else,for,if,return,while"];var u=[h,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var p=[u,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var l=[p,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var x=[p,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var R=[x,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"];var r="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes";var w=[p,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var s="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var I=[h,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var f=[h,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var H=[h,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var A=[l,R,w,s+I,f,H];var e=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/;var C="str";var z="kwd";var j="com";var O="typ";var G="lit";var L="pun";var F="pln";var m="tag";var E="dec";var J="src";var P="atn";var n="atv";var N="nocode";var M="(?:^^\\.?|[+-]|\\!|\\!=|\\!==|\\#|\\%|\\%=|&|&&|&&=|&=|\\(|\\*|\\*=|\\+=|\\,|\\-=|\\->|\\/|\\/=|:|::|\\;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\@|\\[|\\^|\\^=|\\^\\^|\\^\\^=|\\{|\\||\\|=|\\|\\||\\|\\|=|\\~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function k(Z){var ad=0;var S=false;var ac=false;for(var V=0,U=Z.length;V122)){if(!(al<65||ag>90)){af.push([Math.max(65,ag)|32,Math.min(al,90)|32])}if(!(al<97||ag>122)){af.push([Math.max(97,ag)&~32,Math.min(al,122)&~32])}}}}af.sort(function(av,au){return(av[0]-au[0])||(au[1]-av[1])});var ai=[];var ap=[NaN,NaN];for(var ar=0;arat[0]){if(at[1]+1>at[0]){an.push("-")}an.push(T(at[1]))}}an.push("]");return an.join("")}function W(al){var aj=al.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var ah=aj.length;var an=[];for(var ak=0,am=0;ak=2&&ai==="["){aj[ak]=X(ag)}else{if(ai!=="\\"){aj[ak]=ag.replace(/[a-zA-Z]/g,function(ao){var ap=ao.charCodeAt(0);return"["+String.fromCharCode(ap&~32,ap|32)+"]"})}}}}return aj.join("")}var aa=[];for(var V=0,U=Z.length;V=0;){S[ac.charAt(ae)]=Y}}var af=Y[1];var aa=""+af;if(!ag.hasOwnProperty(aa)){ah.push(af);ag[aa]=null}}ah.push(/[\0-\uffff]/);V=k(ah)})();var X=T.length;var W=function(ah){var Z=ah.sourceCode,Y=ah.basePos;var ad=[Y,F];var af=0;var an=Z.match(V)||[];var aj={};for(var ae=0,aq=an.length;ae=5&&"lang-"===ap.substring(0,5);if(am&&!(ai&&typeof ai[1]==="string")){am=false;ap=J}if(!am){aj[ag]=ap}}var ab=af;af+=ag.length;if(!am){ad.push(Y+ab,ap)}else{var al=ai[1];var ak=ag.indexOf(al);var ac=ak+al.length;if(ai[2]){ac=ag.length-ai[2].length;ak=ac-al.length}var ar=ap.substring(5);B(Y+ab,ag.substring(0,ak),W,ad);B(Y+ab+ak,al,q(ar,al),ad);B(Y+ab+ac,ag.substring(ac),W,ad)}}ah.decorations=ad};return W}function i(T){var W=[],S=[];if(T.tripleQuotedStrings){W.push([C,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(T.multiLineStrings){W.push([C,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{W.push([C,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(T.verbatimStrings){S.push([C,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var Y=T.hashComments;if(Y){if(T.cStyleComments){if(Y>1){W.push([j,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{W.push([j,/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}S.push([C,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,null])}else{W.push([j,/^#[^\r\n]*/,null,"#"])}}if(T.cStyleComments){S.push([j,/^\/\/[^\r\n]*/,null]);S.push([j,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(T.regexLiterals){var X=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");S.push(["lang-regex",new RegExp("^"+M+"("+X+")")])}var V=T.types;if(V){S.push([O,V])}var U=(""+T.keywords).replace(/^ | $/g,"");if(U.length){S.push([z,new RegExp("^(?:"+U.replace(/[\s,]+/g,"|")+")\\b"),null])}W.push([F,/^\s+/,null," \r\n\t\xA0"]);S.push([G,/^@[a-z_$][a-z_$@0-9]*/i,null],[O,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[F,/^[a-z_$][a-z_$@0-9]*/i,null],[G,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[F,/^\\[\s\S]?/,null],[L,/^.[^\s\w\.$@\'\"\`\/\#\\]*/,null]);return g(W,S)}var K=i({keywords:A,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function Q(V,ag){var U=/(?:^|\s)nocode(?:\s|$)/;var ab=/\r\n?|\n/;var ac=V.ownerDocument;var S;if(V.currentStyle){S=V.currentStyle.whiteSpace}else{if(window.getComputedStyle){S=ac.defaultView.getComputedStyle(V,null).getPropertyValue("white-space")}}var Z=S&&"pre"===S.substring(0,3);var af=ac.createElement("LI");while(V.firstChild){af.appendChild(V.firstChild)}var W=[af];function ae(al){switch(al.nodeType){case 1:if(U.test(al.className)){break}if("BR"===al.nodeName){ad(al);if(al.parentNode){al.parentNode.removeChild(al)}}else{for(var an=al.firstChild;an;an=an.nextSibling){ae(an)}}break;case 3:case 4:if(Z){var am=al.nodeValue;var aj=am.match(ab);if(aj){var ai=am.substring(0,aj.index);al.nodeValue=ai;var ah=am.substring(aj.index+aj[0].length);if(ah){var ak=al.parentNode;ak.insertBefore(ac.createTextNode(ah),al.nextSibling)}ad(al);if(!ai){al.parentNode.removeChild(al)}}}break}}function ad(ak){while(!ak.nextSibling){ak=ak.parentNode;if(!ak){return}}function ai(al,ar){var aq=ar?al.cloneNode(false):al;var ao=al.parentNode;if(ao){var ap=ai(ao,1);var an=al.nextSibling;ap.appendChild(aq);for(var am=an;am;am=an){an=am.nextSibling;ap.appendChild(am)}}return aq}var ah=ai(ak.nextSibling,0);for(var aj;(aj=ah.parentNode)&&aj.nodeType===1;){ah=aj}W.push(ah)}for(var Y=0;Y=S){ah+=2}if(V>=ap){Z+=2}}}var t={};function c(U,V){for(var S=V.length;--S>=0;){var T=V[S];if(!t.hasOwnProperty(T)){t[T]=U}else{if(window.console){console.warn("cannot override language handler %s",T)}}}}function q(T,S){if(!(T&&t.hasOwnProperty(T))){T=/^\s*]*(?:>|$)/],[j,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[L,/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);c(g([[F,/^[\s]+/,null," \t\r\n"],[n,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[m,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[P,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[L,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);c(g([],[[n,/^[\s\S]+/]]),["uq.val"]);c(i({keywords:l,hashComments:true,cStyleComments:true,types:e}),["c","cc","cpp","cxx","cyc","m"]);c(i({keywords:"null,true,false"}),["json"]);c(i({keywords:R,hashComments:true,cStyleComments:true,verbatimStrings:true,types:e}),["cs"]);c(i({keywords:x,cStyleComments:true}),["java"]);c(i({keywords:H,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);c(i({keywords:I,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);c(i({keywords:s,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);c(i({keywords:f,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);c(i({keywords:w,cStyleComments:true,regexLiterals:true}),["js"]);c(i({keywords:r,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);c(g([],[[C,/^[\s\S]+/]]),["regex"]);function d(V){var U=V.langExtension;try{var S=a(V.sourceNode);var T=S.sourceCode;V.sourceCode=T;V.spans=S.spans;V.basePos=0;q(U,T)(V);D(V)}catch(W){if("console" in window){console.log(W&&W.stack?W.stack:W)}}}function y(W,V,U){var S=document.createElement("PRE");S.innerHTML=W;if(U){Q(S,U)}var T={langExtension:V,numberLines:U,sourceNode:S};d(T);return S.innerHTML}function b(ad){function Y(af){return document.getElementsByTagName(af)}var ac=[Y("pre"),Y("code"),Y("xmp")];var T=[];for(var aa=0;aa=0){var ah=ai.match(ab);var am;if(!ah&&(am=o(aj))&&"CODE"===am.tagName){ah=am.className.match(ab)}if(ah){ah=ah[1]}var al=false;for(var ak=aj.parentNode;ak;ak=ak.parentNode){if((ak.tagName==="pre"||ak.tagName==="code"||ak.tagName==="xmp")&&ak.className&&ak.className.indexOf("prettyprint")>=0){al=true;break}}if(!al){var af=aj.className.match(/\blinenums\b(?::(\d+))?/);af=af?af[1]&&af[1].length?+af[1]:true:false;if(af){Q(aj,af)}S={langExtension:ah,sourceNode:aj,numberLines:af};d(S)}}}if(X]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]); diff --git a/coverage/lcov-report/sort-arrow-sprite.png b/coverage/lcov-report/sort-arrow-sprite.png deleted file mode 100644 index 03f704a609c6fd0dbfdac63466a7d7c958b5cbf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^>_9Bd!3HEZxJ@+%Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>Jii$m5978H@?Fn+^JD|Y9yzj{W`447Gxa{7*dM7nnnD-Lb z6^}Hx2)'; - } - } - return cols; - } - // attaches a data attribute to every tr element with an object - // of data values keyed by column name - function loadRowData(tableRow) { - var tableCols = tableRow.querySelectorAll('td'), - colNode, - col, - data = {}, - i, - val; - for (i = 0; i < tableCols.length; i += 1) { - colNode = tableCols[i]; - col = cols[i]; - val = colNode.getAttribute('data-value'); - if (col.type === 'number') { - val = Number(val); - } - data[col.key] = val; - } - return data; - } - // loads all row data - function loadData() { - var rows = getTableBody().querySelectorAll('tr'), - i; - - for (i = 0; i < rows.length; i += 1) { - rows[i].data = loadRowData(rows[i]); - } - } - // sorts the table using the data for the ith column - function sortByIndex(index, desc) { - var key = cols[index].key, - sorter = function(a, b) { - a = a.data[key]; - b = b.data[key]; - return a < b ? -1 : a > b ? 1 : 0; - }, - finalSorter = sorter, - tableBody = document.querySelector('.coverage-summary tbody'), - rowNodes = tableBody.querySelectorAll('tr'), - rows = [], - i; - - if (desc) { - finalSorter = function(a, b) { - return -1 * sorter(a, b); - }; - } - - for (i = 0; i < rowNodes.length; i += 1) { - rows.push(rowNodes[i]); - tableBody.removeChild(rowNodes[i]); - } - - rows.sort(finalSorter); - - for (i = 0; i < rows.length; i += 1) { - tableBody.appendChild(rows[i]); - } - } - // removes sort indicators for current column being sorted - function removeSortIndicators() { - var col = getNthColumn(currentSort.index), - cls = col.className; - - cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, ''); - col.className = cls; - } - // adds sort indicators for current column being sorted - function addSortIndicators() { - getNthColumn(currentSort.index).className += currentSort.desc - ? ' sorted-desc' - : ' sorted'; - } - // adds event listeners for all sorter widgets - function enableUI() { - var i, - el, - ithSorter = function ithSorter(i) { - var col = cols[i]; - - return function() { - var desc = col.defaultDescSort; - - if (currentSort.index === i) { - desc = !currentSort.desc; - } - sortByIndex(i, desc); - removeSortIndicators(); - currentSort.index = i; - currentSort.desc = desc; - addSortIndicators(); - }; - }; - for (i = 0; i < cols.length; i += 1) { - if (cols[i].sortable) { - // add the click event handler on the th so users - // dont have to click on those tiny arrows - el = getNthColumn(i).querySelector('.sorter').parentElement; - if (el.addEventListener) { - el.addEventListener('click', ithSorter(i)); - } else { - el.attachEvent('onclick', ithSorter(i)); - } - } - } - } - // adds sorting functionality to the UI - return function() { - if (!getTable()) { - return; - } - cols = loadColumns(); - loadData(); - addSortIndicators(); - enableUI(); - }; -})(); - -window.addEventListener('load', addSorting); diff --git a/coverage/lcov-report/test-export.js.html b/coverage/lcov-report/test-export.js.html deleted file mode 100644 index 713f95b37..000000000 --- a/coverage/lcov-report/test-export.js.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - Code coverage report for test-export.js - - - - - - - - - -
    -
    -

    All files test-export.js

    -
    - -
    - 100% - Statements - 3/3 -
    - - -
    - 100% - Branches - 0/0 -
    - - -
    - 100% - Functions - 1/1 -
    - - -
    - 100% - Lines - 3/3 -
    - - -
    -

    - Press n or j to go to the next uncovered block, b, p or k for the previous block. -

    -
    -
    - 
    
-
    1
-2
-3
-4
-5
-6
-7 
-1x
- 
-1x
-1x
- 
- 
    // import getToday from './date'
-const { getToday } = require('./date');
- 
-exports.test = () => {
-    return getToday();
-}
- 
    - -
    -
    -
    - Code coverage generated by - istanbul - at Tue Jan 28 2020 13:23:54 GMT-0500 (GMT-05:00) -
    - - - - - - - - \ No newline at end of file diff --git a/coverage/lcov.info b/coverage/lcov.info deleted file mode 100644 index 3a68270ac..000000000 --- a/coverage/lcov.info +++ /dev/null @@ -1,46 +0,0 @@ -TN: -SF:_site\assets\js\src\date.js -FN:3,getToday -FN:20,(anonymous_1) -FNF:2 -FNH:2 -FNDA:2,getToday -FNDA:2,(anonymous_1) -DA:4,2 -DA:6,2 -DA:7,2 -DA:9,2 -DA:20,1 -DA:21,2 -LF:6 -LH:6 -BRDA:12,0,0,2 -BRDA:12,0,1,0 -BRDA:15,1,0,0 -BRDA:15,1,1,2 -BRF:4 -BRH:2 -end_of_record -TN: -SF:assets\js\src\date.js -FN:3,getToday -FN:20,(anonymous_1) -FNF:2 -FNH:2 -FNDA:2,getToday -FNDA:2,(anonymous_1) -DA:4,2 -DA:6,2 -DA:7,2 -DA:9,2 -DA:20,1 -DA:21,2 -LF:6 -LH:6 -BRDA:12,0,0,2 -BRDA:12,0,1,0 -BRDA:15,1,0,0 -BRDA:15,1,1,2 -BRF:4 -BRH:2 -end_of_record diff --git a/cypress/integration/unit-tests/date.spec.js b/cypress/integration/unit-tests/date.spec.js deleted file mode 100644 index 2f9976252..000000000 --- a/cypress/integration/unit-tests/date.spec.js +++ /dev/null @@ -1,68 +0,0 @@ -/// -/* global cy, context, it, before, expect, date */ - -context('date.js', () => { - const now = new Date(); - const output = (now.getFullYear() + - '-' + - ((now.getMonth() + 1) < 10 ? '0' : '') + - (now.getMonth() + 1) + - '-' + - ((now.getDate()) < 10 ? '0' : '') + - (now.getDate()) - ); - - before(() => { - cy.visit('http://localhost:4000/ore-ero/en/open-researches.html'); - }); - - it('Loads the script', () => { - cy.window().should('have.property', 'Date'); - }); - - it('It should call and return Date.now()', () => { - cy.window().then(win => { - let value = win.date.getToday(); - expect(value).to.equal(output); - }); - }); - - it('It should not equal to day time', () => { - // cy.window().then(win => { - // let value = { - // a: 'A', - // b: 'B' - // }; - - // win.DeepObject.set(value, 'a', 'sweet!'); - // expect(value.a).to.equal('sweet!'); - // }); - cy.window().then(win => { - const outputDate = new Date(Date.now());; - expect(getToday()).not.toEqual(outputDate); - }); - }); - - // it("Returns undefined if it doesn't exist", () => { - // cy.window().then(win => { - // let value = win.date.getToday(); - // expect(value).to.equal(undefined); - // }); - // }); - - // it('Adds new object', () => { - // // cy.window().then(win => { - // // let innerValue = { - // // b: 'B' - // // }; - // // let value = { - // // a: { - // // a: 'A' - // // } - // // }; - - // // win.DeepObject.set(value, 'b', innerValue); - // // expect(value.b.b).to.equal('B'); - // // }); - // }); -}); \ No newline at end of file From 74cd0889920a68aaa4783397ec7ca9cc1a715392 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 6 Feb 2020 08:22:23 -0500 Subject: [PATCH 07/16] Remove data test for open research --- _data/research/ansible.yml | 37 ----------------------- _data/research/debezium.yml | 39 ------------------------ _data/research/docker.yml | 52 -------------------------------- _data/research/elasticsearch.yml | 51 ------------------------------- 4 files changed, 179 deletions(-) delete mode 100644 _data/research/ansible.yml delete mode 100644 _data/research/debezium.yml delete mode 100644 _data/research/docker.yml delete mode 100644 _data/research/elasticsearch.yml diff --git a/_data/research/ansible.yml b/_data/research/ansible.yml deleted file mode 100644 index 3545e59e4..000000000 --- a/_data/research/ansible.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -schemaVersion: '1.0' -description: - whatItDoes: - en: Ansible is an IT automation tool. - fr: Ansible est un outil d'automatisation informatique. -category: '43232200' -homepageURL: - en: 'https://www.ansible.com/' - fr: 'https://www.ansible.com/' -researchAcronym: ansible -licences: - - URL: - en: 'https://github.com/ansible/ansible/blob/devel/COPYING' - fr: 'https://github.com/ansible/ansible/blob/devel/COPYING' - spdxID: GPL-3.0-only -name: - en: Ansible - fr: Ansible -tags: - en: - - Application platform - fr: - - Plateforme applicative -researchOrg: - en: - - Test - fr: - - Test -administrations: - - adminCode: city-of-montreal-qc - uses: - - contact: - email: libre@ville.montreal.qc.ca - date: - started: '2017-06-30' - metadataLastUpdated: '2019-05-06' diff --git a/_data/research/debezium.yml b/_data/research/debezium.yml deleted file mode 100644 index fbbb44dca..000000000 --- a/_data/research/debezium.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -schemaVersion: '1.0' -description: - whatItDoes: - en: Debezium is an open source distributed platform for change data capture. - fr: >- - Debezium est une platforme distribuée d'une ressource ouverte pour la - capture de données modifiées. -category: '43232300' -homepageURL: - en: 'https://debezium.io/' - fr: 'https://debezium.io/' -researchAcronym: debezium -licences: - - URL: - en: 'https://github.com/debezium/debezium/blob/master/LICENSE.txt' - fr: 'https://github.com/debezium/debezium/blob/master/LICENSE.txt' - spdxID: Apache-2.0 -name: - en: Debezium - fr: Debezium -tags: - en: - - Incremental management of data - fr: - - Gestion incrementale des données -researchOrg: - en: - - Test - fr: - - Test -administrations: - - adminCode: city-of-montreal-qc - uses: - - contact: - email: libre@ville.montreal.qc.ca - date: - started: '2017-06-30' - metadataLastUpdated: '2019-05-10' diff --git a/_data/research/docker.yml b/_data/research/docker.yml deleted file mode 100644 index 8461c0faf..000000000 --- a/_data/research/docker.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- -schemaVersion: '1.0' -description: - whatItDoes: - en: >- - Performs operating-system-level virtualization also known as - containerization - fr: >- - Effectue une virtualisation au niveau du système d'exploitation, également - appelée conteneurisation -category: '43233000' -homepageURL: - en: 'https://www.docker.com' - fr: 'https://www.docker.com' -researchAcronym: docker -licences: - - URL: - en: 'https://www.docker.com/legal/components-licenses' - fr: 'https://www.docker.com/legal/components-licenses' - spdxID: Apache-2.0 -name: - en: Docker - fr: Docker -tags: - en: - - Container platform - - Development - - Infrastructure - fr: - - Plate-forme de conteneur - - Développement - - Infrastructure -researchOrg: - en: - - Test - fr: - - Test -administrations: - - adminCode: statcan - uses: - - contact: - email: michael.goit@canada.ca - date: - started: '2019-05-06' - metadataLastUpdated: '2019-05-13' - - adminCode: tbs-sct - uses: - - contact: - email: ilia.salem@tbs-sct.gc.ca - date: - started: '2019-05-06' - metadataLastUpdated: '2019-05-13' diff --git a/_data/research/elasticsearch.yml b/_data/research/elasticsearch.yml deleted file mode 100644 index 390b100e3..000000000 --- a/_data/research/elasticsearch.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- -schemaVersion: '1.0' -description: - whatItDoes: - en: >- - Elasticsearch is a distributed, RESTful search and analytics engine - capable of solving a growing number of use cases. - fr: >- - Elasticsearch est un moteur de recherche et d'analyse RESTful distribué, - conçu pour répondre à une multitude de cas d'utilisation. -category: '43232300' -homepageURL: - en: 'https://www.elastic.co/products/elasticsearch' - fr: 'https://www.elastic.co/fr/products/elasticsearch' -researchAcronym: elasticsearch -licences: - - URL: - en: >- - https://www.elastic.co/guide/en/elasticsearch/hadoop/current/license.html - fr: >- - https://www.elastic.co/guide/en/elasticsearch/hadoop/current/license.html - spdxID: Apache-2.0 -name: - en: Elasticsearch - fr: Elasticsearch -tags: - en: - - Web site - fr: - - Site web -researchOrg: - en: - - Test - fr: - - Test -administrations: - - adminCode: tc - uses: - - contact: - email: irina.krasteleva@tc.gc.ca - name: Irina Krasteleva - date: - started: '2019-05-06' - metadataLastUpdated: '2019-05-13' - - adminCode: city-of-montreal-qc - uses: - - contact: - email: libre@ville.montreal.qc.ca - date: - started: '2017-06-30' - metadataLastUpdated: '2019-05-10' From 7a8d759a9f2d345cb9d1de922bba5948db24e4fd Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 6 Feb 2020 09:07:19 -0500 Subject: [PATCH 08/16] Fix html5 validator root _site --- _includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/footer.html b/_includes/footer.html index 809e2a536..8eebfa19a 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -76,7 +76,7 @@

    {{ site.data.i18n.general.footer.AboutSite[page.lang] }}

    {%- if page.ref == "researchForm" -%} -{%- endif %} +{%- endif %} {%- if page.ref == "partnershipForm" -%} From bce3ddd779c1641994ba617186b77a32832a9639 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 6 Feb 2020 09:29:04 -0500 Subject: [PATCH 09/16] Pull request fix build problem --- _includes/form/presets/selectResearch.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/form/presets/selectResearch.html b/_includes/form/presets/selectResearch.html index fe4153fb1..da91f52d6 100644 --- a/_includes/form/presets/selectResearch.html +++ b/_includes/form/presets/selectResearch.html @@ -6,7 +6,7 @@ {%- endfor %} {%- assign research_arr = research_arr | sort_natural -%}
    - {% include form/components/label-group.html id=include.id title=title group=group param=site.data.forms.param.required_false %} + - + {%- for research in research_arr -%} {%- endfor %} From 973d6d5494997d7b1238c93bf44d5a0084815a91 Mon Sep 17 00:00:00 2001 From: Joseph Date: Thu, 13 Feb 2020 15:19:09 -0500 Subject: [PATCH 11/16] Remove research acronym. Co-authored-by:fnduister@gmail.com --- _data/forms/config-research.yml | 2 +- _data/i18n/form.yml | 14 -------------- _includes/form/presets/selectResearch.html | 18 ------------------ _includes/schema/presets/selectResearch.html | 1 - 4 files changed, 1 insertion(+), 34 deletions(-) diff --git a/_data/forms/config-research.yml b/_data/forms/config-research.yml index 8f49b30b3..337bab68b 100644 --- a/_data/forms/config-research.yml +++ b/_data/forms/config-research.yml @@ -25,4 +25,4 @@ formGroups: title: date param: {type: date, rule: dateISO} - preset: empty - - preset: empty + diff --git a/_data/i18n/form.yml b/_data/i18n/form.yml index fbc3e8f5e..4aa7b603d 100644 --- a/_data/i18n/form.yml +++ b/_data/i18n/form.yml @@ -743,20 +743,6 @@ research: infobulle: en: Select the date when the public administration started contributing to the research. fr: Choisir la date lorsque l'administration publique a commencé à contribuer à la recherche. - researchAcronym: - title: - en: Research Acronym - fr: Acronyme de la recherche - label: - en: Research Acronym - fr: Acronyme de la recherche - labels: - select: - en: If you wish to update information of a research that already exists in our library, please select it below - fr: Si vous souhaitez mettre à jour les données d'une norme ajoutée déjà au catalogue, veuillez la sélectionner de la liste - infobulle: - en: Enter the short name or acronym for the new reseach. - fr: Entrer l'acronyme de la recherche ouverte. administrations: *administrations uses: title: diff --git a/_includes/form/presets/selectResearch.html b/_includes/form/presets/selectResearch.html index a839c6145..853d0fffe 100644 --- a/_includes/form/presets/selectResearch.html +++ b/_includes/form/presets/selectResearch.html @@ -1,21 +1,3 @@ -{%- assign title = "researchAcronym" -%} -{%- assign group = "select" -%} -{%- assign research_arr = "" | split: ',' -%} -{%- for research in site.data.research -%} - {%- assign research_arr = research_arr | push: research[1].researchAcronym -%} -{%- endfor %} -{%- assign research_arr = research_arr | sort_natural -%} -
    - {% include form/components/label-group.html id=include.id title=title group=group param=site.data.forms.param.required_false %} - -
    - -{% include form/components/group.html id=include.id title=title -%} {%- include form/presets/name.html id=include.id -%} diff --git a/_includes/schema/presets/selectResearch.html b/_includes/schema/presets/selectResearch.html index b48f632b3..150f9d628 100644 --- a/_includes/schema/presets/selectResearch.html +++ b/_includes/schema/presets/selectResearch.html @@ -1,2 +1 @@ -{% include schema/widgets/string.html id=include.id title="researchAcronym" -%} {%- include schema/widgets/string-i18n.html id=include.id title="name" -%} From 564aba30faf1e42874aeba07682b671e796c36e8 Mon Sep 17 00:00:00 2001 From: Joseph Date: Fri, 14 Feb 2020 09:58:32 -0500 Subject: [PATCH 12/16] Minor fix --- _data/forms/config-research.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_data/forms/config-research.yml b/_data/forms/config-research.yml index 337bab68b..387bf8aa1 100644 --- a/_data/forms/config-research.yml +++ b/_data/forms/config-research.yml @@ -25,4 +25,5 @@ formGroups: title: date param: {type: date, rule: dateISO} - preset: empty + - preset: empty From 9eaefd09226bf1770bd3d31df389aa009c6cab81 Mon Sep 17 00:00:00 2001 From: Joseph Date: Fri, 14 Feb 2020 10:17:44 -0500 Subject: [PATCH 13/16] removed licenses from form Co-authored-by: fnduister@gmail.com --- _data/forms/config-research.yml | 2 - _includes/researchTable.html | 202 +++++++++++++++----------------- 2 files changed, 95 insertions(+), 109 deletions(-) diff --git a/_data/forms/config-research.yml b/_data/forms/config-research.yml index 387bf8aa1..eeb2727d9 100644 --- a/_data/forms/config-research.yml +++ b/_data/forms/config-research.yml @@ -13,8 +13,6 @@ formGroups: - preset: tags - preset: homepageURL param: {type: url} - - preset: licences - param: {more: true} - preset: team - preset: empty title: uses diff --git a/_includes/researchTable.html b/_includes/researchTable.html index 2c42befe8..f8b91e6f3 100644 --- a/_includes/researchTable.html +++ b/_includes/researchTable.html @@ -3,7 +3,9 @@
    -

    {{ site.data.i18n.tables.filterOptions[page.lang] }}

     + +

    {{ site.data.i18n.tables.filterOptions[page.lang] }}

    +
    @@ -14,74 +16,60 @@ {%- endfor -%}
    - +
    -
    - -
    - -
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -96,90 +84,90 @@ {%- for researches in site.data.research -%} - {%- assign research = researches[1] -%} - - - - - - - - - - + {%- assign research = researches[1] -%} + + + + + + + + + + {%- endfor -%}
    {{ site.data.i18n.tables.research[page.lang] }}
    {{ research.name[page.lang] }} - {{ site.data.i18n.categories[research.category][page.lang] }} - {{ research.description.whatItDoes[page.lang] }} - {%- for licence in research.licences -%} - {{ licence.spdxID }}  - {%- endfor -%} - - {%- for tag in research.tags[page.lang] -%} - {{ tag }}  - {%- endfor -%} - {{ research.administrations.size }}{{ research.homepageURL[page.lang] | remove: "https://" | rstrip }} - {%- for administration in research.administrations -%} - {%- for levels in site.data.i18n.administrations -%} - {%- assign govLevel = levels[0] -%} - {%- assign admin = site.data.administrations[govLevel] | where: "code": administration.adminCode -%} - {%- if admin[0] != nil -%} - {{ site.data.i18n.administrations[govLevel].value }}  - {%- endif -%} - {%- endfor -%} - {% endfor %} -
    {{ research.name[page.lang] }} + {{ site.data.i18n.categories[research.category][page.lang] }} + {{ research.description.whatItDoes[page.lang] }} + {%- for licence in research.licences -%} + {{ licence.spdxID }}  + {%- endfor -%} + + {%- for tag in research.tags[page.lang] -%} + {{ tag }}  + {%- endfor -%} + {{ research.administrations.size }}{{ research.homepageURL[page.lang] | remove: "https://" | rstrip }} + {%- for administration in research.administrations -%} + {%- for levels in site.data.i18n.administrations -%} + {%- assign govLevel = levels[0] -%} + {%- assign admin = site.data.administrations[govLevel] | where: "code": administration.adminCode -%} + {%- if admin[0] != nil -%} + {{ site.data.i18n.administrations[govLevel].value }}  + {%- endif -%} + {%- endfor -%} + {% endfor %} +
    - + {%- for researches in site.data.research -%} - {%- assign research = researches[1] -%} -
    -
    -

    {{ research.name[page.lang] }}

    -
    -
    -

    Description:

    -

    {{ research.description.whatItDoes[page.lang] }}

    -

    {{ site.data.i18n.tables.tag[page.lang] }}(s):

    -
      - {%- for tag in research.tags[page.lang] -%} -
    • {{ tag }}
      •   - {%- endfor -%} -
    -
    -
    {{ site.data.i18n.tables.lightbox.beingUsed[page.lang] }}
    -
    Contact:
    -
    - {%- for administration in research.administrations -%} -
    -
    - {%- for levels in site.data.i18n.administrations -%} - {%- assign govLevel = levels[0] -%} - {%- assign admin = site.data.administrations[govLevel] | where: "code", administration.adminCode -%} - {{ admin[0].name[page.lang] }} - {%- endfor -%} -
    -
    - {%- for use in administration.uses -%} - {{ use.contact.email }}
    - {%- endfor -%} -
    -
    + {%- assign research = researches[1] -%} +
    +
    +

    {{ research.name[page.lang] }}

    +
    +
    +

    Description:

    +

    {{ research.description.whatItDoes[page.lang] }}

    +

    {{ site.data.i18n.tables.tag[page.lang] }}(s):

    +
      + {%- for tag in research.tags[page.lang] -%} +
    • {{ tag }}
      •   + {%- endfor -%} +
    +
    +
    {{ site.data.i18n.tables.lightbox.beingUsed[page.lang] }}
    +
    Contact:
    +
    + {%- for administration in research.administrations -%} +
    +
    + {%- for levels in site.data.i18n.administrations -%} + {%- assign govLevel = levels[0] -%} + {%- assign admin = site.data.administrations[govLevel] | where: "code", administration.adminCode -%} + {{ admin[0].name[page.lang] }} + {%- endfor -%} +
    +
    + {%- for use in administration.uses -%} + {{ use.contact.email }}
    {%- endfor -%} +
    +
    + {%- endfor -%}
    - {{ site.data.i18n.tables.lightbox.website[page.lang] }} + {{ site.data.i18n.tables.lightbox.website[page.lang] }}
    - -
    -
    + +
    +
    {%- endfor -%} - -
    - \ No newline at end of file + + \ No newline at end of file From eb4ce4a677ef9ce02c7443b90ed89e3f0975cec4 Mon Sep 17 00:00:00 2001 From: Joseph Date: Fri, 14 Feb 2020 10:28:36 -0500 Subject: [PATCH 14/16] Modify start using date to published date Co-authored-by: fnduister@gmail.com --- _data/i18n/form.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_data/i18n/form.yml b/_data/i18n/form.yml index 4aa7b603d..bcfc273d3 100644 --- a/_data/i18n/form.yml +++ b/_data/i18n/form.yml @@ -735,14 +735,14 @@ research: fr: Ajouter le nom de la recherche libre date: title: - en: Started using - fr: Date de début d'utilisation + en: Published date + fr: Date de publication label: - en: Started using - fr: Date de début d'utilisation + en: Published date + fr: Date de publication infobulle: - en: Select the date when the public administration started contributing to the research. - fr: Choisir la date lorsque l'administration publique a commencé à contribuer à la recherche. + en: Select the date when the research was published. + fr: Choisir la date lorsque la recherche a été publié. administrations: *administrations uses: title: From 83df3135567b3a598d3c422c04799b33ac58b29e Mon Sep 17 00:00:00 2001 From: Joseph Date: Fri, 14 Feb 2020 12:24:03 -0500 Subject: [PATCH 15/16] Modify what it does? Research subject and how it work? to Abstract Co-authored-by: fnduister@gmail.com --- _data/forms/config-research.yml | 1 + _data/i18n/form.yml | 49 ++++++++++++++++++++++- _includes/form/presets/description.html | 52 +++++++++++++++++++------ 3 files changed, 90 insertions(+), 12 deletions(-) diff --git a/_data/forms/config-research.yml b/_data/forms/config-research.yml index eeb2727d9..5b3553b73 100644 --- a/_data/forms/config-research.yml +++ b/_data/forms/config-research.yml @@ -9,6 +9,7 @@ formGroups: - preset: adminCode - preset: selectResearch - preset: description + param: {model: true} - preset: category - preset: tags - preset: homepageURL diff --git a/_data/i18n/form.yml b/_data/i18n/form.yml index bcfc273d3..852073094 100644 --- a/_data/i18n/form.yml +++ b/_data/i18n/form.yml @@ -751,4 +751,51 @@ research: infobulle: en: Information concerning the participations on this research fr: Information à propos des participations à cette recherche - \ No newline at end of file + description: + title: + en: Description + fr: Description + labels: + whatItDoes: + subtitle: + en: Research subject + fr: Sujet de recherche + en: + en: English + fr: Anglais + fr: + en: French + fr: Français + schema: + en: Research subject + fr: Sujet de recherche + howItWorks: + subtitle: + en: Abstract + fr: Résumé + en: + en: English + fr: Anglais + fr: + en: French + fr: Français + schema: + en: Abstract + fr: Résumé + label: + schema: + en: Description + fr: Description + charactersLimit: + en: (200 characters limit) + fr: (limite de 200 caractères) + infobulle: + en: Add a brief description of the research. + fr: Ajoutez une brève description de la recherche. + titles: + whatItDoes: + en: Description of the research's subject + fr: Description du sujet de la recherche + howItWorks: + en: Description of the abstract's research + fr: Description du résumé de la recherche \ No newline at end of file diff --git a/_includes/form/presets/description.html b/_includes/form/presets/description.html index b10e0a477..b8ca8d39a 100644 --- a/_includes/form/presets/description.html +++ b/_includes/form/presets/description.html @@ -1,14 +1,44 @@ {%- assign title = "description" -%} -{%- include form/components/title.html id=include.idPreset title=title -%} + +{%- if include.param.model -%} + {%- include form/components/title.html + id="research" title=title -%} + {%- assign descriptionPosition = "research" -%} + {%- else -%} + {%- include form/components/title.html + id=include.idPreset title=title -%} + {%- assign descriptionPosition = include.idPreset -%} +{%- endif -%}
    -
    -

    {{ site.data.i18n.form.presets.description.labels.whatItDoes.subtitle[page.lang] }}

    -

    {{ site.data.i18n.form.presets.description.charactersLimit[page.lang] }}

    -{%- include form/components/textarea-i18n.html id=include.idPreset title=title group="whatItDoes" -%} -
    -
    -

    {{ site.data.i18n.form.presets.description.labels.howItWorks.subtitle[page.lang] }}

    -

    {{ site.data.i18n.form.presets.description.charactersLimit[page.lang] }}

    -{%- include form/components/textarea-i18n.html id=include.idPreset title=title group="howItWorks" param=site.data.forms.param.required_false -%} -
    +
    +

    + {{ + site.data.i18n.form[descriptionPosition][title].labels.whatItDoes.subtitle[page.lang] + }} +

    +

    + {{ site.data.i18n.form[descriptionPosition][title].charactersLimit[page.lang] + }} +

    + {%- include form/components/textarea-i18n.html id=include.idPreset + title=title group="whatItDoes" -%} +
    +
    +

    + {{ + site.data.i18n.form[descriptionPosition][title].labels.howItWorks.subtitle[page.lang] + }} +

    +

    + {{ site.data.i18n.form[descriptionPosition][title].charactersLimit[page.lang] + }} +

    + {%- include form/components/textarea-i18n.html id=include.idPreset + title=title group="howItWorks" param=site.data.forms.param.required_false + -%} +
    From 403ae308e2a51c2308e376e4606df970d0515352 Mon Sep 17 00:00:00 2001 From: Joseph Date: Fri, 14 Feb 2020 12:56:31 -0500 Subject: [PATCH 16/16] Rename Project Name to Research Name Co-authored-by: fnduister@gmail.com --- _data/i18n/form.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/_data/i18n/form.yml b/_data/i18n/form.yml index 852073094..f9f7e7aff 100644 --- a/_data/i18n/form.yml +++ b/_data/i18n/form.yml @@ -714,18 +714,18 @@ partnership: research: name: title: - en: Project Name - fr: Nom du projet + en: Research Name + fr: Nom de la recherche label: en: - en: English project name - fr: Nom du projet en anglais + en: English research Name + fr: Nom de la recherche en anglais fr: - en: French project name - fr: Nom du projet en français + en: French research Name + fr: Nom de la recherche en français schema: - en: Project Name - fr: Nom du projet + en: Research Name + fr: Nom de la recherche labels: select: en: If you wish to update information of a research that already exists in our library, please select it below