Merge pull request #34734 from dimagi/es/support-toolz

Release User Metadata tab

corehq/apps/app_manager/templates/app_manager/apps_base.html

@@ -2,7 +2,6 @@
 {% load xforms_extras %}
 {% load url_extras %}
 {% load hq_shared_tags %}
-{% load timezone_tags %}
 {% load i18n %}
 {% load compress %}
 

corehq/apps/app_manager/templates/app_manager/partials/releases/releases.html

@@ -1,8 +1,6 @@
 {% load xforms_extras %}
 {% load url_extras %}
-{% load timezone_tags %}
 {% load hq_shared_tags %}
-{% load timezone_tags %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 

corehq/apps/export/templates/export/download_data_files.html

@@ -1,6 +1,5 @@
 {% extends "hqwebapp/bootstrap3/base_section.html" %}
 {% load hq_shared_tags %}
-{% load timezone_tags %}
 {% load i18n %}
 {% load compress %}
 
@@ -33,7 +32,7 @@ <h2>{% trans "Download Files" %}</h2>
                   <textarea id="url_{{ data_file.id }}" style="display: none">{{ url_base }}{% url 'download_data_file' domain data_file.id data_file.filename %}</textarea>
                 </td>
                 <td>
-                  {% trans "Available until" %}: {% utc_to_timezone data_file.delete_after timezone %}
+                  {% trans "Available until" %}: {{ data_file.delete_after|to_user_time:request }}
                 </td>
                 <td style="width: 6em; text-align: right;">
                   <a href="#"

corehq/apps/export/views/utils.py

@@ -8,7 +8,6 @@
 from django.utils.translation import gettext_lazy
 from django.views.generic import View
 
-import pytz
 from memoized import memoized
 
 from dimagi.utils.web import get_url_base, json_response
@@ -55,21 +54,11 @@
 from corehq.blobs.exceptions import NotFound
 from corehq.privileges import DAILY_SAVED_EXPORT, EXCEL_DASHBOARD
 from corehq.util.download import get_download_response
-from corehq.util.timezones.utils import get_timezone_for_user
+from corehq.util.timezones.utils import get_timezone
 from corehq.apps.reports.analytics.esaccessors import get_case_types_for_domain
 from corehq.apps.app_manager.dbaccessors import get_app_ids_in_domain
 
 
-def get_timezone(domain, couch_user):
-    if not domain:
-        return pytz.utc
-    else:
-        try:
-            return get_timezone_for_user(couch_user, domain)
-        except AttributeError:
-            return get_timezone_for_user(None, domain)
-
-
 def user_can_view_deid_exports(domain, couch_user):
     return (domain_has_privilege(domain, privileges.DEIDENTIFIED_DATA)
             and has_permission_to_view_report(couch_user, domain, DEID_EXPORT_PERMISSION))
@@ -162,7 +151,7 @@ def create_new_export_instance(self, schema, username, export_settings=None):
         )
         instance.is_daily_saved_export = True
 
-        span = datespan_from_beginning(self.domain_object, get_timezone(self.domain, self.request.couch_user))
+        span = datespan_from_beginning(self.domain_object, get_timezone(self.request, self.domain))
         instance.filters.date_period = DatePeriod(
             period_type="since", begin=span.startdate.date()
         )
