diff --git a/iris-client-fe/src/components/btn-toggle-select.vue b/iris-client-fe/src/components/btn-toggle-select.vue index 033273e2f..5cdbf8dd5 100644 --- a/iris-client-fe/src/components/btn-toggle-select.vue +++ b/iris-client-fe/src/components/btn-toggle-select.vue @@ -10,11 +10,11 @@ text v-for="selectOption in selectOptions" :key="selectOption.value" - :data-test="`btn.select.${selectOption.value}`" + :data-test="`${dataTestKey}.select.${selectOption.value}`" > {{ selectOption.text }} - Alle + Alle @@ -36,6 +36,10 @@ const BtnToggleSelectProps = Vue.extend({ type: Array as PropType, default: () => [], }, + dataTestKey: { + type: String, + default: "btn", + }, }, }); diff --git a/iris-client-fe/src/modules/vaccination-report/views/details/vaccination-report-details.view.vue b/iris-client-fe/src/modules/vaccination-report/views/details/vaccination-report-details.view.vue index b66350e8d..d20bf5342 100644 --- a/iris-client-fe/src/modules/vaccination-report/views/details/vaccination-report-details.view.vue +++ b/iris-client-fe/src/modules/vaccination-report/views/details/vaccination-report-details.view.vue @@ -10,6 +10,7 @@ @@ -24,13 +25,18 @@ show-select show-select-all :filter="dataTableFilter" + data-test="vaccination-report.employee.data-table" > @@ -117,9 +123,7 @@ export default class VaccinationReportDetailsView extends Mixins( firstName: employee.firstName || "-", address: getFormattedAddress(employee.address), vaccination: employee.vaccination || "-", - vaccinationStatus: vaccinationReportConstants.getStatusName( - employee.vaccinationStatus - ), + vaccinationStatus: employee.vaccinationStatus || "-", raw: employee, }; }); @@ -144,10 +148,10 @@ export default class VaccinationReportDetailsView extends Mixins( }); } getStatusColor = vaccinationReportConstants.getStatusColor; + getStatusName = vaccinationReportConstants.getStatusName; dataTableFilter(value: VREmployeeTableRow) { if (this.status) { - const statusName = vaccinationReportConstants.getStatusName(this.status); - return value.vaccinationStatus === statusName; + return value.vaccinationStatus === this.status; } return true; } diff --git a/iris-client-fe/src/modules/vaccination-report/views/list/vaccination-report-list.view.vue b/iris-client-fe/src/modules/vaccination-report/views/list/vaccination-report-list.view.vue index 4c9d17ed4..09de4c16b 100644 --- a/iris-client-fe/src/modules/vaccination-report/views/list/vaccination-report-list.view.vue +++ b/iris-client-fe/src/modules/vaccination-report/views/list/vaccination-report-list.view.vue @@ -18,6 +18,7 @@ :items-per-page.sync="query.size" :server-items-length="totalElements" @click:row="handleRowClick" + data-test="view.data-table" >