From 83a6f072b49ae38b26660c19c22d52c5d907e429 Mon Sep 17 00:00:00 2001
From: chiayin <chiayin.kuo@dsp.im>
Date: Tue, 12 Sep 2023 14:59:47 +0800
Subject: [PATCH] =?UTF-8?q?Issues=20#71:=20Short=20loop(s)=E3=80=81Self=20?=
 =?UTF-8?q?loop(s),=20ALL,=20Done.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Discover/Conformance/ConformanceSidebar.vue  | 16 ++++++++--------
 .../ConformanceSidebar/ConformanceRadioGroup.vue |  5 +----
 .../ConformanceSidebar/ConformanceShowBar.vue    |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue
index 1b2be23..53ca3ed 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar.vue
@@ -1,5 +1,5 @@
 <template>
-<section class="h-full shadow-[1px_0px_4px_rgba(0,0,0,0.25)] bg-neutral-100 absolute inset-y-0 left-0 z-10" :class="isShowBar?'w-full':'w-[312px]'">
+<section class="h-full shadow-[1px_0px_4px_rgba(0,0,0,0.25)] bg-neutral-100 absolute inset-y-0 left-0 z-10" :class="!notShowActList ? (isShowBar ? 'w-full' : 'w-[312px]') : 'w-[312px]'">
   <!-- header -->
   <div class="bg-neutral-200 px-4">
     <p class="h2">Rule Settings</p>
@@ -12,7 +12,7 @@
         <!-- radio group -->
         <ConformanceRadioGroup></ConformanceRadioGroup>
         <!-- show and hidden button -->
-        <div class="flex items-center justify-between mr-1" :class="isShowBar ? 'text-primary' : ''">
+        <div v-if="!notShowActList" class="flex items-center justify-between mr-1" :class="isShowBar ? 'text-primary' : ''">
           <p class="h2">Activity Selector</p>
           <span class="material-symbols-outlined cursor-pointer duration-300 hover:bg-primary/50 hover:rounded" @click="isShowBar = !isShowBar">{{ isShowBar ? 'keyboard_double_arrow_right' : 'keyboard_double_arrow_left' }}</span>
         </div>
@@ -70,7 +70,7 @@
       </div>
     </div>
     <!-- show bar -->
-    <ConformanceShowBar :class="isShowBar?'':'hidden'"
+    <ConformanceShowBar v-if="!notShowActList" :class="isShowBar?'':'hidden'"
     :isSubmit="isSubmit"
     :isSubmitTask="isSubmitTask"
     :isSubmitStartAndEnd="isSubmitStartAndEnd"
@@ -196,6 +196,11 @@ export default {
     ConformanceTimeRange,
     ConformanceSelectResult,
   },
+  computed: {
+    notShowActList: function() {
+      return (this.selectedRuleType === 'Activity sequence' && this.selectedActivitySequence === 'Sequence' && (this.selectedMode === 'Short loop(s)' || this.selectedMode === 'Self loop(s)')) || (this.selectedRuleType === 'Processing time' && this.selectedProcessScope === 'End to end' && this.selectedActSeqMore === 'All') || (this.selectedRuleType === 'Waiting time' && this.selectedProcessScope === 'End to end' && this.selectedActSeqMore === 'All') || (this.selectedRuleType === 'Cycle time' && this.selectedProcessScope === 'End to end' && this.selectedActSeqMore === 'All')
+    }
+  },
   methods: {
     /**
      * get min total seconds
@@ -831,11 +836,6 @@ export default {
         this.listSeq = [];
       };
     });
-    this.$emitter.on('isRadioMode', (data) => {
-      if(data) {
-        if(this.selectedMode === 'Short loop(s)' || this.selectedMode === 'Self loop(s)') this.isShowBar = false;
-      }
-    })
     this.$emitter.on('isRadioProcessScopeChange', (data) => {
       if(data) {
         this.selectDurationTime = { min: 0, max: 0};
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue
index e55425c..76a3b61 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue
@@ -20,7 +20,7 @@
     <div v-show="selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Sequence'">
       <p class="h2">Mode</p>
       <div v-for="mode in mode" :key="mode.id" class="ml-4 mb-2">
-        <RadioButton v-model="selectedMode" :inputId="mode.id + mode.name" name="mode" :value="mode.name" @change="changeRadioMode" />
+        <RadioButton v-model="selectedMode" :inputId="mode.id + mode.name" name="mode" :value="mode.name" />
         <label :for="mode.id + mode.name" class="ml-2">{{ mode.name }}</label>
       </div>
     </div>
@@ -110,9 +110,6 @@ export default {
     changeRadioSeq() {
       this.$emitter.emit('isRadioSeqChange',true);
     },
-    changeRadioMode() {
-      this.$emitter.emit('isRadioMode', true);
-    },
     changeRadioProcessScope() {
       this.$emitter.emit('isRadioProcessScopeChange', true);
     },
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
index 02a2815..a486b22 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="animate-fadein w-full h-full">
+  <section class="animate-fadein w-full h-full" >
     <!-- Have activity -->
     <ActList v-if="selectedRuleType === 'Have activity'" :data="conformanceTask" :select="isSubmitTask"></ActList>
     <!-- Activity sequence  -->