From 39369ce2450a7906a20ca75f7910f46467e25e4b Mon Sep 17 00:00:00 2001 From: sandeepsajan0 Date: Mon, 25 Nov 2024 17:59:15 +0530 Subject: [PATCH 1/8] Remove old submissions table, removed old table batch actions, update invoice batch action to use htmx --- eslint.config.mjs | 1 + .../batch_determination_form.html | 6 +- .../batch_determination_confirmation.html | 12 - hypha/apply/funds/forms.py | 82 ---- .../funds/base_submissions_table.html | 2 +- .../batch_archive_submission_form.html | 16 - .../batch_delete_submission_form.html | 16 - .../funds/includes/batch_progress_form.html | 11 - .../includes/batch_update_lead_form.html | 13 - .../includes/batch_update_reviewer_form.html | 13 - .../includes/table_filter_and_search.html | 60 +-- .../templates/funds/reviewer_leaderboard.html | 2 +- hypha/apply/funds/templates/funds/rounds.html | 2 +- .../funds/templates/funds/submissions.html | 45 --- .../templates/funds/submissions_by_round.html | 18 - .../funds/submissions_by_status.html | 21 - .../templates/funds/submissions_result.html | 2 +- .../funds/templates/submissions/all.html | 3 +- hypha/apply/funds/urls.py | 4 - hypha/apply/funds/views.py | 360 ------------------ hypha/apply/projects/forms/payment.py | 4 +- .../includes/batch_invoice_status_update.html | 13 - .../application_projects/invoice_list.html | 2 +- .../modals/batch_invoice_status_update.html | 28 ++ .../application_projects/project_list.html | 2 +- hypha/apply/projects/urls.py | 6 + hypha/apply/projects/views/__init__.py | 2 + hypha/apply/projects/views/payment.py | 64 ++-- hypha/static_src/javascript/batch-actions.js | 116 ++---- .../sass/components/_list-reveal.scss | 3 +- 30 files changed, 123 insertions(+), 806 deletions(-) delete mode 100644 hypha/apply/determinations/templates/determinations/includes/batch_determination_confirmation.html delete mode 100644 hypha/apply/funds/templates/funds/includes/batch_archive_submission_form.html delete mode 100644 hypha/apply/funds/templates/funds/includes/batch_delete_submission_form.html delete mode 100644 hypha/apply/funds/templates/funds/includes/batch_progress_form.html delete mode 100644 hypha/apply/funds/templates/funds/includes/batch_update_lead_form.html delete mode 100644 hypha/apply/funds/templates/funds/includes/batch_update_reviewer_form.html delete mode 100644 hypha/apply/funds/templates/funds/submissions.html delete mode 100644 hypha/apply/funds/templates/funds/submissions_by_round.html delete mode 100644 hypha/apply/funds/templates/funds/submissions_by_status.html delete mode 100644 hypha/apply/projects/templates/application_projects/includes/batch_invoice_status_update.html create mode 100644 hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html diff --git a/eslint.config.mjs b/eslint.config.mjs index c91087dccb..2a8e04858b 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -26,6 +26,7 @@ export default [ ...globals.commonjs, jQuery: true, Alpine: true, + htmx: true, }, }, diff --git a/hypha/apply/determinations/templates/determinations/batch_determination_form.html b/hypha/apply/determinations/templates/determinations/batch_determination_form.html index d2903360f4..b058c36b93 100644 --- a/hypha/apply/determinations/templates/determinations/batch_determination_form.html +++ b/hypha/apply/determinations/templates/determinations/batch_determination_form.html @@ -30,9 +30,9 @@ {% endblock %} {% block form_buttons %} - - {% include "determinations/includes/batch_determination_confirmation.html" with count=submissions.count %} - + {% endblock %} {% block show_submission %} diff --git a/hypha/apply/determinations/templates/determinations/includes/batch_determination_confirmation.html b/hypha/apply/determinations/templates/determinations/includes/batch_determination_confirmation.html deleted file mode 100644 index e1d1b4e493..0000000000 --- a/hypha/apply/determinations/templates/determinations/includes/batch_determination_confirmation.html +++ /dev/null @@ -1,12 +0,0 @@ -{% load i18n %} - diff --git a/hypha/apply/funds/forms.py b/hypha/apply/funds/forms.py index 5ddeeb000e..5712b8a123 100644 --- a/hypha/apply/funds/forms.py +++ b/hypha/apply/funds/forms.py @@ -22,7 +22,6 @@ from .permissions import can_change_external_reviewers from .utils import model_form_initial, render_icon from .widgets import MetaTermSelect2Widget, Select2MultiCheckboxesWidget -from .workflow import get_action_mapping class ApplicationSubmissionModelForm(forms.ModelForm): @@ -76,34 +75,6 @@ def __init__(self, *args, **kwargs): action_field.choices = choices -class BatchProgressSubmissionForm(forms.Form): - action = forms.ChoiceField(label=_("Take action")) - submissions = forms.CharField( - widget=forms.HiddenInput(attrs={"class": "js-submissions-id"}) - ) - - def __init__(self, *args, round=None, **kwargs): - self.user = kwargs.pop("user") - super().__init__(*args, **kwargs) - workflow = round and round.workflow - self.action_mapping = get_action_mapping(workflow) - choices = [ - (action, detail["display"]) - for action, detail in self.action_mapping.items() - ] - self.fields["action"].choices = choices - - def clean_submissions(self): - value = self.cleaned_data["submissions"] - submission_ids = [int(submission) for submission in value.split(",")] - return ApplicationSubmission.objects.filter(id__in=submission_ids) - - def clean_action(self): - value = self.cleaned_data["action"] - action = self.action_mapping[value]["transitions"] - return action - - class UpdateSubmissionLeadForm(ApplicationSubmissionModelForm): class Meta: model = ApplicationSubmission @@ -116,59 +87,6 @@ def __init__(self, *args, **kwargs): lead_field.queryset = lead_field.queryset.exclude(id=self.instance.lead.id) -class BatchUpdateSubmissionLeadForm(forms.Form): - lead = forms.ChoiceField(label=_("Lead")) - submissions = forms.CharField( - widget=forms.HiddenInput(attrs={"class": "js-submissions-id"}) - ) - - def __init__(self, *args, round=None, **kwargs): - self.user = kwargs.pop("user") - super().__init__(*args, **kwargs) - self.fields["lead"].choices = [ - (staff.id, staff) for staff in User.objects.staff() - ] - - def clean_lead(self): - value = self.cleaned_data["lead"] - return User.objects.get(id=value) - - def clean_submissions(self): - value = self.cleaned_data["submissions"] - submission_ids = [int(submission) for submission in value.split(",")] - return ApplicationSubmission.objects.filter(id__in=submission_ids) - - -class BatchDeleteSubmissionForm(forms.Form): - submissions = forms.CharField( - widget=forms.HiddenInput(attrs={"class": "js-submissions-id"}) - ) - - def __init__(self, *args, round=None, **kwargs): - self.user = kwargs.pop("user") - super().__init__(*args, **kwargs) - - def clean_submissions(self): - value = self.cleaned_data["submissions"] - submission_ids = [int(submission) for submission in value.split(",")] - return ApplicationSubmission.objects.filter(id__in=submission_ids) - - -class BatchArchiveSubmissionForm(forms.Form): - submissions = forms.CharField( - widget=forms.HiddenInput(attrs={"class": "js-submissions-id"}) - ) - - def __init__(self, *args, round=None, **kwargs): - self.user = kwargs.pop("user") - super().__init__(*args, **kwargs) - - def clean_submissions(self): - value = self.cleaned_data["submissions"] - submission_ids = [int(submission) for submission in value.split(",")] - return ApplicationSubmission.objects.filter(id__in=submission_ids) - - class UpdateReviewersForm(ApplicationSubmissionModelForm): reviewer_reviewers = forms.ModelMultipleChoiceField( queryset=User.objects.reviewers().only("pk", "full_name"), diff --git a/hypha/apply/funds/templates/funds/base_submissions_table.html b/hypha/apply/funds/templates/funds/base_submissions_table.html index fddfd0f064..17d7ef904d 100644 --- a/hypha/apply/funds/templates/funds/base_submissions_table.html +++ b/hypha/apply/funds/templates/funds/base_submissions_table.html @@ -9,7 +9,7 @@ {% block content %} {% block table %} - {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" can_export=can_export %} + {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action filter_classes="filters-open" can_export=can_export %} {% render_table table %} {% endblock %} diff --git a/hypha/apply/funds/templates/funds/includes/batch_archive_submission_form.html b/hypha/apply/funds/templates/funds/includes/batch_archive_submission_form.html deleted file mode 100644 index e7b41dd823..0000000000 --- a/hypha/apply/funds/templates/funds/includes/batch_archive_submission_form.html +++ /dev/null @@ -1,16 +0,0 @@ -{% load i18n %} - diff --git a/hypha/apply/funds/templates/funds/includes/batch_delete_submission_form.html b/hypha/apply/funds/templates/funds/includes/batch_delete_submission_form.html deleted file mode 100644 index 10cb903c15..0000000000 --- a/hypha/apply/funds/templates/funds/includes/batch_delete_submission_form.html +++ /dev/null @@ -1,16 +0,0 @@ -{% load i18n %} - diff --git a/hypha/apply/funds/templates/funds/includes/batch_progress_form.html b/hypha/apply/funds/templates/funds/includes/batch_progress_form.html deleted file mode 100644 index 668b998470..0000000000 --- a/hypha/apply/funds/templates/funds/includes/batch_progress_form.html +++ /dev/null @@ -1,11 +0,0 @@ -{% load i18n %} - diff --git a/hypha/apply/funds/templates/funds/includes/batch_update_lead_form.html b/hypha/apply/funds/templates/funds/includes/batch_update_lead_form.html deleted file mode 100644 index 6d35fe51b3..0000000000 --- a/hypha/apply/funds/templates/funds/includes/batch_update_lead_form.html +++ /dev/null @@ -1,13 +0,0 @@ -{% load i18n %} - diff --git a/hypha/apply/funds/templates/funds/includes/batch_update_reviewer_form.html b/hypha/apply/funds/templates/funds/includes/batch_update_reviewer_form.html deleted file mode 100644 index dfa2c2d0d3..0000000000 --- a/hypha/apply/funds/templates/funds/includes/batch_update_reviewer_form.html +++ /dev/null @@ -1,13 +0,0 @@ -{% load i18n %} - diff --git a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html index d2270e7159..a430744f99 100644 --- a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html +++ b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html @@ -9,51 +9,16 @@

{{ heading }}

{% endif %} - - {% if use_batch_actions %} + {% if invoice_batch_actions %}

0 {% trans "Selected" %}

- - {% if not project_actions %} - - - - - - - - - {% if can_bulk_archive %} - - {% endif %} - {% elif invoice_actions %} - - {% endif %} +
{% endif %} + {# Right #} @@ -140,16 +105,3 @@

{{ heading }}

- -{% if use_batch_actions %} - {% include "funds/includes/batch_update_lead_form.html" %} - {% include "funds/includes/batch_update_reviewer_form.html" %} - {% include "funds/includes/batch_progress_form.html" %} - {% include "funds/includes/batch_delete_submission_form.html" %} - {% include "funds/includes/batch_archive_submission_form.html" %} - {% if project_actions %} - {% if invoice_actions %} - {% include "application_projects/includes/batch_invoice_status_update.html" %} - {% endif %} - {% endif %} -{% endif %} diff --git a/hypha/apply/funds/templates/funds/reviewer_leaderboard.html b/hypha/apply/funds/templates/funds/reviewer_leaderboard.html index 7779ab602d..e07cb0e32e 100644 --- a/hypha/apply/funds/templates/funds/reviewer_leaderboard.html +++ b/hypha/apply/funds/templates/funds/reviewer_leaderboard.html @@ -14,7 +14,7 @@
{% block table %} {% trans "All reviewers" as all_reviewers %} - {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="reviewers" use_search=True filter_action=filter_action use_batch_actions=False heading=all_reviewers %} + {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="reviewers" use_search=True filter_action=filter_action heading=all_reviewers %} {% render_table table %} {% endblock %} diff --git a/hypha/apply/funds/templates/funds/rounds.html b/hypha/apply/funds/templates/funds/rounds.html index 9712508e5e..9abc21a256 100644 --- a/hypha/apply/funds/templates/funds/rounds.html +++ b/hypha/apply/funds/templates/funds/rounds.html @@ -17,7 +17,7 @@ {% endadminbar %}
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_batch_actions=False can_export=can_export %} + {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term can_export=can_export %} {% render_table table %}
diff --git a/hypha/apply/funds/templates/funds/submissions.html b/hypha/apply/funds/templates/funds/submissions.html deleted file mode 100644 index ef41590025..0000000000 --- a/hypha/apply/funds/templates/funds/submissions.html +++ /dev/null @@ -1,45 +0,0 @@ -{% extends "funds/base_submissions_table.html" %} -{% load heroicons %} -{% load i18n static %} -{% load render_table from django_tables2 %} - -{% block title %}{% trans "Submissions" %}{% endblock %} -{% block content %} - - {% adminbar %} - {% slot header %} - {% trans "All Submissions" %} ({{ table.rows|length }}) - {% endslot %} - {% slot sub_heading %} - {% trans "Search and filter all submissions" %} • - Switch to new table view - {% endslot %} - - {% slot buttons %} - - {% heroicon_mini "queue-list" aria_hidden="true" size=16 class="inline align-text-bottom" %} - {% trans "List view" %} - - {% endslot %} - {% endadminbar %} - -
- {% if request.user.is_apply_staff %} -
-
-
-
-
-
- {% endif %} - - {% block table %} - {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" show_archive=show_archive can_export=can_export %} - - {% render_table table %} - {% endblock %} -
-{% endblock %} diff --git a/hypha/apply/funds/templates/funds/submissions_by_round.html b/hypha/apply/funds/templates/funds/submissions_by_round.html deleted file mode 100644 index ebc84903f9..0000000000 --- a/hypha/apply/funds/templates/funds/submissions_by_round.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "funds/base_submissions_table.html" %} -{% load i18n static %} - -{% block title %}{{ object }}{% endblock %} - -{% block content %} - - {% adminbar %} - {% slot header %}{{ object }} ({{ table.rows|length }}){% endslot %} - {% slot sub_heading %}{% if object.fund %}{{ object.fund }} | {% endif %}{% trans "Lead" %}: {{ object.lead }}{% endslot %} - {% endadminbar %} - -
- {% block table %} - {{ block.super }} - {% endblock %} -
-{% endblock %} diff --git a/hypha/apply/funds/templates/funds/submissions_by_status.html b/hypha/apply/funds/templates/funds/submissions_by_status.html deleted file mode 100644 index c99b2e14f7..0000000000 --- a/hypha/apply/funds/templates/funds/submissions_by_status.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "funds/base_submissions_table.html" %} -{% load i18n %} - -{% block title %}{{ status }}{% endblock %} - -{% block content %} - {% adminbar %} - {% slot header %} - {{ status }} ({{ table.rows|length }}) - {% endslot %} - {% slot sub_heading %}{% trans "All submissions in " %}{{ status }}{% endslot %} - {% endadminbar %} - -
-
- {% block table %} - {{ block.super }} - {% endblock %} -
-
-{% endblock %} diff --git a/hypha/apply/funds/templates/funds/submissions_result.html b/hypha/apply/funds/templates/funds/submissions_result.html index 7e4a19092b..ac0c7df1bb 100644 --- a/hypha/apply/funds/templates/funds/submissions_result.html +++ b/hypha/apply/funds/templates/funds/submissions_result.html @@ -72,7 +72,7 @@
{% trans "Reviews" %}

{% trans "Submission value totals" %}

- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term filter_action=filter_action use_batch_actions=False filter_classes="filters-open" %} + {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term filter_action=filter_action filter_classes="filters-open" %}
diff --git a/hypha/apply/funds/templates/submissions/all.html b/hypha/apply/funds/templates/submissions/all.html index 7423c954eb..82bbd53253 100644 --- a/hypha/apply/funds/templates/submissions/all.html +++ b/hypha/apply/funds/templates/submissions/all.html @@ -13,8 +13,7 @@ {% endslot %} {% slot sub_heading %} - {% trans "Search and filter all submissions" %} • - Switch to old table view + {% trans "Search and filter all submissions" %} {% endslot %} {% slot buttons %} diff --git a/hypha/apply/funds/urls.py b/hypha/apply/funds/urls.py index 7f421aecb6..121dc6887d 100644 --- a/hypha/apply/funds/urls.py +++ b/hypha/apply/funds/urls.py @@ -20,10 +20,8 @@ SubmissionDetailPDFView, SubmissionDetailView, SubmissionEditView, - SubmissionListView, SubmissionPrivateMediaView, SubmissionResultView, - SubmissionsByStatus, SubmissionSealedView, TranslateSubmissionView, UpdateLeadView, @@ -92,7 +90,6 @@ ), path("success//", submission_success, name="success"), path("all/", submissions_all, name="list"), - path("all/old/", SubmissionListView.as_view(), name="list-old"), path( "statuses/", get_applications_status_counts, @@ -274,7 +271,6 @@ "", include("hypha.apply.determinations.urls", namespace="determinations") ), path("", include("hypha.apply.flags.urls", namespace="flags")), - path("/", SubmissionsByStatus.as_view(), name="status"), ], "submissions", ) diff --git a/hypha/apply/funds/views.py b/hypha/apply/funds/views.py index 7a655967df..b97ea7f2b9 100644 --- a/hypha/apply/funds/views.py +++ b/hypha/apply/funds/views.py @@ -26,7 +26,6 @@ from django.urls import reverse_lazy from django.utils import timezone from django.utils.decorators import method_decorator -from django.utils.safestring import mark_safe from django.utils.translation import gettext as _ from django.views import View from django.views.decorators.cache import cache_page @@ -34,7 +33,6 @@ from django.views.generic import ( DeleteView, DetailView, - FormView, ListView, UpdateView, ) @@ -55,10 +53,8 @@ from hypha.apply.activity.views import ( ActivityContextMixin, CommentFormView, - DelegatedViewMixin, ) from hypha.apply.determinations.views import ( - BatchDeterminationCreateView, DeterminationCreateOrUpdateView, ) from hypha.apply.projects.forms import ProjectCreateForm @@ -75,7 +71,6 @@ from hypha.apply.utils.pdfs import draw_submission_content, make_pdf from hypha.apply.utils.storage import PrivateMediaView from hypha.apply.utils.views import ( - DelegateableListView, DelegateableView, ViewDispatcher, ) @@ -84,11 +79,6 @@ from .differ import compare from .files import generate_private_file_path from .forms import ( - BatchArchiveSubmissionForm, - BatchDeleteSubmissionForm, - BatchProgressSubmissionForm, - BatchUpdateReviewersForm, - BatchUpdateSubmissionLeadForm, CreateReminderForm, ProgressSubmissionForm, UpdateMetaTermsForm, @@ -106,37 +96,27 @@ RoundsAndLabs, ) from .permissions import ( - can_access_drafts, can_alter_archived_submissions, - can_bulk_archive_submissions, - can_export_submissions, - can_view_archived_submissions, get_archive_view_groups, has_permission, ) from .tables import ( - AdminSubmissionsTable, ReviewerLeaderboardDetailTable, ReviewerLeaderboardFilter, ReviewerLeaderboardTable, - ReviewerSubmissionsTable, RoundsFilter, RoundsTable, StaffAssignmentsTable, SubmissionFilterAndSearch, - SubmissionReviewerFilterAndSearch, ) from .utils import ( - export_submissions_to_csv, format_submission_sum_value, is_filter_empty, ) from .workflow import ( DRAFT_STATE, - PHASES_MAPPING, STAGE_CHANGE_ACTIONS, active_statuses, - review_statuses, ) if settings.APPLICATION_TRANSLATIONS_ENABLED: @@ -201,299 +181,6 @@ def get_context_data(self, **kwargs): ) -class BaseAdminSubmissionsTable(SingleTableMixin, FilterView): - table_class = AdminSubmissionsTable - filterset_class = SubmissionFilterAndSearch - filter_action = "" - search_action = "" - paginator_class = LazyPaginator - table_pagination = {"per_page": 25} - - excluded_fields = settings.SUBMISSIONS_TABLE_EXCLUDED_FIELDS - - @property - def excluded(self): - return {"exclude": self.excluded_fields} - - def get_table_kwargs(self, **kwargs): - return {**self.excluded, **kwargs} - - def get_filterset_kwargs(self, filterset_class, **kwargs): - new_kwargs = super().get_filterset_kwargs(filterset_class) - new_kwargs.update(self.excluded) - new_kwargs.update(kwargs) - return new_kwargs - - def get_queryset(self): - submissions = self.filterset_class._meta.model.objects.current().for_table( - self.request.user - ) - - if not can_access_drafts(self.request.user): - submissions = submissions.exclude_draft() - - return submissions - - def get_context_data(self, **kwargs): - search_term = self.request.GET.get("query") - - return super().get_context_data( - search_term=search_term, - search_action=self.search_action, - filter_action=self.filter_action, - can_export=can_export_submissions(self.request.user), - **kwargs, - ) - - def dispatch(self, request, *args, **kwargs): - disp = super().dispatch(request, *args, **kwargs) - if "export" in request.GET and can_export_submissions(request.user): - csv_data = export_submissions_to_csv(self.object_list) - response = HttpResponse(csv_data.readlines(), content_type="text/csv") - response["Content-Disposition"] = "attachment; filename=submissions.csv" - return response - return disp - - -@method_decorator(staff_required, name="dispatch") -class BatchUpdateLeadView(DelegatedViewMixin, FormView): - form_class = BatchUpdateSubmissionLeadForm - context_name = "batch_lead_form" - - def form_valid(self, form): - new_lead = form.cleaned_data["lead"] - submissions = form.cleaned_data["submissions"] - services.bulk_update_lead( - submissions=submissions, - user=self.request.user, - lead=new_lead, - request=self.request, - ) - return super().form_valid(form) - - def form_invalid(self, form): - messages.error( - self.request, - mark_safe(_("Sorry something went wrong") + form.errors.as_ul()), - ) - return super().form_invalid(form) - - -@method_decorator(staff_required, name="dispatch") -class BatchUpdateReviewersView(DelegatedViewMixin, FormView): - form_class = BatchUpdateReviewersForm - context_name = "batch_reviewer_form" - - def form_valid(self, form): - submissions = form.cleaned_data["submissions"] - external_reviewers = form.cleaned_data["external_reviewers"] - assigned_roles = { - role: form.cleaned_data[field] for field, role in form.role_fields.items() - } - services.bulk_update_reviewers( - submissions=submissions, - external_reviewers=external_reviewers, - assigned_roles=assigned_roles, - user=self.request.user, - request=self.request, - ) - - return super().form_valid(form) - - def form_invalid(self, form): - messages.error( - self.request, - mark_safe(_("Sorry something went wrong") + form.errors.as_ul()), - ) - return super().form_invalid(form) - - -@method_decorator(staff_required, name="dispatch") -class BatchDeleteSubmissionView(DelegatedViewMixin, FormView): - form_class = BatchDeleteSubmissionForm - context_name = "batch_delete_submission_form" - - def form_valid(self, form): - submissions = form.cleaned_data["submissions"] - services.bulk_delete_submissions( - submissions=submissions, - user=self.request.user, - request=self.request, - ) - return super().form_valid(form) - - def form_invalid(self, form): - messages.error( - self.request, - mark_safe(_("Sorry something went wrong") + form.errors.as_ul()), - ) - return super().form_invalid(form) - - -@method_decorator(staff_required, name="dispatch") -class BatchArchiveSubmissionView(DelegatedViewMixin, FormView): - form_class = BatchArchiveSubmissionForm - context_name = "batch_archive_submission_form" - - def form_valid(self, form): - # If a user without archive edit access is somehow able to access batch archive submissions - # (ie. they were looking at the submission list when permissions changed) "refresh" the page - if not can_alter_archived_submissions(self.request.user): - return HttpResponseRedirect(self.request.path) - submissions = form.cleaned_data["submissions"] - services.bulk_archive_submissions( - submissions=submissions, - user=self.request.user, - request=self.request, - ) - return super().form_valid(form) - - def form_invalid(self, form): - messages.error( - self.request, - mark_safe(_("Sorry something went wrong") + form.errors.as_ul()), - ) - return super().form_invalid(form) - - -@method_decorator(staff_required, name="dispatch") -class BatchProgressSubmissionView(DelegatedViewMixin, FormView): - form_class = BatchProgressSubmissionForm - context_name = "batch_progress_form" - - def form_valid(self, form): - submissions = form.cleaned_data["submissions"] - transitions = form.cleaned_data.get("action") - - try: - redirect = BatchDeterminationCreateView.should_redirect( - self.request, submissions, transitions - ) - except ValueError as e: - messages.warning(self.request, "Could not determine: " + str(e)) - return self.form_invalid(form) - else: - if redirect: - return redirect - - failed = [] - phase_changes = {} - for submission in submissions: - valid_actions = { - action - for action, _ in submission.get_actions_for_user(self.request.user) - } - old_phase = submission.phase - try: - transition = (valid_actions & set(transitions)).pop() - submission.perform_transition( - transition, - self.request.user, - request=self.request, - notify=False, - ) - except (PermissionDenied, KeyError): - failed.append(submission) - else: - phase_changes[submission.id] = old_phase - - if failed: - messages.warning( - self.request, - _("Failed to update: ") - + ", ".join(str(submission) for submission in failed), - ) - - succeeded_submissions = submissions.exclude( - id__in=[submission.id for submission in failed] - ) - messenger( - MESSAGES.BATCH_TRANSITION, - user=self.request.user, - request=self.request, - sources=succeeded_submissions, - related=phase_changes, - ) - - ready_for_review = [phase for phase in transitions if phase in review_statuses] - if ready_for_review: - messenger( - MESSAGES.BATCH_READY_FOR_REVIEW, - user=self.request.user, - request=self.request, - sources=succeeded_submissions.filter(status__in=ready_for_review), - ) - - return super().form_valid(form) - - -class BaseReviewerSubmissionsTable(BaseAdminSubmissionsTable): - table_class = ReviewerSubmissionsTable - filterset_class = SubmissionReviewerFilterAndSearch - - def get_queryset(self): - """ - If use_settings variable is set for ReviewerSettings use settings - parameters to filter submissions or return only reviewed_by as it - was by default. - """ - reviewer_settings = ReviewerSettings.for_request(self.request) - if reviewer_settings.use_settings: - return ( - super() - .get_queryset() - .for_reviewer_settings(self.request.user, reviewer_settings) - .order_by("-submit_time") - ) - return super().get_queryset().reviewed_by(self.request.user) - - -class SubmissionAdminListView(BaseAdminSubmissionsTable, DelegateableListView): - template_name = "funds/submissions.html" - form_views = [ - BatchUpdateLeadView, - BatchUpdateReviewersView, - BatchProgressSubmissionView, - BatchDeleteSubmissionView, - BatchArchiveSubmissionView, - ] - - def get_filterset_kwargs(self, filterset_class, **kwargs): - new_kwargs = super().get_filterset_kwargs(filterset_class) - archived_kwargs = {"archived": self.request.GET.get("archived", 0)} - new_kwargs.update(archived_kwargs) - new_kwargs.update(kwargs) - return new_kwargs - - def get_queryset(self): - if self.request.GET.get("archived"): - # if archived is in param, let archived filter handle the queryset as per its value. - submissions = ( - self.filterset_class._meta.model.objects.include_archive().for_table( - self.request.user - ) - ) - else: - submissions = self.filterset_class._meta.model.objects.current().for_table( - self.request.user - ) - - if not can_access_drafts(self.request.user): - submissions = submissions.exclude_draft() - - return submissions - - def get_context_data(self, **kwargs): - show_archive = can_view_archived_submissions(self.request.user) - can_archive = can_bulk_archive_submissions(self.request.user) - - return super().get_context_data( - show_archive=show_archive, - can_bulk_archive=can_archive, - **kwargs, - ) - - @method_decorator(staff_required, name="dispatch") class GroupingApplicationsListView(TemplateView): """ @@ -503,53 +190,6 @@ class GroupingApplicationsListView(TemplateView): template_name = "funds/grouped_application_list.html" -class SubmissionReviewerListView(BaseReviewerSubmissionsTable): - template_name = "funds/submissions.html" - - -class SubmissionListView(ViewDispatcher): - admin_view = SubmissionAdminListView - reviewer_view = SubmissionReviewerListView - - -@method_decorator(staff_required, name="dispatch") -class SubmissionsByStatus(BaseAdminSubmissionsTable, DelegateableListView): - template_name = "funds/submissions_by_status.html" - status_mapping = PHASES_MAPPING - form_views = [ - BatchUpdateLeadView, - BatchUpdateReviewersView, - BatchProgressSubmissionView, - BatchDeleteSubmissionView, - BatchArchiveSubmissionView, - ] - - def dispatch(self, request, *args, **kwargs): - self.status = kwargs.get("status") - try: - status_data = self.status_mapping[self.status] - except KeyError: - raise Http404(_("No statuses match the requested value")) from None - self.status_name = status_data["name"] - self.statuses = status_data["statuses"] - return super().dispatch(request, *args, **kwargs) - - def get_filterset_kwargs(self, filterset_class, **kwargs): - return super().get_filterset_kwargs( - filterset_class, limit_statuses=self.statuses, **kwargs - ) - - def get_queryset(self): - return super().get_queryset().filter(status__in=self.statuses) - - def get_context_data(self, **kwargs): - return super().get_context_data( - status=self.status_name, - statuses=self.statuses, - **kwargs, - ) - - @method_decorator(staff_required, name="dispatch") class ProgressSubmissionView(View): def dispatch(self, request, *args, **kwargs): diff --git a/hypha/apply/projects/forms/payment.py b/hypha/apply/projects/forms/payment.py index c830156390..1c4d67c613 100644 --- a/hypha/apply/projects/forms/payment.py +++ b/hypha/apply/projects/forms/payment.py @@ -206,9 +206,7 @@ def save(self, *args, **kwargs): class BatchUpdateInvoiceStatusForm(forms.Form): invoice_action = forms.ChoiceField(label=_("Status")) - invoices = forms.CharField( - widget=forms.HiddenInput(attrs={"class": "js-invoices-id"}) - ) + invoices = forms.CharField(widget=forms.HiddenInput(attrs={"id": "js-invoices-id"})) def __init__(self, *args, **kwargs): self.user = kwargs.pop("user") diff --git a/hypha/apply/projects/templates/application_projects/includes/batch_invoice_status_update.html b/hypha/apply/projects/templates/application_projects/includes/batch_invoice_status_update.html deleted file mode 100644 index 75120ef70d..0000000000 --- a/hypha/apply/projects/templates/application_projects/includes/batch_invoice_status_update.html +++ /dev/null @@ -1,13 +0,0 @@ -{% load i18n %} - diff --git a/hypha/apply/projects/templates/application_projects/invoice_list.html b/hypha/apply/projects/templates/application_projects/invoice_list.html index fb38c672f5..db86b8796f 100644 --- a/hypha/apply/projects/templates/application_projects/invoice_list.html +++ b/hypha/apply/projects/templates/application_projects/invoice_list.html @@ -22,7 +22,7 @@ {% if table %} {% trans "invoices" as search_placeholder %} - {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True project_actions=True invoice_actions=True search_placeholder=search_placeholder %} + {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action project_actions=True invoice_batch_actions=True search_placeholder=search_placeholder %} {% render_table table %} {% else %}

