Merge branch 'master' of https://github.com/dev-otta/dhis2-who-growth…

…-chart into eas/feat/CGC-51_ImplementationGuideInMarkdown

cypress/component/ChartSelector/ChartSelector.cy.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { ChartSelector } from '../../../src/Components/GrowthChartSelector';
 import { useChartDataForGender } from '../../../src/utils/DataFetching/Sorting/useChartDataForGender';
+import { ChartSelector } from '../../../src/components/GrowthChart/GrowthChartSelector';
 
 describe('ChartSelector', () => {
     const TestComponent = () => {

cypress/component/ChartSelector/ChartSelectorDropdown/ChartSelectorDropdown.cy.js

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { ChartSelectorDropdown } from '../../../../src/Components/GrowthChartSelector/ChartSelectorDropdown';
+import { ChartSelectorDropdown } from '../../../../src/components/GrowthChart/GrowthChartSelector/ChartSelectorDropdown';
 
 describe('ChartSelectorDropdown', () => {
     const TestComponent = () => {

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-03-18T10:17:19.228Z\n"
-"PO-Revision-Date: 2024-03-18T10:17:19.228Z\n"
+"POT-Creation-Date: 2024-03-25T03:31:40.489Z\n"
+"PO-Revision-Date: 2024-03-25T03:31:40.489Z\n"
 
 msgid "Date"
 msgstr "Date"
@@ -17,41 +17,20 @@ msgstr "Height"
 msgid "Weight"
 msgstr "Weight"
 
-msgid "Year"
-msgstr "Year"
-
-msgid "Years"
-msgstr "Years"
-
-msgid "Month"
-msgstr "Month"
-
-msgid "Months"
-msgstr "Months"
-
 msgid "Growth Chart"
 msgstr "Growth Chart"
 
-msgid "There was an error fetching the config for the growth chart."
-msgstr "There was an error fetching the config for the growth chart."
-
-msgid "Please check the configuration in Datastore Management and try again."
-msgstr "Please check the configuration in Datastore Management and try again."
+msgid "Months"
+msgstr "Months"
 
 msgid "Weeks"
 msgstr "Weeks"
 
-msgid "Head circumference (cm)"
-msgstr "Head circumference (cm)"
-
-msgid "Length (cm)"
-msgstr "Length (cm)"
-
-msgid "Height (cm)"
-msgstr "Height (cm)"
+msgid "Head circumference"
+msgstr "Head circumference"
 
-msgid "Weight (kg)"
-msgstr "Weight (kg)"
+msgid "Length"
+msgstr "Length"
 
 msgid "Head circumference for age"
 msgstr "Head circumference for age"
@@ -82,3 +61,18 @@ msgstr "Boy"
 
 msgid "Girl"
 msgstr "Girl"
+
+msgid "There was an error fetching the config for the growth chart."
+msgstr "There was an error fetching the config for the growth chart."
+
+msgid "Please check the configuration in Datastore Management and try again."
+msgstr "Please check the configuration in Datastore Management and try again."
+
+msgid "Year"
+msgstr "Year"
+
+msgid "Years"
+msgstr "Years"
+
+msgid "Month"
+msgstr "Month"

package.json

@@ -17,12 +17,12 @@
   "devDependencies": {
     "@dhis2/cli-app-scripts": "^11.0.0",
     "@testing-library/cypress": "^10.0.1",
-    "cypress": "^13.6.6",
+    "cypress": "^13.7.0",
     "eslint": "8.57.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-react": "^7.34.0",
+    "eslint-plugin-react": "^7.34.1",
     "react-scripts": "5.1.0-next.14",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.3.3"