This commit is contained in:
@@ -10,8 +10,8 @@
|
|||||||
## ROUGH SCHEDULE
|
## ROUGH SCHEDULE
|
||||||
|
|
||||||
new testing cases
|
new testing cases
|
||||||
|
3964 redux
|
||||||
|
todo: Alert / popup notes should not be red, that is reserved for ayanova errors and confusing, so make it orangey instead warning color
|
||||||
Schedule form
|
Schedule form
|
||||||
Dashboard / widgets
|
Dashboard / widgets
|
||||||
Installer INNO
|
Installer INNO
|
||||||
@@ -735,6 +735,9 @@ BUILD 130 CHANGES OF NOTE
|
|||||||
- case 3954 Tags not available in data list for Users (or Contacts) added
|
- case 3954 Tags not available in data list for Users (or Contacts) added
|
||||||
- Migrate: added code to set Tags on Contact type users created from v7 Client contacts (use same tags as Customer)
|
- Migrate: added code to set Tags on Contact type users created from v7 Client contacts (use same tags as Customer)
|
||||||
- case 3955 back to you for recommendations
|
- case 3955 back to you for recommendations
|
||||||
|
- case 3956 implemented
|
||||||
|
- case 3958 fixed
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -375,6 +375,21 @@ export default {
|
|||||||
`task-group/${this.selectedTaskGroup}`
|
`task-group/${this.selectedTaskGroup}`
|
||||||
);
|
);
|
||||||
if (res.data && res.data.items) {
|
if (res.data && res.data.items) {
|
||||||
|
//If there is one empty task line only then they likely just want to append the group and ditch the default empty item so remove it here
|
||||||
|
if (
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks.length == 1 &&
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks[0].task == null &&
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks[0].id == 0
|
||||||
|
) {
|
||||||
|
//but first need to unbreak rule from initial add empty in case it's the only broken validation rule preventing saving
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks[0].task = "..";
|
||||||
|
this.fieldValueChanged(
|
||||||
|
`Items[${this.activeWoItemIndex}].tasks[${this.activeItemIndex}].task`
|
||||||
|
);
|
||||||
|
//Now we can remove it
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks.splice(0, 1);
|
||||||
|
}
|
||||||
|
|
||||||
let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
|
let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
|
||||||
let incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
|
let incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
|
||||||
s => s.id == 1 //incomplete
|
s => s.id == 1 //incomplete
|
||||||
|
|||||||
@@ -375,6 +375,20 @@ export default {
|
|||||||
`task-group/${this.selectedTaskGroup}`
|
`task-group/${this.selectedTaskGroup}`
|
||||||
);
|
);
|
||||||
if (res.data && res.data.items) {
|
if (res.data && res.data.items) {
|
||||||
|
//If there is one empty task line only then they likely just want to append the group and ditch the default empty item so remove it here
|
||||||
|
if (
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks.length == 1 &&
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks[0].task == null &&
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks[0].id == 0
|
||||||
|
) {
|
||||||
|
//but first need to unbreak rule from initial add empty in case it's the only broken validation rule preventing saving
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks[0].task = "..";
|
||||||
|
this.fieldValueChanged(
|
||||||
|
`Items[${this.activeWoItemIndex}].tasks[${this.activeItemIndex}].task`
|
||||||
|
);
|
||||||
|
//Now we can remove it
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks.splice(0, 1);
|
||||||
|
}
|
||||||
let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
|
let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
|
||||||
let incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
|
let incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
|
||||||
s => s.id == 1 //incomplete
|
s => s.id == 1 //incomplete
|
||||||
|
|||||||
@@ -375,6 +375,21 @@ export default {
|
|||||||
`task-group/${this.selectedTaskGroup}`
|
`task-group/${this.selectedTaskGroup}`
|
||||||
);
|
);
|
||||||
if (res.data && res.data.items) {
|
if (res.data && res.data.items) {
|
||||||
|
//If there is one empty task line only then they likely just want to append the group and ditch the default empty item so remove it here
|
||||||
|
if (
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks.length == 1 &&
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks[0].task == null &&
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks[0].id == 0
|
||||||
|
) {
|
||||||
|
//but first need to unbreak rule from initial add empty in case it's the only broken validation rule preventing saving
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks[0].task = "..";
|
||||||
|
this.fieldValueChanged(
|
||||||
|
`Items[${this.activeWoItemIndex}].tasks[${this.activeItemIndex}].task`
|
||||||
|
);
|
||||||
|
//Now we can remove it
|
||||||
|
this.value.items[this.activeWoItemIndex].tasks.splice(0, 1);
|
||||||
|
}
|
||||||
|
|
||||||
let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
|
let newIndex = this.value.items[this.activeWoItemIndex].tasks.length;
|
||||||
let incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
|
let incompleteViz = this.pvm.selectLists.woItemTaskCompletionTypes.find(
|
||||||
s => s.id == 1 //incomplete
|
s => s.id == 1 //incomplete
|
||||||
|
|||||||
Reference in New Issue
Block a user