From 237404527d50f57a7426fabda12ace15b34508d2 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 12 Jan 2023 22:53:47 +0000 Subject: [PATCH] --- src/views/biz-subscription-server.vue | 19 ++-- src/views/home-notify-subscription.vue | 125 +++++++------------------ 2 files changed, 42 insertions(+), 102 deletions(-) diff --git a/src/views/biz-subscription-server.vue b/src/views/biz-subscription-server.vue index 78e67f7..145b162 100644 --- a/src/views/biz-subscription-server.vue +++ b/src/views/biz-subscription-server.vue @@ -32,14 +32,14 @@ @@ -210,13 +210,7 @@ @input="fieldValueChanged('customerSubDomain')" > - + - - + - - - - - - - + :readonly="formState.readOnly" + :label="$sock.t('ServerState')" + data-cy="idValue" + :rules="[form().integerValid(this, 'idValue')]" + :error-messages="form().serverErrors(this, 'idValue')" + @input="fieldValueChanged('idValue')" + > @@ -243,8 +181,7 @@ export default { data() { return { selectLists: { - wostatus: [], - quotestatus: [], + serverStates: [], eventTypes: [], deliveryMethods: [], coreSockTypes: [] @@ -284,24 +221,16 @@ export default { showDeliveryMethod() { return this.obj.eventType != 27; }, - showWoStatus() { + showServerStatus() { switch (this.obj.eventType) { - case 4: - case 24: - return true; - default: - return false; - } - }, - showQuoteStatus() { - switch (this.obj.eventType) { - case 9: - case 29: + case 36: + case 37: return true; default: return false; } }, + showDecValue() { //WorkorderTotalExceedsThreshold = 23 The "Andy" return this.obj.eventType == 23; // || this.obj.eventType == 11; //service bank threshold @@ -332,6 +261,7 @@ export default { case 22: case 25: case 34: + case 38: return true; default: return false; @@ -342,6 +272,8 @@ export default { case 24: case 29: case 10: + case 37: + case 39: return true; default: return false; @@ -542,7 +474,7 @@ export default { this.obj.decValue = 0; } - if (!this.showQuoteStatus && !this.showWoStatus) { + if (!this.showQuoteStatus && !this.showServerStatus) { this.obj.idValue = 0; } @@ -742,10 +674,9 @@ async function fetchTranslatedText() { "Tags", "Duration", "TaggedWith", - "WorkOrderStatus", "Total", "UiFieldDataTypesInteger", - "QuoteQuoteStatusType" + "ServerState" ]); } @@ -785,5 +716,19 @@ async function populateSelectionLists(vm) { ); await window.$gz.enums.fetchEnumList("coreview"); vm.selectLists.coreSockTypes = window.$gz.enums.getSelectionList("coreview"); + + await window.$gz.enums.fetchEnumList("ServerState"); + vm.selectLists.serverStates = window.$gz.enums.getSelectionList( + "ServerState" + ); } +/* +ServerStateStatusChange = 36, +ServerStateStatusAge=37, +SubscriptionServerExpiring = 38, +SubscriptionServerLastUpdateAge = 39, +SubscriptionServerRequestReceived = 40, +LicenseTrialRequestReceived = 41, +PurchaseNotificationReceived = 42 +*/