diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue
index 408ed2f..7c100fe 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar.vue
@@ -24,53 +24,53 @@
@@ -89,33 +89,33 @@
@@ -160,7 +160,6 @@ export default {
i18next: i18next,
isMainBtnDisabled: true,
isShowBarOpen: false,
- visibleLeft: false,
selectConformanceTask: null,
selectConformanceStartAndEnd: null, // Activity sequence
selectCfmSeqStart: null,
@@ -297,44 +296,44 @@ export default {
* Apply button is disabled or not
*/
isApplyBtnDisabled() {
- let disabled = true;
+ let disabledBool = true;
switch (this.selectedRuleType) {
case 'Have activity': // Rule Type 選 Have activity 的行為
if(this.selectConformanceTask?.length) {
- disabled = false;
+ disabledBool = false;
}
break
case 'Activity sequence': // Rule Type 選 Activity sequence 的行為
switch (this.selectedActivitySequence) {
case 'Start & End': // Activity Sequence 選 Start & End 的行為
if(this.selectCfmSeqStart && this.selectCfmSeqEnd) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'Sequence': // Activity Sequence 選 Sequence 的行為
switch (this.selectedMode) {
case 'Directly follows':
if(this.selectCfmSeqDirectly.length >= 2) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'Eventually follows':
if(this.selectCfmSeqEventually.length >= 2) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'Short loop(s)':
disabled = false;
break;
case 'Self loop(s)':
- disabled = false;
+ disabledBool = false;
break;
};
}
break;
case 'Activity duration': // Rule Type 選 Activity duration 的行為
if(this.selectDurationData?.length) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'Processing time': // Rule Type 選 Processing time 的行為
@@ -342,30 +341,30 @@ export default {
case 'End to end':
switch (this.selectedActSeqMore) {
case 'All':
- disabled = false;
+ disabledBool = false;
break;
case 'Start':
if(this.selectCfmPtEteStart) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'End':
if(this.selectCfmPtEteEnd) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'Start & End':
if(!this.isAlreadySubmit) {
if(this.selectCfmPtEteSEStart && this.selectCfmPtEteSEEnd){
- disabled = false;
+ disabledBool = false;
}
} else {
if((!this.selectCfmPtEteSEStart && this.selectCfmPtEteSEEnd)
|| (this.selectCfmPtEteSEStart && !this.selectCfmPtEteSEEnd)) {
- disabled = true;
+ disabledBool = true;
}
else {
- disabled = false;
+ disabledBool = false;
}
}
break;
@@ -375,26 +374,26 @@ export default {
switch (this.selectedActSeqFromTo) {
case 'From':
if(this.selectCfmPtPStart) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'To':
if(this.selectCfmPtPEnd) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'From & To':
if(!this.isAlreadySubmit) {
if(this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd) {
- disabled = false;
+ disabledBool = false;
}
} else {
if((!this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd)
|| (this.selectCfmPtPSEStart && !this.selectCfmPtPSEEnd)) {
- disabled = true;
+ disabledBool = true;
}
else {
- disabled = false;
+ disabledBool = false;
}
}
break;
@@ -408,25 +407,25 @@ export default {
switch (this.selectedActSeqMore) {
case 'Start':
if(this.selectCfmWtEteStart) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'End':
if(this.selectCfmWtEteEnd) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'Start & End':
if(!this.isAlreadySubmit) {
if(this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd) {
- disabled = false;
+ disabledBool = false;
} else {
if((!this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd)
|| (this.selectCfmWtEteSEStart && !this.selectCfmWtEteSEEnd)) {
- disabled = true;
+ disabledBool = true;
}
else {
- disabled = false;
+ disabledBool = false;
}
}
break;
@@ -437,26 +436,26 @@ export default {
switch (this.selectedActSeqFromTo) {
case 'From':
if(this.selectCfmWtPStart) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'To':
if(this.selectCfmWtPEnd) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'From & To':
if(!this.isAlreadySubmit) {
if(this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd) {
- disabled = false;
+ disabledBool = false;
}
} else {
if((!this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd)
|| (this.selectCfmWtPSEStart && !this.selectCfmWtPSEEnd)) {
- disabled = true;
+ disabledBool = true;
}
else {
- disabled = false;
+ disabledBool = false;
}
}
break;
@@ -467,30 +466,30 @@ export default {
case 'Cycle time': // Rule Type 選 Cycle time 的行為
switch (this.selectedActSeqMore) {
case 'All':
- disabled = false;
+ disabledBool = false;
break;
case 'Start':
if(this.selectCfmCtEteStart) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'End':
if(this.selectCfmCtEteEnd) {
- disabled = false;
+ disabledBool = false;
}
break;
case 'Start & End':
if(!this.isAlreadySubmit) {
if(this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) {
- disabled = false;
+ disabledBool = false;
}
} else {
if((!this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd)
|| (this.selectCfmCtEteSEStart && !this.selectCfmCtEteSEEnd)) {
- disabled = true;
+ disabledBool = true;
}
else {
- disabled = false;
+ disabledBool = false;
}
}
break;
@@ -498,7 +497,7 @@ export default {
break;
};
- return this.isMainBtnDisabled = disabled;
+ return this.isMainBtnDisabled = disabledBool;
},
},
@@ -902,7 +901,7 @@ export default {
this.selectTimeReset();
this.$emitter.emit('reset', null);
// reset 成功訊息
- this.$toast.success('Rule cleared.');
+ this.$toast.success(i18next.t("Conformance.RuleCleared"));
this.isShowBarOpen = true;
},
/**
@@ -1292,10 +1291,10 @@ export default {
break;
};
if(dataToSave.min > dataToSave.max) {
- return this.$toast.error('Please check time range setting.');
+ return this.$toast.error(i18next.t("Conformance.PleaseCheckTimeRange"));
}
if(JSON.stringify(dataToSave) === JSON.stringify(this.isSubmittedData)) {
- return this.$toast.error('Please set the new rule.');
+ return this.$toast.error(i18next.t("Conformance.PleaseSetNewRule"));
}
this.isLoading = true;
@@ -1308,7 +1307,7 @@ export default {
this.isLoading = false;
// Results page Cover Plate
this.$emitter.emit('coverPlate', false);
- this.$toast.success('Rule applied.');
+ this.$toast.success(i18next.t("Conformance.RuleApplied"));
},
setTaskByCategoryOnRadioEmitting () {
this.$emitter.on('actRadioData', (data) => {
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/TimeRangeDuration.vue b/src/components/Discover/Conformance/ConformanceSidebar/TimeRangeDuration.vue
index a122d39..fa23640 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/TimeRangeDuration.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/TimeRangeDuration.vue
@@ -1,8 +1,12 @@
-
+
+
~
-
+
+