diff --git a/cypress/fixtures/filterFunnel.cy.js b/cypress/fixtures/filterFunnel.cy.js index 4ce6242..a1f8b84 100644 --- a/cypress/fixtures/filterFunnel.cy.js +++ b/cypress/fixtures/filterFunnel.cy.js @@ -60,7 +60,7 @@ describe('Save Log and Filter', ()=>{ it('Sequence, Start', () => { // select radio cy.get('input#Sequence0').should('be.checked'); // 選取 Radio 'Sequence' - cy.contains('label', 'Start activity / End activity') // 選取 Radio 'Have activity(s)' + cy.contains('label', 'Start & End') // 選取 Radio 'Have activity(s)' .prev(2) .find('input') .should('have.attr', 'type', 'radio') // select the previous element @@ -98,7 +98,7 @@ describe('Save Log and Filter', ()=>{ it('Sequence, End', () => { // select radio cy.get('input#Sequence0').should('be.checked'); // 選取 Radio 'Sequence' - cy.contains('label', 'Start activity / End activity') // 選取 Radio 'Have activity(s)' + cy.contains('label', 'Start & End') // 選取 Radio 'Have activity(s)' .prev(2) .find('input') .should('have.attr', 'type', 'radio') // select the previous element @@ -137,7 +137,7 @@ describe('Save Log and Filter', ()=>{ it('Sequence, Start & End', () => { // select radio cy.get('input#Sequence0').should('be.checked'); // 選取 Radio 'Sequence' - cy.contains('label', 'Start activity / End activity') // 選取 Radio 'Have activity(s)' + cy.contains('label', 'Start & End') // 選取 Radio 'Have activity(s)' .prev(2) .find('input') .should('have.attr', 'type', 'radio') // select the previous element diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue index 725f0d0..2616d01 100644 --- a/src/components/Discover/Map/SidebarFilter.vue +++ b/src/components/Discover/Map/SidebarFilter.vue @@ -24,7 +24,7 @@ -
+

Start & End

@@ -71,11 +71,11 @@ - + - + -
+
@@ -130,7 +130,7 @@ export default { selectFilter: { // 'Filter Type': ['Sequence', 'Attributes', 'Trace', 'Timeframes'], 'Filter Type': ['Sequence', 'Trace', 'Timeframes'], - 'Activity Sequence':['Have activity(s)', 'Start activity / End activity', 'Sequence'], + 'Activity Sequence':['Have activity(s)', 'Start & End', 'Sequence'], 'Start & End': ['Start', 'End', 'Start & End'], 'Mode': ['Directly follows', 'Eventually follows'], 'ModeAtt': ['Case', 'Activity'], @@ -202,7 +202,7 @@ export default { case 'Have activity(s)': // Activity Sequence 選 Have activity(s) 的行為 if(this.selectFilterTask && this.selectFilterTask?.length !== 0) disabled = false; break; - case 'Start activity / End activity': // Activity Sequence 選 Start activity / End activity 的行為 + case 'Start & End': // Activity Sequence 選 Start & End 的行為 switch(sele[2]) { case 'Start': if(this.selectFilterStart) disabled = false; @@ -458,7 +458,7 @@ export default { } }); break; - case 'Start activity / End activity': // Activity Sequence 選 Start activity / End activity 的行為 + case 'Start & End': // Activity Sequence 選 Start & End 的行為 switch(sele[2]) { case 'Start': data = {