From aad7dcee226bf3ff84a72c266fc71e1b26ad238b Mon Sep 17 00:00:00 2001 From: David Linko Date: Fri, 16 Aug 2024 14:09:51 -0400 Subject: [PATCH] 117 anms fun bld 010 state based rule no limits (#122) * adding multiprocessing * updated table display and processing * uncommented code * upadting submodules * updated submodules to latest * removing old code --------- Co-authored-by: linkodm1 --- .../components/management/agents/reports.vue | 37 +++++++------------ deps/anms-ace | 2 +- deps/anms-camp | 2 +- ion/src | 2 +- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/anms-ui/public/app/components/management/agents/reports.vue b/anms-ui/public/app/components/management/agents/reports.vue index c6f13cf..1237610 100644 --- a/anms-ui/public/app/components/management/agents/reports.vue +++ b/anms-ui/public/app/components/management/agents/reports.vue @@ -53,25 +53,20 @@ export default { this.loading = true; this.tableHeaders = []; this.tableItems = []; - if (this.reports[this.selected] == undefined) { - this.loading = true; - let rpt_name = this.rptts[this.selected].name; - let rpt_adm = this.rptts[this.selected].adm; - await api.methods.apiEntriesForReport(this.agentName, rpt_adm, rpt_name) - .then(res => { - this.processReport(res.data); - this.reports[this.selected] = this.tableItems; - this.reportsHeader[this.selected] = this.tableHeaders; - }).catch(error => { - // handle error - console.error("reports error", error); - console.info("error obj:", error); - }); - } else{ - this.tableHeaders = this.reportsHeader[this.selected]; - this.tableItems = this.reports[this.selected]; - } - + this.loading = true; + let rpt_name = this.rptts[this.selected].name; + let rpt_adm = this.rptts[this.selected].adm; + await api.methods.apiEntriesForReport(this.agentName, rpt_adm, rpt_name) + .then(res => { + this.processReport(res.data); + this.reports[this.selected] = this.tableItems; + this.reportsHeader[this.selected] = this.tableHeaders; + }).catch(error => { + // handle error + console.error("reports error", error); + console.info("error obj:", error); + }); + this.loading = false; }, processReport(report) { @@ -93,14 +88,10 @@ export default { }, mounted() { this.loading = true; - - // this.title = this.adm + "." + this.reportName this.rptts.forEach((rpt, index) => { api.methods.apiEntriesForReport(this.agentName, rpt.adm, rpt.name) .then(res => { - this.reports[index] = res.data - // this.headers = this.reports.shift() }).catch(error => { // handle error console.error("reports error", error); diff --git a/deps/anms-ace b/deps/anms-ace index 55b82b1..ecf173c 160000 --- a/deps/anms-ace +++ b/deps/anms-ace @@ -1 +1 @@ -Subproject commit 55b82b178b067bdee7b28fc63d1f283c0961a568 +Subproject commit ecf173caa449cfa977b66c6886998e3e0cbe208a diff --git a/deps/anms-camp b/deps/anms-camp index 6c5c8a8..1302277 160000 --- a/deps/anms-camp +++ b/deps/anms-camp @@ -1 +1 @@ -Subproject commit 6c5c8a80fc7a8bc96165e48b09da85d4e5bf7d00 +Subproject commit 1302277adab1e0818293398d22a6351fb2616049 diff --git a/ion/src b/ion/src index 6e95a2e..0405843 160000 --- a/ion/src +++ b/ion/src @@ -1 +1 @@ -Subproject commit 6e95a2e7fd6975cd8d859627cee73323857ac161 +Subproject commit 0405843767d58b7dd3366ea702ccce084278eb6e