@@ -335,7 +324,6 @@ def dispatch(self, request, *args, **kwargs):
     def get_context_data(self, **kwargs):
         context = super(DataFileDownloadList, self).get_context_data(**kwargs)
         context.update({
-            'timezone': get_timezone_for_user(self.request.couch_user, self.domain),
             'data_files': DataFile.get_all(self.domain),
             'is_admin': can_upload_data_files(self.domain, self.request.couch_user),
             'url_base': get_url_base(),

corehq/apps/hqwebapp/templatetags/hq_shared_tags.py

@@ -23,9 +23,14 @@
 from dimagi.utils.web import json_handler
 
 from corehq import privileges
-from corehq.apps.hqwebapp.exceptions import AlreadyRenderedException, TemplateTagJSONException
+from corehq.apps.hqwebapp.exceptions import (
+    AlreadyRenderedException,
+    TemplateTagJSONException,
+)
 from corehq.apps.hqwebapp.models import Alert
 from corehq.motech.utils import pformat_json
+from corehq.util.timezones.conversions import ServerTime
+from corehq.util.timezones.utils import get_timezone
 
 register = template.Library()
 
@@ -114,7 +119,10 @@ def domains_for_user(context, request, selected_domain=None):
     the user doc updates via save.
     """
 
-    from corehq.apps.domain.views.base import get_domain_links_for_dropdown, get_enterprise_links_for_dropdown
+    from corehq.apps.domain.views.base import (
+        get_domain_links_for_dropdown,
+        get_enterprise_links_for_dropdown,
+    )
     domain_links = get_domain_links_for_dropdown(request.couch_user)
 
     # Enterprise permissions projects aren't in the dropdown, but show a hint they exist
@@ -746,3 +754,14 @@ def request_has_privilege(request, privilege_name):
     from corehq import privileges
     privilege = _get_obj_from_name_or_instance(privileges, privilege_name)
     return domain_has_privilege(request.domain, privilege)
+
+
+@register.filter
+def to_user_time(dt, request):
+    """Convert a datetime to a readable string in the user's timezone"""
+    if not dt:
+        return "---"
+    if not isinstance(dt, datetime):
+        raise ValueError("to_user_time only accepts datetimes")
+    timezone = get_timezone(request, getattr(request, 'domain', None))
+    return ServerTime(dt).user_time(timezone).ui_string()

corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/reportdata/case_data.html.diff.txt

@@ -6,7 +6,7 @@
  {% load case_tags %}
  {% load hq_shared_tags %}
  {% load i18n %}
-@@ -9,7 +9,7 @@
+@@ -8,7 +8,7 @@
    <link rel="stylesheet" type="text/css" href="{% static "hqwebapp/css/proptable.css" %}">
  {% endblock %}
 
@@ -15,7 +15,7 @@
 
  {% block page_content %}
 
-@@ -30,7 +30,7 @@
+@@ -29,7 +29,7 @@
      <div id="report-content">
        <div id="tabbed-content-container">
          <div class="row">
@@ -24,7 +24,7 @@
              {% if is_case_type_deprecated %}
                <div class="alert alert-warning">
                  <p>
-@@ -47,25 +47,25 @@
+@@ -46,25 +46,25 @@
            </div>
          </div>
          <div class="row">
@@ -58,7 +58,7 @@
                {% endif %}
              </ul>
 
-@@ -74,18 +74,18 @@
+@@ -73,18 +73,18 @@
                  <div class="row-fluid">
                    {% if case_property_tables %}
                      {% if show_expand_collapse_buttons %}
@@ -84,7 +84,7 @@
                                     data-parent="#property-table-{{ forloop.counter }}-parent"
                                     href="#property-table-{{ forloop.counter }}"
                                     class="collapse in">
-@@ -96,7 +96,7 @@
+@@ -95,7 +95,7 @@
                              </div>
                            {% endif %}
                            <div class="panel-collapse collapse in" id="property-table-{{ forloop.counter }}">
@@ -93,7 +93,7 @@
                                {% include "reports/partials/case_property_table.html" with rows=table.rows %}
                              </div>
                            </div>
-@@ -104,11 +104,11 @@
+@@ -103,11 +103,11 @@
                        {% endfor %}
                      </div>
                    {% else %}
@@ -108,7 +108,7 @@
                        </a>
                        {% blocktrans %}
                          <p>
-@@ -145,7 +145,7 @@
+@@ -144,7 +144,7 @@
                {% if ledgers %}
                  <div class="tab-pane" id="case-ledgers">
                    {% if show_transaction_export %}
@@ -117,7 +117,7 @@
                    {% endif %}
                    {% for section_id, product_map in ledgers.items %}
                      <h1>{% blocktrans %}Section: {{ section_id }}{% endblocktrans %}</h1>
-@@ -174,7 +174,7 @@
+@@ -173,7 +173,7 @@
                {% endif %}
 
                <div class="tab-pane row" id="history">
@@ -126,7 +126,7 @@
                    <ul data-bind="foreach: $root.form_type_facets">
                      <li>
                        <strong><span data-bind="text: form_name"></span></strong>:
-@@ -188,10 +188,10 @@
+@@ -187,10 +187,10 @@
                    <table class="table table-striped datatable table-hover">
                      <thead>
                      <tr>
@@ -141,7 +141,7 @@
                      </tr>
                      </thead>
                      <tbody data-bind="foreach: xforms">
-@@ -206,7 +206,7 @@
+@@ -205,7 +205,7 @@
                        </td>
                        <td>
                          <span data-bind="text: user_type"></span>
@@ -150,7 +150,7 @@
                        </td>
                      </tr>
                      </tbody>
-@@ -215,26 +215,26 @@
+@@ -214,26 +214,26 @@
                      <div class="dataTables_info">
                        <span data-bind="text: $root.page_start_num() + '-' + $root.page_end_num() + ' / ' + $root.total_rows()"></span>
                      </div>
@@ -183,7 +183,7 @@
                    <div id="xform_data_panel"></div>
                  </div>
                </div> <!-- end case-history tab -->
-@@ -250,36 +250,36 @@
+@@ -249,36 +249,36 @@
 
      {% if can_edit_data %}
        <div id="case-actions" class="clearfix form-actions">
@@ -229,7 +229,7 @@
                  <i class="fa fa-archive"></i>
                  {% trans 'Close Case' %}
                </button>
-@@ -293,6 +293,6 @@
+@@ -292,6 +292,6 @@
 
  {% block modals %}{{ block.super }}
    {% if show_properties_edit %}

corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/reportdata/form_data.html.diff.txt

@@ -4,18 +4,18 @@
 -{% extends "hqwebapp/bootstrap3/base_section.html" %}
 +{% extends "hqwebapp/bootstrap5/base_section.html" %}
  {% load case_tags %}
- {% load timezone_tags %}
  {% load hq_shared_tags %}
-@@ -8,7 +8,7 @@
+ {% load i18n %}
+@@ -7,7 +7,7 @@
    <link rel="stylesheet" type="text/css" href="{% static "hqwebapp/css/proptable.css" %}">
  {% endblock %}
 
 -{% requirejs_main 'reports/js/bootstrap3/form_data_main' %}
 +{% requirejs_main_b5 'reports/js/bootstrap5/form_data_main' %}
 
- {% block title %}Form: {{ form_name }}{% if form_received_on %} ({% utc_to_timezone form_received_on timezone %}){% endif %}{% endblock %}
+ {% block title %}Form: {{ form_name }} {% if form_received_on %} ({{ form_received_on|to_user_time:request }}){% endif %}{% endblock %}
 
-@@ -26,5 +26,5 @@
+@@ -25,5 +25,5 @@
        <strong>{{ instance.problem }}</strong>
      </div>
    {% endif %}

corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html

@@ -3,7 +3,6 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 {% load proptable_tags %}
-{% load timezone_tags %}
 
 {% block head %} {{ block.super }}
   <link rel="stylesheet" type="text/css" href="{% static "hqwebapp/css/proptable.css" %}">

corehq/apps/reports/templates/reports/reportdata/bootstrap3/form_data.html

@@ -1,6 +1,5 @@
 {% extends "hqwebapp/bootstrap3/base_section.html" %}
 {% load case_tags %}
-{% load timezone_tags %}
 {% load hq_shared_tags %}
 {% load i18n %}
 
@@ -10,7 +9,7 @@
 
 {% requirejs_main 'reports/js/bootstrap3/form_data_main' %}
 
-{% block title %}Form: {{ form_name }}{% if form_received_on %} ({% utc_to_timezone form_received_on timezone %}){% endif %}{% endblock %}
+{% block title %}Form: {{ form_name }} {% if form_received_on %} ({{ form_received_on|to_user_time:request }}){% endif %}{% endblock %}
 
 {% block page_content %}
   {% initial_page_data 'ordered_question_values' ordered_question_values %}

corehq/apps/reports/templates/reports/reportdata/bootstrap5/case_data.html

@@ -3,7 +3,6 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 {% load proptable_tags %}
-{% load timezone_tags %}
 
 {% block head %} {{ block.super }}
   <link rel="stylesheet" type="text/css" href="{% static "hqwebapp/css/proptable.css" %}">

corehq/apps/reports/templates/reports/reportdata/bootstrap5/form_data.html

@@ -1,6 +1,5 @@
 {% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load case_tags %}
-{% load timezone_tags %}
 {% load hq_shared_tags %}
 {% load i18n %}
 
@@ -10,7 +9,7 @@
 
 {% requirejs_main_b5 'reports/js/bootstrap5/form_data_main' %}
 
-{% block title %}Form: {{ form_name }}{% if form_received_on %} ({% utc_to_timezone form_received_on timezone %}){% endif %}{% endblock %}
+{% block title %}Form: {{ form_name }} {% if form_received_on %} ({{ form_received_on|to_user_time:request }}){% endif %}{% endblock %}
 
 {% block page_content %}
   {% initial_page_data 'ordered_question_values' ordered_question_values %}

corehq/apps/sms/templates/sms/compose.html

@@ -1,7 +1,6 @@
 {% extends 'hqwebapp/bootstrap3/base_section.html' %}
 {% load i18n %}
 {% load hq_shared_tags %}
-{% load timezone_tags %}
 {% load crispy_forms_tags %}
 
 {% requirejs_main "sms/js/compose" %}

corehq/apps/sms/templates/sms/subscribe_sms.html

@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
-{% load timezone_tags %}
 
 {% block page_content %}
   {% crispy form %}