Skip to content

Commit

Permalink
Merge pull request #3055 from dhis2/dev
Browse files Browse the repository at this point in the history
fix: merge to master
  • Loading branch information
edoardo authored May 13, 2024
2 parents afc06c2 + b1b6148 commit 7a5fd93
Show file tree
Hide file tree
Showing 9 changed files with 395 additions and 64 deletions.
3 changes: 3 additions & 0 deletions cypress/elements/pivotTable.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
const valueCellEl = 'visualization-value-cell'
const headerCellEl = 'visualization-column-header'

export const expectTableToBeVisible = () =>
cy.get('.pivot-table-container').should('have.length', 1).and('be.visible')

export const clickTableValueCell = (index) =>
cy.getBySel(valueCellEl).eq(index).click()

Expand Down
82 changes: 82 additions & 0 deletions cypress/integration/options/totals.cy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
import {
AXIS_ID_COLUMNS,
AXIS_ID_ROWS,
DIMENSION_ID_DATA,
DIMENSION_ID_PERIOD,
VIS_TYPE_PIVOT_TABLE,
visTypeDisplayNames,
} from '@dhis2/analytics'
import { checkCheckbox } from '../../elements/common.js'
import {
clickDimensionModalHideButton,
clickDimensionModalUpdateButton,
expectDimensionModalToBeVisible,
selectAllItemsByButton,
selectDataElements,
selectFixedPeriods,
unselectAllItemsByButton,
} from '../../elements/dimensionModal/index.js'
import {
clickContextMenuAdd,
openContextMenu as openDimPanelContextMenu,
openDimension,
} from '../../elements/dimensionsPanel.js'
import { clickContextMenuMove, openContextMenu } from '../../elements/layout.js'
import { openOptionsModal } from '../../elements/menuBar.js'
import {
OPTIONS_TAB_DATA,
clickOptionsModalHideButton,
} from '../../elements/optionsModal/index.js'
import {
colTotalsOptionEl,
expectColumnsTotalsToBeChecked,
} from '../../elements/optionsModal/totals.js'
import { expectTableToBeVisible } from '../../elements/pivotTable.js'
import { goToStartPage } from '../../elements/startScreen.js'
import { changeVisType } from '../../elements/visualizationTypeSelector.js'
import { TEST_CUSTOM_DIMENSIONS } from '../../utils/data.js'

const AREA_DIMENSION = TEST_CUSTOM_DIMENSIONS.find((dim) => dim.name === 'Area')

describe('Options - Column totals', () => {
describe('Regression test for DHIS2-17297', () => {
it('does not crash', () => {
goToStartPage()
changeVisType(visTypeDisplayNames[VIS_TYPE_PIVOT_TABLE])

openOptionsModal(OPTIONS_TAB_DATA)
checkCheckbox(colTotalsOptionEl)

expectColumnsTotalsToBeChecked()

clickOptionsModalHideButton()

openContextMenu(DIMENSION_ID_DATA)
clickContextMenuMove(DIMENSION_ID_DATA, AXIS_ID_ROWS)
openContextMenu(DIMENSION_ID_PERIOD)
clickContextMenuMove(DIMENSION_ID_PERIOD, AXIS_ID_COLUMNS)

openDimension(DIMENSION_ID_DATA)
selectDataElements(['ART enrollment stage 1'])
clickDimensionModalHideButton()

const year = new Date().getFullYear().toString()
openDimension(DIMENSION_ID_PERIOD)
unselectAllItemsByButton()
selectFixedPeriods(
[`May ${year}`, `June ${year}`, `July ${year}`],
'Monthly'
)
clickDimensionModalHideButton()

openDimPanelContextMenu(AREA_DIMENSION.id)
clickContextMenuAdd(AREA_DIMENSION.id, AXIS_ID_ROWS)
expectDimensionModalToBeVisible(AREA_DIMENSION.id)
selectAllItemsByButton()

clickDimensionModalUpdateButton()

expectTableToBeVisible()
})
})
})
61 changes: 47 additions & 14 deletions i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ msgid ""
"'{{visualizationType}}' is intended to show a single item for this type of "
"dimension. Only the first item will be used and saved."
msgstr ""
"'{{visualizationType}}' está destinado a mostrar un solo elemento para este "
"tipo de dimensión. Sólo se utilizará y guardará el primer elemento."

msgid ""
"'{{visualiationType}}' is intended to show maximum {{maxNumber}} number of "
Expand All @@ -81,6 +83,8 @@ msgid ""
"'Outlier table' shows values from data elements only. Only data elements "
"will be used and saved."
msgstr ""
"La 'tabla de valores atípicos' muestra valores de elementos de datos "
"únicamente. Sólo se utilizarán y guardarán elementos de datos."

msgid "Vertical"
msgstr "Vertical"
Expand Down Expand Up @@ -203,13 +207,13 @@ msgid "None selected"
msgstr "Ninguno seleccionado"

msgid "None in use"
msgstr ""
msgstr "Ninguno en uso"

msgid "Only '{{- name}}' in use"
msgstr "Solo '{{- name}}' en uso"

msgid "Only {{number}} in use"
msgstr ""
msgstr "Solo {{number}} en uso"

