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

Add Assigned Location Column to Application Status Report #34744

Merged
merged 20 commits into from
Jul 3, 2024
Merged

Add Assigned Location Column to Application Status Report #34744

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
30a284a
add new loc col
zandre-eng Jun 10, 2024
de825b1
refactor help text
zandre-eng Jun 12, 2024
07b5828
add loc data to assigned loc col
zandre-eng Jun 12, 2024
c229c7a
add JS to handle toggling see more link
zandre-eng Jun 12, 2024
d60fcbd
Bootstrap 5 Migration - Rebuilt diffs
zandre-eng Jun 12, 2024
362e684
move up col index to account for new col
zandre-eng Jun 13, 2024
561afac
move var to helper func
zandre-eng Jun 17, 2024
78bb53d
make primary bold even if only 1 loc
zandre-eng Jun 17, 2024
7ebeb72
do single DB query for loc names
zandre-eng Jun 17, 2024
c1a088b
constrain assigned locations to domain
zandre-eng Jun 18, 2024
37c70b4
refactor help text
zandre-eng Jun 19, 2024
e55ec3d
insert primary location at front of list
zandre-eng Jun 19, 2024
fd2f9be
add ability to shrink list of all locs again
zandre-eng Jun 19, 2024
ee88a55
refactor building loc HTML
zandre-eng Jun 20, 2024
d5b5728
use HTML class to toggle visibility
zandre-eng Jun 20, 2024
581bfe1
correctly fetch locations for web users
zandre-eng Jun 20, 2024
ba975bf
docstring + rename
zandre-eng Jul 1, 2024
b045a3d
update collapse string text
zandre-eng Jul 1, 2024
d6a20e8
move func + small refactor
zandre-eng Jul 2, 2024
e5c2342
rename refactor
zandre-eng Jul 2, 2024
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
10 changes: 7 additions & 3 deletions corehq/apps/reports/standard/deployments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,14 +522,18 @@ def _get_formatted_assigned_location_names(self, user, user_loc_dict):

formatted_str = ', '.join(formatted_loc_names[:4])
all_str = ', '.join(formatted_loc_names)
eplise_str = _('...See more') if len(formatted_loc_names) > 4 else ''
view_all_str = _('...See more') if len(formatted_loc_names) > 4 else ''
view_less_str = _('...See less') if len(formatted_loc_names) > 4 else ''
out_str = ('''
<div>
<span class="locations-list">{}</span>
<a href="#" class="toggle-all-locations">{}</a>
<span class="all-locations-list" style="display:none">{}</span>
<a href="#" class="toggle-all-locations">
<span>{}</span>
<span style="display:none">{}</span>
</a>
</div>
''').format(formatted_str, eplise_str, all_str)
''').format(formatted_str, all_str, view_all_str, view_less_str)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this code will be easier to follow if we add additional html elements later. And we are just adding empty nodes which can be avoided.
something like:

html_nodes = ['<span class="locations-list">{formatted_str}</span>']
if len(formatted_loc_names) > 4:
    html_nodes.append[
        '<span class="all-locations-list" style="display:none">{all_str}</span>',
        '...'
    ]
return format_html(f'<div>{''.join(html_nodes)}</div>')

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I really like this approach, a bit cleaner. I've done some refactoring in (ee88a55).

return format_html(out_str)


Expand Down
4 changes: 2 additions & 2 deletions corehq/apps/reports/static/reports/js/bootstrap3/application_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ hqDefine("reports/js/bootstrap3/application_status", [
$(function () {
$('#report-content').on('click', '.toggle-all-locations', function (e) {
$(this).prevAll('.locations-list').toggle();
$(this).toggle();
$(this).nextAll('.all-locations-list').toggle();
$(this).children('span').toggle();
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: would be nice to limit this by adding a specific class to this span to avoid conflicting with any other span getting added to the div in future.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

d5b5728

$(this).prevAll('.all-locations-list').toggle();
e.preventDefault();
});
});
Expand Down
4 changes: 2 additions & 2 deletions corehq/apps/reports/static/reports/js/bootstrap5/application_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ hqDefine("reports/js/bootstrap5/application_status", [
$(function () {
$('#report-content').on('click', '.toggle-all-locations', function (e) {
$(this).prevAll('.locations-list').toggle();
$(this).toggle();
$(this).nextAll('.all-locations-list').toggle();
$(this).children('span').toggle();
$(this).prevAll('.all-locations-list').toggle();
e.preventDefault();
});
});
Expand Down
Loading