This commit is contained in:
2020-07-23 22:43:58 +00:00
parent ca9269dc3e
commit a1f49341c3
2 changed files with 10 additions and 2 deletions

View File

@@ -42,7 +42,7 @@ todo: notification system docs
While it's fresh write a quick overview in docs so can flesh it out more later but get the main points even if in shorthand While it's fresh write a quick overview in docs so can flesh it out more later but get the main points even if in shorthand
Big overview then drill down Big overview then drill down
todo: need a place to send a General (old "quick") notification directly to a user and test it works via email delivery as well when user subscribes to general via email
todo: As biz objects are fleshed out need to also code their notification event stuff as well todo: As biz objects are fleshed out need to also code their notification event stuff as well
todo: Localize this message or get rid of it, it's annoying and possibly useless todo: Localize this message or get rid of it, it's annoying and possibly useless
"Error checking for notifications, see about->log for details; log out and back in again to reset " "Error checking for notifications, see about->log for details; log out and back in again to reset "

View File

@@ -78,7 +78,7 @@
></gz-duration-picker> ></gz-duration-picker>
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col v-if="showDeliveryMethod" cols="12" sm="6" lg="4" xl="3">
<v-select <v-select
v-model="obj.deliveryMethod" v-model="obj.deliveryMethod"
:items="selectLists.deliveryMethods" :items="selectLists.deliveryMethods"
@@ -295,6 +295,9 @@ export default {
showDeliveryAddress() { showDeliveryAddress() {
return this.obj.deliveryMethod == 2; return this.obj.deliveryMethod == 2;
}, },
showDeliveryMethod() {
return this.obj.eventType != 27;
},
showWoStatus() { showWoStatus() {
switch (this.obj.eventType) { switch (this.obj.eventType) {
case 4: case 4:
@@ -371,6 +374,11 @@ export default {
!this.formState.loading && !this.formState.loading &&
!this.formState.readOnly !this.formState.readOnly
) { ) {
//"fieldValueChanged('eventType')"
//if it's a general notification make sure delivery is set to email
if (ref == "eventType" && this.obj.eventType == 27) {
this.obj.deliveryMethod = 2;
}
window.$gz.form.fieldValueChanged(this, ref); window.$gz.form.fieldValueChanged(this, ref);
} }
}, },