Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow submitting system forms with a name for display to users #31923

Merged
merged 12 commits into from
Jul 25, 2022
Merged

allow submitting system forms with a name for display to users #31923

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
12f4a54
update docstring with latest best practice
snopoke Jul 21, 2022
3204cc1
rename form_extras to submission_extras
snopoke Jul 21, 2022
5e19c37
lint
snopoke Jul 21, 2022
28dbf68
add form_name to submit_case_blocks
snopoke Jul 21, 2022
7141f86
pass form_name from case update rules
snopoke Jul 21, 2022
666e0e0
refactor _FormType
snopoke Jul 21, 2022
8121700
include form name in non-app forms if supplied
snopoke Jul 21, 2022
2273a91
tests for xmlns_to_name
snopoke Jul 21, 2022
7601265
patch DB lookup
snopoke Jul 21, 2022
c16f7b7
coerce to string
snopoke Jul 21, 2022
39b38f2
update calls to xmlns_to_name to include name from xml
snopoke Jul 21, 2022
db0a758
extract defaults out of loop
snopoke Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 40 additions & 30 deletions corehq/apps/reports/display.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,39 +88,49 @@ def __init__(self, domain, xmlns, app_id):
def get_label(self, lang=None, separator=None):
if separator is None:
separator = " > "

return (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?w=1 reads a lot easier for this commit

self.get_label_from_app(lang, separator)
or self.get_name_from_xml()
or self.xmlns
)

def get_label_from_app(self, lang, separator):
form = get_form_analytics_metadata(self.domain, self.app_id, self.xmlns)
if form and form.get('app'):
langs = form['app']['langs']
app_name = form['app']['name']
app = form and form.get('app')
if not app:
return

if form.get('is_user_registration'):
form_name = "User Registration"
title = separator.join([app_name, form_name])
else:
def _menu_name(menu, lang):
if lang and menu.get(lang):
return menu.get(lang)
else:
for lang in langs + list(menu):
menu_name = menu.get(lang)
if menu_name is not None:
return menu_name
return "?"

module_name = _menu_name(form["module"]["name"], lang)
form_name = _menu_name(form["form"]["name"], lang)
title = separator.join([app_name, module_name, form_name])

if form.get('app_deleted'):
title += ' [Deleted]'
if form.get('duplicate'):
title += " [Multiple Forms]"
name = title
elif self.xmlns in SYSTEM_FORM_XMLNS_MAP:
name = SYSTEM_FORM_XMLNS_MAP[self.xmlns]
langs = form['app']['langs']
app_name = form['app']['name']

if form.get('is_user_registration'):
form_name = "User Registration"
title = separator.join([app_name, form_name])
else:
name = self.xmlns
return name
def _menu_name(menu, lang):
if lang and menu.get(lang):
return menu.get(lang)
else:
for lang in langs + list(menu):
menu_name = menu.get(lang)
if menu_name is not None:
return menu_name
return "?"

module_name = _menu_name(form["module"]["name"], lang)
form_name = _menu_name(form["form"]["name"], lang)
title = separator.join([app_name, module_name, form_name])

if form.get('app_deleted'):
title += ' [Deleted]'
if form.get('duplicate'):
title += " [Multiple Forms]"
return title

def get_name_from_xml(self):
if self.xmlns in SYSTEM_FORM_XMLNS_MAP:
return SYSTEM_FORM_XMLNS_MAP[self.xmlns]


def xmlns_to_name(domain, xmlns, app_id, lang=None, separator=None):
Expand Down