diff --git a/ayanova/src/views/home-memo.vue b/ayanova/src/views/home-memo.vue
index 9de75174..bb665b36 100644
--- a/ayanova/src/views/home-memo.vue
+++ b/ayanova/src/views/home-memo.vue
@@ -5,6 +5,10 @@
+
+
@@ -33,20 +37,7 @@
-
-
-
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
@@ -241,7 +273,6 @@ export default {
sent: null,
fromName: null
},
- tab: 0,
formState: {
ready: false,
dirty: false,
@@ -255,8 +286,9 @@ export default {
rights: window.$gz.role.defaultRightsObject(),
ayaType: window.$gz.type.Memo,
composing: false,
- selectedUsers: [],
- selectedUser: null
+ pickListSelectedUserId: null,
+ items: [],
+ toUsers: []
};
},
//WATCHERS
@@ -268,8 +300,9 @@ export default {
return;
}
+ let hasSelection = this.toUsers.length > 0;
//enable / disable save button
- if (val.dirty && val.valid && !val.readOnly) {
+ if (val.dirty && val.valid && !val.readOnly && hasSelection) {
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
} else {
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
@@ -298,10 +331,42 @@ export default {
}
vm.selectedUsers.push(user);
},
- canSave: function() {
- return this.formState.valid && this.formState.dirty;
+ updateSave: function() {
+ let hasSelection = this.toUsers.length > 0;
+ //enable / disable save button
+ if (
+ this.formState.dirty &&
+ this.formState.valid &&
+ !this.formState.readOnly &&
+ hasSelection
+ ) {
+ window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
+ } else {
+ window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
+ }
},
+ closeChip(item) {
+ let i = this.toUsers.findIndex(z => z.id == item.id);
+ if (i != -1) {
+ this.toUsers.splice(i, 1);
+ }
+ this.updateSave();
+ },
+ addSelected() {
+ let selected = this.$refs.userPickList.getFullSelectionValue();
+ if (selected == null) {
+ return;
+ }
+ //already in the list?
+ if (this.toUsers.find(z => z.id == selected.id)) {
+ return;
+ }
+
+ this.toUsers.push(selected);
+ this.pickListSelectedUserId = 0;
+ this.updateSave();
+ },
ayaTypes: function() {
return window.$gz.type;
},
@@ -363,6 +428,7 @@ export default {
async submit() {
let vm = this;
if (vm.canSave == false) {
+ console.log("Can save is false");
return;
}
diff --git a/ayanova/src/views/home-notify-direct.vue b/ayanova/src/views/home-notify-direct.vue
index fa076727..070f92d9 100644
--- a/ayanova/src/views/home-notify-direct.vue
+++ b/ayanova/src/views/home-notify-direct.vue
@@ -5,7 +5,7 @@
-
+
+
+
+
+
+
+ {{ item.name }}
+
+