{% trans "No Invoices available" %}

diff --git a/hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html b/hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html new file mode 100644 index 0000000000..bc71d5a9f7 --- /dev/null +++ b/hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html @@ -0,0 +1,28 @@ +{% load i18n %} +{% modal_title %}{% trans "Update Invoices Status" %}{% endmodal_title %} + +
+
+
+ {{ invoices|length }} {% trans " invoices selected" %} + +
+ {% for invoice in invoices %} + + {{ invoice.invoice_number }} + + + + + + {% endfor %} +
+ {% trans "Update status" as update %} + {% include 'funds/includes/dialog_form_base.html' with form=form value=update %} +
+ + diff --git a/hypha/apply/projects/templates/application_projects/project_list.html b/hypha/apply/projects/templates/application_projects/project_list.html index b69b3a1d8e..6e247c35fe 100644 --- a/hypha/apply/projects/templates/application_projects/project_list.html +++ b/hypha/apply/projects/templates/application_projects/project_list.html @@ -21,7 +21,7 @@
{% if table %} - {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="projects" use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" %} + {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="projects" use_search=True filter_action=filter_action filter_classes="filters-open" %} {% render_table table %} {% else %}

{% trans "No Projects Available." %}

diff --git a/hypha/apply/projects/urls.py b/hypha/apply/projects/urls.py index d476b18827..9b73c7105d 100644 --- a/hypha/apply/projects/urls.py +++ b/hypha/apply/projects/urls.py @@ -3,6 +3,7 @@ from .views import ( ApproveContractView, + BatchUpdateInvoiceStatusView, CategoryTemplatePrivateMediaView, ChangeInvoiceStatusView, ChangePAFStatusView, @@ -64,6 +65,11 @@ path( "invoices/statuses/", get_invoices_status_counts, name="invoices_status_counts" ), + path( + "all/bulk_invoice_status_update/", + BatchUpdateInvoiceStatusView.as_view(), + name="bulk_invoice_status_update", + ), path( "/", include( diff --git a/hypha/apply/projects/views/__init__.py b/hypha/apply/projects/views/__init__.py index 04102602fd..08425c8656 100644 --- a/hypha/apply/projects/views/__init__.py +++ b/hypha/apply/projects/views/__init__.py @@ -1,4 +1,5 @@ from .payment import ( + BatchUpdateInvoiceStatusView, ChangeInvoiceStatusView, CreateInvoiceView, DeleteInvoiceView, @@ -71,6 +72,7 @@ "partial_contracting_documents", "get_invoices_status_counts", "get_project_status_counts", + "BatchUpdateInvoiceStatusView", "ChangeInvoiceStatusView", "ChangeProjectstatusView", "SendForApprovalView", diff --git a/hypha/apply/projects/views/payment.py b/hypha/apply/projects/views/payment.py index 522794837f..eed884bdbf 100644 --- a/hypha/apply/projects/views/payment.py +++ b/hypha/apply/projects/views/payment.py @@ -21,6 +21,9 @@ View, ) from django_filters.views import FilterView +from django_htmx.http import ( + HttpResponseClientRefresh, +) from django_tables2 import SingleTableMixin from hypha.apply.activity.messaging import MESSAGES, messenger @@ -491,40 +494,51 @@ def test_func(self): class BatchUpdateInvoiceStatusView(DelegatedViewMixin, FormView): form_class = BatchUpdateInvoiceStatusForm context_name = "batch_invoice_status_form" + template_name = "application_projects/modals/batch_invoice_status_update.html" - def form_valid(self, form): - new_status = form.cleaned_data["invoice_action"] - invoices = form.cleaned_data["invoices"] - invoices_old_statuses = {invoice: invoice.status for invoice in invoices} - batch_update_invoices_status( - invoices=invoices, - user=self.request.user, - status=new_status, + def get(self, *args, **kwargs): + selected_ids = self.request.GET.getlist("selected_ids", "") + invoices = Invoice.objects.filter(id__in=selected_ids) + form = self.form_class(user=self.request.user) + return render( + self.request, + self.template_name, + context={"form": form, "invoices": invoices}, ) - # add activity feed for batch update invoice status - projects = Project.objects.filter( - id__in=[invoice.project.id for invoice in invoices] - ) - messenger( - MESSAGES.BATCH_UPDATE_INVOICE_STATUS, - request=self.request, - user=self.request.user, - sources=projects, - related=invoices, - ) + def post(self, *args, **kwargs): + form = self.form_class(self.request.POST, user=self.request.user) + if form.is_valid(): + new_status = form.cleaned_data["invoice_action"] + invoices = form.cleaned_data["invoices"] + invoices_old_statuses = {invoice: invoice.status for invoice in invoices} + batch_update_invoices_status( + invoices=invoices, + user=self.request.user, + status=new_status, + ) - # update tasks for selected invoices - for invoice, old_status in invoices_old_statuses.items(): - handle_tasks_on_invoice_update(old_status, invoice) - return super().form_valid(form) + # add activity feed for batch update invoice status + projects = Project.objects.filter( + id__in=[invoice.project.id for invoice in invoices] + ) + messenger( + MESSAGES.BATCH_UPDATE_INVOICE_STATUS, + request=self.request, + user=self.request.user, + sources=projects, + related=invoices, + ) - def form_invalid(self, form): + # update tasks for selected invoices + for invoice, old_status in invoices_old_statuses.items(): + handle_tasks_on_invoice_update(old_status, invoice) + return HttpResponseClientRefresh() messages.error( self.request, mark_safe(_("Sorry something went wrong") + form.errors.as_ul()), ) - return super().form_invalid(form) + return HttpResponseClientRefresh() @method_decorator(staff_or_finance_required, name="dispatch") diff --git a/hypha/static_src/javascript/batch-actions.js b/hypha/static_src/javascript/batch-actions.js index e994baccd5..7033af7d81 100644 --- a/hypha/static_src/javascript/batch-actions.js +++ b/hypha/static_src/javascript/batch-actions.js @@ -3,33 +3,15 @@ const $checkbox = $(".js-batch-select"); const $allCheckboxInput = $(".js-batch-select-all"); const $batchButtons = $(".js-batch-button"); - const $batchProgress = $(".js-batch-progress"); const $batchInvoiceProgress = $(".js-batch-invoice-progress"); - const $actionOptions = $("#id_action option"); - const $actionInvoiceOptions = $("#id_invoice_action option"); const $batchTitlesList = $(".js-batch-titles"); const $batchTitleCount = $(".js-batch-title-count"); const $hiddenIDlist = $(".js-submissions-id"); const $hiddenInvoiceIDlist = $(".js-invoices-id"); - const $batchDetermineSend = $(".js-batch-determine-send"); - const $batchDetermineConfirm = $(".js-batch-determine-confirm"); - const $batchDetermineForm = $batchDetermineSend.parent("form"); const $toggleBatchList = $(".js-toggle-batch-list"); const activeClass = "batch-actions-enabled"; const closedClass = "is-closed"; - $batchDetermineSend.click(function (e) { - if (!$batchDetermineForm[0].checkValidity()) { - $batchDetermineForm.submit(); - e.preventDefault(); - } - }); - - $batchDetermineConfirm.click(function (e) { - $batchDetermineForm.find(":submit").click(); - e.preventDefault(); - }); - $(window).on("load", function () { toggleBatchActions(); updateCount(); @@ -48,7 +30,6 @@ toggleBatchActions(); updateCount(); - updateProgressButton(); updateInvoiceProgressButton(); }); @@ -64,20 +45,33 @@ resetCheckAllInput(); } - updateProgressButton(); updateInvoiceProgressButton(); }); // append selected project titles to batch update reviewer modal $batchButtons.each(function () { - $(this).click(function () { - prepareBatchListing(); + $(this).click(function (e) { + let selectedIDs = []; + e.preventDefault(); + selectedIDs = prepareBatchListing(); + + if (selectedIDs.length > 0) { + // Get the base URL from the href attribute + const baseUrl = $(this).attr("href"); + const url = new URL(baseUrl, window.location.origin); + selectedIDs.forEach(id => { + url.searchParams.append("selected_ids", id); + }); + // Send the request using htmx.ajax + htmx.ajax('GET', url.toString(), { + target: '#htmx-modal' // Optional: set the target element + }); + } else { + alert("Please select at least one item."); + } }); }); - $batchProgress.click(function () { - updateProgressButton(); - }); $batchInvoiceProgress.click(function () { updateInvoiceProgressButton(); }); @@ -107,53 +101,35 @@ let selectedIDs = []; $checkbox.filter(":checked").each(function () { - const link = $(this).parents("tr").find(".js-title").find("a"); - const href = link.attr("href"); - const title = link.text(); - - $batchTitlesList.append(` - - ${title} - - - - - - `); selectedIDs.push($(this).parents("tr").data("record-id")); }); $batchTitleCount.append(`${selectedIDs.length} submissions selected`); $hiddenIDlist.val(selectedIDs.join(",")); $hiddenInvoiceIDlist.val(selectedIDs.join(",")); + return selectedIDs; } /** * Update the invoice progress button. */ function updateInvoiceProgressButton() { - var actions = $actionInvoiceOptions - .map(function () { - return this.value; - }) - .get(); + var actions; $checkbox.filter(":checked").each(function () { let newActions = $(this) .parents("tr") .find(".js-actions") .data("actions"); - actions = actions.filter((action) => newActions.includes(action)); - }); - - $actionInvoiceOptions.each(function () { - if (!actions.includes(this.value)) { - $(this).attr("disabled", "disabled"); + // If actions is undefined (i.e., first iteration), initialize it with newActions + if (!actions) { + actions = newActions; } else { - $(this).removeAttr("disabled"); + // Filter actions to keep only items also present in newActions + actions = actions.filter((action) => newActions.includes(action)); } }); - $actionInvoiceOptions.filter(":enabled:first").prop("selected", true); - if (actions.length === 0) { + + if (!actions || actions.length === 0) { $batchInvoiceProgress.attr("disabled", "disabled"); $batchInvoiceProgress.attr( "data-tooltip", @@ -165,42 +141,6 @@ } } - /** - * Update the progress button. - */ - function updateProgressButton() { - var actions = $actionOptions - .map(function () { - return this.value; - }) - .get(); - $checkbox.filter(":checked").each(function () { - let newActions = $(this) - .parents("tr") - .find(".js-actions") - .data("actions"); - actions = actions.filter((action) => newActions.includes(action)); - }); - $actionOptions.each(function () { - if (!actions.includes(this.value)) { - $(this).attr("disabled", "disabled"); - } else { - $(this).removeAttr("disabled"); - } - }); - $actionOptions.filter(":enabled:first").prop("selected", true); - if (actions.length === 0) { - $batchProgress.attr("disabled", "disabled"); - $batchProgress.attr( - "data-tooltip", - "Status changes can't be applied to submissions with this combination of statuses" - ); - } else { - $batchProgress.removeAttr("disabled"); - $batchProgress.removeAttr("data-tooltip"); - } - } - /** * Toggle the batch actions. */ diff --git a/hypha/static_src/sass/components/_list-reveal.scss b/hypha/static_src/sass/components/_list-reveal.scss index 4679499530..aedb95c0ac 100644 --- a/hypha/static_src/sass/components/_list-reveal.scss +++ b/hypha/static_src/sass/components/_list-reveal.scss @@ -4,6 +4,7 @@ .list-reveal { $root: &; + padding-bottom: 16px; &--determination { background-color: variables.$color--white; @@ -27,7 +28,7 @@ font-weight: variables.$weight--semibold; display: flex; justify-content: space-between; - margin: 0 -24px; + margin: 0 -16px; } &--determination { From 0e268338ab2bd4c2010fb3ea61cc3459f100e9b3 Mon Sep 17 00:00:00 2001 From: sandeepsajan0 Date: Thu, 28 Nov 2024 14:03:03 +0530 Subject: [PATCH 2/8] Removed batch action test for old tables and removed adminsubmissiontable --- hypha/apply/funds/tables.py | 16 --- .../funds/tests/views/test_batch_progress.py | 131 ------------------ .../funds/tests/views/test_batch_reviewers.py | 106 -------------- 3 files changed, 253 deletions(-) delete mode 100644 hypha/apply/funds/tests/views/test_batch_progress.py delete mode 100644 hypha/apply/funds/tests/views/test_batch_reviewers.py diff --git a/hypha/apply/funds/tables.py b/hypha/apply/funds/tables.py index b5274a923d..9c7823a64f 100644 --- a/hypha/apply/funds/tables.py +++ b/hypha/apply/funds/tables.py @@ -207,22 +207,6 @@ def render_screening_status(self, value): ) -class AdminSubmissionsTable(BaseAdminSubmissionsTable): - """Adds admin only columns to the submissions table""" - - selected = LabeledCheckboxColumn( - accessor=A("pk"), - attrs={ - "input": {"class": "js-batch-select"}, - "th__input": {"class": "js-batch-select-all"}, - }, - ) - - class Meta(BaseAdminSubmissionsTable.Meta): - fields = ("selected", *BaseAdminSubmissionsTable.Meta.fields) - sequence = fields - - class SummarySubmissionsTable(BaseAdminSubmissionsTable): class Meta(BaseAdminSubmissionsTable.Meta): orderable = False diff --git a/hypha/apply/funds/tests/views/test_batch_progress.py b/hypha/apply/funds/tests/views/test_batch_progress.py deleted file mode 100644 index 0e6a2e3192..0000000000 --- a/hypha/apply/funds/tests/views/test_batch_progress.py +++ /dev/null @@ -1,131 +0,0 @@ -from unittest import mock - -from hypha.apply.determinations.tests.factories import DeterminationFactory -from hypha.apply.funds.models import ApplicationSubmission -from hypha.apply.funds.tests.factories import ( - ApplicationSubmissionFactory, - InvitedToProposalFactory, -) -from hypha.apply.users.tests.factories import ReviewerFactory, StaffFactory, UserFactory -from hypha.apply.utils.testing.tests import BaseViewTestCase - - -class BaseBatchProgressViewTestCase(BaseViewTestCase): - url_name = "funds:submissions:{}" - base_view_name = "list-old" - - def data(self, action, submissions): - return { - "form-submitted-batch_progress_form": "Update", - "action": action, - "submissions": ",".join([str(submission.id) for submission in submissions]), - } - - -class StaffTestCase(BaseBatchProgressViewTestCase): - user_factory = StaffFactory - - def test_can_progress_application(self): - submission = ApplicationSubmissionFactory() - action = "open-review" - self.post_page(data=self.data(action, [submission])) - submission = self.refresh(submission) - self.assertEqual(submission.status, "internal_review") - - def test_can_progress_multiple_applications(self): - submissions = ApplicationSubmissionFactory.create_batch(3) - action = "open-review" - self.post_page(data=self.data(action, submissions)) - - self.assertCountEqual( - [self.refresh(submission).status for submission in submissions], - ["internal_review"] * 3, - ) - - def test_cant_progress_in_incorrect_state(self): - submission = ApplicationSubmissionFactory() - action = "close-review" - self.post_page(data=self.data(action, [submission])) - submission = self.refresh(submission) - self.assertEqual(submission.status, "in_discussion") - - def test_can_progress_one_in_mixed_state(self): - bad_submission = ApplicationSubmissionFactory() - good_submission = ApplicationSubmissionFactory(status="internal_review") - action = "close-review" - self.post_page(data=self.data(action, [good_submission, bad_submission])) - good_submission = self.refresh(good_submission) - bad_submission = self.refresh(bad_submission) - self.assertEqual(bad_submission.status, "in_discussion") - self.assertEqual(good_submission.status, "post_review_discussion") - - def test_can_progress_different_states(self): - submission = ApplicationSubmissionFactory() - other_submission = InvitedToProposalFactory() - action = "open-review" - self.post_page(data=self.data(action, [submission, other_submission])) - submission = self.refresh(submission) - other_submission = self.refresh(other_submission) - self.assertEqual(submission.status, "internal_review") - self.assertEqual(other_submission.status, "proposal_internal_review") - - def test_mixed_determine_notifies(self): - submission = ApplicationSubmissionFactory() - dismissed_submission = ApplicationSubmissionFactory(status="rejected") - DeterminationFactory( - submission=dismissed_submission, rejected=True, submitted=True - ) - action = "dismiss" - response = self.post_page( - data=self.data(action, [submission, dismissed_submission]) - ) - self.assertEqual(len(response.context["messages"]), 1) - - def test_determine_redirects(self): - submission = ApplicationSubmissionFactory() - action = "dismiss" - response = self.post_page(data=self.data(action, [submission])) - redirect_url = self.url_from_pattern( - "apply:submissions:determinations:batch", absolute=False - ) - self.assertEqual( - response.request["PATH_INFO"][: len(redirect_url)], redirect_url - ) - - @mock.patch("hypha.apply.funds.views.messenger") - def test_messenger_not_called_with_failed(self, patched): - submission = ApplicationSubmissionFactory() - action = "close-review" - self.post_page(data=self.data(action, [submission])) - patched.assert_called_once() - _, _, kwargs = patched.mock_calls[0] - self.assertQuerysetEqual( - kwargs["sources"], ApplicationSubmission.objects.none() - ) - - @mock.patch("hypha.apply.funds.views.messenger") - def test_messenger_with_submission_in_review(self, patched): - submission = ApplicationSubmissionFactory() - action = "open-review" - self.post_page(data=self.data(action, [submission])) - self.assertEqual(patched.call_count, 2) - _, _, kwargs = patched.mock_calls[0] - self.assertCountEqual(kwargs["sources"], [submission]) - _, _, kwargs = patched.mock_calls[1] - self.assertCountEqual(kwargs["sources"], [submission]) - - -class ReivewersTestCase(BaseBatchProgressViewTestCase): - user_factory = ReviewerFactory - - def test_cant_post_to_page(self): - response = self.post_page() - self.assertEqual(response.status_code, 405) - - -class ApplicantTestCase(BaseBatchProgressViewTestCase): - user_factory = UserFactory - - def test_cant_access_page_to_page(self): - response = self.post_page() - self.assertEqual(response.status_code, 403) diff --git a/hypha/apply/funds/tests/views/test_batch_reviewers.py b/hypha/apply/funds/tests/views/test_batch_reviewers.py deleted file mode 100644 index d1c4d0ed96..0000000000 --- a/hypha/apply/funds/tests/views/test_batch_reviewers.py +++ /dev/null @@ -1,106 +0,0 @@ -from hypha.apply.funds.tests.factories import ( - ApplicationSubmissionFactory, - AssignedWithRoleReviewersFactory, - ReviewerRoleFactory, -) -from hypha.apply.review.tests.factories import ReviewFactory -from hypha.apply.users.tests.factories import ReviewerFactory, StaffFactory -from hypha.apply.utils.testing.tests import BaseViewTestCase - - -class BaseBatchReviewerTestCase(BaseViewTestCase): - url_name = "funds:submissions:{}" - base_view_name = "list-old" - submissions = [] - staff = None - reviewers = [] - roles = [] - - def setUp(self): - super().setUp() - self.submissions = ApplicationSubmissionFactory.create_batch(4) - self.staff = StaffFactory.create_batch(4) - self.reviewers = ReviewerFactory.create_batch(4) - self.roles = ReviewerRoleFactory.create_batch(2) - - def data(self, reviewer_roles, submissions): - data = { - "form-submitted-batch_reviewer_form": "Update", - "submissions": ",".join([str(submission.id) for submission in submissions]), - } - - data.update( - **{ - f"role_reviewer_{str(role.id)}": reviewer.id - for role, reviewer in zip(self.roles, reviewer_roles, strict=False) - } - ) - return data - - -class StaffTestCase(BaseBatchReviewerTestCase): - user_factory = StaffFactory - - def test_can_assign_role_reviewers(self): - reviewer_roles = [self.staff[0]] - submissions = self.submissions[0:2] - self.post_page(data=self.data(reviewer_roles, submissions)) - for submission in submissions: - self.assertEqual(submission.assigned.count(), 1) - self.assertEqual(submission.assigned.first().reviewer, self.staff[0]) - self.assertEqual(submission.assigned.first().role, self.roles[0]) - - def test_can_reassign_role_reviewers(self): - AssignedWithRoleReviewersFactory( - reviewer=self.staff[1], submission=self.submissions[0], role=self.roles[0] - ) - AssignedWithRoleReviewersFactory( - reviewer=self.staff[1], submission=self.submissions[1], role=self.roles[0] - ) - submissions = self.submissions[0:2] - reviewer_roles = [self.staff[0]] - self.post_page(data=self.data(reviewer_roles, submissions)) - for submission in submissions: - self.assertEqual(submission.assigned.count(), 1) - self.assertEqual(submission.assigned.first().reviewer, self.staff[0]) - self.assertEqual(submission.assigned.first().role, self.roles[0]) - - def test_can_reassign_from_other_role_reviewers(self): - AssignedWithRoleReviewersFactory( - reviewer=self.staff[0], submission=self.submissions[0], role=self.roles[1] - ) - AssignedWithRoleReviewersFactory( - reviewer=self.staff[0], submission=self.submissions[1], role=self.roles[1] - ) - submissions = self.submissions[0:2] - reviewer_roles = [self.staff[0]] - self.post_page(data=self.data(reviewer_roles, submissions)) - for submission in submissions: - self.assertEqual(submission.assigned.count(), 1) - self.assertEqual(submission.assigned.first().reviewer, self.staff[0]) - self.assertEqual(submission.assigned.first().role, self.roles[0]) - - def test_doesnt_remove_if_already_reviewed(self): - AssignedWithRoleReviewersFactory( - reviewer=self.staff[1], submission=self.submissions[0], role=self.roles[0] - ) - ReviewFactory( - author__reviewer=self.staff[1], - author__staff=True, - submission=self.submissions[0], - draft=False, - ) - ReviewFactory( - author__reviewer=self.staff[1], - author__staff=True, - submission=self.submissions[1], - draft=False, - ) - submissions = self.submissions[0:2] - reviewer_roles = [self.staff[0]] - self.post_page(data=self.data(reviewer_roles, submissions)) - for submission in submissions: - self.assertEqual(submission.assigned.count(), 2) - reviewers = submission.assigned.values_list("reviewer", flat=True) - self.assertIn(self.staff[0].pk, reviewers) - self.assertIn(self.staff[1].pk, reviewers) From 0f0366ddce47a6b472e0b99c9f387d88a985d1c7 Mon Sep 17 00:00:00 2001 From: sandeepsajan0 Date: Fri, 29 Nov 2024 16:55:20 +0530 Subject: [PATCH 3/8] Add submission id to fix submission/success/ path in middleware test --- hypha/apply/users/tests/test_middleware.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hypha/apply/users/tests/test_middleware.py b/hypha/apply/users/tests/test_middleware.py index 21111d3cb3..01c7edfb12 100644 --- a/hypha/apply/users/tests/test_middleware.py +++ b/hypha/apply/users/tests/test_middleware.py @@ -2,6 +2,7 @@ from django.test import TestCase, override_settings from django.urls import reverse +from hypha.apply.funds.tests.factories import ApplicationSubmissionFactory from hypha.apply.users.tests.factories import UserFactory from ..middleware import TWO_FACTOR_EXEMPTED_PATH_PREFIXES @@ -37,5 +38,8 @@ def test_unverified_user_can_access_allowed_urls(self): self.client.force_login(user) for path in TWO_FACTOR_EXEMPTED_PATH_PREFIXES: + if "success" in path: + submission = ApplicationSubmissionFactory() + path = str(path) + f"{submission.id}/" response = self.client.get(path, follow=True) self.assertEqual(response.status_code, 200) From 7b3d5a7a7081db628cf91bf3879c11e8621f8714 Mon Sep 17 00:00:00 2001 From: sandeepsajan0 Date: Thu, 5 Dec 2024 17:50:07 +0530 Subject: [PATCH 4/8] Removed next path from the batch determination should_redirect url --- hypha/apply/determinations/views.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hypha/apply/determinations/views.py b/hypha/apply/determinations/views.py index 887d775d22..e303b38c0c 100644 --- a/hypha/apply/determinations/views.py +++ b/hypha/apply/determinations/views.py @@ -1,5 +1,3 @@ -from urllib import parse - from django import forms from django.conf import settings from django.contrib import messages @@ -277,8 +275,6 @@ def should_redirect(cls, request, submissions, actions): + action + "&submissions=" + ",".join([str(submission.id) for submission in submissions]) - + "&next=" - + parse.quote_plus(request.get_full_path()), ) elif set(actions) != non_determine_states: raise ValueError("Inconsistent states provided - please talk to an admin") From b574da906e62d06d3e050be1797ec19264045f6b Mon Sep 17 00:00:00 2001 From: sandeepsajan0 Date: Thu, 5 Dec 2024 18:01:50 +0530 Subject: [PATCH 5/8] removed next path test for batch determination code --- hypha/apply/determinations/tests/test_views.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/hypha/apply/determinations/tests/test_views.py b/hypha/apply/determinations/tests/test_views.py index 1b10d697cf..4f81b79779 100644 --- a/hypha/apply/determinations/tests/test_views.py +++ b/hypha/apply/determinations/tests/test_views.py @@ -8,7 +8,6 @@ from hypha.apply.activity.models import Activity from hypha.apply.determinations.options import ACCEPTED, NEEDS_MORE_INFO, REJECTED from hypha.apply.determinations.views import BatchDeterminationCreateView -from hypha.apply.funds.models import ApplicationSubmission from hypha.apply.funds.tests.factories import ApplicationSubmissionFactory from hypha.apply.users.tests.factories import StaffFactory, UserFactory from hypha.apply.utils.testing import BaseViewTestCase @@ -469,19 +468,6 @@ def test_can_submit_batch_determination_more_info_comment(self): self.assertRedirects(response, self.url_from_pattern("apply:submissions:list")) - def test_sets_next_on_redirect(self): - test_path = "/a/path/?with=query&a=sting" - request = RequestFactory().get("", PATH_INFO=test_path) - redirect = BatchDeterminationCreateView.should_redirect( - request, - ApplicationSubmission.objects.none(), - ["rejected"], - ) - url = urllib.parse.urlparse(redirect.url) - query = urllib.parse.parse_qs(url.query) - next_path = urllib.parse.unquote_plus(query["next"][0]) - self.assertEqual(next_path, test_path) - def test_success_redirects_if_exists(self): test_path = "/a/path/?with=query&a=sting" view = BatchDeterminationCreateView() From 595d61cd44c10989ec11f5beef1b5e4661e2c015 Mon Sep 17 00:00:00 2001 From: sandeepsajan0 Date: Mon, 9 Dec 2024 16:58:39 +0530 Subject: [PATCH 6/8] removed fancybox --- .../batch_determination_form.html | 3 - .../applicationsubmission_admin_detail.html | 7 - .../funds/base_submissions_table.html | 3 - .../funds/grouped_application_list.html | 3 - .../funds/includes/delegated_form_base.html | 1 - .../static_src/javascript/fancybox-global.js | 33 - .../javascript/jquery.fancybox.min.js | 13 - hypha/static_src/sass/fancybox.scss | 614 ------------------ 8 files changed, 677 deletions(-) delete mode 100644 hypha/static_src/javascript/fancybox-global.js delete mode 100644 hypha/static_src/javascript/jquery.fancybox.min.js delete mode 100644 hypha/static_src/sass/fancybox.scss diff --git a/hypha/apply/determinations/templates/determinations/batch_determination_form.html b/hypha/apply/determinations/templates/determinations/batch_determination_form.html index b058c36b93..c55a3c9709 100644 --- a/hypha/apply/determinations/templates/determinations/batch_determination_form.html +++ b/hypha/apply/determinations/templates/determinations/batch_determination_form.html @@ -3,7 +3,6 @@ {% block extra_css %} {{ block.super }} - {% endblock %} {% block adminbar %} @@ -40,7 +39,5 @@ {% block extra_js %} {{ block.super }} - - {% endblock %} diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html index 5bf69f9c5f..ef1d45a91e 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html @@ -1,11 +1,6 @@ {% extends "funds/applicationsubmission_detail.html" %} {% load i18n static workflow_tags review_tags determination_tags translate_tags heroicons %} -{% block extra_css %} - -{% endblock %} - - {% block sidebar_top %}
{% include "funds/includes/admin_primary_actions.html" %} @@ -95,8 +90,6 @@
{% trans "Reminders" %}
{% block extra_js %} {{ comment_form.media.js }} {{ block.super }} - - {% if request.user|can_translate_submission %} diff --git a/hypha/apply/funds/templates/funds/base_submissions_table.html b/hypha/apply/funds/templates/funds/base_submissions_table.html index 17d7ef904d..76715a3d40 100644 --- a/hypha/apply/funds/templates/funds/base_submissions_table.html +++ b/hypha/apply/funds/templates/funds/base_submissions_table.html @@ -3,7 +3,6 @@ {% load render_table from django_tables2 %} {% block extra_css %} - {{ filter.form.media.css }} {% endblock %} @@ -17,8 +16,6 @@ {% block extra_js %} {{ filter.form.media.js }} - - diff --git a/hypha/apply/funds/templates/funds/grouped_application_list.html b/hypha/apply/funds/templates/funds/grouped_application_list.html index f49c626ada..06b17bb2a7 100644 --- a/hypha/apply/funds/templates/funds/grouped_application_list.html +++ b/hypha/apply/funds/templates/funds/grouped_application_list.html @@ -2,7 +2,6 @@ {% load i18n static %} {% block extra_css %} - {{ filter.form.media.css }} {% endblock %} @@ -17,8 +16,6 @@ {% block extra_js %} {{ filter.form.media.js }} - - diff --git a/hypha/apply/funds/templates/funds/includes/delegated_form_base.html b/hypha/apply/funds/templates/funds/includes/delegated_form_base.html index e09828f13f..33e1c82a04 100644 --- a/hypha/apply/funds/templates/funds/includes/delegated_form_base.html +++ b/hypha/apply/funds/templates/funds/includes/delegated_form_base.html @@ -27,7 +27,6 @@ {% if cancel %} ',close:'',arrowLeft:'',arrowRight:'',smallBtn:''},parentEl:"body",hideScrollbar:!0,autoFocus:!0,backFocus:!0,trapFocus:!0,fullScreen:{autoStart:!1},touch:{vertical:!0,momentum:!0},hash:null,media:{},slideShow:{autoStart:!1,speed:3e3},thumbs:{autoStart:!1,hideOnClose:!0,parentEl:".fancybox-container",axis:"y"},wheel:"auto",onInit:n.noop,beforeLoad:n.noop,afterLoad:n.noop,beforeShow:n.noop,afterShow:n.noop,beforeClose:n.noop,afterClose:n.noop,onActivate:n.noop,onDeactivate:n.noop,clickContent:function(t,e){return"image"===t.type&&"zoom"},clickSlide:"close",clickOutside:"close",dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1,mobile:{idleTime:!1,clickContent:function(t,e){return"image"===t.type&&"toggleControls"},clickSlide:function(t,e){return"image"===t.type?"toggleControls":"close"},dblclickContent:function(t,e){return"image"===t.type&&"zoom"},dblclickSlide:function(t,e){return"image"===t.type&&"zoom"}},lang:"en",i18n:{en:{CLOSE:"Close",NEXT:"Next",PREV:"Previous",ERROR:"The requested content cannot be loaded.
Please try again later.",PLAY_START:"Start slideshow",PLAY_STOP:"Pause slideshow",FULL_SCREEN:"Full screen",THUMBS:"Thumbnails",DOWNLOAD:"Download",SHARE:"Share",ZOOM:"Zoom"},de:{CLOSE:"Schliessen",NEXT:"Weiter",PREV:"Zurück",ERROR:"Die angeforderten Daten konnten nicht geladen werden.
Bitte versuchen Sie es später nochmal.",PLAY_START:"Diaschau starten",PLAY_STOP:"Diaschau beenden",FULL_SCREEN:"Vollbild",THUMBS:"Vorschaubilder",DOWNLOAD:"Herunterladen",SHARE:"Teilen",ZOOM:"Maßstab"}}},s=n(t),r=n(e),c=0,l=function(t){return t&&t.hasOwnProperty&&t instanceof n},d=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||function(e){return t.setTimeout(e,1e3/60)}}(),u=function(){var t,n=e.createElement("fakeelement"),i={transition:"transitionend",OTransition:"oTransitionEnd",MozTransition:"transitionend",WebkitTransition:"webkitTransitionEnd"};for(t in i)if(n.style[t]!==o)return i[t];return"transitionend"}(),f=function(t){return t&&t.length&&t[0].offsetHeight},p=function(t,e){var o=n.extend(!0,{},t,e);return n.each(e,function(t,e){n.isArray(e)&&(o[t]=e)}),o},h=function(t,e,o){var i=this;i.opts=p({index:o},n.fancybox.defaults),n.isPlainObject(e)&&(i.opts=p(i.opts,e)),n.fancybox.isMobile&&(i.opts=p(i.opts,i.opts.mobile)),i.id=i.opts.id||++c,i.currIndex=parseInt(i.opts.index,10)||0,i.prevIndex=null,i.prevPos=null,i.currPos=0,i.firstRun=!0,i.group=[],i.slides={},i.addContent(t),i.group.length&&i.init()};n.extend(h.prototype,{init:function(){var i,a,s,r=this,c=r.group[r.currIndex],l=c.opts,d=n.fancybox.scrollbarWidth;l.closeExisting&&n.fancybox.close(!0),n("body").addClass("fancybox-active"),!n.fancybox.getInstance()&&l.hideScrollbar!==!1&&!n.fancybox.isMobile&&e.body.scrollHeight>t.innerHeight&&(d===o&&(i=n('
').appendTo("body"),d=n.fancybox.scrollbarWidth=i[0].offsetWidth-i[0].clientWidth,i.remove()),n("head").append('"),n("body").addClass("compensate-for-scrollbar")),s="",n.each(l.buttons,function(t,e){s+=l.btnTpl[e]||""}),a=n(r.translate(r,l.baseTpl.replace("{{buttons}}",s).replace("{{arrows}}",l.btnTpl.arrowLeft+l.btnTpl.arrowRight))).attr("id","fancybox-container-"+r.id).addClass(l.baseClass).data("FancyBox",r).appendTo(l.parentEl),r.$refs={container:a},["bg","inner","infobar","toolbar","stage","caption","navigation"].forEach(function(t){r.$refs[t]=a.find(".fancybox-"+t)}),r.trigger("onInit"),r.activate(),r.jumpTo(r.currIndex)},translate:function(t,e){var n=t.opts.i18n[t.opts.lang];return e.replace(/\{\{(\w+)\}\}/g,function(t,e){var i=n[e];return i===o?t:i})},addContent:function(t){var e,i=this,a=n.makeArray(t);n.each(a,function(t,e){var a,s,r,c,l,d={},u={};n.isPlainObject(e)?(d=e,u=e.opts||e):"object"===n.type(e)&&n(e).length?(a=n(e),u=a.data()||{},u=n.extend(!0,{},u,u.options),u.$orig=a,d.src=i.opts.src||u.src||a.attr("href"),d.type||d.src||(d.type="inline",d.src=e)):d={type:"html",src:e+""},d.opts=n.extend(!0,{},i.opts,u),n.isArray(u.buttons)&&(d.opts.buttons=u.buttons),n.fancybox.isMobile&&d.opts.mobile&&(d.opts=p(d.opts,d.opts.mobile)),s=d.type||d.opts.type,c=d.src||"",!s&&c&&((r=c.match(/\.(mp4|mov|ogv|webm)((\?|#).*)?$/i))?(s="video",d.opts.video.format||(d.opts.video.format="video/"+("ogv"===r[1]?"ogg":r[1]))):c.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)?s="image":c.match(/\.(pdf)((\?|#).*)?$/i)?s="iframe":"#"===c.charAt(0)&&(s="inline")),s?d.type=s:i.trigger("objectNeedsType",d),d.contentType||(d.contentType=n.inArray(d.type,["html","inline","ajax"])>-1?"html":d.type),d.index=i.group.length,"auto"==d.opts.smallBtn&&(d.opts.smallBtn=n.inArray(d.type,["html","inline","ajax"])>-1),"auto"===d.opts.toolbar&&(d.opts.toolbar=!d.opts.smallBtn),d.opts.$trigger&&d.index===i.opts.index&&(d.opts.$thumb=d.opts.$trigger.find("img:first"),d.opts.$thumb.length&&(d.opts.$orig=d.opts.$trigger)),d.opts.$thumb&&d.opts.$thumb.length||!d.opts.$orig||(d.opts.$thumb=d.opts.$orig.find("img:first")),"function"===n.type(d.opts.caption)&&(d.opts.caption=d.opts.caption.apply(e,[i,d])),"function"===n.type(i.opts.caption)&&(d.opts.caption=i.opts.caption.apply(e,[i,d])),d.opts.caption instanceof n||(d.opts.caption=d.opts.caption===o?"":d.opts.caption+""),"ajax"===d.type&&(l=c.split(/\s+/,2),l.length>1&&(d.src=l.shift(),d.opts.filter=l.shift())),d.opts.modal&&(d.opts=n.extend(!0,d.opts,{infobar:0,toolbar:0,smallBtn:0,keyboard:0,slideShow:0,fullScreen:0,thumbs:0,touch:0,clickContent:!1,clickSlide:!1,clickOutside:!1,dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1})),i.group.push(d)}),Object.keys(i.slides).length&&(i.updateControls(),e=i.Thumbs,e&&e.isActive&&(e.create(),e.focus()))},addEvents:function(){var e=this;e.removeEvents(),e.$refs.container.on("click.fb-close","[data-fancybox-close]",function(t){t.stopPropagation(),t.preventDefault(),e.close(t)}).on("touchstart.fb-prev click.fb-prev","[data-fancybox-prev]",function(t){t.stopPropagation(),t.preventDefault(),e.previous()}).on("touchstart.fb-next click.fb-next","[data-fancybox-next]",function(t){t.stopPropagation(),t.preventDefault(),e.next()}).on("click.fb","[data-fancybox-zoom]",function(t){e[e.isScaledDown()?"scaleToActual":"scaleToFit"]()}),s.on("orientationchange.fb resize.fb",function(t){t&&t.originalEvent&&"resize"===t.originalEvent.type?d(function(){e.update()}):(e.current&&"iframe"===e.current.type&&e.$refs.stage.hide(),setTimeout(function(){e.$refs.stage.show(),e.update()},n.fancybox.isMobile?600:250))}),r.on("keydown.fb",function(t){var o=n.fancybox?n.fancybox.getInstance():null,i=o.current,a=t.keyCode||t.which;if(9==a)return void(i.opts.trapFocus&&e.focus(t));if(!(!i.opts.keyboard||t.ctrlKey||t.altKey||t.shiftKey||n(t.target).is("input")||n(t.target).is("textarea")))return 8===a||27===a?(t.preventDefault(),void e.close(t)):37===a||38===a?(t.preventDefault(),void e.previous()):39===a||40===a?(t.preventDefault(),void e.next()):void e.trigger("afterKeydown",t,a)}),e.group[e.currIndex].opts.idleTime&&(e.idleSecondsCounter=0,r.on("mousemove.fb-idle mouseleave.fb-idle mousedown.fb-idle touchstart.fb-idle touchmove.fb-idle scroll.fb-idle keydown.fb-idle",function(t){e.idleSecondsCounter=0,e.isIdle&&e.showControls(),e.isIdle=!1}),e.idleInterval=t.setInterval(function(){e.idleSecondsCounter++,e.idleSecondsCounter>=e.group[e.currIndex].opts.idleTime&&!e.isDragging&&(e.isIdle=!0,e.idleSecondsCounter=0,e.hideControls())},1e3))},removeEvents:function(){var e=this;s.off("orientationchange.fb resize.fb"),r.off("keydown.fb .fb-idle"),this.$refs.container.off(".fb-close .fb-prev .fb-next"),e.idleInterval&&(t.clearInterval(e.idleInterval),e.idleInterval=null)},previous:function(t){return this.jumpTo(this.currPos-1,t)},next:function(t){return this.jumpTo(this.currPos+1,t)},jumpTo:function(t,e){var i,a,s,r,c,l,d,u=this,f=u.group.length;if(!(u.isDragging||u.isClosing||u.isAnimating&&u.firstRun)){if(t=parseInt(t,10),s=u.current?u.current.opts.loop:u.opts.loop,!s&&(t<0||t>=f))return!1;if(i=u.firstRun=!Object.keys(u.slides).length,!(f<2&&!i&&u.isDragging)){if(c=u.current,u.prevIndex=u.currIndex,u.prevPos=u.currPos,r=u.createSlide(t),f>1&&((s||r.index0)&&u.createSlide(t-1)),u.current=r,u.currIndex=r.index,u.currPos=r.pos,u.trigger("beforeShow",i),u.updateControls(),a=u.isMoved(r),r.forcedDuration=o,n.isNumeric(e)?r.forcedDuration=e:e=r.opts[i?"animationDuration":"transitionDuration"],e=parseInt(e,10),i)return r.opts.animationEffect&&e&&u.$refs.container.css("transition-duration",e+"ms"),u.$refs.container.addClass("fancybox-is-open"),r.$slide.addClass("fancybox-slide--previous"),u.loadSlide(r),r.$slide.removeClass("fancybox-slide--previous").addClass("fancybox-slide--current"),u.preload("image"),void u.$refs.container.trigger("focus");n.each(u.slides,function(t,e){n.fancybox.stop(e.$slide,!0),e.$slide.removeClass("fancybox-animated").removeClass(function(t,e){return(e.match(/(^|\s)fancybox-fx-\S+/g)||[]).join(" ")})}),r.$slide.removeClass("fancybox-slide--next fancybox-slide--previous").addClass("fancybox-slide--current"),a?(l=Math.round(r.$slide.width()),n.each(u.slides,function(t,o){var i=o.pos-r.pos;n.fancybox.animate(o.$slide,{top:0,left:i*l+i*o.opts.gutter},e,function(){o.$slide.removeAttr("style").removeClass("fancybox-slide--next fancybox-slide--previous"),o.pos===u.currPos&&u.complete()})})):u.$refs.stage.children().removeAttr("style"),r.isLoaded?u.revealContent(r):u.loadSlide(r),u.preload("image"),c.pos!==r.pos&&(d="fancybox-slide--"+(c.pos>r.pos?"next":"previous"),c.$slide.removeClass("fancybox-slide--complete fancybox-slide--current fancybox-slide--next fancybox-slide--previous"),c.isComplete=!1,e&&(a||r.opts.transitionEffect)&&(a?c.$slide.addClass(d):(d="fancybox-animated "+d+" fancybox-fx-"+r.opts.transitionEffect,n.fancybox.animate(c.$slide,d,e,null,!1))))}}},createSlide:function(t){var e,o,i=this;return o=t%i.group.length,o=o<0?i.group.length+o:o,!i.slides[t]&&i.group[o]&&(e=n('
').appendTo(i.$refs.stage),i.slides[t]=n.extend(!0,{},i.group[o],{pos:t,$slide:e,isLoaded:!1}),i.updateSlide(i.slides[t])),i.slides[t]},scaleToActual:function(t,e,i){var a,s,r,c,l,d=this,u=d.current,f=u.$content,p=n.fancybox.getTranslate(u.$slide).width,h=n.fancybox.getTranslate(u.$slide).height,g=u.width,b=u.height;!d.isAnimating&&f&&"image"==u.type&&u.isLoaded&&!u.hasError&&(n.fancybox.stop(f),d.isAnimating=!0,t=t===o?.5*p:t,e=e===o?.5*h:e,a=n.fancybox.getTranslate(f),a.top-=n.fancybox.getTranslate(u.$slide).top,a.left-=n.fancybox.getTranslate(u.$slide).left,c=g/a.width,l=b/a.height,s=.5*p-.5*g,r=.5*h-.5*b,g>p&&(s=a.left*c-(t*c-t),s>0&&(s=0),sh&&(r=a.top*l-(e*l-e),r>0&&(r=0),rl/a?d=l/a:l>d*a&&(l=d*a)),u.width=l,u.height=d,u)},update:function(){var t=this;n.each(t.slides,function(e,n){t.updateSlide(n)})},updateSlide:function(t){var e=this,o=t&&t.$content,i=t.width||t.opts.width,a=t.height||t.opts.height,s=t.$slide;o&&(i||a||"video"===t.contentType)&&!t.hasError&&(n.fancybox.stop(o),n.fancybox.setTranslate(o,e.getFitPos(t)),t.pos===e.currPos&&(e.isAnimating=!1,e.updateCursor())),s.length&&(s.trigger("refresh"),e.$refs.toolbar.toggleClass("compensate-for-scrollbar",s.get(0).scrollHeight>s.get(0).clientHeight)),e.trigger("onUpdate",t)},centerSlide:function(t,e){var i,a,s=this;s.current&&(i=Math.round(t.$slide.width()),a=t.pos-s.current.pos,n.fancybox.animate(t.$slide,{top:0,left:a*i+a*t.opts.gutter,opacity:1},e===o?0:e,null,!1))},isMoved:function(t){var e=t||this.current,o=n.fancybox.getTranslate(e.$slide);return(0!==o.left||0!==o.top)&&!e.$slide.hasClass("fancybox-animated")},updateCursor:function(t,e){var o,i=this,a=i.current,s=i.$refs.container.removeClass("fancybox-is-zoomable fancybox-can-zoomIn fancybox-can-zoomOut fancybox-can-swipe fancybox-can-pan");a&&!i.isClosing&&(o=i.isZoomable(),s.toggleClass("fancybox-is-zoomable",o),n("[data-fancybox-zoom]").prop("disabled",!o),i.canPan(t,e)?s.addClass("fancybox-can-pan"):o&&("zoom"===a.opts.clickContent||n.isFunction(a.opts.clickContent)&&"zoom"==a.opts.clickContent(a))?s.addClass("fancybox-can-zoomIn"):a.opts.touch&&(a.opts.touch.vertical||i.group.length>1)&&"video"!==a.contentType&&s.addClass("fancybox-can-swipe"))},isZoomable:function(){var t,e=this,n=e.current;if(n&&!e.isClosing&&"image"===n.type&&!n.hasError){if(!n.isLoaded)return!0;if(t=e.getFitPos(n),n.width>t.width||n.height>t.height)return!0}return!1},isScaledDown:function(t,e){var i=this,a=!1,s=i.current,r=s.$content;return t!==o&&e!==o?a=t1.5||Math.abs(a.height-r.height)>1.5),r},loadSlide:function(t){var e,o,i,a=this;if(!t.isLoading&&!t.isLoaded){switch(t.isLoading=!0,a.trigger("beforeLoad",t),e=t.type,o=t.$slide,o.off("refresh").trigger("onReset").addClass(t.opts.slideClass),e){case"image":a.setImage(t);break;case"iframe":a.setIframe(t);break;case"html":a.setContent(t,t.src||t.content);break;case"video":a.setContent(t,t.opts.video.tpl.replace("{{src}}",t.src).replace("{{format}}",t.opts.videoFormat||t.opts.video.format));break;case"inline":n(t.src).length?a.setContent(t,n(t.src)):a.setError(t);break;case"ajax":a.showLoading(t),i=n.ajax(n.extend({},t.opts.ajax.settings,{url:t.src,success:function(e,n){"success"===n&&a.setContent(t,e)},error:function(e,n){e&&"abort"!==n&&a.setError(t)}})),o.one("onReset",function(){i.abort()});break;default:a.setError(t)}return!0}},setImage:function(e){var o,i,a,s,r,c=this,l=e.opts.srcset||e.opts.image.srcset;if(e.timouts=setTimeout(function(){var t=e.$image;!e.isLoading||t&&t.length&&t[0].complete||e.hasError||c.showLoading(e)},350),l){s=t.devicePixelRatio||1,r=t.innerWidth*s,a=l.split(",").map(function(t){var e={};return t.trim().split(/\s+/).forEach(function(t,n){var o=parseInt(t.substring(0,t.length-1),10);return 0===n?e.url=t:void(o&&(e.value=o,e.postfix=t[t.length-1]))}),e}),a.sort(function(t,e){return t.value-e.value});for(var d=0;d=r||"x"===u.postfix&&u.value>=s){i=u;break}}!i&&a.length&&(i=a[a.length-1]),i&&(e.src=i.url,e.width&&e.height&&"w"==i.postfix&&(e.height=e.width/e.height*i.value,e.width=i.value),e.opts.srcset=l)}e.$content=n('
').addClass("fancybox-is-hidden").appendTo(e.$slide.addClass("fancybox-slide--image")),o=e.opts.thumb||!(!e.opts.$thumb||!e.opts.$thumb.length)&&e.opts.$thumb.attr("src"),e.opts.preload!==!1&&e.opts.width&&e.opts.height&&o&&(e.width=e.opts.width,e.height=e.opts.height,e.$ghost=n("").one("error",function(){n(this).remove(),e.$ghost=null}).one("load",function(){c.afterLoad(e)}).addClass("fancybox-image").appendTo(e.$content).attr("src",o)),c.setBigImage(e)},setBigImage:function(t){var e=this,o=n("");t.$image=o.one("error",function(){e.setError(t)}).one("load",function(){var n;t.$ghost||(e.resolveImageSlideSize(t,this.naturalWidth,this.naturalHeight),e.afterLoad(t)),t.timouts&&(clearTimeout(t.timouts),t.timouts=null),e.isClosing||(t.opts.srcset&&(n=t.opts.sizes,n&&"auto"!==n||(n=(t.width/t.height>1&&s.width()/s.height()>1?"100":Math.round(t.width/t.height*100))+"vw"),o.attr("sizes",n).attr("srcset",t.opts.srcset)),t.$ghost&&setTimeout(function(){t.$ghost&&!e.isClosing&&t.$ghost.hide()},Math.min(300,Math.max(1e3,t.height/1600))),e.hideLoading(t))}).addClass("fancybox-image").attr("src",t.src).appendTo(t.$content),(o[0].complete||"complete"==o[0].readyState)&&o[0].naturalWidth&&o[0].naturalHeight?o.trigger("load"):o[0].error&&o.trigger("error")},resolveImageSlideSize:function(t,e,n){var o=parseInt(t.opts.width,10),i=parseInt(t.opts.height,10);t.width=e,t.height=n,o>0&&(t.width=o,t.height=Math.floor(o*n/e)),i>0&&(t.width=Math.floor(i*e/n),t.height=i)},setIframe:function(t){var e,i=this,a=t.opts.iframe,s=t.$slide;t.$content=n('
').css(a.css).appendTo(s),s.addClass("fancybox-slide--"+t.contentType),t.$iframe=e=n(a.tpl.replace(/\{rnd\}/g,(new Date).getTime())).attr(a.attr).appendTo(t.$content),a.preload?(i.showLoading(t),e.on("load.fb error.fb",function(e){this.isReady=1,t.$slide.trigger("refresh"),i.afterLoad(t)}),s.on("refresh.fb",function(){var n,i,r=t.$content,c=a.css.width,l=a.css.height;if(1===e[0].isReady){try{n=e.contents(),i=n.find("body")}catch(t){}i&&i.length&&i.children().length&&(s.css("overflow","visible"),r.css({width:"100%",height:""}),c===o&&(c=Math.ceil(Math.max(i[0].clientWidth,i.outerWidth(!0)))),c&&r.width(c),l===o&&(l=Math.ceil(Math.max(i[0].clientHeight,i.outerHeight(!0)))),l&&r.height(l),s.css("overflow","auto")),r.removeClass("fancybox-is-hidden")}})):this.afterLoad(t),e.attr("src",t.src),s.one("onReset",function(){try{n(this).find("iframe").hide().unbind().attr("src","//about:blank")}catch(t){}n(this).off("refresh.fb").empty(),t.isLoaded=!1})},setContent:function(t,e){var o=this;o.isClosing||(o.hideLoading(t),t.$content&&n.fancybox.stop(t.$content),t.$slide.empty(),l(e)&&e.parent().length?(e.hasClass("fancybox-content")&&e.parent(".fancybox-slide--html").trigger("onReset"),t.$placeholder=n("
").hide().insertAfter(e),e.css("display","inline-block")):t.hasError||("string"===n.type(e)&&(e=n("
").append(n.trim(e)).contents()),t.opts.filter&&(e=n("
").html(e).find(t.opts.filter))),t.$slide.one("onReset",function(){n(this).find("video,audio").trigger("pause"),t.$placeholder&&(t.$placeholder.after(e.removeClass("fancybox-content").hide()).remove(),t.$placeholder=null),t.$smallBtn&&(t.$smallBtn.remove(),t.$smallBtn=null),t.hasError||(n(this).empty(),t.isLoaded=!1,t.isRevealed=!1)}),n(e).appendTo(t.$slide),n(e).is("video,audio")&&(n(e).addClass("fancybox-video"),n(e).wrap("
"),t.contentType="video",t.opts.width=t.opts.width||n(e).attr("width"),t.opts.height=t.opts.height||n(e).attr("height")),t.$content=t.$slide.children().filter("div,form,main,video,audio,article,.fancybox-content").first(),t.$content.siblings().hide(),t.$content.length||(t.$content=t.$slide.wrapInner("
").children().first()),t.$content.addClass("fancybox-content"),t.$slide.addClass("fancybox-slide--"+t.contentType),this.afterLoad(t))},setError:function(t){t.hasError=!0,t.$slide.trigger("onReset").removeClass("fancybox-slide--"+t.contentType).addClass("fancybox-slide--error"),t.contentType="html",this.setContent(t,this.translate(t,t.opts.errorTpl)),t.pos===this.currPos&&(this.isAnimating=!1)},showLoading:function(t){var e=this;t=t||e.current,t&&!t.$spinner&&(t.$spinner=n(e.translate(e,e.opts.spinnerTpl)).appendTo(t.$slide))},hideLoading:function(t){var e=this;t=t||e.current,t&&t.$spinner&&(t.$spinner.remove(),delete t.$spinner)},afterLoad:function(t){var e=this;e.isClosing||(t.isLoading=!1,t.isLoaded=!0,e.trigger("afterLoad",t),e.hideLoading(t),t.pos===e.currPos&&e.updateCursor(),!t.opts.smallBtn||t.$smallBtn&&t.$smallBtn.length||(t.$smallBtn=n(e.translate(t,t.opts.btnTpl.smallBtn)).appendTo(t.$content)),t.opts.protect&&t.$content&&!t.hasError&&(t.$content.on("contextmenu.fb",function(t){return 2==t.button&&t.preventDefault(),!0}),"image"===t.type&&n('
').appendTo(t.$content)),e.revealContent(t))},revealContent:function(t){var e,i,a,s,r=this,c=t.$slide,l=!1,d=!1,u=r.isMoved(t),p=t.isRevealed;if(!u||!p){if(t.isRevealed=!0,e=t.opts[r.firstRun?"animationEffect":"transitionEffect"],a=t.opts[r.firstRun?"animationDuration":"transitionDuration"],a=parseInt(t.forcedDuration===o?a:t.forcedDuration,10),t.pos===r.currPos&&(t.isComplete?e=!1:r.isAnimating=!0),!u&&t.pos===r.currPos&&a||(e=!1),"zoom"===e&&(t.pos===r.currPos&&a&&"image"===t.type&&!t.hasError&&(d=r.getThumbPos(t))?l=r.getFitPos(t):e="fade"),"zoom"===e)return l.scaleX=l.width/d.width,l.scaleY=l.height/d.height,s=t.opts.zoomOpacity,"auto"==s&&(s=Math.abs(t.width/t.height-d.width/d.height)>.1),s&&(d.opacity=.1,l.opacity=1),n.fancybox.setTranslate(t.$content.removeClass("fancybox-is-hidden"),d),f(t.$content),void n.fancybox.animate(t.$content,l,a,function(){r.isAnimating=!1,r.complete()});if(r.updateSlide(t),!e)return f(c),p||t.$content.removeClass("fancybox-is-hidden").hide().fadeIn("fast"),void(t.pos===r.currPos&&r.complete());n.fancybox.stop(c),i="fancybox-animated fancybox-slide--"+(t.pos>=r.prevPos?"next":"previous")+" fancybox-fx-"+e,c.removeAttr("style").removeClass("fancybox-slide--current fancybox-slide--next fancybox-slide--previous").addClass(i),t.$content.removeClass("fancybox-is-hidden"),f(c),n.fancybox.animate(c,"fancybox-slide--current",a,function(){c.removeClass(i).removeAttr("style"),t.pos===r.currPos&&r.complete()},!0)}},getThumbPos:function(o){var i,a=this,s=!1,r=o.opts.$thumb,c=r&&r.length&&r[0].ownerDocument===e?r.offset():0,l=function(e){for(var o,i=e[0],a=i.getBoundingClientRect(),s=[];null!==i.parentElement;)"hidden"!==n(i.parentElement).css("overflow")&&"auto"!==n(i.parentElement).css("overflow")||s.push(i.parentElement.getBoundingClientRect()),i=i.parentElement;return o=s.every(function(t){var e=Math.min(a.right,t.right)-Math.max(a.left,t.left),n=Math.min(a.bottom,t.bottom)-Math.max(a.top,t.top);return e>0&&n>0}),o&&a.bottom>0&&a.right>0&&a.left=e.currPos-1&&o.pos<=e.currPos+1?i[o.pos]=o:o&&(n.fancybox.stop(o.$slide),o.$slide.off().remove())}),e.slides=i),e.isAnimating=!1,e.updateCursor(),e.trigger("afterShow"),o.opts.video.autoStart&&o.$slide.find("video,audio").filter(":visible:first").trigger("play"),o.opts.autoFocus&&"html"===o.contentType&&(t=o.$content.find("input[autofocus]:enabled:visible:first"),t.length?t.trigger("focus"):e.focus(null,!0)),o.$slide.scrollTop(0).scrollLeft(0))},preload:function(t){var e=this,n=e.slides[e.currPos+1],o=e.slides[e.currPos-1];o&&o.type===t&&e.loadSlide(o),n&&n.type===t&&e.loadSlide(n)},focus:function(t,o){var i,a,s=this,r=["a[href]","area[href]",'input:not([disabled]):not([type="hidden"]):not([aria-hidden])',"select:not([disabled]):not([aria-hidden])","textarea:not([disabled]):not([aria-hidden])","button:not([disabled]):not([aria-hidden])","iframe","object","embed","[contenteditable]",'[tabindex]:not([tabindex^="-"])'].join(",");s.isClosing||(i=!t&&s.current&&s.current.isComplete?s.current.$slide.find("*:visible"+(o?":not(.fancybox-close-small)":"")):s.$refs.container.find("*:visible"),i=i.filter(r).filter(function(){return"hidden"!==n(this).css("visibility")&&!n(this).hasClass("disabled")}),i.length?(a=i.index(e.activeElement),t&&t.shiftKey?(a<0||0==a)&&(t.preventDefault(),i.eq(i.length-1).trigger("focus")):(a<0||a==i.length-1)&&(t&&t.preventDefault(),i.eq(0).trigger("focus"))):s.$refs.container.trigger("focus"))},activate:function(){var t=this;n(".fancybox-container").each(function(){var e=n(this).data("FancyBox");e&&e.id!==t.id&&!e.isClosing&&(e.trigger("onDeactivate"),e.removeEvents(),e.isVisible=!1)}),t.isVisible=!0,(t.current||t.isIdle)&&(t.update(),t.updateControls()),t.trigger("onActivate"),t.addEvents()},close:function(t,e){var o,i,a,s,r,c,l,p=this,h=p.current,g=function(){p.cleanUp(t)};return!p.isClosing&&(p.isClosing=!0,p.trigger("beforeClose",t)===!1?(p.isClosing=!1,d(function(){p.update()}),!1):(p.removeEvents(),h.timouts&&clearTimeout(h.timouts),a=h.$content,o=h.opts.animationEffect,i=n.isNumeric(e)?e:o?h.opts.animationDuration:0,h.$slide.off(u).removeClass("fancybox-slide--complete fancybox-slide--next fancybox-slide--previous fancybox-animated"),h.$slide.siblings().trigger("onReset").remove(),i&&p.$refs.container.removeClass("fancybox-is-open").addClass("fancybox-is-closing"),p.hideLoading(h),p.hideControls(),p.updateCursor(),"zoom"!==o||t!==!0&&a&&i&&"image"===h.type&&!h.hasError&&(l=p.getThumbPos(h))||(o="fade"),"zoom"===o?(n.fancybox.stop(a),s=n.fancybox.getTranslate(a),c={top:s.top,left:s.left,scaleX:s.width/l.width,scaleY:s.height/l.height,width:l.width,height:l.height},r=h.opts.zoomOpacity,"auto"==r&&(r=Math.abs(h.width/h.height-l.width/l.height)>.1),r&&(l.opacity=0),n.fancybox.setTranslate(a,c),f(a),n.fancybox.animate(a,l,i,g),!0):(o&&i?t===!0?setTimeout(g,i):n.fancybox.animate(h.$slide.removeClass("fancybox-slide--current"),"fancybox-animated fancybox-slide--previous fancybox-fx-"+o,i,g):g(),!0)))},cleanUp:function(e){var o,i,a,s=this,r=s.current.opts.$orig;s.current.$slide.trigger("onReset"),s.$refs.container.empty().remove(),s.trigger("afterClose",e),s.current.opts.backFocus&&(r&&r.length&&r.is(":visible")||(r=s.$trigger),r&&r.length&&(i=t.scrollX,a=t.scrollY,r.trigger("focus"),n("html, body").scrollTop(a).scrollLeft(i))),s.current=null,o=n.fancybox.getInstance(),o?o.activate():(n("body").removeClass("fancybox-active compensate-for-scrollbar"),n("#fancybox-style-noscroll").remove())},trigger:function(t,e){var o,i=Array.prototype.slice.call(arguments,1),a=this,s=e&&e.opts?e:a.current;return s?i.unshift(s):s=a,i.unshift(a),n.isFunction(s.opts[t])&&(o=s.opts[t].apply(s,i)),o===!1?o:void("afterClose"!==t&&a.$refs?a.$refs.container.trigger(t+".fb",i):r.trigger(t+".fb",i))},updateControls:function(){var t=this,o=t.current,i=o.index,a=o.opts.caption,s=t.$refs.container,r=t.$refs.caption;o.$slide.trigger("refresh"),t.$caption=a&&a.length?r.html(a):null,t.isHiddenControls||t.isIdle||t.showControls(),s.find("[data-fancybox-count]").html(t.group.length),s.find("[data-fancybox-index]").html(i+1),s.find("[data-fancybox-prev]").prop("disabled",!o.opts.loop&&i<=0),s.find("[data-fancybox-next]").prop("disabled",!o.opts.loop&&i>=t.group.length-1),"image"===o.type?s.find("[data-fancybox-zoom]").show().end().find("[data-fancybox-download]").attr("href",o.opts.image.src||o.src).show():o.opts.toolbar&&s.find("[data-fancybox-download],[data-fancybox-zoom]").hide(),n(e.activeElement).is(":hidden,[disabled]")&&t.$refs.container.trigger("focus")},hideControls:function(){this.isHiddenControls=!0,this.$refs.container.removeClass("fancybox-show-infobar fancybox-show-toolbar fancybox-show-caption fancybox-show-nav")},showControls:function(){var t=this,e=t.current?t.current.opts:t.opts,n=t.$refs.container;t.isHiddenControls=!1, -t.idleSecondsCounter=0,n.toggleClass("fancybox-show-toolbar",!(!e.toolbar||!e.buttons)).toggleClass("fancybox-show-infobar",!!(e.infobar&&t.group.length>1)).toggleClass("fancybox-show-caption",!!t.$caption).toggleClass("fancybox-show-nav",!!(e.arrows&&t.group.length>1)).toggleClass("fancybox-is-modal",!!e.modal)},toggleControls:function(){this.isHiddenControls?this.showControls():this.hideControls()}}),n.fancybox={version:"3.4.1",defaults:a,getInstance:function(t){var e=n('.fancybox-container:not(".fancybox-is-closing"):last').data("FancyBox"),o=Array.prototype.slice.call(arguments,1);return e instanceof h&&("string"===n.type(t)?e[t].apply(e,o):"function"===n.type(t)&&t.apply(e,o),e)},open:function(t,e,n){return new h(t,e,n)},close:function(t){var e=this.getInstance();e&&(e.close(),t===!0&&this.close(t))},destroy:function(){this.close(!0),r.add("body").off("click.fb-start","**")},isMobile:/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),use3d:function(){var n=e.createElement("div");return t.getComputedStyle&&t.getComputedStyle(n)&&t.getComputedStyle(n).getPropertyValue("transform")&&!(e.documentMode&&e.documentMode<11)}(),getTranslate:function(t){var e;return!(!t||!t.length)&&(e=t[0].getBoundingClientRect(),{top:e.top||0,left:e.left||0,width:e.width,height:e.height,opacity:parseFloat(t.css("opacity"))})},setTranslate:function(t,e){var n="",i={};if(t&&e)return e.left===o&&e.top===o||(n=(e.left===o?t.position().left:e.left)+"px, "+(e.top===o?t.position().top:e.top)+"px",n=this.use3d?"translate3d("+n+", 0px)":"translate("+n+")"),e.scaleX!==o&&e.scaleY!==o&&(n=(n.length?n+" ":"")+"scale("+e.scaleX+", "+e.scaleY+")"),n.length&&(i.transform=n),e.opacity!==o&&(i.opacity=e.opacity),e.width!==o&&(i.width=e.width),e.height!==o&&(i.height=e.height),t.css(i)},animate:function(t,e,i,a,s){var r,c=!1;n.isFunction(i)&&(a=i,i=null),n.isPlainObject(e)||t.removeAttr("style"),n.fancybox.stop(t),t.on(u,function(o){(!o||!o.originalEvent||t.is(o.originalEvent.target)&&"z-index"!=o.originalEvent.propertyName)&&(n.fancybox.stop(t),c&&n.fancybox.setTranslate(t,c),n.isNumeric(i)&&t.css("transition-duration",""),n.isPlainObject(e)?s===!1&&t.removeAttr("style"):s!==!0&&t.removeClass(e),n.isFunction(a)&&a(o))}),n.isNumeric(i)&&t.css("transition-duration",i+"ms"),n.isPlainObject(e)?(e.scaleX!==o&&e.scaleY!==o&&(r=n.fancybox.getTranslate(t),c=n.extend({},e,{width:r.width*e.scaleX,height:r.height*e.scaleY,scaleX:1,scaleY:1}),delete e.width,delete e.height,t.parent().hasClass("fancybox-slide--image")&&t.parent().addClass("fancybox-is-scaling")),n.fancybox.setTranslate(t,e)):t.addClass(e),t.data("timer",setTimeout(function(){t.trigger("transitionend")},i+16))},stop:function(t,e){t&&t.length&&(clearTimeout(t.data("timer")),e&&t.trigger(u),t.off(u).css("transition-duration",""),t.parent().removeClass("fancybox-is-scaling"))}},n.fn.fancybox=function(t){var e;return t=t||{},e=t.selector||!1,e?n("body").off("click.fb-start",e).on("click.fb-start",e,{options:t},i):this.off("click.fb-start").on("click.fb-start",{items:this,options:t},i),this},r.on("click.fb-start","[data-fancybox]",i),r.on("click.fb-start","[data-fancybox-trigger]",function(t){n('[data-fancybox="'+n(this).attr("data-fancybox-trigger")+'"]').eq(n(this).attr("data-fancybox-index")||0).trigger("click.fb-start",{$trigger:n(this)})}),function(){var t=".fancybox-button",e="fancybox-focus",o=null;r.on("mousedown mouseup focus blur",t,function(i){switch(i.type){case"mousedown":o=n(this);break;case"mouseup":o=null;break;case"focusin":n(t).removeClass(e),n(this).is(o)||n(this).is("[disabled]")||n(this).addClass(e);break;case"focusout":n(t).removeClass(e)}})}()}}(window,document,jQuery),function(t){"use strict";var e=function(e,n,o){if(e)return o=o||"","object"===t.type(o)&&(o=t.param(o,!0)),t.each(n,function(t,n){e=e.replace("$"+t,n||"")}),o.length&&(e+=(e.indexOf("?")>0?"&":"?")+o),e},n={youtube:{matcher:/(youtube\.com|youtu\.be|youtube\-nocookie\.com)\/(watch\?(.*&)?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*))(.*)/i,params:{autoplay:1,autohide:1,fs:1,rel:0,hd:1,wmode:"transparent",enablejsapi:1,html5:1},paramPlace:8,type:"iframe",url:"//www.youtube-nocookie.com/embed/$4",thumb:"//img.youtube.com/vi/$4/hqdefault.jpg"},vimeo:{matcher:/^.+vimeo.com\/(.*\/)?([\d]+)(.*)?/,params:{autoplay:1,hd:1,show_title:1,show_byline:1,show_portrait:0,fullscreen:1,api:1},paramPlace:3,type:"iframe",url:"//player.vimeo.com/video/$2"},instagram:{matcher:/(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i,type:"image",url:"//$1/p/$2/media/?size=l"},gmap_place:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(((maps\/(place\/(.*)\/)?\@(.*),(\d+.?\d+?)z))|(\?ll=))(.*)?/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/?ll="+(t[9]?t[9]+"&z="+Math.floor(t[10])+(t[12]?t[12].replace(/^\//,"&"):""):t[12]+"").replace(/\?/,"&")+"&output="+(t[12]&&t[12].indexOf("layer=c")>0?"svembed":"embed")}},gmap_search:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(maps\/search\/)(.*)/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/maps?q="+t[5].replace("query=","q=").replace("api=1","")+"&output=embed"}}};t(document).on("objectNeedsType.fb",function(o,i,a){var s,r,c,l,d,u,f,p=a.src||"",h=!1;s=t.extend(!0,{},n,a.opts.media),t.each(s,function(n,o){if(c=p.match(o.matcher)){if(h=o.type,f=n,u={},o.paramPlace&&c[o.paramPlace]){d=c[o.paramPlace],"?"==d[0]&&(d=d.substring(1)),d=d.split("&");for(var i=0;ie.clientHeight,a=("scroll"===o||"auto"===o)&&e.scrollWidth>e.clientWidth;return i||a},l=function(t){for(var e=!1;;){if(e=c(t.get(0)))break;if(t=t.parent(),!t.length||t.hasClass("fancybox-stage")||t.is("body"))break}return e},d=function(t){var e=this;e.instance=t,e.$bg=t.$refs.bg,e.$stage=t.$refs.stage,e.$container=t.$refs.container,e.destroy(),e.$container.on("touchstart.fb.touch mousedown.fb.touch",n.proxy(e,"ontouchstart"))};d.prototype.destroy=function(){this.$container.off(".fb.touch")},d.prototype.ontouchstart=function(o){var i=this,c=n(o.target),d=i.instance,u=d.current,f=u.$slide,p=u.$content,h="touchstart"==o.type;if(h&&i.$container.off("mousedown.fb.touch"),(!o.originalEvent||2!=o.originalEvent.button)&&f.length&&c.length&&!r(c)&&!r(c.parent())&&(c.is("img")||!(o.originalEvent.clientX>c[0].clientWidth+c.offset().left))){if(!u||d.isAnimating||d.isClosing)return o.stopPropagation(),void o.preventDefault();if(i.realPoints=i.startPoints=a(o),i.startPoints.length){if(u.touch&&o.stopPropagation(),i.startEvent=o,i.canTap=!0,i.$target=c,i.$content=p,i.opts=u.opts.touch,i.isPanning=!1,i.isSwiping=!1,i.isZooming=!1,i.isScrolling=!1,i.canPan=d.canPan(),i.startTime=(new Date).getTime(),i.distanceX=i.distanceY=i.distance=0,i.canvasWidth=Math.round(f[0].clientWidth),i.canvasHeight=Math.round(f[0].clientHeight),i.contentLastPos=null,i.contentStartPos=n.fancybox.getTranslate(i.$content)||{top:0,left:0},i.sliderStartPos=i.sliderLastPos||n.fancybox.getTranslate(f),i.stagePos=n.fancybox.getTranslate(d.$refs.stage),i.sliderStartPos.top-=i.stagePos.top,i.sliderStartPos.left-=i.stagePos.left,i.contentStartPos.top-=i.stagePos.top,i.contentStartPos.left-=i.stagePos.left,n(e).off(".fb.touch").on(h?"touchend.fb.touch touchcancel.fb.touch":"mouseup.fb.touch mouseleave.fb.touch",n.proxy(i,"ontouchend")).on(h?"touchmove.fb.touch":"mousemove.fb.touch",n.proxy(i,"ontouchmove")),n.fancybox.isMobile&&e.addEventListener("scroll",i.onscroll,!0),!i.opts&&!i.canPan||!c.is(i.$stage)&&!i.$stage.find(c).length)return void(c.is(".fancybox-image")&&o.preventDefault());i.isScrollable=l(c)||l(c.parent()),n.fancybox.isMobile&&i.isScrollable||o.preventDefault(),(1===i.startPoints.length||u.hasError)&&(i.canPan?(n.fancybox.stop(i.$content),i.$content.css("transition-duration",""),i.isPanning=!0):i.isSwiping=!0,i.$container.addClass("fancybox-is-grabbing")),2===i.startPoints.length&&"image"===u.type&&(u.isLoaded||u.$ghost)&&(i.canTap=!1,i.isSwiping=!1,i.isPanning=!1,i.isZooming=!0,n.fancybox.stop(i.$content),i.$content.css("transition-duration",""),i.centerPointStartX=.5*(i.startPoints[0].x+i.startPoints[1].x)-n(t).scrollLeft(),i.centerPointStartY=.5*(i.startPoints[0].y+i.startPoints[1].y)-n(t).scrollTop(),i.percentageOfImageAtPinchPointX=(i.centerPointStartX-i.contentStartPos.left)/i.contentStartPos.width,i.percentageOfImageAtPinchPointY=(i.centerPointStartY-i.contentStartPos.top)/i.contentStartPos.height,i.startDistanceBetweenFingers=s(i.startPoints[0],i.startPoints[1]))}}},d.prototype.onscroll=function(t){var n=this;n.isScrolling=!0,e.removeEventListener("scroll",n.onscroll,!0)},d.prototype.ontouchmove=function(t){var e=this;return void 0!==t.originalEvent.buttons&&0===t.originalEvent.buttons?void e.ontouchend(t):e.isScrolling?void(e.canTap=!1):(e.newPoints=a(t),void((e.opts||e.canPan)&&e.newPoints.length&&e.newPoints.length&&(e.isSwiping&&e.isSwiping===!0||t.preventDefault(),e.distanceX=s(e.newPoints[0],e.startPoints[0],"x"),e.distanceY=s(e.newPoints[0],e.startPoints[0],"y"),e.distance=s(e.newPoints[0],e.startPoints[0]),e.distance>0&&(e.isSwiping?e.onSwipe(t):e.isPanning?e.onPan():e.isZooming&&e.onZoom()))))},d.prototype.onSwipe=function(e){var a,s=this,r=s.isSwiping,c=s.sliderStartPos.left||0;if(r!==!0)"x"==r&&(s.distanceX>0&&(s.instance.group.length<2||0===s.instance.current.index&&!s.instance.current.opts.loop)?c+=Math.pow(s.distanceX,.8):s.distanceX<0&&(s.instance.group.length<2||s.instance.current.index===s.instance.group.length-1&&!s.instance.current.opts.loop)?c-=Math.pow(-s.distanceX,.8):c+=s.distanceX),s.sliderLastPos={top:"x"==r?0:s.sliderStartPos.top+s.distanceY,left:c},s.requestId&&(i(s.requestId),s.requestId=null),s.requestId=o(function(){s.sliderLastPos&&(n.each(s.instance.slides,function(t,e){var o=e.pos-s.instance.currPos;n.fancybox.setTranslate(e.$slide,{top:s.sliderLastPos.top,left:s.sliderLastPos.left+o*s.canvasWidth+o*e.opts.gutter})}),s.$container.addClass("fancybox-is-sliding"))});else if(Math.abs(s.distance)>10){if(s.canTap=!1,s.instance.group.length<2&&s.opts.vertical?s.isSwiping="y":s.instance.isDragging||s.opts.vertical===!1||"auto"===s.opts.vertical&&n(t).width()>800?s.isSwiping="x":(a=Math.abs(180*Math.atan2(s.distanceY,s.distanceX)/Math.PI),s.isSwiping=a>45&&a<135?"y":"x"),s.canTap=!1,"y"===s.isSwiping&&n.fancybox.isMobile&&s.isScrollable)return void(s.isScrolling=!0);s.instance.isDragging=s.isSwiping,s.startPoints=s.newPoints,n.each(s.instance.slides,function(t,e){n.fancybox.stop(e.$slide),e.$slide.css("transition-duration",""),e.inTransition=!1,e.pos===s.instance.current.pos&&(s.sliderStartPos.left=n.fancybox.getTranslate(e.$slide).left-n.fancybox.getTranslate(s.instance.$refs.stage).left)}),s.instance.SlideShow&&s.instance.SlideShow.isActive&&s.instance.SlideShow.stop()}},d.prototype.onPan=function(){var t=this;return s(t.newPoints[0],t.realPoints[0])<(n.fancybox.isMobile?10:5)?void(t.startPoints=t.newPoints):(t.canTap=!1,t.contentLastPos=t.limitMovement(),t.requestId&&(i(t.requestId),t.requestId=null),void(t.requestId=o(function(){n.fancybox.setTranslate(t.$content,t.contentLastPos)})))},d.prototype.limitMovement=function(){var t,e,n,o,i,a,s=this,r=s.canvasWidth,c=s.canvasHeight,l=s.distanceX,d=s.distanceY,u=s.contentStartPos,f=u.left,p=u.top,h=u.width,g=u.height;return i=h>r?f+l:f,a=p+d,t=Math.max(0,.5*r-.5*h),e=Math.max(0,.5*c-.5*g),n=Math.min(r-h,.5*r-.5*h),o=Math.min(c-g,.5*c-.5*g),l>0&&i>t&&(i=t-1+Math.pow(-t+f+l,.8)||0),l<0&&i0&&a>e&&(a=e-1+Math.pow(-e+p+d,.8)||0),d<0&&aa?(t=t>0?0:t,t=ts?(e=e>0?0:e,e=e50?(n.fancybox.animate(o.instance.current.$slide,{top:o.sliderStartPos.top+o.distanceY+150*o.velocityY,opacity:0},200),i=o.instance.close(!0,200)):"x"==t&&o.distanceX>50&&a>1?i=o.instance.previous(o.speedX):"x"==t&&o.distanceX<-50&&a>1&&(i=o.instance.next(o.speedX)),i!==!1||"x"!=t&&"y"!=t||(e||a<2?o.instance.centerSlide(o.instance.current,150):o.instance.jumpTo(o.instance.current.index)),o.$container.removeClass("fancybox-is-sliding")},d.prototype.endPanning=function(){var t,e,o,i=this;i.contentLastPos&&(i.opts.momentum===!1?(t=i.contentLastPos.left,e=i.contentLastPos.top):(t=i.contentLastPos.left+i.velocityX*i.speed,e=i.contentLastPos.top+i.velocityY*i.speed),o=i.limitPosition(t,e,i.contentStartPos.width,i.contentStartPos.height),o.width=i.contentStartPos.width,o.height=i.contentStartPos.height,n.fancybox.animate(i.$content,o,330))},d.prototype.endZooming=function(){var t,e,o,i,a=this,s=a.instance.current,r=a.newWidth,c=a.newHeight;a.contentLastPos&&(t=a.contentLastPos.left,e=a.contentLastPos.top,i={top:e,left:t,width:r,height:c,scaleX:1,scaleY:1},n.fancybox.setTranslate(a.$content,i),rs.width||c>s.height?a.instance.scaleToActual(a.centerPointStartX,a.centerPointStartY,150):(o=a.limitPosition(t,e,r,c),n.fancybox.setTranslate(a.$content,n.fancybox.getTranslate(a.$content)),n.fancybox.animate(a.$content,o,150)))},d.prototype.onTap=function(e){var o,i=this,s=n(e.target),r=i.instance,c=r.current,l=e&&a(e)||i.startPoints,d=l[0]?l[0].x-n(t).scrollLeft()-i.stagePos.left:0,u=l[0]?l[0].y-n(t).scrollTop()-i.stagePos.top:0,f=function(t){var o=c.opts[t];if(n.isFunction(o)&&(o=o.apply(r,[c,e])),o)switch(o){case"close":r.close(i.startEvent);break;case"toggleControls":r.toggleControls(!0);break;case"next":r.next();break;case"nextOrClose":r.group.length>1?r.next():r.close(i.startEvent);break;case"zoom":"image"==c.type&&(c.isLoaded||c.$ghost)&&(r.canPan()?r.scaleToFit():r.isScaledDown()?r.scaleToActual(d,u):r.group.length<2&&r.close(i.startEvent))}};if((!e.originalEvent||2!=e.originalEvent.button)&&(s.is("img")||!(d>s[0].clientWidth+s.offset().left))){if(s.is(".fancybox-bg,.fancybox-inner,.fancybox-outer,.fancybox-container"))o="Outside";else if(s.is(".fancybox-slide"))o="Slide";else{if(!r.current.$content||!r.current.$content.find(s).addBack().filter(s).length)return;o="Content"}if(i.tapped){if(clearTimeout(i.tapped),i.tapped=null,Math.abs(d-i.tapX)>50||Math.abs(u-i.tapY)>50)return this;f("dblclick"+o)}else i.tapX=d,i.tapY=u,c.opts["dblclick"+o]&&c.opts["dblclick"+o]!==c.opts["click"+o]?i.tapped=setTimeout(function(){i.tapped=null,f("click"+o)},500):f("click"+o);return this}},n(e).on("onActivate.fb",function(t,e){e&&!e.Guestures&&(e.Guestures=new d(e))})}(window,document,jQuery),function(t,e){"use strict";e.extend(!0,e.fancybox.defaults,{btnTpl:{slideShow:''},slideShow:{autoStart:!1,speed:3e3}});var n=function(t){this.instance=t,this.init()};e.extend(n.prototype,{timer:null,isActive:!1,$button:null,init:function(){var t=this;t.$button=t.instance.$refs.toolbar.find("[data-fancybox-play]").on("click",function(){t.toggle()}),(t.instance.group.length<2||!t.instance.group[t.instance.currIndex].opts.slideShow)&&t.$button.hide()},set:function(t){var e=this,n=e.instance,o=n.current,i=function(){e.isActive&&n.jumpTo((n.currIndex+1)%n.group.length)};o&&(t===!0||o.opts.loop||n.currIndex'},fullScreen:{autoStart:!1}}),e(t).on(n.fullscreenchange,function(){var t=o.isFullscreen(),n=e.fancybox.getInstance();n&&(n.current&&"image"===n.current.type&&n.isAnimating&&(n.current.$content.css("transition","none"),n.isAnimating=!1,n.update(!0,!0,0)),n.trigger("onFullscreenChange",t),n.$refs.container.toggleClass("fancybox-is-fullscreen",t),n.$refs.toolbar.find("[data-fancybox-fullscreen]").toggleClass("fancybox-button--fsenter",!t).toggleClass("fancybox-button--fsexit",t))})}e(t).on({"onInit.fb":function(t,e){var i;return n?void(e&&e.group[e.currIndex].opts.fullScreen?(i=e.$refs.container,i.on("click.fb-fullscreen","[data-fancybox-fullscreen]",function(t){t.stopPropagation(),t.preventDefault(),o.toggle()}),e.opts.fullScreen&&e.opts.fullScreen.autoStart===!0&&o.request(),e.FullScreen=o):e&&e.$refs.toolbar.find("[data-fancybox-fullscreen]").hide()):void e.$refs.toolbar.find("[data-fancybox-fullscreen]").remove()},"afterKeydown.fb":function(t,e,n,o,i){e&&e.FullScreen&&70===i&&(o.preventDefault(),e.FullScreen.toggle())},"beforeClose.fb":function(t,e){e&&e.FullScreen&&e.$refs.container.hasClass("fancybox-is-fullscreen")&&o.exit()}})}(document,jQuery),function(t,e){"use strict";var n="fancybox-thumbs",o=n+"-active";e.fancybox.defaults=e.extend(!0,{btnTpl:{thumbs:''},thumbs:{autoStart:!1,hideOnClose:!0,parentEl:".fancybox-container",axis:"y"}},e.fancybox.defaults);var i=function(t){this.init(t)};e.extend(i.prototype,{$button:null,$grid:null,$list:null,isVisible:!1,isActive:!1,init:function(t){var e,n,o=this;o.instance=t,t.Thumbs=o,o.opts=t.group[t.currIndex].opts.thumbs,e=t.group[0],e=e.opts.thumb||!(!e.opts.$thumb||!e.opts.$thumb.length)&&e.opts.$thumb.attr("src"),t.group.length>1&&(n=t.group[1],n=n.opts.thumb||!(!n.opts.$thumb||!n.opts.$thumb.length)&&n.opts.$thumb.attr("src")),o.$button=t.$refs.toolbar.find("[data-fancybox-thumbs]"),o.opts&&e&&n?(o.$button.show().on("click",function(){o.toggle()}),o.isActive=!0):o.$button.hide()},create:function(){var t,o=this,i=o.instance,a=o.opts.parentEl,s=[];o.$grid||(o.$grid=e('
').appendTo(i.$refs.container.find(a).addBack().filter(a)),o.$grid.on("click","a",function(){i.jumpTo(e(this).attr("data-index"))})),o.$list||(o.$list=e('
').appendTo(o.$grid)),e.each(i.group,function(e,n){t=n.opts.thumb||(n.opts.$thumb?n.opts.$thumb.attr("src"):null),t||"image"!==n.type||(t=n.src),s.push('':"")+">")}),o.$list[0].innerHTML=s.join(""),"x"===o.opts.axis&&o.$list.width(parseInt(o.$grid.css("padding-right"),10)+i.group.length*o.$list.children().eq(0).outerWidth(!0))},focus:function(t){var e,n,i=this,a=i.$list,s=i.$grid;i.instance.current&&(e=a.children().removeClass(o).filter('[data-index="'+i.instance.current.index+'"]').addClass(o),n=e.position(),"y"===i.opts.axis&&(n.top<0||n.top>a.height()-e.outerHeight())?a.stop().animate({scrollTop:a.scrollTop()+n.top},t):"x"===i.opts.axis&&(n.lefts.scrollLeft()+(s.width()-e.outerWidth()))&&a.parent().stop().animate({scrollLeft:n.left},t))},update:function(){var t=this;t.instance.$refs.container.toggleClass("fancybox-show-thumbs",this.isVisible),t.isVisible?(t.$grid||t.create(),t.instance.trigger("onThumbsShow"),t.focus(0)):t.$grid&&t.instance.trigger("onThumbsHide"),t.instance.update()},hide:function(){this.isVisible=!1,this.update()},show:function(){this.isVisible=!0,this.update()},toggle:function(){this.isVisible=!this.isVisible,this.update()}}),e(t).on({"onInit.fb":function(t,e){var n;e&&!e.Thumbs&&(n=new i(e),n.isActive&&n.opts.autoStart===!0&&n.show())},"beforeShow.fb":function(t,e,n,o){var i=e&&e.Thumbs;i&&i.isVisible&&i.focus(o?0:250)},"afterKeydown.fb":function(t,e,n,o,i){var a=e&&e.Thumbs;a&&a.isActive&&71===i&&(o.preventDefault(),a.toggle())},"beforeClose.fb":function(t,e){var n=e&&e.Thumbs;n&&n.isVisible&&n.opts.hideOnClose!==!1&&n.$grid.hide()}})}(document,jQuery),function(t,e){"use strict";function n(t){var e={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/","`":"`","=":"="};return String(t).replace(/[&<>"'`=\/]/g,function(t){return e[t]})}e.extend(!0,e.fancybox.defaults,{btnTpl:{share:''},share:{url:function(t,e){return!t.currentHash&&"inline"!==e.type&&"html"!==e.type&&(e.origSrc||e.src)||window.location},tpl:'

{{SHARE}}

FacebookTwitterPinterest

'}}),e(t).on("click","[data-fancybox-share]",function(){var t,o,i=e.fancybox.getInstance(),a=i.current||null;a&&("function"===e.type(a.opts.share.url)&&(t=a.opts.share.url.apply(a,[i,a])),o=a.opts.share.tpl.replace(/\{\{media\}\}/g,"image"===a.type?encodeURIComponent(a.src):"").replace(/\{\{url\}\}/g,encodeURIComponent(t)).replace(/\{\{url_raw\}\}/g,n(t)).replace(/\{\{descr\}\}/g,i.$caption?encodeURIComponent(i.$caption.text()):""),e.fancybox.open({src:i.translate(i,o),type:"html",opts:{touch:!1,animationEffect:!1,afterLoad:function(t,e){i.$refs.container.one("beforeClose.fb",function(){t.close(null,0)}),e.$content.find(".fancybox-share__button").click(function(){return window.open(this.href,"Share","width=550, height=450"),!1})},mobile:{autoFocus:!1}}}))})}(document,jQuery),function(t,e,n){"use strict";function o(){var e=t.location.hash.substr(1),n=e.split("-"),o=n.length>1&&/^\+?\d+$/.test(n[n.length-1])?parseInt(n.pop(-1),10)||1:1,i=n.join("-");return{hash:e,index:o<1?1:o,gallery:i}}function i(t){""!==t.gallery&&n("[data-fancybox='"+n.escapeSelector(t.gallery)+"']").eq(t.index-1).focus().trigger("click.fb-start")}function a(t){var e,n;return!!t&&(e=t.current?t.current.opts:t.opts,n=e.hash||(e.$orig?e.$orig.data("fancybox")||e.$orig.data("fancybox-trigger"):""),""!==n&&n)}n.escapeSelector||(n.escapeSelector=function(t){var e=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,n=function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t};return(t+"").replace(e,n)}),n(function(){n.fancybox.defaults.hash!==!1&&(n(e).on({"onInit.fb":function(t,e){var n,i;e.group[e.currIndex].opts.hash!==!1&&(n=o(),i=a(e),i&&n.gallery&&i==n.gallery&&(e.currIndex=n.index-1))},"beforeShow.fb":function(n,o,i,s){var r;i&&i.opts.hash!==!1&&(r=a(o),r&&(o.currentHash=r+(o.group.length>1?"-"+(i.index+1):""),t.location.hash!=="#"+o.currentHash&&(s&&!o.origHash&&(o.origHash=t.location.hash),o.hashTimer&&clearTimeout(o.hashTimer),o.hashTimer=setTimeout(function(){"replaceState"in t.history?(t.history[s?"pushState":"replaceState"]({},e.title,t.location.pathname+t.location.search+"#"+o.currentHash),s&&(o.hasCreatedHistory=!0)):t.location.hash=o.currentHash,o.hashTimer=null},300))))},"beforeClose.fb":function(n,o,i){i.opts.hash!==!1&&(clearTimeout(o.hashTimer),o.currentHash&&o.hasCreatedHistory?t.history.back():o.currentHash&&("replaceState"in t.history?t.history.replaceState({},e.title,t.location.pathname+t.location.search+(o.origHash||"")):t.location.hash=o.origHash),o.currentHash=null)}}),n(t).on("hashchange.fb",function(){var t=o(),e=null;n.each(n(".fancybox-container").get().reverse(),function(t,o){var i=n(o).data("FancyBox");if(i&&i.currentHash)return e=i,!1}),e?e.currentHash===t.gallery+"-"+t.index||1===t.index&&e.currentHash==t.gallery||(e.currentHash=null,e.close()):""!==t.gallery&&i(t)}),setTimeout(function(){n.fancybox.getInstance()||i(o())},50))})}(window,document,jQuery),function(t,e){"use strict";var n=(new Date).getTime();e(t).on({"onInit.fb":function(t,e,o){e.$refs.stage.on("mousewheel DOMMouseScroll wheel MozMousePixelScroll",function(t){ -var o=e.current,i=(new Date).getTime();e.group.length<2||o.opts.wheel===!1||"auto"===o.opts.wheel&&"image"!==o.type||(t.preventDefault(),t.stopPropagation(),o.$slide.hasClass("fancybox-animated")||(t=t.originalEvent||t,i-n<250||(n=i,e[(-t.deltaY||-t.deltaX||t.wheelDelta||-t.detail)<0?"next":"previous"]())))})}})}(document,jQuery); \ No newline at end of file diff --git a/hypha/static_src/sass/fancybox.scss b/hypha/static_src/sass/fancybox.scss deleted file mode 100644 index 4c9bc1f99c..0000000000 --- a/hypha/static_src/sass/fancybox.scss +++ /dev/null @@ -1,614 +0,0 @@ -// stylelint-disable -body.fancybox-active { - overflow: hidden; -} - -body.fancybox-iosfix { - position: fixed; - inset-inline-start: 0; - inset-inline-end: 0; -} - -.fancybox-is-hidden { - position: absolute; - inset-block-start: -9999px; - inset-inline-start: -9999px; - visibility: hidden; -} - -.fancybox-container { - position: fixed; - inset-block-start: 0; - inset-inline-start: 0; - width: 100%; - height: 100%; - z-index: 99992; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); - backface-visibility: hidden; - transform: translateZ(0); - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, - "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", - "Segoe UI Emoji", "Segoe UI Symbol"; -} - -.fancybox-outer, -.fancybox-inner, -.fancybox-bg, -.fancybox-stage { - position: absolute; - inset-block-start: 0; - inset-inline-end: 0; - inset-block-end: 0; - inset-inline-start: 0; -} - -.fancybox-outer { - overflow-y: auto; - -webkit-overflow-scrolling: touch; -} - -.fancybox-bg { - background: rgb(30, 30, 30); - opacity: 0; - transition-duration: inherit; - transition-property: opacity; - transition-timing-function: cubic-bezier(0.47, 0, 0.74, 0.71); -} - -.fancybox-is-open .fancybox-bg { - opacity: 0.87; - transition-timing-function: cubic-bezier(0.22, 0.61, 0.36, 1); -} - -.fancybox-infobar, -.fancybox-toolbar, -.fancybox-caption-wrap { - position: absolute; - direction: ltr; - z-index: 99997; - opacity: 0; - visibility: hidden; - transition: - opacity 0.25s, - visibility 0s linear 0.25s; - box-sizing: border-box; -} - -.fancybox-show-infobar .fancybox-infobar, -.fancybox-show-toolbar .fancybox-toolbar, -.fancybox-show-caption .fancybox-caption-wrap { - opacity: 1; - visibility: visible; - transition: - opacity 0.25s, - visibility 0s; -} - -.fancybox-infobar { - inset-block-start: 0; - inset-inline-start: 0; - font-size: 13px; - padding: 0 10px; - height: 44px; - min-width: 44px; - line-height: 44px; - color: #ccc; - text-align: center; - pointer-events: none; - user-select: none; - -webkit-touch-callout: none; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); - -webkit-font-smoothing: subpixel-antialiased; - mix-blend-mode: exclusion; -} - -.fancybox-toolbar { - inset-block-start: 0; - inset-inline-end: 0; - margin: 0; - padding: 0; -} - -.fancybox-stage { - overflow: hidden; - direction: ltr; - z-index: 99994; - -webkit-transform: translate3d(0, 0, 0); -} - -.fancybox-is-closing .fancybox-stage { - overflow: visible; -} - -.fancybox-slide { - position: absolute; - inset-block-start: 0; - inset-inline-start: 0; - width: 100%; - height: 100%; - margin: 0; - padding: 0; - overflow: auto; - outline: none; - white-space: normal; - box-sizing: border-box; - text-align: center; - z-index: 99994; - -webkit-overflow-scrolling: touch; - display: none; - backface-visibility: hidden; - transition-property: transform, opacity; -} - -.fancybox-slide::before { - content: ""; - display: inline-block; - vertical-align: middle; - height: 100%; - width: 0; -} - -.fancybox-is-sliding .fancybox-slide, -.fancybox-slide--previous, -.fancybox-slide--current, -.fancybox-slide--next { - display: block; -} - -.fancybox-slide--image { - overflow: visible; -} - -.fancybox-slide--image::before { - display: none; -} - -.fancybox-slide--video .fancybox-content, -.fancybox-slide--video iframe { - background: #000; -} - -.fancybox-slide--map .fancybox-content, -.fancybox-slide--map iframe { - background: #e5e3df; -} - -.fancybox-slide--next { - z-index: 99995; -} - -.fancybox-slide > * { - display: inline-block; - position: relative; - padding: 24px; - margin: 44px 0 44px; - border-width: 0; - vertical-align: middle; - text-align: left; - background-color: #fff; - overflow: auto; - box-sizing: border-box; -} - -.fancybox-slide > title, -.fancybox-slide > style, -.fancybox-slide > meta, -.fancybox-slide > link, -.fancybox-slide > script, -.fancybox-slide > base { - display: none; -} - -.fancybox-slide .fancybox-image-wrap { - position: absolute; - inset-block-start: 0; - inset-inline-start: 0; - margin: 0; - padding: 0; - border: 0; - z-index: 99995; - background: transparent; - cursor: default; - overflow: visible; - transform-origin: top left; - background-size: 100% 100%; - background-repeat: no-repeat; - backface-visibility: hidden; - user-select: none; - transition-property: transform, opacity; -} - -.fancybox-can-zoomOut .fancybox-image-wrap { - cursor: zoom-out; -} - -.fancybox-can-zoomIn .fancybox-image-wrap { - cursor: zoom-in; -} - -.fancybox-can-drag .fancybox-image-wrap { - cursor: grab; -} - -.fancybox-is-dragging .fancybox-image-wrap { - cursor: grabbing; -} - -.fancybox-image, -.fancybox-spaceball { - position: absolute; - inset-block-start: 0; - inset-inline-start: 0; - width: 100%; - height: 100%; - margin: 0; - padding: 0; - border: 0; - max-width: none; - max-height: none; - user-select: none; -} - -.fancybox-spaceball { - z-index: 1; -} - -.fancybox-slide--iframe .fancybox-content { - padding: 0; - width: 80%; - height: 80%; - max-width: calc(100% - 100px); - max-height: calc(100% - 88px); - overflow: visible; - background: #fff; -} - -.fancybox-iframe { - display: block; - margin: 0; - padding: 0; - border: 0; - width: 100%; - height: 100%; - background: #fff; -} - -.fancybox-error { - margin: 0; - padding: 40px; - width: 100%; - max-width: 380px; - background: #fff; - cursor: default; -} - -.fancybox-error p { - margin: 0; - padding: 0; - color: #444; - font-size: 16px; - line-height: 20px; -} - -/* Buttons */ - -.fancybox-button { - box-sizing: border-box; - display: inline-block; - vertical-align: top; - width: 44px; - height: 44px; - margin: 0; - padding: 10px; - border: 0; - border-radius: 0; - background: rgba(30, 30, 30, 0.6); - transition: color 0.3s ease; - cursor: pointer; - outline: none; -} - -.fancybox-button, -.fancybox-button:visited, -.fancybox-button:link { - color: #ccc; -} - -.fancybox-button:focus, -.fancybox-button:hover { - color: #fff; -} - -.fancybox-button[disabled] { - color: #ccc; - cursor: default; - opacity: 0.6; -} - -.fancybox-button svg { - display: block; - position: relative; - overflow: visible; - shape-rendering: geometricPrecision; -} - -.fancybox-button svg path { - fill: currentColor; - stroke: currentColor; - stroke-linejoin: round; - stroke-width: 3; -} - -.fancybox-button--share svg path { - stroke-width: 1; -} - -.fancybox-button--play svg path:nth-child(2) { - display: none; -} - -.fancybox-button--pause svg path:nth-child(1) { - display: none; -} - -.fancybox-button--zoom svg path { - fill: transparent; -} - -/* Navigation arrows */ - -.fancybox-navigation { - display: none; -} - -.fancybox-show-nav .fancybox-navigation { - display: block; -} - -.fancybox-navigation button { - position: absolute; - inset-block-start: 50%; - margin: -50px 0 0 0; - z-index: 99997; - background: transparent; - width: 60px; - height: 100px; - padding: 17px; -} - -.fancybox-navigation button:before { - content: ""; - position: absolute; - inset-block-start: 30px; - inset-inline-end: 10px; - width: 40px; - height: 40px; - background: rgba(30, 30, 30, 0.6); -} - -.fancybox-navigation .fancybox-button--arrow_left { - inset-inline-start: 0; -} - -.fancybox-navigation .fancybox-button--arrow_right { - inset-inline-end: 0; -} - -/* Close button on the top right corner of html content */ - -.fancybox-close-small { - position: absolute; - inset-block-start: 5px; - inset-inline-end: 5px; - width: 40px; - height: 40px; - padding: 0; - margin: 0; - border: 0; - border-radius: 0; - background: transparent; - z-index: 10; - cursor: pointer; -} - -.fancybox-close-small:focus { - outline: none; -} - -.fancybox-close-small:focus:after { - outline: 1px dotted #888; -} - -.fancybox-close-small:hover:after { - color: #555; - background: #eee; -} - -.fancybox-slide--image .fancybox-close-small, -.fancybox-slide--iframe .fancybox-close-small { - inset-block-start: 0; - inset-inline-end: -40px; -} - -.fancybox-slide--image .fancybox-close-small:after, -.fancybox-slide--iframe .fancybox-close-small:after { - font-size: 35px; - color: #aaa; -} - -.fancybox-slide--image .fancybox-close-small:hover:after, -.fancybox-slide--iframe .fancybox-close-small:hover:after { - color: #fff; - background: transparent; -} - -.fancybox-is-scaling .fancybox-close-small, -.fancybox-is-zoomable.fancybox-can-drag .fancybox-close-small { - display: none; -} - -/* Caption */ - -.fancybox-caption-wrap { - inset-block-end: 0; - inset-inline-start: 0; - inset-inline-end: 0; - padding: 60px 2vw 0 2vw; - background: linear-gradient( - to bottom, - rgba(0, 0, 0, 0) 0%, - rgba(0, 0, 0, 0.1) 20%, - rgba(0, 0, 0, 0.2) 40%, - rgba(0, 0, 0, 0.6) 80%, - rgba(0, 0, 0, 0.8) 100% - ); - pointer-events: none; -} - -.fancybox-caption { - padding: 30px 0; - border-block-start: 1px solid rgba(255, 255, 255, 0.4); - font-size: 14px; - color: #fff; - line-height: 20px; - -webkit-text-size-adjust: none; -} - -.fancybox-caption a, -.fancybox-caption button, -.fancybox-caption select { - pointer-events: all; - position: relative; /* Fix IE11 */ -} - -.fancybox-caption a { - color: #fff; - text-decoration: underline; -} - -/* Loading indicator */ - -.fancybox-slide > .fancybox-loading { - border: 6px solid rgba(100, 100, 100, 0.4); - border-block-start: 6px solid rgba(255, 255, 255, 0.6); - border-radius: 100%; - height: 50px; - width: 50px; - animation: fancybox-rotate 0.8s infinite linear; - background: transparent; - position: absolute; - inset-block-start: 50%; - inset-inline-start: 50%; - margin-block-start: -30px; - margin-inline-start: -30px; - z-index: 99999; -} - -@keyframes fancybox-rotate { - from { - transform: rotate(0deg); - } - to { - transform: rotate(359deg); - } -} - -/* Transition effects */ - -.fancybox-animated { - transition-timing-function: cubic-bezier(0, 0, 0.25, 1); -} - -/* transitionEffect: slide */ - -.fancybox-fx-slide.fancybox-slide--previous { - transform: translate3d(-100%, 0, 0); - opacity: 0; -} - -.fancybox-fx-slide.fancybox-slide--next { - transform: translate3d(100%, 0, 0); - opacity: 0; -} - -.fancybox-fx-slide.fancybox-slide--current { - transform: translate3d(0, 0, 0); - opacity: 1; -} - -/* transitionEffect: fade */ - -.fancybox-fx-fade.fancybox-slide--previous, -.fancybox-fx-fade.fancybox-slide--next { - opacity: 0; - transition-timing-function: cubic-bezier(0.19, 1, 0.22, 1); -} - -.fancybox-fx-fade.fancybox-slide--current { - opacity: 1; -} - -/* transitionEffect: zoom-in-out */ - -.fancybox-fx-zoom-in-out.fancybox-slide--previous { - transform: scale3d(1.5, 1.5, 1.5); - opacity: 0; -} - -.fancybox-fx-zoom-in-out.fancybox-slide--next { - transform: scale3d(0.5, 0.5, 0.5); - opacity: 0; -} - -.fancybox-fx-zoom-in-out.fancybox-slide--current { - transform: scale3d(1, 1, 1); - opacity: 1; -} - -/* transitionEffect: rotate */ - -.fancybox-fx-rotate.fancybox-slide--previous { - transform: rotate(-360deg); - opacity: 0; -} - -.fancybox-fx-rotate.fancybox-slide--next { - transform: rotate(360deg); - opacity: 0; -} - -.fancybox-fx-rotate.fancybox-slide--current { - transform: rotate(0deg); - opacity: 1; -} - -/* transitionEffect: circular */ - -.fancybox-fx-circular.fancybox-slide--previous { - transform: scale3d(0, 0, 0) translate3d(-100%, 0, 0); - opacity: 0; -} - -.fancybox-fx-circular.fancybox-slide--next { - transform: scale3d(0, 0, 0) translate3d(100%, 0, 0); - opacity: 0; -} - -.fancybox-fx-circular.fancybox-slide--current { - transform: scale3d(1, 1, 1) translate3d(0, 0, 0); - opacity: 1; -} - -/* transitionEffect: tube */ - -.fancybox-fx-tube.fancybox-slide--previous { - transform: translate3d(-100%, 0, 0) scale(0.1) skew(-10deg); -} - -.fancybox-fx-tube.fancybox-slide--next { - transform: translate3d(100%, 0, 0) scale(0.1) skew(10deg); -} - -.fancybox-fx-tube.fancybox-slide--current { - transform: translate3d(0, 0, 0) scale(1); -} From 11e78aa04d674f0ef0b64fcb3845a0b960e5feac Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Mon, 9 Dec 2024 13:42:41 +0100 Subject: [PATCH 7/8] Lint fix to batch-actions.js. --- hypha/static_src/javascript/batch-actions.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hypha/static_src/javascript/batch-actions.js b/hypha/static_src/javascript/batch-actions.js index 7033af7d81..5d83cd79fb 100644 --- a/hypha/static_src/javascript/batch-actions.js +++ b/hypha/static_src/javascript/batch-actions.js @@ -59,12 +59,12 @@ // Get the base URL from the href attribute const baseUrl = $(this).attr("href"); const url = new URL(baseUrl, window.location.origin); - selectedIDs.forEach(id => { + selectedIDs.forEach((id) => { url.searchParams.append("selected_ids", id); }); // Send the request using htmx.ajax - htmx.ajax('GET', url.toString(), { - target: '#htmx-modal' // Optional: set the target element + htmx.ajax("GET", url.toString(), { + target: "#htmx-modal", // Optional: set the target element }); } else { alert("Please select at least one item."); @@ -125,7 +125,9 @@ actions = newActions; } else { // Filter actions to keep only items also present in newActions - actions = actions.filter((action) => newActions.includes(action)); + actions = actions.filter((action) => + newActions.includes(action) + ); } }); From 7662db993fe1d7da69d229369c545aed228c3fd6 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Mon, 9 Dec 2024 13:54:56 +0100 Subject: [PATCH 8/8] Lint fix to batch-actions.js and translate-application.js. --- hypha/static_src/javascript/batch-actions.js | 2 ++ hypha/static_src/javascript/translate-application.js | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hypha/static_src/javascript/batch-actions.js b/hypha/static_src/javascript/batch-actions.js index 5d83cd79fb..38877cdc63 100644 --- a/hypha/static_src/javascript/batch-actions.js +++ b/hypha/static_src/javascript/batch-actions.js @@ -1,3 +1,4 @@ +/* eslint-disable max-nested-callbacks */ (function ($) { const $body = $("body"); const $checkbox = $(".js-batch-select"); @@ -91,6 +92,7 @@ /** * Prepare the batch listing. + * @returns {Array} selectedIDs */ function prepareBatchListing() { $batchTitlesList.html(""); diff --git a/hypha/static_src/javascript/translate-application.js b/hypha/static_src/javascript/translate-application.js index 27e3daaf47..628c1e1f4d 100644 --- a/hypha/static_src/javascript/translate-application.js +++ b/hypha/static_src/javascript/translate-application.js @@ -1,5 +1,4 @@ (function () { - // eslint-disable-next-line no-undef htmx.on("translatedSubmission", (event) => { if (event.detail?.appTitle) { document.getElementById("app-title").textContent =