landon/Submissions-App
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved error messaging when saving submissions.

Browse Source
This commit is contained in:
lwark
2024-09-11 12:00:43 -05:00
parent 220c74a06d
commit d52fa36150
6 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/submissions/backend/db/models/controls.py
View File

@@ -142,20 +142,22 @@ class Control(BaseClass):
kraken_cnt_total = sum([kraken[item]['kraken_count'] for item in kraken])
# logger.debug("Creating new kraken.")
new_kraken = [dict(name=item, kraken_count=kraken[item]['kraken_count'],
kraken_percent="{0:.0%}".format(kraken[item]['kraken_count'] / kraken_cnt_total)) for item in
kraken]
kraken_percent="{0:.0%}".format(kraken[item]['kraken_count'] / kraken_cnt_total),
target=item in self.controltype.targets)
for item in kraken]
# logger.debug(f"New kraken before sort: {new_kraken}")
new_kraken = sorted(new_kraken, key=itemgetter('kraken_count'), reverse=True)
# logger.debug("setting targets")
if not self.controltype.targets:
targets = ["None"]
else:
if self.controltype.targets:
targets = self.controltype.targets
else:
targets = ["None"]
# logger.debug("constructing output dictionary")
output = {
"name": self.name,
"type": self.controltype.name,
"targets": ", ".join(targets),
"kraken": new_kraken[0:5]
"kraken": new_kraken[0:10]
}
return output