Issue #68: done.

src/components/Discover/Conformance/ConformanceSidebar.vue

@@ -21,7 +21,8 @@
         :isSubmit="isSubmit"
         :isSubmitTask="isSubmitTask"
         :isSubmitStartAndEnd="isSubmitStartAndEnd"
-        :isSubmitListSeq="isSubmitListSeq"
+        :isSubmitCfmSeqDirectly="isSubmitCfmSeqDirectly"
+        :isSubmitCfmSeqEventually="isSubmitCfmSeqEventually"
         :isSubmitDurationData="isSubmitDurationData"
         :isSubmitCfmPtEteStart="isSubmitCfmPtEteStart"
         :isSubmitCfmPtEteEnd="isSubmitCfmPtEteEnd"
@@ -74,7 +75,8 @@
     :isSubmit="isSubmit"
     :isSubmitTask="isSubmitTask"
     :isSubmitStartAndEnd="isSubmitStartAndEnd"
-    :isSubmitListSeq="isSubmitListSeq"
+    :isSubmitCfmSeqDirectly="isSubmitCfmSeqDirectly"
+    :isSubmitCfmSeqEventually="isSubmitCfmSeqEventually"
     :isSubmitDurationData="isSubmitDurationData"
     :isSubmitCfmPtEteStart="isSubmitCfmPtEteStart"
     :isSubmitCfmPtEteEnd="isSubmitCfmPtEteEnd"
@@ -119,13 +121,12 @@ export default {
       isShowBar: false,
       visibleLeft: false,
       selectConformanceTask: null,
-      selectConformanceStartAndEnd: null,
+      selectConformanceStartAndEnd: null, // Activity sequence
       selectCfmSeqStart: null,
       selectCfmSeqEnd: null,
-      selectConformanceFrom: null,
-      selectConformanceTo: null,
-      listSeq: [],
-      selectDurationData: null,
+      selectCfmSeqDirectly: [],
+      selectCfmSeqEventually: [],
+      selectDurationData: null, // Activity duration
       selectDurationTime: { min: 0, max: 0},
       selectTimeRangeMin: 0, // Time Range min
       selectTimeRangeMax: 0, // Time Range max
@@ -152,8 +153,9 @@ export default {
       isSubmit: false,
       isSubmitData: null, // 已 Apply 後，沒有重新改變規則的 Data
       isSubmitTask: null,
-      isSubmitStartAndEnd: null,
-      isSubmitListSeq: [],
+      isSubmitStartAndEnd: null, // Activity sequence
+      isSubmitCfmSeqDirectly: [],
+      isSubmitCfmSeqEventually: [],
       isSubmitDurationData: null, // Activity duration
       isSubmitCfmPtEteStart: null, // Processing time
       isSubmitCfmPtEteEnd: null,
@@ -231,9 +233,8 @@ export default {
       this.selectConformanceStartAndEnd = null; // Activity Sequence
       this.selectCfmSeqStart = null;
       this.selectCfmSeqEnd = null;
-      this.selectConformanceFrom = null;
-      this.selectConformanceTo = null;
-      this.listSeq = [];
+      this.selectCfmSeqDirectly = [];
+      this.selectCfmSeqEventually = [];
       this.selectDurationData = null; // Activity durations
       this.selectTimeRangeMin = 0; // Time Range min
       this.selectTimeRangeMax = 0; // Time Range max
@@ -262,10 +263,11 @@ export default {
      * is submit select Reset
      */
     isSubmitReset() {
-      // 沒有 isSubmitData
+      // 不包含 isSubmitData
       this.isSubmitTask = null;
       this.isSubmitStartAndEnd = null;
-      this.isSubmitListSeq = [];
+      this.isSubmitCfmSeqDirectly = [];
+      this.isSubmitCfmSeqEventually = [];
       this.isSubmitDurationData = null;
       this.isSubmitDurationTime = null;
       this.isSubmitCfmPtEteStart = null; // Processing time
@@ -364,18 +366,22 @@ export default {
             case 'Sequence': // Activity Sequence 選 Sequence 的行為
               switch (this.selectedMode) {
                 case 'Directly follows':
-                  if(this.listSeq.length < 2) return this.$toast.error('Select two or more.');
+                  if(this.selectCfmSeqDirectly.length < 2) return this.$toast.error('Select two or more.');
                   else data = {
                     type: 'directly-follows',
-                    task_seq: this.listSeq,
+                    task_seq: this.selectCfmSeqDirectly,
                   };
+                  this.isSubmitReset();
+                  this.isSubmitCfmSeqDirectly = this.selectCfmSeqDirectly;
                   break;
                 case 'Eventually follows':
-                  if(this.listSeq.length < 2) return this.$toast.error('Select two or more.');
+                  if(this.selectCfmSeqEventually.length < 2) return this.$toast.error('Select two or more.');
                   else data = {
                     type: 'eventually-follows',
-                    task_seq: this.listSeq,
+                    task_seq: this.selectCfmSeqEventually,
                   };
+                  this.isSubmitReset();
+                  this.isSubmitCfmSeqEventually = this.selectCfmSeqEventually;
                   break;
                 case 'Short loop(s)':
                   data = {
@@ -390,8 +396,6 @@ export default {
                 default:
                   break;
               };
-              this.isSubmitReset();
-              this.isSubmitListSeq = this.listSeq;
             default:
               break;
           }
@@ -822,15 +826,23 @@ export default {
           this.selectCfmCtEteSEEnd = data.task;
           break;
         default:
-          if(this.selectedRuleType === 'Activity sequence') this.listSequence = [data.task];
-          else if(this.selectedRuleType === 'Activity duration') {
+          if(this.selectedRuleType === 'Activity duration') {
             this.selectDurationData = [data.task];
           };
           break;
       };
     });
     this.$emitter.on('getListSequence', (data) => {
-      this.listSeq = data;
+      switch (data.category) {
+        case 'cfmSeqDirectly':
+          this.selectCfmSeqDirectly = data.task;
+          break;
+        case 'cfmSeqEventually':
+          this.selectCfmSeqEventually = data.task;
+          break;
+        default:
+          break;
+      }
     });
     // Radio 切換時，資料要清空
     this.$emitter.on('isRadioChange', (data) => {
@@ -842,7 +854,8 @@ export default {
     this.$emitter.on('isRadioSeqChange', (data) => {
       if(data) {
         this.selectConformanceStartAndEnd = null;
-        this.listSeq = [];
+        this.selectCfmSeqDirectly = [];
+        this.selectCfmSeqEventually = [];
       };
     });
     this.$emitter.on('isRadioProcessScopeChange', (data) => {