Announcements in Phases

This commit is contained in:
Luis Fernando Molina committed 2019-10-21 12:37:20 +02:00
1 parent bc3d3983cc
commit 900c1a9f88
7 files changed
+41 -1

No files matched your search

+1 -1
View File
@@ -284,7 +284,7 @@ function newStrategyPart () {
compatibleSubType = undefined
break
case 'Announcement':
compatibleType = '->' + 'Telegram Bot' + '->' + 'Trigger On Event' + '->' + 'Trigger Off Event' + '->' + 'Take Position Event' + '->' + 'Next Phase Event' + '->'
compatibleType = '->' + 'Telegram Bot' + '->' + 'Trigger On Event' + '->' + 'Trigger Off Event' + '->' + 'Take Position Event' + '->' + 'Next Phase Event' + '->' + '->' + 'Phase' + '->'
compatibleSubType = undefined
break
case 'Task Manager':
@@ -920,6 +920,13 @@ function newNodeChildren () {
response.childIndex = response.childrenCount
}
}
for (let i = 0; i < parentNode.announcements.length; i++) {
let child = parentNode.announcements[i]
response.childrenCount++
if (child.id === childNode.id) {
response.childIndex = response.childrenCount
}
}
return response
}
@@ -1057,6 +1057,12 @@ function newNodeDeleter () {
if (node.nextPhaseEvent !== undefined) {
deleteEvent(node.nextPhaseEvent, rootNodes)
}
if (node.announcements !== undefined) {
while (node.announcements.length > 0) {
deleteAnnouncement(node.announcements[0], rootNodes)
}
}
destroyPart(node)
cleanNode(node)
}
@@ -81,6 +81,12 @@ function newOnFocus () {
if (child !== undefined) {
return child
}
for (let m = 0; m < node.announcements.length; m++) {
child = getNodeThatIsOnFocus(node.announcements[m])
if (child !== undefined) {
return child
}
}
if (node.payload.uiObject.isOnFocus === true) {
return node
} else {
@@ -98,6 +98,13 @@ function newPartsFromNodes () {
if (node.nextPhaseEvent !== undefined) {
createPartFromNode(node.nextPhaseEvent, phase, phase)
}
if (node.announcements === undefined) {
node.announcements = []
}
for (let m = 0; m < node.announcements.length; m++) {
let announcement = node.announcements[m]
createPartFromNode(announcement, node, node)
}
return
}
case 'Stop': {
@@ -1190,6 +1197,7 @@ function newPartsFromNodes () {
let phase = {
name: 'New Phase',
announcements: [],
formula: {
code: DEFAULT_FORMULA_TEXT
},
@@ -111,9 +111,16 @@ function newProtocolNode () {
type: node.type,
subType: node.subType,
name: node.name,
announcements: [],
formula: getProtocolNode(node.formula, removePersonalData, parseCode, includeIds, includePayload),
nextPhaseEvent: getProtocolNode(node.nextPhaseEvent, removePersonalData, parseCode, includeIds, includePayload)
}
for (let m = 0; m < node.announcements.length; m++) {
let announcement = getProtocolNode(node.announcements[m], removePersonalData, parseCode, includeIds, includePayload)
if (announcement !== undefined) {
object.announcements.push(announcement)
}
}
if (includeIds) {
object.id = node.id
}
@@ -81,6 +81,12 @@ function newShortcutKeys () {
if (child !== undefined) {
return child
}
for (let m = 0; m < node.announcements.length; m++) {
child = getNodeByShortcutKey(node.announcements[m], searchingKey)
if (child !== undefined) {
return child
}
}
if (node.payload.uiObject.shortcutKey === searchingKey) {
return node
} else {