msgid "All items are selected"
msgstr "Todos los elementos están seleccionados"
Expand Down Expand Up @@ -612,6 +616,8 @@ msgid ""
"The maximum number of outlier values to show in the table. Must be between "
"1-500."
msgstr ""
"El número máximo de valores atípicos a mostrar en la tabla. Debe estar entre"
" 1-500."

msgid "Organisation unit"
msgstr "Unidad organizativa"
Expand Down Expand Up @@ -740,10 +746,10 @@ msgid "{{level}} level in {{orgunit}}"
msgstr "{{level}} nivel en {{orgunit}}"

msgid "Sort ascending by {{columnName}} and update"
msgstr ""
msgstr "Ordenar de forma ascendente por {{columnName}} y actualizar"

msgid "Sort descending by {{columnName}} and update"
msgstr ""
msgstr "Ordenar de forma descendente por {{columnName}} y actualizar"

msgid "Open as Map"
msgstr "Abrir como mapa"
Expand All @@ -755,68 +761,89 @@ msgstr ""
" capas de mapa separadas."

msgid "Category option combination"
msgstr ""
msgstr "Category option combination"

msgid "Absolute deviation"
msgstr ""
msgstr "Desviación absoluta"

msgid ""
"A measure of the absolute difference between each data point and a central "
"value, usually the mean or median, providing a straightforward understanding"
" of dispersion in the dataset."
msgstr ""
"Una medida de la diferencia absoluta entre cada punto de datos y un valor "
"central, generalmente la media o mediana, que proporciona una comprensión "
"directa de la dispersión en el conjunto de datos."

msgid ""
"A measure of how far a data point deviates from the median, using the median"
" absolute deviation instead of the standard deviation, making it robust "
"against outliers."
msgstr ""
"Una medida de qué tan lejos se desvía un punto de datos de la mediana, "
"utilizando la desviación absoluta de la mediana en lugar de la desviación "
"estándar, lo que la hace robusta frente a los valores atípicos."

msgid "Median"
msgstr ""
msgstr "Mediana"

msgid ""
"The middle value in a dataset when the values are arranged in ascending or "
"descending order. It's a robust measure of central tendency that is less "
"affected by outliers compared to the mean."
msgstr ""
"El valor medio de un conjunto de datos cuando los valores están ordenados de"
" forma ascendente o descendente. Es una medida robusta de tendencia central "
"que se ve menos afectada por los valores atípicos en comparación con la "
"media."

msgid "Median absolute deviation"
msgstr ""
msgstr "Desviación absoluta mediana"

msgid ""
"A robust measure of variability, found by calculating the median of the "
"absolute differences between each data point and the overall median. It's "
"less influenced by outliers compared to other measures like the standard "
"deviation."
msgstr ""
"Una medida sólida de variabilidad, que se obtiene calculando la mediana de "
"las diferencias absolutas entre cada punto de datos y la mediana general. "
"Está menos influenciado por valores atípicos en comparación con otras "
"medidas como la desviación estándar."

msgid "Z-score"
msgstr ""
msgstr "Puntuación Z"

msgid ""
"A measure of how many standard deviations a data point is from the mean of a"
" dataset, providing insight into how unusual or typical that data point is "
"relative to the rest of the distribution."
msgstr ""
"Una medida de cuántas desviaciones estándar tiene un punto de datos de la "
"media de un conjunto de datos, proporcionando información sobre cuán inusual"
" o típico es ese punto de datos en relación con el resto de la distribución."

msgid "Mean"
msgstr ""
msgstr "Media"

msgid "Average of the value over time."
msgstr ""
msgstr "Promedio del valor en el tiempo."

msgid ""
"A measure of how dispersed the data is in relation to the mean. Low standard"
" deviation indicates data are clustered tightly around the mean, and high "
"standard deviation indicates data are more spread out."
msgstr ""
"Una medida de cuán dispersos están los datos en relación con la media. Una "
"desviación estándar baja indica que los datos están agrupados estrechamente "
"alrededor de la media, y la desviación estándar alta indica que los datos "
"están más dispersos."

msgid "Minimum score threshold"
msgstr ""
msgstr "Umbral de puntuación mínima"

msgid "Maximum score threshold"
msgstr ""
msgstr "Umbral de puntuación máxima"

msgid "Not supported when using cumulative values"
msgstr "No es compatible cuando se utilizan valores acumulativos."
Expand Down Expand Up @@ -973,10 +1000,12 @@ msgid "There's a syntax problem with the analytics request."
msgstr "Hay un problema de sintaxis con la solicitud de análisis."

msgid "No outliers found"
msgstr ""
msgstr "No se encontraron valores atípicos"

msgid "There were no outliers found for the selected data items and options."
msgstr ""
"No se encontraron valores atípicos para los elementos de datos y opciones "
"seleccionados."

msgid "or"
msgstr "o"
Expand Down Expand Up @@ -1256,9 +1285,13 @@ msgid ""
"Compare the relationship between two data items across multiple places. "
"Recommended for visualizing outliers."
msgstr ""
"Comparar la relación entre dos elementos de datos en varios lugares. "
"Recomendado para visualizar valores atípicos."

msgid "Automatically identify extreme outliers based on historical data."
msgstr ""
"Identificar automáticamente los valores atípicos extremos basándose en datos"
" históricos."

msgid "Weeks per year"
msgstr "Semanas por año"
Expand Down
Loading

0 comments on commit 7a5fd93

Please sign in to comment.