\d+)/$',
ProgressReportAttachmentAPIView.as_view(),
name="progress-reports-attachment"),
-
]
diff --git a/django_api/django_api/apps/unicef/views.py b/django_api/django_api/apps/unicef/views.py
index dc9cfe32e..84f2c5970 100644
--- a/django_api/django_api/apps/unicef/views.py
+++ b/django_api/django_api/apps/unicef/views.py
@@ -10,7 +10,7 @@
from rest_framework import status as statuses
from rest_framework.exceptions import ValidationError
-from rest_framework.generics import RetrieveAPIView, ListAPIView
+from rest_framework.generics import RetrieveAPIView, ListAPIView, ListCreateAPIView
from rest_framework.parsers import FileUploadParser, FormParser, MultiPartParser
from rest_framework.response import Response
from rest_framework.views import APIView
@@ -25,6 +25,7 @@
INDICATOR_REPORT_STATUS,
OVERALL_STATUS,
PD_STATUS,
+ PR_ATTACHMENT_TYPES,
PRP_ROLE_TYPES,
)
from core.paginations import SmallPagination
@@ -48,6 +49,7 @@
from indicator.filters import PDReportsFilter
from indicator.serializers import IndicatorBlueprintSimpleSerializer
from indicator.disaggregators import QuantityIndicatorDisaggregator, RatioIndicatorDisaggregator
+from indicator.utilities import convert_string_number_to_float
from partner.models import Partner
from unicef.exports.reportables import ReportableListXLSXExporter, ReportableListPDFExporter
@@ -72,7 +74,7 @@
ProgressReportSRUpdateSerializer,
ProgressReportPullHFDataSerializer,
)
-from .models import ProgrammeDocument, ProgressReport, LowerLevelOutput
+from .models import ProgrammeDocument, ProgressReport, LowerLevelOutput, ProgressReportAttachment
from .permissions import (
CanChangePDCalculationMethod,
UnicefPartnershipManagerOrRead
@@ -330,15 +332,21 @@ class ProgressReportAnnexCPDFView(RetrieveAPIView):
IsUNICEFAPIUser,
IsPartnerAuthorizedOfficerForCurrentWorkspace,
IsPartnerEditorForCurrentWorkspace,
+ IsPartnerViewerForCurrentWorkspace,
),
)
def get(self, request, *args, **kwargs):
report = self.get_object()
+ funds_received_to_date_percentage = "%.1f" % (
+ report.programme_document.funds_received_to_date * 100 / report.programme_document.budget
+ ) if report.programme_document and report.programme_document.budget > 0 else 0
+
data = {
'report': report,
'pd': report.programme_document,
+ 'funds_received_to_date_percentage': funds_received_to_date_percentage,
'challenges_in_the_reporting_period': report.challenges_in_the_reporting_period,
'proposed_way_forward': report.proposed_way_forward,
'partner_contribution_to_date': report.partner_contribution_to_date,
@@ -361,6 +369,7 @@ class ProgressReportDetailsUpdateAPIView(APIView):
AnyPermission(
IsPartnerAuthorizedOfficerForCurrentWorkspace,
IsPartnerEditorForCurrentWorkspace,
+ IsPartnerAdminForCurrentWorkspace,
),
)
@@ -513,12 +522,13 @@ def list(self, request, workspace_id, progress_report_id, *args, **kwargs):
class ProgressReportSubmitAPIView(APIView):
"""
- Only a partner authorized officer and partner editor can submit a progress report.
+ Only a partner authorized officer, partner admin, and partner editor can submit a progress report.
"""
permission_classes = (
AnyPermission(
IsPartnerAuthorizedOfficerForCurrentWorkspace,
IsPartnerEditorForCurrentWorkspace,
+ IsPartnerAdminForCurrentWorkspace,
),
)
@@ -550,14 +560,11 @@ def post(self, request, *args, **kwargs):
)
for ir in progress_report.indicator_reports.all():
- # Check if all indicator data is fulfilled
- for data in ir.indicator_location_data.all():
- for key, vals in data.disaggregation.items():
- if (vals.get('d', 0) in [None, '']):
- raise ValidationError(
- "You have not completed all indicator location data across "
- "all indicator reports for this progress report."
- )
+ if not ir.is_complete:
+ raise ValidationError(
+ "You have not completed all indicator location data across "
+ "all indicator reports for this progress report."
+ )
# Check if indicator was already submitted or SENT BACK
if ir.submission_date is None or ir.report_status == INDICATOR_REPORT_STATUS.sent_back:
@@ -578,8 +585,8 @@ def post(self, request, *args, **kwargs):
if ir.overall_status not in {OVERALL_STATUS.met, OVERALL_STATUS.no_progress} \
and not ir.narrative_assessment:
raise ValidationError(
- "You have not completed narrative assessment for one of Outputs ({}). Unless your Output "
- "status is Met or No Progress.".format(
+ "You have not completed the narrative assessment for one of the outputs ({}). Unless your output "
+ "status is Met or No Progress, you have to fill in the narrative assessment.".format(
ir.reportable.content_object
)
)
@@ -604,7 +611,8 @@ def post(self, request, *args, **kwargs):
authorized_officer_user = get_user_model().objects.filter(
email=provided_email or self.request.user.email,
prp_roles__role=PRP_ROLE_TYPES.ip_authorized_officer,
- email__in=progress_report.programme_document.unicef_officers.values_list('email', flat=True)
+ email__in=progress_report.programme_document
+ .unicef_officers.filter(active=True).values_list('email', flat=True)
).first()
if not authorized_officer_user:
@@ -650,12 +658,13 @@ def post(self, request, *args, **kwargs):
class ProgressReportSRSubmitAPIView(APIView):
"""
A dedicated API endpoint for submitting SR Progress Report.
- Only a partner authorized officer and partner editor can submit a progress report.
+ Only a partner authorized officer, partner admin, and partner editor can submit a progress report.
"""
permission_classes = (
AnyPermission(
IsPartnerAuthorizedOfficerForCurrentWorkspace,
IsPartnerEditorForCurrentWorkspace,
+ IsPartnerAdminForCurrentWorkspace,
),
)
@@ -692,7 +701,7 @@ def post(self, request, *args, **kwargs):
)
# Attachment field validation
- if not progress_report.attachment:
+ if not progress_report.attachments.exists():
raise ValidationError(
"Attachment is required for SR report type"
)
@@ -704,7 +713,8 @@ def post(self, request, *args, **kwargs):
authorized_officer_user = get_user_model().objects.filter(
email=provided_email or self.request.user.email,
prp_roles__role=PRP_ROLE_TYPES.ip_authorized_officer,
- email__in=progress_report.programme_document.partner_focal_point.values_list('email', flat=True)
+ email__in=progress_report.programme_document.unicef_officers
+ .filter(active=True).values_list('email', flat=True)
).first()
if not authorized_officer_user:
@@ -743,6 +753,7 @@ class ProgressReportPullHFDataAPIView(APIView):
AnyPermission(
IsPartnerAuthorizedOfficerForCurrentWorkspace,
IsPartnerEditorForCurrentWorkspace,
+ IsPartnerAdminForCurrentWorkspace,
),
)
@@ -845,7 +856,6 @@ def _calculate_report_location_totals_per_reports(self, indicator_report, hf_rep
# Store location_totals only for each IndicatorLocationData
for ild in target_hf_ilds_by_loc:
- calculated[loc_id]['total']['c'] += ild.disaggregation['()']['c']
calculated[loc_id]['total']['v'] += ild.disaggregation['()']['v']
if indicator_report.reportable.blueprint.unit == IndicatorBlueprint.NUMBER:
@@ -853,6 +863,12 @@ def _calculate_report_location_totals_per_reports(self, indicator_report, hf_rep
else:
calculated[loc_id]['total']['d'] += ild.disaggregation['()']['d']
+
+ calculated[loc_id]['total']['c'] = convert_string_number_to_float(calculated[loc_id]['total']['v']) / calculated[loc_id]['total']['d']
+
+ if calculated[loc_id]['total']['c'] is None:
+ calculated[loc_id]['total']['c'] = 0
+
else:
target_keys = target_hf_ilds_by_loc[0].disaggregation.keys()
@@ -865,7 +881,6 @@ def _calculate_report_location_totals_per_reports(self, indicator_report, hf_rep
if key not in calculated[loc_id]['data']:
calculated[loc_id]['data'][key] = {'c': 0, 'd': 0, 'v': 0}
- calculated[loc_id]['data'][key]['c'] += ild.disaggregation[key]['c']
calculated[loc_id]['data'][key]['v'] += ild.disaggregation[key]['v']
if indicator_report.reportable.blueprint.unit == IndicatorBlueprint.NUMBER:
@@ -874,6 +889,12 @@ def _calculate_report_location_totals_per_reports(self, indicator_report, hf_rep
else:
calculated[loc_id]['data'][key]['d'] += ild.disaggregation[key]['d']
+ calculated[loc_id]['data'][key]['c'] = convert_string_number_to_float(calculated[loc_id]['data'][key]['v']) \
+ / calculated[loc_id]['data'][key]['d']
+
+ if calculated[loc_id]['data'][key]['c'] is None:
+ calculated[loc_id]['data'][key]['c'] = 0
+
return calculated
def get(self, request, *args, **kwargs):
@@ -1092,28 +1113,63 @@ def post(self, request, *args, **kwargs):
return Response(serializer.data, status=statuses.HTTP_200_OK)
+class ProgressReportAttachmentListCreateAPIView(ListCreateAPIView):
+ serializer_class = ProgressReportAttachmentSerializer
+ permission_classes = (
+ AnyPermission(
+ IsUNICEFAPIUser,
+ IsPartnerAuthorizedOfficerForCurrentWorkspace,
+ IsPartnerEditorForCurrentWorkspace,
+ IsPartnerAdminForCurrentWorkspace,
+ ),
+ )
+ parser_classes = (FormParser, MultiPartParser, FileUploadParser)
+
+ def get_queryset(self):
+ return ProgressReportAttachment.objects.filter(
+ progress_report_id=self.kwargs['progress_report_id'],
+ progress_report__programme_document__workspace_id=self.kwargs['workspace_id'],
+ )
+
+ def perform_create(self, serializer):
+ if self.get_queryset().count() == 3:
+ raise ValidationError('This progress report already has 3 attachments')
+
+ if serializer.validated_data['type'] == PR_ATTACHMENT_TYPES.face \
+ and self.get_queryset().filter(type=PR_ATTACHMENT_TYPES.face).count() == 1:
+ raise ValidationError('This progress report already has 1 FACE attachment')
+
+ if serializer.validated_data['type'] == PR_ATTACHMENT_TYPES.other \
+ and self.get_queryset().filter(type=PR_ATTACHMENT_TYPES.other).count() == 2:
+ raise ValidationError('This progress report already has 2 Other attachments')
+
+ serializer.save(progress_report_id=self.kwargs['progress_report_id'])
+
+
class ProgressReportAttachmentAPIView(APIView):
permission_classes = (
AnyPermission(
IsUNICEFAPIUser,
IsPartnerAuthorizedOfficerForCurrentWorkspace,
IsPartnerEditorForCurrentWorkspace,
+ IsPartnerAdminForCurrentWorkspace,
),
)
parser_classes = (FormParser, MultiPartParser, FileUploadParser)
- def get(self, request, workspace_id, progress_report_id):
- progress_report = get_object_or_404(
- ProgressReport,
- id=progress_report_id,
- programme_document__workspace_id=workspace_id
+ def get(self, request, workspace_id, progress_report_id, pk):
+ attachment = get_object_or_404(
+ ProgressReportAttachment,
+ id=pk,
+ progress_report_id=progress_report_id,
+ progress_report__programme_document__workspace_id=workspace_id
)
try:
# lookup just so the possible FileNotFoundError can be triggered
- progress_report.attachment
- serializer = ProgressReportAttachmentSerializer(progress_report)
+ attachment.file
+ serializer = ProgressReportAttachmentSerializer(attachment)
return Response(serializer.data, status=statuses.HTTP_200_OK)
except FileNotFoundError:
pass
@@ -1121,16 +1177,18 @@ def get(self, request, workspace_id, progress_report_id):
return Response({"message": "Attachment does not exist."}, status=statuses.HTTP_404_NOT_FOUND)
@transaction.atomic
- def delete(self, request, workspace_id, progress_report_id):
- pr = get_object_or_404(
- ProgressReport,
- id=progress_report_id,
- programme_document__workspace_id=workspace_id
+ def delete(self, request, workspace_id, progress_report_id, pk):
+ attachment = get_object_or_404(
+ ProgressReportAttachment,
+ id=pk,
+ progress_report_id=progress_report_id,
+ progress_report__programme_document__workspace_id=workspace_id
)
- if pr.attachment:
+ if attachment.file:
try:
- pr.attachment.delete()
+ attachment.file.delete()
+ attachment.delete()
return Response({}, status=statuses.HTTP_204_NO_CONTENT)
except ValueError:
pass
@@ -1138,21 +1196,23 @@ def delete(self, request, workspace_id, progress_report_id):
return Response({"message": "Attachment does not exist."}, status=statuses.HTTP_404_NOT_FOUND)
@transaction.atomic
- def put(self, request, workspace_id, progress_report_id):
- pr = get_object_or_404(
- ProgressReport,
- id=progress_report_id,
- programme_document__workspace_id=workspace_id)
+ def put(self, request, workspace_id, progress_report_id, pk):
+ attachment = get_object_or_404(
+ ProgressReportAttachment,
+ id=pk,
+ progress_report_id=progress_report_id,
+ progress_report__programme_document__workspace_id=workspace_id
+ )
serializer = ProgressReportAttachmentSerializer(
- instance=pr,
+ instance=attachment,
data=request.data
)
serializer.is_valid(raise_exception=True)
- if pr.attachment:
+ if attachment.file:
try:
- pr.attachment.delete()
+ attachment.file.delete()
except ValueError:
pass
@@ -1242,12 +1302,31 @@ class ProgressReportExcelImportView(APIView):
permission_classes = (IsAuthenticated, )
- def post(self, request, *args, **kwargs):
+ def post(self, request, workspace_id, pk):
up_file = request.FILES['file']
filepath = "/tmp/" + up_file.name
destination = open(filepath, 'wb+')
+ tokens = up_file.name[:up_file.name.rfind('.')].split('_')
+ file_report_name = tokens[0].lower()
+ file_ref_num = tokens[1].lower()
+
+ progress_report = get_object_or_404(
+ ProgressReport,
+ id=pk,
+ programme_document__workspace_id=workspace_id,
+ )
+
+ report_name = f"{progress_report.report_type}{progress_report.report_number}".lower()
+ ref_num = progress_report.programme_document.reference_number.split('/')[-1].lower()
+
+ if file_ref_num != ref_num or file_report_name != report_name:
+ raise ValidationError(
+ f"You are trying to upload a template for the wrong report. "
+ f"This template is for {file_report_name.upper()} and you are loading it into {report_name.upper()}."
+ )
+
for chunk in up_file.chunks():
destination.write(chunk)
destination.close()
diff --git a/django_api/django_api/apps/utils/emails.py b/django_api/django_api/apps/utils/emails.py
index 9f677d572..d5e018bcb 100644
--- a/django_api/django_api/apps/utils/emails.py
+++ b/django_api/django_api/apps/utils/emails.py
@@ -1,6 +1,24 @@
+import logging
+
from django.conf import settings
-from django.core.mail import EmailMultiAlternatives
from django.template.loader import get_template
+from post_office.models import EmailTemplate
+from unicef_notification.models import Notification
+
+logger = logging.getLogger(__name__)
+
+
+def scrub_template_path(template_path):
+ """Take full template path and generate a template name
+
+ e.g.
+ 'email/notify_partner_on_calculation_method_change_subject.txt'
+ ->
+ 'notify_partner_on_calculation_method_change_subject'
+ """
+ __, name_ext = template_path.rsplit("/", 1)
+ name, __ = name_ext.split(".", 1)
+ return name
def send_email_from_template(
@@ -11,7 +29,6 @@ def send_email_from_template(
to_email_list=(),
fail_silently=True,
content_subtype='plain',
- **kwargs
):
"""
send_email_from_template simplifies Django's send_email API
@@ -28,12 +45,116 @@ def send_email_from_template(
fail_silently {bool} -- A flag to mute exception if it fails (default: {True})
"""
- message = EmailMultiAlternatives(
- get_template(subject_template_path).render(template_data).strip(),
- get_template(body_template_path).render(template_data),
- from_email,
- to_email_list,
- **kwargs
+ template_name = scrub_template_path(body_template_path)
+ subject_template = get_template(subject_template_path)
+ subject = subject_template.template.source.strip()
+ defaults = {"subject": subject}
+ message = get_template(body_template_path).template.source
+ if content_subtype == "plain":
+ defaults["content"] = message
+ else:
+ defaults["html_content"] = message
+
+ EmailTemplate.objects.update_or_create(
+ name=template_name,
+ defaults=defaults,
+ )
+ notification = Notification(
+ method_type=Notification.TYPE_EMAIL,
+ sender=None,
+ from_address=from_email,
+ recipients=to_email_list,
+ template_name=template_name,
+ template_data=template_data,
+ )
+ notification.full_clean()
+ notification.save()
+ notification.send_notification()
+
+
+def send_due_progress_report_email():
+ """send_due_progress_report_email sends email notifications to
+ UNICEF Authorized Officers and Focal Points about reports due in 1 week.
+ """
+ from datetime import date
+ from dateutil.relativedelta import relativedelta
+ from core.common import PROGRESS_REPORT_STATUS
+ from unicef.models import ProgressReport
+
+ logger.info("Notifying IP due progress reports")
+ notified = list()
+
+ today = date.today()
+ unsubmitted_due_reports = ProgressReport.objects.filter(
+ submission_date__isnull=True,
+ status=PROGRESS_REPORT_STATUS.due,
+ due_date=today + relativedelta(days=7),
+ )
+
+ for progress_report in unsubmitted_due_reports:
+ pd = progress_report.programme_document
+
+ template_data = {
+ 'person': None,
+ 'progress_report': progress_report,
+ 'programme_document': pd,
+ }
+
+ to_emails = set()
+ to_emails |= set(map(lambda person: person, pd.unicef_officers.all()))
+ to_emails |= set(map(lambda person: person, pd.unicef_focal_point.all()))
+
+ for person in to_emails:
+ send_email_from_template(
+ subject_template_path='emails/due_progress_report_subject.txt',
+ body_template_path='emails/due_progress_report.html',
+ template_data=template_data,
+ to_email_list=[person.email, ],
+ content_subtype='html'
+ )
+
+ notified.append(str(progress_report.id))
+
+ return "Sent emails for {} Due Report IDs: {}".format(len(notified), ", ".join(notified)) if notified else "---"
+
+
+def send_overdue_progress_report_email():
+ """send_overdue_progress_report_email sends email notifications to
+ UNICEF Authorized Officers and Focal Points about overdue reports.
+ """
+ from core.common import PROGRESS_REPORT_STATUS
+ from unicef.models import ProgressReport
+
+ logger.info("Notifying IP overdue progress reports")
+ notified = list()
+
+ unsubmitted_overdue_reports = ProgressReport.objects.filter(
+ submission_date__isnull=True,
+ status=PROGRESS_REPORT_STATUS.overdue,
)
- message.content_subtype = content_subtype
- message.send(fail_silently=fail_silently)
+
+ for progress_report in unsubmitted_overdue_reports:
+ pd = progress_report.programme_document
+
+ template_data = {
+ 'person': None,
+ 'progress_report': progress_report,
+ 'programme_document': pd,
+ }
+
+ to_emails = set()
+ to_emails |= set(map(lambda person: person, pd.unicef_officers.all()))
+ to_emails |= set(map(lambda person: person, pd.unicef_focal_point.all()))
+
+ for person in to_emails:
+ send_email_from_template(
+ subject_template_path='emails/overdue_progress_report_subject.txt',
+ body_template_path='emails/overdue_progress_report.html',
+ template_data=template_data,
+ to_email_list=[person.email, ],
+ content_subtype='html'
+ )
+
+ notified.append(str(progress_report.id))
+
+ return "Sent emails for {} Overdue Report IDs: {}".format(len(notified), ", ".join(notified)) if notified else "---"
diff --git a/django_api/django_api/settings/base.py b/django_api/django_api/settings/base.py
index 942af36cb..106cff68a 100644
--- a/django_api/django_api/settings/base.py
+++ b/django_api/django_api/settings/base.py
@@ -39,7 +39,7 @@
if not ENV:
raise Exception('Environment variable ENV is required!')
-DATA_VOLUME = '/data'
+DATA_VOLUME = os.getenv('DATA_VOLUME', '/data')
UPLOADS_DIR_NAME = 'uploads'
MEDIA_URL = '/api/%s/' % UPLOADS_DIR_NAME
@@ -123,6 +123,8 @@
'unicef',
'ocha',
'id_management',
+ 'post_office',
+ 'unicef_notification',
]
MIDDLEWARE_CLASSES = [
@@ -139,13 +141,13 @@
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
-CORS_ORIGIN_WHITELIST = (
+CORS_ORIGIN_WHITELIST = os.getenv('CORS_ORIGIN_WHITELIST', '').replace(' ', '').strip().split(',') or [
'etools.unicef.org',
'etools-demo.unicef.org',
'etools-test.unicef.org',
'etools-staging.unicef.org',
'etools-dev.unicef.org',
-)
+]
ROOT_URLCONF = 'django_api.urls'
@@ -445,7 +447,7 @@
# 'social_core.pipeline.user.get_username',
'core.mixins.get_username',
'social_core.pipeline.social_auth.associate_by_email',
- 'social_core.pipeline.user.create_user',
+ # 'social_core.pipeline.user.create_user',
'social_core.pipeline.social_auth.associate_user',
'social_core.pipeline.social_auth.load_extra_data',
# 'social_core.pipeline.user.user_details',
diff --git a/django_api/django_api/settings/dev.py b/django_api/django_api/settings/dev.py
index ad6b0a396..be0d7f641 100644
--- a/django_api/django_api/settings/dev.py
+++ b/django_api/django_api/settings/dev.py
@@ -36,3 +36,5 @@
)
CORS_ORIGIN_WHITELIST += ('localhost:8082', )
+
+FIXTURE_DIRS += ["fixtures"]
diff --git a/django_api/django_api/templates/emails/due_progress_report.html b/django_api/django_api/templates/emails/due_progress_report.html
new file mode 100644
index 000000000..5a2a54914
--- /dev/null
+++ b/django_api/django_api/templates/emails/due_progress_report.html
@@ -0,0 +1,16 @@
+{% extends 'emails/base.html' %}
+
+{% block content %}
+ Dear {{ person.name }},
+ Please note that the following is due in 1 week:
+ Report: {{progress_report.report_type}}{{progress_report.report_number}}
+ Period: {{progress_report.start_date}} - {{progress_report.end_date}}
+ Due Date: {{progress_report.due_date}}
+ Programme Document Ref: {{programme_document.reference_number}}
+ Programme Document Title: {{programme_document.title}}
+ Kind regards,
+ UNICEF
+ -- Please note that replies to this email are not monitored and cannot be replied to --
+{% endblock content %}
\ No newline at end of file
diff --git a/django_api/django_api/templates/emails/due_progress_report_subject.txt b/django_api/django_api/templates/emails/due_progress_report_subject.txt
new file mode 100644
index 000000000..14185d055
--- /dev/null
+++ b/django_api/django_api/templates/emails/due_progress_report_subject.txt
@@ -0,0 +1 @@
+[UNICEF Partner Reporting Portal] Due Report
\ No newline at end of file
diff --git a/django_api/django_api/templates/emails/on_progress_report_status_change_accepted.html b/django_api/django_api/templates/emails/on_progress_report_status_change_accepted.html
index f0e6ff5d4..47ba098dc 100644
--- a/django_api/django_api/templates/emails/on_progress_report_status_change_accepted.html
+++ b/django_api/django_api/templates/emails/on_progress_report_status_change_accepted.html
@@ -2,6 +2,17 @@
{% block content %}
Dear {{ person.name }},
- Your progress report {{ pr_url }} for {{ pd_ref_title }}} has been Accepted by UNICEF.
- Best Regards,
+ Please note that the following was accepted by UNICEF:
+ Report: {{report.report_type}}{{report.report_number}}
+ Period: {{report.start_date}} - {{report.end_date}}
+ Submission Date: {{report.submission_date}}
+ Due Date: {{report.due_date}}
+ Link to the report: {{ pr_url }}
+ Programme Document Ref: {{pd.reference_number}}
+ Programme Document Title: {{pd.title}}
+ Kind regards,
+ UNICEF
+ -- Please note that replies to this email are not monitored and cannot be replied to --
{% endblock content %}
\ No newline at end of file
diff --git a/django_api/django_api/templates/emails/on_progress_report_status_change_sent_back.html b/django_api/django_api/templates/emails/on_progress_report_status_change_sent_back.html
index 44fc32cd3..c368b3a37 100644
--- a/django_api/django_api/templates/emails/on_progress_report_status_change_sent_back.html
+++ b/django_api/django_api/templates/emails/on_progress_report_status_change_sent_back.html
@@ -2,6 +2,19 @@
{% block content %}
Dear {{ person.name }},
- Your progress report {{ pr_url }} for {{ pd_ref_title }}} has been Sent Back for Revision by UNICEF. Please make the necessary changes and resubmit this report.
- Best Regards,
+ Please note that the following was sent back by UNICEF:
+ Report: {{report.report_type}}{{report.report_number}}
+ Period: {{report.start_date}} - {{report.end_date}}
+ Submission Date: {{report.submission_date}}
+ Due Date: {{report.due_date}}
+ Link to the report: {{ pr_url }}
+ Programme Document Ref: {{pd.reference_number}}
+ Programme Document Title: {{pd.title}}
+ Please log in to the UNICEF Partner Reporting Portal to see the reason and contact details of the person that sent the report back.
+ Kind regards,
+ UNICEF
+ -- Please note that replies to this email are not monitored and cannot be replied to --
{% endblock content %}
\ No newline at end of file
diff --git a/django_api/django_api/templates/emails/on_progress_report_status_change_subject.txt b/django_api/django_api/templates/emails/on_progress_report_status_change_subject.txt
index 1230bfb93..58bf8f5b7 100644
--- a/django_api/django_api/templates/emails/on_progress_report_status_change_subject.txt
+++ b/django_api/django_api/templates/emails/on_progress_report_status_change_subject.txt
@@ -1 +1 @@
-[Partner Reporting Portal] Progress Report {{ status }}
\ No newline at end of file
+[UNICEF Partner Reporting Portal] Report {{ status }}
\ No newline at end of file
diff --git a/django_api/django_api/templates/emails/on_progress_report_status_change_submitted.html b/django_api/django_api/templates/emails/on_progress_report_status_change_submitted.html
index c412f5b40..e832e1c6c 100644
--- a/django_api/django_api/templates/emails/on_progress_report_status_change_submitted.html
+++ b/django_api/django_api/templates/emails/on_progress_report_status_change_submitted.html
@@ -2,6 +2,17 @@
{% block content %}
Dear {{ person.name }},
- Your progress report {{ pr_url }} for {{ pd_ref_title }}} has been submitted.
- Best Regards,
+ Please note that the following was submitted to UNICEF:
+ Report: {{report.report_type}}{{report.report_number}}
+ Period: {{report.start_date}} - {{report.end_date}}
+ Submission Date: {{report.submission_date}}
+ Due Date: {{report.due_date}}
+ Link to the report: {{ pr_url }}
+ Programme Document Ref: {{pd.reference_number}}
+ Programme Document Title: {{pd.title}}
+ Kind regards,
+ UNICEF
+ -- Please note that replies to this email are not monitored and cannot be replied to --
{% endblock content %}
\ No newline at end of file
diff --git a/django_api/django_api/templates/emails/overdue_progress_report.html b/django_api/django_api/templates/emails/overdue_progress_report.html
new file mode 100644
index 000000000..defb18575
--- /dev/null
+++ b/django_api/django_api/templates/emails/overdue_progress_report.html
@@ -0,0 +1,16 @@
+{% extends 'emails/base.html' %}
+
+{% block content %}
+ Dear {{ person.name }},
+ Please note that the following is overdue:
+ Report: {{progress_report.report_type}}{{progress_report.report_number}}
+ Period: {{progress_report.start_date}} - {{progress_report.end_date}}
+ Due Date: {{progress_report.due_date}}
+ Programme Document Ref: {{programme_document.reference_number}}
+ Programme Document Title: {{programme_document.title}}
+ Kind regards,
+ UNICEF
+ -- Please note that replies to this email are not monitored and cannot be replied to --
+{% endblock content %}
\ No newline at end of file
diff --git a/django_api/django_api/templates/emails/overdue_progress_report_subject.txt b/django_api/django_api/templates/emails/overdue_progress_report_subject.txt
new file mode 100644
index 000000000..ff215a266
--- /dev/null
+++ b/django_api/django_api/templates/emails/overdue_progress_report_subject.txt
@@ -0,0 +1 @@
+[UNICEF Partner Reporting Portal] Overdue Report
\ No newline at end of file
diff --git a/django_api/django_api/uwsgi.ini b/django_api/django_api/uwsgi.ini
index 83586dd0b..97ade3ca3 100644
--- a/django_api/django_api/uwsgi.ini
+++ b/django_api/django_api/uwsgi.ini
@@ -16,7 +16,7 @@ master = true
processes = 2
max-requests = 250
max-requests-delta = 25
-harakiri = 180
+harakiri = 900
listen = 32 # request queue
diff --git a/django_api/requirements/base.txt b/django_api/requirements/base.txt
index a5b31b9bd..2f95a0cad 100644
--- a/django_api/requirements/base.txt
+++ b/django_api/requirements/base.txt
@@ -30,6 +30,7 @@ Babel==2.5.3
pycountry==18.2.23
aiohttp==3.0.8
pyrestcli==0.6.6
+unicef-notification==0.2.1
# Storages
boto3==1.7.0
diff --git a/django_api/requirements/dev.txt b/django_api/requirements/dev.txt
index c8483e532..08e02a82a 100644
--- a/django_api/requirements/dev.txt
+++ b/django_api/requirements/dev.txt
@@ -4,4 +4,7 @@ django-debug-toolbar==1.7
# django-test-without-migrations==0.4
ipdb==0.8.1
-tblib==1.3.2
\ No newline at end of file
+tblib==1.3.2
+
+# test exports
+xlrd==1.2.0
diff --git a/docker-compose.polymer-bundle.yml b/docker-compose.polymer-bundle.yml
index 12bcccef6..92d8019f8 100644
--- a/docker-compose.polymer-bundle.yml
+++ b/docker-compose.polymer-bundle.yml
@@ -1,6 +1,38 @@
version: '2.1'
services:
+ beater-prp:
+ command: bash -c "/usr/local/bin/waitforit -host=db -port=5432 && ./manage.py celery beat --loglevel=${CELERY_LOG_LEVEL:-info}"
+ image: 'unicef/etools-prp'
+ env_file:
+ - .env
+ depends_on:
+ - django_api
+ - redis
+ restart: always
+
+ celerycam-prp:
+ command: bash -c "/usr/local/bin/waitforit -host=db -port=5432 && ./manage.py celerycam"
+ image: 'unicef/etools-prp'
+ env_file:
+ - .env
+ depends_on:
+ - django_api
+ - redis
+ restart: always
+
+ worker-prp:
+ command: bash -c "/usr/local/bin/waitforit -host=db -port=5432 && ./manage.py celery worker -E --loglevel=${CELERY_LOG_LEVEL:-debug}"
+ image: 'unicef/etools-prp'
+ env_file:
+ - .env
+ depends_on:
+ - django_api
+ - redis
+ restart: always
+ volumes:
+ - './django_api:/code/'
+
proxy:
image: unicef/etools-prp-nginx-proxy
environment:
@@ -11,7 +43,7 @@ services:
context: ./nginx_proxy
dockerfile: ./Dockerfile
ports:
- - "8082:80"
+ - "9000:80"
depends_on:
- django_api
- polymer
@@ -49,6 +81,16 @@ services:
build:
context: ./redis
dockerfile: ./Dockerfile
+
+ id-management-frontend:
+ image: unicef/etools-prp-id-management-frontend
+ build:
+ context: ./react/id_management_frontend
+ dockerfile: ./Dockerfile
+ volumes:
+ - ./react/id_management_frontend/:/code
+ - /code/node_modules
+ command: bash -c "npm start"
polymer:
image: unicef/etools-prp-polymer
diff --git a/docs/.gitbook/assets/cluster_indicator_refresh.png b/docs/.gitbook/assets/cluster_indicator_refresh.png
new file mode 100644
index 000000000..5e8b6678d
Binary files /dev/null and b/docs/.gitbook/assets/cluster_indicator_refresh.png differ
diff --git a/docs/.gitbook/assets/cluster_indicator_refresh_modal.png b/docs/.gitbook/assets/cluster_indicator_refresh_modal.png
new file mode 100644
index 000000000..d400bc990
Binary files /dev/null and b/docs/.gitbook/assets/cluster_indicator_refresh_modal.png differ
diff --git a/docs/.gitbook/assets/progress_report_refresh.png b/docs/.gitbook/assets/progress_report_refresh.png
new file mode 100644
index 000000000..ed2b8ac04
Binary files /dev/null and b/docs/.gitbook/assets/progress_report_refresh.png differ
diff --git a/docs/.gitbook/assets/progress_report_refresh_modal.png b/docs/.gitbook/assets/progress_report_refresh_modal.png
new file mode 100644
index 000000000..cf3fa397a
Binary files /dev/null and b/docs/.gitbook/assets/progress_report_refresh_modal.png differ
diff --git a/docs/product-end-user-documentation/cluster-reporting/reporting-on-results.md b/docs/product-end-user-documentation/cluster-reporting/reporting-on-results.md
index 7bf3b13ca..bd86318c8 100644
--- a/docs/product-end-user-documentation/cluster-reporting/reporting-on-results.md
+++ b/docs/product-end-user-documentation/cluster-reporting/reporting-on-results.md
@@ -27,6 +27,15 @@ We will have a data key to specify the labels of the indicators.
Once all the data for all locations has been entered the indicator report can be submitted. Once submitted the indicator report goes under "Submitted Reports" tab, and can be reviewed by the IMO. Once submitted, none of the report data can be modified by anyone. The IMO may send back the report if they would like to see changes or incorrect data was entered, in which case the partner can re-submit after making the appropriate changes.
+### **Refreshing report**
+It is possible that Cluster Indicator may get updated by Cluster IMO for locations which become deactivated over the course of the year period, and generated Cluster Indicator Reports may not reflect such location changes. PRP provides a **"resetting"** mechanism for target Cluster Indicator Report to destroy its location data entries in order to regenerate clean location data entries from current state of Cluster Indicator in PRP system at given time.
+
+
+
+Upon clicking `Refresh` button, a warning modal will be opened to show possible consequences by refreshing current Cluster Indicator Report. When the user agrees to do so, PRP will perform an irreversible action to delete and regenerate Indicator Location Data based on current state of Cluster Indicator which may have up-to-date location information, pertinent to current reporting purposes.
+
+
+
### Import / Export of data
Users will be able to export data they see here. Additionally they will be able to export an "import template" which they can then use to import data back into the system.
diff --git a/docs/product-end-user-documentation/ip-reporting/progress-reports/reporting-process.md b/docs/product-end-user-documentation/ip-reporting/progress-reports/reporting-process.md
index 52c34f526..a5b3d27c8 100644
--- a/docs/product-end-user-documentation/ip-reporting/progress-reports/reporting-process.md
+++ b/docs/product-end-user-documentation/ip-reporting/progress-reports/reporting-process.md
@@ -18,6 +18,15 @@ Once a final report has been generated, no change to the PD reporting periods sh
**Edge case** \(to be handled in a future release\): Super-users in PMP can make changes that might not be in alignment with above restrictions. If that were to happen then a manual administrative data fix might be required on the PRP side as well.
+### **Refreshing report**
+It is possible that Programme Document may get updated for locations which become deactivated over the course of the program period, and generated Progress Reports may not reflect such location changes. PRP provides a **"resetting"** mechanism for target Progress Report to destroy its Indicator Reports along with their location data entries in order to regenerate the Indicator Reports from current state of Programme Document in PRP system at given time.
+
+
+
+Upon clicking `Refresh` button, a warning modal will be opened to show possible consequences by refreshing current Progress Report. When the user agrees to do so, PRP will perform an irreversible action to delete and regenerate Indicator Reports based on current state of Programme Document which may have up-to-date location information, pertinent to current reporting purposes.
+
+
+
### **Acceptance of a report**
The UNICEF PO is responsible for acceptance of a progress reports that are submitted \(There is no workflow following the submission by the IP to UNICEF and Cluster\). This happens in the PMP system. The PO can also **send the report back with a note**, in which case the partner should get an email informing them that should review the note and re-submit the report \(data in the report becomes editable once its been sent back\). In that case the partner can log back in, make any changes recommended \(edit data and upload attachment \#[947](https://github.com/unicef/etools-partner-reporting-portal/issues/947)\) and resubmit the report back to UNICEF.
diff --git a/fabfile.py b/fabfile.py
index dfc5b6995..fbacab3e1 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -5,9 +5,9 @@
def ssh(service):
"""
ssh into running service container
- :param service: ['django_api', 'polymer', 'proxy', 'db']
+ :param service: ['django_api', 'polymer', 'proxy', 'db', 'id-management-frontend']
"""
- assert service in ['django_api', 'polymer', 'proxy', 'db'], "%s is unrecognized service"
+ assert service in ['django_api', 'polymer', 'proxy', 'db', 'id-management-frontend'], "%s is unrecognized service"
if service == 'polymer':
local('docker-compose exec polymer ash')
else:
@@ -43,9 +43,9 @@ def up_with_bundle(rebuild=True):
def restart(service):
"""
restart a service container
- :param service: ['django_api', 'polymer', 'proxy', 'db']
+ :param service: ['django_api', 'polymer', 'proxy', 'db', 'id-management-frontend']
"""
- assert service in ['django_api', 'polymer', 'proxy', 'db', 'beater-prp', 'worker-prp'], "%s is unrecognized service"
+ assert service in ['django_api', 'polymer', 'proxy', 'db', 'beater-prp', 'worker-prp', 'id-management-frontend'], "%s is unrecognized service"
local('docker-compose restart %s' % service)
@@ -61,7 +61,7 @@ def rebuild(service):
Re-build docker images for containers.
"""
if service:
- assert service in ['django_api', 'polymer', 'proxy', 'db'], "%s is unrecognized service"
+ assert service in ['django_api', 'polymer', 'proxy', 'db', 'id-management-frontend'], "%s is unrecognized service"
local('docker-compose build %s' % service if service else '')
@@ -88,7 +88,7 @@ def stop(service):
local('docker-compose stop')
elif service:
- assert service in ['django_api', 'polymer', 'proxy', 'db'], "%s is unrecognized service"
+ assert service in ['django_api', 'polymer', 'proxy', 'db', 'id-management-frontend'], "%s is unrecognized service"
local('docker-compose stop %s' % service)
diff --git a/polymer/.gitignore b/polymer/.gitignore
index 1da2b01f3..56c3a9295 100644
--- a/polymer/.gitignore
+++ b/polymer/.gitignore
@@ -7,3 +7,6 @@ yarn-error.log
.idea
*.sublime-project
*.sublime-workspace
+debug/*
+.coverdata
+.coverrun
\ No newline at end of file
diff --git a/polymer/.jshintrc b/polymer/.jshintrc
index b9d746457..e321af0ea 100755
--- a/polymer/.jshintrc
+++ b/polymer/.jshintrc
@@ -1,5 +1,6 @@
{
"node": true,
+ "esversion": 6,
"browser": true,
"bitwise": true,
"camelcase": false,
@@ -28,6 +29,26 @@
"fixture": true,
"assert": true,
"moment": true,
- "numeral": true
+ "numeral": true,
+ "AuthorizedOfficerModalUtils": true,
+ "IndicatorDetailsUtils": true,
+ "IndicatorsToolbarUtils": true,
+ "PartnerDetailsUtils": true,
+ "PdDetailsOverviewUtils": true,
+ "PdDetailsCalculationMethodsUtils": true,
+ "PdDetailsDocDownloadUtils": true,
+ "PdDetailsReportingRequirementsUtils": true,
+ "PdDetailsReportsUtils": true,
+ "PdListToolbarUtils": true,
+ "PdOutputListToolbarUtils": true,
+ "PdOutputListUtils": true,
+ "PdOutputUtils": true,
+ "PdReportInfoUtils": true,
+ "PdReportsToolbarUtils": true,
+ "PdReportsListUtils": true,
+ "PdReportsReportTitleUtils": true,
+ "ProgressReportsToolbarUtils": true,
+ "ReportAttachmentsUtils": true,
+ "ProgressReportsListUtils": true
}
}
diff --git a/polymer/Dockerfile b/polymer/Dockerfile
index d3eae3326..735276de9 100644
--- a/polymer/Dockerfile
+++ b/polymer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mhart/alpine-node:7.8.0
+FROM mhart/alpine-node:11.13.0
RUN apk update
RUN apk --update --no-cache \
@@ -18,7 +18,7 @@ RUN apk --update --no-cache \
libjpeg-turbo \
libjpeg-turbo-dev
-RUN npm install -g bower polymer-cli gulp-cli
+RUN npm install -g bower polymer-cli gulp-cli --unsafe-perm
ADD bower.json /tmp/
ADD package.json /tmp/
diff --git a/polymer/Dockerfile-bundle b/polymer/Dockerfile-bundle
index 4e926108b..0b6db6f62 100644
--- a/polymer/Dockerfile-bundle
+++ b/polymer/Dockerfile-bundle
@@ -1,4 +1,4 @@
-FROM mhart/alpine-node:7.8.0
+FROM mhart/alpine-node:11.13.0
RUN apk update
RUN apk --update --no-cache \
@@ -18,7 +18,7 @@ RUN apk --update --no-cache \
libjpeg-turbo \
libjpeg-turbo-dev
-RUN npm install -g bower polymer-cli gulp-cli
+RUN npm install -g bower@~1.7.0 polymer-cli gulp-cli --unsafe-perm
ADD bower.json /tmp/
ADD package.json /tmp/
diff --git a/polymer/codefresh_polymer.yml b/polymer/codefresh_polymer.yml
index 17c066e50..1f488fb0a 100644
--- a/polymer/codefresh_polymer.yml
+++ b/polymer/codefresh_polymer.yml
@@ -9,6 +9,14 @@ steps:
working_directory: ${{main_clone}}/polymer
tag: ${{CF_BRANCH}}
+ composition_step:
+ type: composition
+ composition: 'unicef-prp-unit-tests'
+ composition_candidates:
+ test:
+ image: ${{build_polymer}}
+ command: ash -c "npm run test"
+
push_to_hub:
type: push
title: Pushing polymer image to docker hub
diff --git a/polymer/gulpfile.js b/polymer/gulpfile.js
index d6f91e5ce..f72b70e00 100644
--- a/polymer/gulpfile.js
+++ b/polymer/gulpfile.js
@@ -16,14 +16,15 @@ const gulpif = require('gulp-if');
const gutil = require('gulp-util');
const fancylog = require('fancy-log');
const argv = require('yargs').argv;
+const jasmine = require('gulp-jasmine');
+const cover = require('gulp-coverage');
// Got problems? Try logging 'em
// use -l to activate plylogs
if (argv.l) {
const logging = require('plylog');
logging.setVerbose();
-}
-
+};
// !!! IMPORTANT !!! //
// Keep the global.config above any of the gulp-tasks that depend on it
@@ -51,7 +52,7 @@ global.config = {
navigateFallback: '/index.html',
navigateFallbackWhitelist: [
/^\/app\//,
- /^\/login\//,
+ /^\/landing\//,
/^\/unauthorized\//,
/^\/not-found\//,
],
@@ -75,7 +76,6 @@ const html = require('./gulp-tasks/html.js'); //Any processing on html
const css = require('./gulp-tasks/css.js'); //Any processing on css
const project = require('./gulp-tasks/project.js');
-
// Log task end messages
var log = function(message) {
return function() {
@@ -118,6 +118,23 @@ function dependencies() {
.pipe(project.rejoin());
}
+// Run tests!
+gulp.task('specs', function() {
+ return gulp.src('test/unit/*.js')
+ .pipe(cover.instrument({
+ pattern: ['src/*/*/js/*.js']
+ }))
+ // gulp-jasmine works on filepaths so you can't have any plugins before it
+ .pipe(jasmine())
+ .pipe(cover.gather())
+ .pipe(cover.format())
+ .pipe(gulp.dest('test/reports'));
+});
+
+gulp.task('watch', function() {
+ gulp.watch('test/unit/**.js', {ignoreInitial: false}, gulp.series('specs'));
+});
+
// Clean the build directory, split all source and dependency files into streams
// and process them, and output bundled and unbundled versions of the project
// with their own service workers
@@ -131,7 +148,6 @@ gulp.task('default', gulp.series([
project.serviceWorker
]));
-
// DO NOT RUN
// Fully builds project
// Minifying, linting, and building into eTools
diff --git a/polymer/index.html b/polymer/index.html
index 0974df9b4..d4ec07010 100644
--- a/polymer/index.html
+++ b/polymer/index.html
@@ -20,7 +20,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/polymer/src/elements/cluster-reporting/analysis/indicator-bucket.html b/polymer/src/elements/cluster-reporting/analysis/indicator-bucket.html
index 95e4aa7be..2629ba635 100644
--- a/polymer/src/elements/cluster-reporting/analysis/indicator-bucket.html
+++ b/polymer/src/elements/cluster-reporting/analysis/indicator-bucket.html
@@ -97,7 +97,7 @@
Cluster Objective:
- [[data.co_title]]
+ [[_computeTitle(data)]]
[[indicator.title]]
this.$$('#collapse-' + e.target.toggles).toggle();
},
+ _computeTitle: function (data) {
+ return data.cluster_objective_title === undefined ? data.title : data.cluster_objective_title;
+ },
+
_computePrefix: function (data) {
var prefix = {
partneractivity: 'Partner Activity',
diff --git a/polymer/src/elements/cluster-reporting/analysis/indicator-details.html b/polymer/src/elements/cluster-reporting/analysis/indicator-details.html
index 22c0b4909..2bba1f4f4 100644
--- a/polymer/src/elements/cluster-reporting/analysis/indicator-details.html
+++ b/polymer/src/elements/cluster-reporting/analysis/indicator-details.html
@@ -14,6 +14,7 @@
@@ -221,6 +222,20 @@
data="[[data.current_progress_by_location]]">
+
+
+
+
+
+
+
@@ -18,6 +19,11 @@
--app-grid-columns: 4;
--app-grid-item-height: auto;
+ --app-grid-expandible-item-columns: 3;
+ }
+
+ .filter-3-col {
+ @apply --app-grid-expandible-item;
}
@@ -39,6 +45,15 @@
class="item"
value="[[_withDefault(queryParams.indicator_type, '')]]">
+
+
+
+
+
@@ -59,6 +74,10 @@
notify: true,
},
},
+
+ _correctIndicatorType: function (indicatorType) {
+ return indicatorType === 'partner_activity' || indicatorType === 'partner_project';
+ },
});
diff --git a/polymer/src/elements/cluster-reporting/analysis/operational-presence-map.html b/polymer/src/elements/cluster-reporting/analysis/operational-presence-map.html
index aa0d92088..e6880bbc5 100644
--- a/polymer/src/elements/cluster-reporting/analysis/operational-presence-map.html
+++ b/polymer/src/elements/cluster-reporting/analysis/operational-presence-map.html
@@ -336,7 +336,7 @@ Number of partners:
style.innerHTML = this.mapStyles;
- this.$$('leaflet-map').shadowRoot.appendChild(style);
+ this.$$('leaflet-map').appendChild(style);
});
});
},
diff --git a/polymer/src/elements/cluster-reporting/app-header.html b/polymer/src/elements/cluster-reporting/app-header.html
index f07fb37a9..a83750624 100644
--- a/polymer/src/elements/cluster-reporting/app-header.html
+++ b/polymer/src/elements/cluster-reporting/app-header.html
@@ -7,7 +7,9 @@
+
+
@@ -74,6 +80,10 @@
+
+
[[data.indicator_name]]
+ allow-no-status
+ is-cluster>
+
+
+
+
+
+
Edit Indicator
_save: function () {
var self = this;
+ var noLocationSet = false;
+ var rawLocations = this.get('data.locations');
+
+ var changedLocations = rawLocations.map(function (location) {
+ if (location.location !== undefined && location.location.id !== undefined) {
+ var id = location.location.id;
+ location.location = id;
+ return location;
+ } else if (location.loc_type !== undefined && location.location === undefined) {
+ self.set('errors', 'No location set - please set a location.');
+ noLocationSet = true;
+ return location;
+ } else {
+ return location;
+ }
+ });
+
+ if (noLocationSet === true) {
+ return;
+ }
+
if (!this._fieldsAreValid()) {
return;
}
+ this.set('data.locations', changedLocations);
+
this.set('updatePending', true);
if (this.data.frequency !== 'Csd') {
@@ -568,6 +591,7 @@ Edit Indicator
})
.catch(function (err) {
self.set('errors', err.data);
+ self.set('data.locations', rawLocations);
self.set('updatePending', false);
});
},
diff --git a/polymer/src/elements/cluster-reporting/indicator-locations-modal.html b/polymer/src/elements/cluster-reporting/indicator-locations-modal.html
index 1ce43ce9c..7f60fd949 100644
--- a/polymer/src/elements/cluster-reporting/indicator-locations-modal.html
+++ b/polymer/src/elements/cluster-reporting/indicator-locations-modal.html
@@ -142,16 +142,16 @@ Location settings for indicator
is="dom-if"
if="[[_equals(data.blueprint.display_type, 'number')]]"
restamp="true">
- [[[_withDefault(data.label)]]]
+ [[_withDefault(data.label)]]
- [[[_withDefault(data.numerator_label)]]]
+ [[_withDefault(data.numerator_label)]]
/
- [[[_withDefault(data.denominator_label)]]]
+ [[_withDefault(data.denominator_label)]]
@@ -303,7 +303,7 @@ Location settings for indicator
},
_getLocationName: function (locationId, locations) {
- var location = locations.find(function (loc) {
+ var location = locations.results.find(function (loc) {
return String(loc.id) === String(locationId);
});
diff --git a/polymer/src/elements/cluster-reporting/indicator-locations-widget.html b/polymer/src/elements/cluster-reporting/indicator-locations-widget.html
index 5484a391b..07de0dc4e 100644
--- a/polymer/src/elements/cluster-reporting/indicator-locations-widget.html
+++ b/polymer/src/elements/cluster-reporting/indicator-locations-widget.html
@@ -4,8 +4,8 @@
+
+
Locations ([[value.length]])
- Admin [[item.loc_type]]
+ Admin [[_getLocationAdminLevel(item)]]
@@ -191,6 +198,7 @@ Locations ([[value.length]])
option-value="id"
option-label="title"
selected="{{item.loc_type}}"
+ data-index$="[[index]]"
on-selected-changed="_onLocTypeChanged"
required>
@@ -203,7 +211,7 @@ Locations ([[value.length]])
- [[_getLocationTitle(locations, item.loc_type, item.location)]]
+ [[_getLocationTitle(locations, item, item.id, index)]]
@@ -214,50 +222,56 @@ Locations ([[value.length]])
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -286,8 +300,10 @@ Locations ([[value.length]])
parentIndicatorId: Number,
clusterId: Number,
locations: Object,
+ savedLocations: Object,
pending: Object,
isPai: Boolean,
+ searchLocationType: String,
editing: {
type: Boolean,
@@ -304,6 +320,10 @@ Locations ([[value.length]])
computed: '_computeIsNumber(indicatorType)',
},
+ url: {
+ type: String,
+ },
+
value: {
type: Array,
notify: true,
@@ -321,6 +341,11 @@ Locations ([[value.length]])
value: false,
},
+ locationsInitialized: {
+ type: Boolean,
+ value: false
+ },
+
maxAdminLevel: {
type: Number,
value: App.Settings.cluster.maxLocType,
@@ -341,6 +366,11 @@ Locations ([[value.length]])
computed: '_computeLocationsUrl(responsePlanId)',
},
+ locationTitle: {
+ type: String,
+ value: '',
+ },
+
ajaxData: {
type: Array,
computed: '_computeAjaxData(maxAdminLevel)',
@@ -357,6 +387,49 @@ Locations ([[value.length]])
},
},
+ _onValueChanged: function (event) { // This method runs whenever user begins searching in locations dropdown
+ var loc_type = this.get('searchLocationType') || 0;
+ var index = -1;
+
+ if (event.detail.value === '') {
+ return;
+ }
+
+ event.path.forEach(function (node) {
+ if (node.nodeName === 'ETOOLS-SINGLE-SELECTION-MENU') {
+ index = node.dataset.index; // Grab index of current location widget component
+ return;
+ }
+ });
+
+ if (loc_type === 0 && index === undefined) {
+ index = 0;
+ }
+
+ this.debounce('fetch-locations-' + loc_type, function() {
+ var self = this;
+
+ var thunk = self.$.search;
+ thunk.url = self.get('url');
+
+ thunk.params = {
+ loc_type: loc_type,
+ title: event.detail.value
+ };
+
+ thunk.thunk()()
+ .then(function(res) {
+ self._setPending(loc_type, false, index);
+ self._setLocations(loc_type, res.data.results, index);
+ })
+ .catch(function (err) {
+ console.log(err);
+ self._setPending(loc_type, false, index);
+ });
+ return;
+ }, 1000);
+ },
+
_computeIsNumber: function (type) {
return type === 'number';
},
@@ -420,14 +493,44 @@ Locations ([[value.length]])
loc_type: initial,
});
- this._fetchLocations(initial);
+ this.set('searchLocationType', 0);
+ this.set('locationsInitialized', true);
+
+ var newLocations = this.get('locations');
+ var value = this.get('value');
+
+ value.forEach(function (location, index) {
+ if (location.location === undefined && newLocations[index] === undefined) {
+ newLocations[index] = {0: []};
+ }
+ });
+
+ this.set('locations', newLocations);
+
+ var newPendingIndex = Object.keys(this.get('pending')).length;
+ var pending = this.get('pending');
+
+ pending[newPendingIndex] = {
+ initial: false
+ };
+
+ this.set('pending', pending);
+
+ this._fetchLocations(initial, undefined, this.get('value').length - 1);
},
_remove: function (e) {
var value = this.get('value');
var toRemove = +e.target.dataset.index;
+ var pending = this.get('pending');
+ var locations = this.get('locations');
+
+ delete locations[toRemove];
+ delete pending[toRemove];
+
var newValue = value.slice(0, toRemove).concat(value.slice(toRemove + 1));
+ this.set('pending', pending);
this.set('value', newValue);
},
@@ -435,67 +538,118 @@ Locations ([[value.length]])
e.target.validate();
},
- _onLocTypeChanged: function (_, data) {
- this._fetchLocations(data.value);
+ _onLocTypeChanged: function (event, data) {
+ var index = -1;
+
+ event.path.forEach(function (node) {
+ if (node.nodeName === 'ETOOLS-SINGLE-SELECTION-MENU') {
+ index = node.dataset.index;
+ return;
+ }
+ });
+
+ if (index === -1) {
+ return;
+ }
+
+ this._fetchLocations(data.value, undefined, index);
},
- _fetchLocations: function (loc_type) {
- if (this.get('locations')[loc_type]) {
+ _fetchLocations: function (loc_type, title, index) {
+ if (loc_type === undefined) {
return;
}
+ this.set('searchLocationType', loc_type);
+
this.debounce('fetch-locations-' + loc_type, function () {
var self = this;
- this._setPending(loc_type, true);
+ this._setPending(loc_type, true, index);
+
+ if (title !== undefined) {
+ this.$$('#locations' + loc_type).params.title = title;
+ }
this.$$('#locations' + loc_type).thunk()()
- .then(function (res) {
- self._setPending(loc_type, false);
- self._setLocations(loc_type, res.data);
- })
- .catch(function () {
- self._setPending(loc_type, false);
- });
- }, 100);
+ .then(function (res) {
+ self.set('url', res.xhr.responseURL);
+ self._setPending(loc_type, false, index);
+ self._setLocations(loc_type, res.data.results, index);
+ })
+ .catch(function () {
+ self._setPending(loc_type, false, index);
+ });
+ });
},
_fetchInitialLocations: function (lockedItems) {
- lockedItems.forEach(function (item) {
- this._fetchLocations(item.loc_type);
- }, this);
+ this.set('savedLocations', lockedItems);
+
+ var newLocations = Object.assign({}, this.get('locations'));
+
+ if (lockedItems.length > 0) {
+ lockedItems.forEach(function (location, index) {
+ if (location.admin_level === undefined) {
+ newLocations[index] = {};
+ newLocations[index][location.loc_type] = [location];
+ } else {
+ newLocations[index] = {};
+ newLocations[index][location.admin_level] = [location];
+ }
+ });
+ } else {
+ lockedItems.forEach(function (location, index) {
+ newLocations[index] = {0: []};
+ });
+ }
+
+ this.set('locations', newLocations);
+ },
+
+ _getPending: function (pending, loc_type, index) {
+ return !!pending[index][loc_type];
},
- _getPending: function (pending, loc_type) {
- return !!pending[loc_type];
+ _getLocations: function (locations, loc_type, index) {
+ return locations[index][loc_type] || [];
},
- _getLocations: function (locations, loc_type) {
- return locations[loc_type] || [];
+ _getLocationAdminLevel: function (location) {
+ return location.loc_type ? location.loc_type : location.admin_level;
},
- _getLocationTitle: function (locations, loc_type, locationId) {
- var allLocations = this._getLocations(locations, loc_type);
+ _getLocationTitle: function (locations, location, locationId, index) {
+ var loc_type = location.loc_type ? location.loc_type : location.admin_level;
+ var allLocations = this._getLocations(locations, loc_type, index);
- var location = allLocations.find(function (loc) {
+ var targetLocation = allLocations.find(function (loc) {
return String(loc.id) === String(locationId);
});
- return location ? location.title : '';
+ return targetLocation ? targetLocation.title : '';
},
- _setPending: function (loc_type, value) {
+ _setPending: function (loc_type, value, index) {
var newPending = Object.assign({}, this.get('pending'));
- newPending[loc_type] = value;
+ if (newPending[index] === undefined) {
+ newPending[index] = {};
+ }
+
+ newPending[index][loc_type] = value;
this.set('pending', newPending);
},
- _setLocations: function (loc_type, value) {
+ _setLocations: function (loc_type, value, index) {
var newLocations = Object.assign({}, this.get('locations'));
- newLocations[loc_type] = value;
+ if (newLocations[index] === undefined) {
+ newLocations[index] = {};
+ }
+
+ newLocations[index][loc_type] = value;
this.set('locations', newLocations);
},
diff --git a/polymer/src/elements/cluster-reporting/indicator-modal.html b/polymer/src/elements/cluster-reporting/indicator-modal.html
index 645336677..cf2055e3f 100644
--- a/polymer/src/elements/cluster-reporting/indicator-modal.html
+++ b/polymer/src/elements/cluster-reporting/indicator-modal.html
@@ -29,6 +29,7 @@
@@ -36,10 +37,10 @@
:host {
display: block;
- --app-grid-columns: 3;
+ --app-grid-columns: 2;
--app-grid-gutter: 24px;
--app-grid-item-height: auto;
- --app-grid-expandible-item-columns: 3;
+ --app-grid-expandible-item-columns: 2;
--paper-dialog: {
width: 800px;
@@ -56,17 +57,49 @@
.full-width {
@apply --app-grid-expandible-item;
+ padding-top: 12px;
}
.app-grid {
padding-top: 0;
- margin: 0 -var(--app-grid-gutter);
+ }
+
+ .double {
+ padding-left: 0;
+ justify-content: space-between;
+ }
+
+ .title {
+ padding-top: 0;
+ }
+
+ .pair {
+ margin-right: 0;
+ }
+
+ .app-grid-triple {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ flex-direction: row;
+ }
+
+ .app-grid-triple .item {
+ width: 210px;
}
.item {
margin-bottom: 0;
}
+ #mode {
+ padding-top: 24px;
+ }
+
+ #custom-form-only {
+ padding-top: 20px;
+ }
+
.calculation-method:not(:first-child) {
margin-left: 50px;
}
@@ -80,12 +113,20 @@
}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -116,200 +177,582 @@ [[modalTitle]]
restamp="true">
-
-
- Quantity (#)
- Percent
- Ratio
-
-
-
-
-
-
-
-
+
+
+
+
+ Adopt from Cluster Objective
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Custom
+
+
+
+
-
+
+
+
+
+
+ Quantity (#)
+ Percent
+ Ratio
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ Quantity (#)
+ Percent
+ Ratio
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
@@ -322,7 +765,7 @@ [[modalTitle]]
+ on-tap="_close">
Cancel
@@ -344,6 +787,8 @@ [[modalTitle]]
properties: {
data: Object,
objectId: Number,
+ activityData: Object,
+ projectData: Object,
objectType: String,
modalTitle: String,
@@ -352,6 +797,11 @@ [[modalTitle]]
computed: '_computeIsNumber(data.blueprint.display_type)',
},
+ mode: {
+ type: String,
+ observer: '_setDefaults',
+ },
+
responsePlanId: {
type: String,
statePath: 'responsePlans.currentID',
@@ -364,7 +814,88 @@ [[modalTitle]]
indicatorsUrl: {
type: String,
- value: App.Endpoints.clusterIndicators(),
+ value: '',
+ },
+
+ indicatorsListUrl: {
+ type: String,
+ value: App.Endpoints.indicators('co') + '/',
+ },
+
+ indicatorsListParams: {
+ type: Object,
+ value: {},
+ },
+
+ activitiesUrl: String,
+
+ activitiesParams: {
+ type: Object,
+ value: {
+ page_size: 99999,
+ },
+ },
+
+ activities: {
+ type: Array,
+ value: [],
+ },
+
+ selectedActivity: {
+ type: String,
+ value: '',
+ },
+
+ clusters: {
+ format: Array,
+ value: [],
+ },
+
+ selectedCluster: {
+ type: String,
+ value: '',
+ },
+
+ objectives: {
+ type: Array,
+ value: [],
+ },
+
+ selectedObjective: {
+ type: String,
+ value: '',
+ },
+
+ objectivesParams: {
+ type: Object,
+ value: {}
+ },
+
+ indicators: {
+ type: Array,
+ value: [],
+ },
+
+ selectedIndicator: {
+ type: String,
+ value: '',
+ },
+
+ selectedIndicatorDetailType: String,
+
+ objectivesUrl: {
+ type: String,
+ computed: '_computeObjectivesUrl(responsePlanId)',
+ },
+
+ partnerID: {
+ type: String,
+ statePath: 'partner.current.id',
+ },
+
+ prpRoles: {
+ type: Array,
+ statePath: 'userProfile.profile.prp_roles',
},
updatePending: {
@@ -430,11 +961,36 @@ [[modalTitle]]
observers: [
'_setDefaults(opened)',
+ '_isClusterImo(prpRoles)',
'_resetCalculationFormulas(isNumber)',
'_resetFields(isNumber)',
'_updateCSDates(data.start_date_of_reporting_period)',
+ '_saveCluster(selectedCluster)',
+ '_fetchActivities(selectedCluster)',
+ '_fetchObjectivesList(selectedCluster)',
+ '_fetchIndicatorsList(selectedObjective)',
+ '_fetchActivityIndicatorsList(selectedActivity)',
+ '_fetchSelectedIndicatorDetailType(responsePlanId, selectedIndicator)',
],
+ _isClusterImo: function (prpRoles) {
+ var isImo = prpRoles.find(function (role) {
+ return role.role === 'CLUSTER_IMO';
+ });
+
+ if (isImo !== undefined && this.modalTitle === 'Add Cluster Objective Indicator'
+ || isImo !== undefined && this.modalTitle === 'Add Activity Indicator'
+ ) {
+ this.set('mode', 'custom');
+ return true;
+ } else if (isImo !== undefined && this.modalTitle === 'Add Project Indicator') {
+ this.set('imoInPartner', true);
+ return false;
+ } else {
+ return false;
+ }
+ },
+
_computeIsNumber: function (type) {
return type === 'number';
},
@@ -486,20 +1042,45 @@ [[modalTitle]]
return;
}
- this.set('selectedDisaggregations', []);
- this.set('errors', {});
- this.set('data', {
- blueprint: {
- display_type: 'number',
- calculation_formula_across_locations: 'sum',
- calculation_formula_across_periods: 'sum',
- },
- cs_dates: [],
- locations: [],
- disaggregations: [],
- });
+ if (this.mode === undefined) {
+ return;
+ }
- this._fetchDisaggregations();
+ if (this.mode === 'objectives') {
+ this.set('data', {
+ partner_id: this.projectData.partner_id || this.partnerID,
+ partner_project_id: '',
+ cluster_id: '',
+ cluster_objective_id: '',
+ reportable_id: '',
+ locations: [],
+ target: {d: 1},
+ baseline: {d: 1}
+ });
+
+ this.set('indicatorsUrl', App.Endpoints.adoptedClusterIndicators());
+ } else {
+ this.set('selectedDisaggregations', []);
+ this.set('errors', {});
+ this.set('data', {
+ blueprint: {
+ display_type: 'number',
+ calculation_formula_across_locations: 'sum',
+ calculation_formula_across_periods: 'sum',
+ },
+ cs_dates: [],
+ locations: [],
+ disaggregations: [],
+ });
+
+ if (this.mode === 'activity') {
+ this.set('indicatorsListUrl', App.Endpoints.indicators('ca') + '/');
+ }
+
+ this.set('indicatorsUrl', App.Endpoints.clusterIndicators());
+
+ this._fetchDisaggregations();
+ }
},
_validate: function (e) {
@@ -518,6 +1099,10 @@ [[modalTitle]]
return date ? this._normalizeDate(date) : null;
},
+ _computeObjectivesUrl: function (responsePlanId) {
+ return App.Endpoints.responseParametersClusterObjectives(responsePlanId);
+ },
+
_fetchDisaggregations: function() {
var self = this;
@@ -527,6 +1112,165 @@ [[modalTitle]]
});
},
+ _savePartner: function (selectedPartnerId) {
+ this.set('data.partner_id', selectedPartnerId);
+ },
+
+ _saveCluster: function () {
+ if (this.mode === 'objectives') {
+ this.set('data.cluster_id', this.selectedCluster);
+ }
+ },
+
+ _fetchActivities: function (clusterId) {
+ var self = this;
+ if (typeof clusterId === 'undefined' || typeof this.responsePlanId === 'undefined') {
+ return;
+ }
+ this.set('activities', []);
+ this.set('activitiesParams.cluster_id', clusterId);
+ this.set('activitiesUrl',
+ App.Endpoints.responseParametersClusterActivities(this.responsePlanId)
+ + '?cluster_id=' + clusterId);
+ this.$.activities.abort();
+
+ this.$.activities.thunk()()
+ .then(function (res) {
+ self.set('activities', res.data.results);
+ })
+ .catch(function (err) { // jshint ignore:line
+ // TODO: error handling
+ });
+ },
+
+ _fetchActivityIndicatorsList: function (selectedId) {
+ if (selectedId === '') {
+ return;
+ }
+
+ this.set('indicatorsListParams', {object_id: selectedId, page_size: 9999, page: 1});
+
+ this.debounce('fetch-indicators', function () {
+ var self = this;
+
+ this.set('indicators', []);
+
+ this.$.indicatorsList.abort();
+ this.$.indicatorsList.thunk()()
+ .then(function (res) {
+ var simpleIndicatorsList = [];
+
+ res.data.results.forEach(function (indicator) {
+ var simpleIndicator = indicator;
+ simpleIndicator.title = indicator.blueprint.title;
+
+ simpleIndicatorsList.push(simpleIndicator);
+ });
+
+ self.set('indicators', simpleIndicatorsList);
+ self.fire('details-loaded');
+ });
+ });
+ },
+
+ _fetchObjectivesList: function (selectedClusterId) {
+ if (selectedClusterId === '') {
+ return;
+ }
+
+ if (this.mode === 'objectives') {
+ this.set('data.cluster_id', selectedClusterId);
+ this.set('data.partner_project_id', parseInt(this.objectId));
+ }
+
+ this.debounce('fetch-objectives', function () {
+ var self = this;
+
+ this.set('objectives', []);
+ this.set('objectivesParams.cluster_id', selectedClusterId);
+
+ this.$.objectives.abort();
+ this.$.objectives.thunk()()
+ .then(function (res) {
+ self.set('objectives', res.data.results);
+ self.fire('details-loaded');
+ })
+ .catch(function (err) { // jshint ignore:line
+ // TODO: error handling
+ });
+ }, 100);
+ },
+
+ _fetchIndicatorsList: function (selectedObjectiveId) {
+ if (selectedObjectiveId === '') {
+ return;
+ }
+ this.set('data.cluster_objective_id', selectedObjectiveId);
+ this.set('indicatorsListParams', {object_id: selectedObjectiveId});
+
+ this.debounce('fetch-indicators', function () {
+ var self = this;
+
+ this.set('indicators', []);
+
+ this.$.indicatorsList.abort();
+ this.$.indicatorsList.thunk()()
+ .then(function (res) {
+ var simpleIndicatorsList = [];
+
+ res.data.results.forEach(function (indicator) {
+ var simpleIndicator = {};
+ simpleIndicator.id = indicator.id;
+ simpleIndicator.title = indicator.blueprint.title;
+
+ simpleIndicatorsList.push(simpleIndicator);
+ });
+
+ self.set('indicators', simpleIndicatorsList);
+ self.fire('details-loaded');
+ })
+ .catch(function (err) { // jshint ignore:line
+ // TODO: error handling
+ });
+ }, 100);
+ },
+
+ _fetchSelectedIndicatorDetailType: function (responsePlanId, selectedIndicator) {
+ if (selectedIndicator === undefined || selectedIndicator === '') {
+ return;
+ }
+
+ this.debounce('fetch-selected-indicator', function () {
+ var self = this;
+
+ if (this.mode === 'objectives') {
+ this.set('data.reportable_id', selectedIndicator);
+ }
+
+ if (this.mode === 'activity') {
+ var chosenActivityIndicator = this.indicators.find(function (indicator) {
+ return indicator.id === selectedIndicator;
+ });
+
+ this.set('data.blueprint.title', chosenActivityIndicator.title);
+ this.set('data.frequency', chosenActivityIndicator.frequency);
+ this.set('data.label', chosenActivityIndicator.label);
+ this.set('data.start_date_of_reporting_period', chosenActivityIndicator.start_date_of_reporting_period);
+ }
+
+ this.$.indicatorDetail.url = App.Endpoints.analysisIndicator(responsePlanId, selectedIndicator);
+
+ this.$.indicatorDetail.abort();
+ this.$.indicatorDetail.thunk()()
+ .then(function (res) {
+ self.set('selectedIndicatorDetailType', res.data.display_type);
+ })
+ .catch(function (err) { // jshint ignore:line
+ // TODO: error handling
+ });
+ }, 100);
+ },
+
_processData: function (rawData) {
var data = this._clone(rawData);
@@ -559,25 +1303,138 @@ [[modalTitle]]
_save: function () {
var self = this;
+ var noLocationSet = false;
+ var rawLocations = this.get('data.locations');
+
+ var changedLocations = rawLocations.map(function (location) {
+ if (location.location !== undefined && location.location.id !== undefined) {
+ var id = location.location.id;
+ var title = location.location.title;
+ location.location = id;
+ location.title = title;
+ return location;
+ } else if (location.loc_type !== undefined && location.location === undefined) {
+ self.set('errors', 'No location set - please set a location.');
+ noLocationSet = true;
+ return location;
+ } else {
+ return location;
+ }
+ });
+
+ if (noLocationSet === true) {
+ return;
+ }
+
if (!this._fieldsAreValid()) {
return;
}
- this.set('updatePending', true);
- this._setDisaggregations();
- this.$.indicators.body = this._processData(this.data);
-
- this.$.indicators.thunk()()
- .then(function (res) {
- self.fire('indicator-added', res.data);
- self.set('updatePending', false);
- self.set('errors', {});
- self.close();
- })
- .catch(function (err) {
- self.set('errors', err.data);
- self.set('updatePending', false);
+ this.set('data.locations', changedLocations);
+
+ if (this.mode === 'objectives') {
+ this._setDisaggregations();
+
+ var data = this.get('data');
+
+ if (this.selectedIndicatorDetailType === 'percentage') {
+ data.baseline.d = 100;
+ data.target.d = 100;
+
+ data.locations.forEach(function (location) {
+ location.baseline.d = 100;
+ location.target.d = 100;
+ });
+ } else if (this.selectedIndicatorDetailType === 'number') {
+ data.baseline.d = 1;
+ data.target.d = 1;
+
+ data.locations.forEach(function (location) {
+ location.baseline.d = 1;
+ location.target.d = 1;
+ });
+ }
+
+ data.baseline.v = parseInt(data.baseline.v);
+ data.target.v = parseInt(data.target.v);
+
+ data.baseline.d = parseInt(data.baseline.d);
+ data.target.d = parseInt(data.target.d);
+
+ data.baseline.c = data.baseline.v / data.baseline.d;
+ data.target.c = data.target.v / data.target.d;
+
+ data.locations.forEach(function (location) {
+ location.baseline.v = parseInt(location.baseline.v);
+ location.target.v = parseInt(location.target.v);
+
+ location.baseline.d = parseInt(location.baseline.d);
+ location.target.d = parseInt(location.target.d);
+
+ location.baseline.c = location.baseline.v / location.baseline.d;
+ location.target.c = location.target.v / location.target.d;
});
+
+ this.set('data', data);
+
+ this.$.indicators.body = this.data;
+
+ this.$.indicators.thunk()()
+ .then(function (res) {
+ self.fire('indicator-added', res.data);
+ self.set('updatePending', false);
+ self.set('errors', {});
+ self.close();
+ })
+ .catch(function (err) {
+ self.set('errors', err.data);
+ self.set('data.locations', rawLocations);
+ self.set('updatePending', false);
+ });
+ } else {
+ this.set('updatePending', true);
+ this._setDisaggregations();
+ this.$.indicators.body = this._processData(this.data);
+
+ this.$.indicators.thunk()()
+ .then(function (res) {
+ self.fire('indicator-added', res.data);
+ self.set('updatePending', false);
+ self.set('errors', {});
+ self.close();
+ })
+ .catch(function (err) {
+ self.set('errors', err.data);
+ self.set('data.locations', rawLocations);
+ self.set('updatePending', false);
+ });
+ }
+ },
+
+ _close: function (e) {
+ if (e.target.nodeName === 'PAPER-DIALOG' ||
+ e.target.nodeName === 'PAPER-BUTTON' ||
+ e.target.nodeName === 'PAPER-ICON-BUTTON') {
+ this.set('mode', '');
+ this.set('data', {});
+
+ this.set('clusters', []);
+ this.set('selectedCluster', '');
+
+ this.set('objectives', []);
+ this.set('selectedObjective', '');
+
+ this.set('activities', []);
+ this.set('selectedActivity', '');
+
+ this.set('indicators', []);
+ this.set('selectedIndicator', '');
+ this.set('selectedIndicatorDetailType', undefined);
+
+ this.close();
+ } else {
+ return;
+ }
},
});
diff --git a/polymer/src/elements/cluster-reporting/nav.html b/polymer/src/elements/cluster-reporting/nav.html
index 0b655cd54..e1616be42 100644
--- a/polymer/src/elements/cluster-reporting/nav.html
+++ b/polymer/src/elements/cluster-reporting/nav.html
@@ -16,6 +16,8 @@
@@ -204,62 +253,110 @@ Add activity
required>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[item.title]]
-
-
-
-
+
+ Projects ([[data.cluster.projects.length]])
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[item.title]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add Project
+
+
@@ -319,61 +416,99 @@ Add activity
required>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[item.title]]
-
-
-
-
+ Projects ([[data.custom.projects.length]])
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[item.title]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add Project
+
+
@@ -389,7 +524,7 @@ Add activity
+ on-tap="_close">
Cancel
@@ -527,6 +662,7 @@ Add activity
listeners: {
'mode.selected-changed': 'adjustPosition',
+ 'project-details-selection-refit': 'adjustPosition',
},
observers: [
@@ -535,10 +671,35 @@ Add activity
'_fetchObjectives(data.custom.cluster)',
],
+ _add: function () {
+ if (this.mode === 'cluster') {
+ this.push('data.cluster.projects', {});
+ } else {
+ this.push('data.custom.projects', {});
+ }
+ this.fire('project-details-selection-refit');
+ },
+
+ _remove: function (e) {
+ var currentIndex = +e.target.dataset.index;
+
+ if (this.mode === 'cluster') {
+ this.splice('data.cluster.projects', currentIndex, 1);
+ } else {
+ this.splice('data.custom.projects', currentIndex, 1);
+ }
+
+ this.fire('project-details-selection-refit');
+ },
+
_setDefaults: function () {
this.set('data', {
- cluster: {},
- custom: {},
+ cluster: {
+ projects: []
+ },
+ custom: {
+ projects: []
+ },
});
this.set('activities', []);
this.set('objectives', []);
@@ -547,7 +708,7 @@ Add activity
_onOpenedChanged: function (opened) {
if (opened) {
- this.set('mode', 'cluster');
+ // this.set('mode', 'cluster');
// this.async(function () {
// this.set('mode', 'cluster');
@@ -659,16 +820,35 @@ Add activity
partner: this.partner,
}, this.data[this.mode]);
this.$.activity.thunk()()
- .then(function (res) {
- self.fire('activity-added', res.data);
- self.set('updatePending', false);
- self.set('errors', {});
- self.close();
- })
- .catch(function (err) {
- self.set('errors', err.data);
- self.set('updatePending', false);
- });
+ .then(function (res) {
+ self.fire('activity-added', res.data);
+ self.set('updatePending', false);
+ self.set('errors', {});
+ self._close();
+ })
+ .catch(function (err) {
+ self.set('errors', err.data);
+ self.set('updatePending', false);
+ self.fire('project-details-selection-refit');
+ });
+ },
+
+ _close: function (e) {
+ if (e.target.nodeName === 'PAPER-DIALOG' ||
+ e.target.nodeName === 'PAPER-BUTTON' ||
+ e.target.nodeName === 'PAPER-ICON-BUTTON') {
+ this.set('mode', '');
+ this.set('data', {});
+
+ this.set('objectives', []);
+ this.set('activities', []);
+
+ this.set('errors', {});
+
+ this.close();
+ } else {
+ return;
+ }
},
});
diff --git a/polymer/src/elements/cluster-reporting/planned-action/activities/editing-modal.html b/polymer/src/elements/cluster-reporting/planned-action/activities/editing-modal.html
index 9d92f824a..e7976c74f 100644
--- a/polymer/src/elements/cluster-reporting/planned-action/activities/editing-modal.html
+++ b/polymer/src/elements/cluster-reporting/planned-action/activities/editing-modal.html
@@ -26,6 +26,7 @@
@@ -47,10 +48,82 @@
};
}
+ .app-grid {
+ margin: 0 -var(--app-grid-gutter);
+ padding-bottom: 24px;
+ }
+
+ .row {
+ margin-bottom: 1em;
+ }
+
+ .remove-btn {
+ width: 34px;
+ height: 34px;
+ color: var(--paper-deep-orange-a700);
+ }
+
+ .fields {
+ margin-left: 24px;
+ }
+
+ .add-project-btn {
+ width: 100px;
+ margin: 0;
+ text-align: start;
+
+ justify-content: flex-start;
+ }
+
+ h3 {
+ font-size: 14px;
+ }
+
+ header.item-wide {
+ background-color: var(--paper-grey-200);
+ padding: 2px 10px;
+ margin: 0 0 1em;
+ height: 24px;
+
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ }
+
.item-wide {
@apply --app-grid-expandible-item;
}
+ .col-actions {
+ width: 40px;
+ margin-right: 24px;
+ border-right: 1px solid var(--paper-grey-400);
+ }
+
+ paper-radio-group {
+ display: block;
+ padding-top: 16px;
+ }
+
+ paper-radio-group > .fields {
+ padding: calc(var(--app-grid-gutter) / 2) 0;
+ }
+
+ paper-radio-group > .fields[empty] {
+ padding: 0;
+ }
+
+ paper-radio-group .app-grid {
+ margin: -var(--app-grid-gutter);
+ }
+
+ paper-radio-button {
+ margin-left: -12px;
+ }
+
+ paper-dropdown-menu {
+ width: 100%;
+ }
+
+
+
+
+
+
Edit activity
if="[[_equals(mode, 'cluster')]]"
restamp="true">
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ [[item.title]]
+
+
+
+
+
+
+
+
+
+
+
+ Projects ([[data.projects.length]])
+
+
+
+
+
-
-
-
-
- [[item.title]]
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ [[item.title]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+ Add Project
+
+
+
+
+
+
+
+
+
+
+
+ [[item.title]]
+
+
+
+
+
+
+
+
+
+
+
+ Projects ([[data.projects.length]])
+
-
-
-
-
-
+ is="dom-repeat"
+ items="{{data.projects}}">
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[item.title]]
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ [[item.title]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ Add Project
+
+
+
@@ -253,6 +483,7 @@
Edit activity
data: Object,
activitiesUrl: String,
+
editData: {
type: Object,
value: {},
@@ -304,6 +535,28 @@
Edit activity
statePath: 'location.id',
},
+ clusters: {
+ type: Array,
+ statePath: 'responsePlans.current.clusters',
+ },
+
+ objectives: {
+ type: Array,
+ value: [],
+ },
+
+ objectivesParams: {
+ type: Object,
+ value: {
+ page_size: 99999,
+ },
+ },
+
+ objectivesUrl: {
+ type: String,
+ computed: '_computeObjectivesUrl(responsePlanId)',
+ },
+
projects: {
type: Array,
value: [],
@@ -332,22 +585,44 @@
Edit activity
},
},
+ listeners: {
+ 'project-details-selection-refit': 'adjustPosition',
+ },
+
observers: [
'_fetchProjects(partnerId)',
+ '_fetchActivities(data.cluster)',
+ '_fetchObjectives(data.cluster)',
],
+ _add: function () {
+ this.push('data.projects', {});
+ this.fire('project-details-selection-refit');
+ },
+
+ _remove: function (e) {
+ var currentIndex = +e.target.dataset.index;
+ this.splice('data.projects', currentIndex, 1);
+ this.fire('project-details-selection-refit');
+ },
+
_setDefaults: function () {
this.set('data', Object.assign({},
{id: this.editData.id,
- status: this.editData.status,
- start_date: this.editData.start_date,
- end_date: this.editData.end_date,
- project: this.editData.project.id}));
+ cluster: this.editData.cluster.id,
+ cluster_activity: null,
+ cluster_objective: this.editData.cluster_objective.id,
+ title: this.editData.title,
+ is_custom: this.editData.is_custom,
+ partner: this.editData.partner,
+ reportables: this.editData.reportables,
+ projects: this.editData.projects}));
if (this.editData.is_custom) {
this.set('data.title', this.editData.title);
+ } else {
+ this.set('data.cluster_activity', this.editData.cluster_activity.id);
}
-
},
open: function () {
@@ -375,6 +650,10 @@
Edit activity
return App.Endpoints.partnerActivityUpdate(responsePlanId, activityId);
},
+ _computeObjectivesUrl: function (responsePlanId) {
+ return App.Endpoints.responseParametersClusterObjectives(responsePlanId);
+ },
+
_computeProjectsUrl: function (responsePlanId) {
return App.Endpoints.plannedActions(responsePlanId);
},
@@ -387,6 +666,48 @@
Edit activity
}
},
+ _fetchActivities: function (clusterId) {
+ var self = this;
+ if (typeof clusterId === 'undefined') {
+ return;
+ }
+ this.set('activities', []);
+ this.set('activitiesParams.cluster_id', clusterId);
+ this.set('activitiesUrl',
+ App.Endpoints.responseParametersClusterActivities(this.responsePlanId)
+ + '?cluster_id=' + clusterId);
+ this.$.activities.abort();
+
+ this.$.activities.thunk()()
+ .then(function (res) {
+ self.set('activities', res.data.results);
+ })
+ .catch(function (err) { // jshint ignore:line
+ // TODO: error handling
+ });
+ },
+
+ _fetchObjectives: function (clusterId) {
+ var self = this;
+
+ if (typeof clusterId === 'undefined') {
+ return;
+ }
+
+ this.set('objectivesParams.cluster_id', clusterId);
+ this.set('objectives', []);
+
+ this.$.objectives.abort();
+
+ this.$.objectives.thunk()()
+ .then(function (res) {
+ self.set('objectives', res.data.results);
+ })
+ .catch(function (err) { // jshint ignore:line
+ // TODO: error handling
+ });
+ },
+
_fetchProjects: function (partnerId) {
var self = this;
diff --git a/polymer/src/elements/cluster-reporting/planned-action/projects/creation-modal.html b/polymer/src/elements/cluster-reporting/planned-action/projects/creation-modal.html
index 7759d1584..d937e1124 100644
--- a/polymer/src/elements/cluster-reporting/planned-action/projects/creation-modal.html
+++ b/polymer/src/elements/cluster-reporting/planned-action/projects/creation-modal.html
@@ -41,6 +41,7 @@
+
@@ -230,12 +231,13 @@
@@ -425,6 +427,23 @@ Fields required
+
+
+
+
+
+
+
+
Fields required
on-input="_validate">
-
-
-
Fields required
Save
-
+
Cancel
@@ -928,11 +938,20 @@
Fields required
return App.Endpoints.ochaProjectDetails(selectedProject);
},
- close: function () {
- this.set('data', {});
- this.set('opened', false);
- this.set('refresh', false);
- this.set('detailsOpened', false);
+ _close: function (e) {
+ if (e.target.nodeName === 'PAPER-DIALOG' ||
+ e.target.nodeName === 'PAPER-BUTTON' ||
+ e.target.nodeName === 'PAPER-ICON-BUTTON') {
+ this.set('data', {});
+ this.set('opened', false);
+ this.set('refresh', false);
+ this.set('detailsOpened', false);
+ this.set('errors', {});
+
+ this.close();
+ } else {
+ return;
+ }
},
open: function () {
@@ -946,7 +965,12 @@
Fields required
if (!this.canAddOchaProjects) {
this.set('mode', 'custom');
}
- this.data = {'custom_fields': [], 'funding': {}};
+ this.data = {
+ 'custom_fields': [],
+ 'funding': {},
+ 'locations': [],
+ 'description': '',
+ };
this.selectedClusters = [];
}
this.set('opened', true);
@@ -1096,7 +1120,9 @@
Fields required
this.set('selectedPartner', {});
this.set('data', {
'custom_fields': [],
- 'funding': {}
+ 'funding': {},
+ 'locations': [],
+ 'description': '',
});
this.set('projectDetails', {});
this.set('errors', {});
@@ -1104,6 +1130,34 @@
Fields required
_save: function () {
var self = this;
+
+ var locationError = false;
+ var rawLocations = this.get('data.locations');
+
+ var changedLocations = rawLocations.map(function (location) {
+ if (location.location !== undefined) {
+ return location.location;
+ } else {
+ return location;
+ }
+ });
+
+ changedLocations.forEach(function (location) {
+ if (location.title === undefined) {
+ self.set('errors', 'No location set - please set a location.');
+ locationError = true;
+ } else if (changedLocations[0].admin_level !== location.admin_level) {
+ self.set('errors', 'All locations need to have the same admin level.');
+ locationError = true;
+ }
+ });
+
+ if (locationError === true) {
+ return;
+ }
+
+ this.set('data.locations', changedLocations);
+
if (!this.data.partner_id) {
this.data.partner_id = this.partnerID;
}
@@ -1128,7 +1182,8 @@
Fields required
.catch(function (err) { // jshint ignore:line
self.updatePending = false;
self.set('errors', err.data);
- });
+ self.set('data.locations', rawLocations); // If there are backend validation errors, reset locations
+ }); // to what they were before request was sent!
},
detached: function () {
@@ -1139,4 +1194,4 @@
Fields required
},
});
-
+
\ No newline at end of file
diff --git a/polymer/src/elements/cluster-reporting/project-details.html b/polymer/src/elements/cluster-reporting/project-details.html
index 5666c2b48..1ac824fc2 100644
--- a/polymer/src/elements/cluster-reporting/project-details.html
+++ b/polymer/src/elements/cluster-reporting/project-details.html
@@ -16,7 +16,7 @@
--app-grid-columns:4;
--app-grid-gutter: 25px;
--app-grid-item-height: auto;
- --app-grid-expandible-item-columns: 4;
+ --app-grid-expandible-item-columns: 3;
}
.app-grid {
@@ -25,10 +25,26 @@
list-style: none;
}
- .full-width {
+ .extended {
@apply(--app-grid-expandible-item);
}
+ .location {
+ margin: 2px 0px;
+ }
+
+ .top-row {
+ display: flex;
+ justify-content: flex-start;
+ align-items: flex-start;
+ flex-direction: row;
+ }
+
+ .top-element {
+ margin-right: 50px;
+ min-width: 200px;
+ }
+
ul {
padding-left: 0;
}
@@ -60,12 +76,22 @@
-
+
[[projectData.title]]
+
+
+
+ [[item.title]]
+
+
+
+
[[_commaSeparatedDictValues(projectData.clusters, 'title')]]
diff --git a/polymer/src/elements/cluster-reporting/response-parameters/partners/activities/indicators.html b/polymer/src/elements/cluster-reporting/response-parameters/partners/activities/indicators.html
index 936129b48..97016867c 100644
--- a/polymer/src/elements/cluster-reporting/response-parameters/partners/activities/indicators.html
+++ b/polymer/src/elements/cluster-reporting/response-parameters/partners/activities/indicators.html
@@ -59,6 +59,7 @@
diff --git a/polymer/src/elements/cluster-reporting/response-parameters/partners/projects/indicators.html b/polymer/src/elements/cluster-reporting/response-parameters/partners/projects/indicators.html
index 840496fc0..94169b403 100644
--- a/polymer/src/elements/cluster-reporting/response-parameters/partners/projects/indicators.html
+++ b/polymer/src/elements/cluster-reporting/response-parameters/partners/projects/indicators.html
@@ -59,6 +59,7 @@
diff --git a/polymer/src/elements/disaggregations/disaggregation-field.html b/polymer/src/elements/disaggregations/disaggregation-field.html
index 4b91e29ec..4dcafb13a 100644
--- a/polymer/src/elements/disaggregations/disaggregation-field.html
+++ b/polymer/src/elements/disaggregations/disaggregation-field.html
@@ -73,6 +73,7 @@
},
attached: function () {
+ this.$.field.validate();
this.fire('register-field', this);
},
diff --git a/polymer/src/elements/disaggregations/disaggregation-modal.html b/polymer/src/elements/disaggregations/disaggregation-modal.html
index 018ee116d..18d6c7b81 100644
--- a/polymer/src/elements/disaggregations/disaggregation-modal.html
+++ b/polymer/src/elements/disaggregations/disaggregation-modal.html
@@ -8,6 +8,8 @@
@@ -475,7 +445,7 @@ Percentage funded by:
.map(function (location) {
return {
title: location.reporting_entity.title,
- percentage: Number(location.percentage_allocated),
+ percentage: 1,
};
});
},
diff --git a/polymer/src/elements/error-box.html b/polymer/src/elements/error-box.html
index 0918e07e9..41442848d 100644
--- a/polymer/src/elements/error-box.html
+++ b/polymer/src/elements/error-box.html
@@ -92,6 +92,9 @@
value: error,
},
];
+
+ case 'undefined':
+ return [];
default:
return Object.keys(error)
diff --git a/polymer/src/elements/error-modal.html b/polymer/src/elements/error-modal.html
index ad91c8cf6..5b1a08394 100644
--- a/polymer/src/elements/error-modal.html
+++ b/polymer/src/elements/error-modal.html
@@ -2,6 +2,10 @@
@@ -26,9 +30,9 @@
- [[error]]
+ items="[[localizedErrors]]"
+ as="localizedError">
+ [[localizedError]]
@@ -46,12 +50,24 @@
Polymer({
is: 'error-modal',
+ behaviors: [
+ App.Behaviors.ReduxBehavior,
+ App.Behaviors.UtilsBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
+ ],
+
properties: {
errors: {
type: Array,
value: [],
},
+ localizedErrors: {
+ type: Array,
+ computed: '_localizeErrors(errors, localize)'
+ },
+
opened: {
type: Boolean,
value: false,
@@ -77,6 +93,32 @@
return this._result;
},
+ _localizeErrors: function (errors, localize) {
+ if (errors.length === 0) {
+ return;
+ }
+
+ var localizedErrors = errors.map(function (error) {
+ switch (error) {
+ case 'You have not selected overall status for one of Outputs':
+ return localize('not_selected_overall_status');
+ case 'You have not completed Partner Contribution To Date field on Other Info tab.':
+ return localize('not_completed_partner_contribution');
+ case 'You have not completed Challenges / bottlenecks in the reporting period field on Other Info tab.':
+ return localize('not_completed_challenges_bottlenecks');
+ case 'You have not completed Proposed way forward field on Other Info tab.':
+ return localize('not_completed_proposed_way');
+ case 'You have not completed all indicator location data across all indicator reports for this progress' +
+ ' report.':
+ return localize('not_completed_indicator_location');
+ default:
+ return error;
+ }
+ });
+
+ return localizedErrors;
+ },
+
close: function () {
this.set('errors', []);
this.set('opened', false);
diff --git a/polymer/src/elements/etools-prp-ajax.html b/polymer/src/elements/etools-prp-ajax.html
index 0f231aade..8ee1fa0f1 100644
--- a/polymer/src/elements/etools-prp-ajax.html
+++ b/polymer/src/elements/etools-prp-ajax.html
@@ -91,6 +91,12 @@
notify: true,
},
+ lastProgress: {
+ notify: true,
+ readOnly: true,
+ type: Object,
+ },
+
activeRequests: {
notify: true,
},
@@ -158,6 +164,7 @@
thunk: function () {
return (function () {
var req = this.generateRequest();
+
var self = this;
return req.completes
diff --git a/polymer/src/elements/etools-prp-languages.html b/polymer/src/elements/etools-prp-languages.html
new file mode 100644
index 000000000..a8b3d0288
--- /dev/null
+++ b/polymer/src/elements/etools-prp-languages.html
@@ -0,0 +1,49 @@
+
+
+
+
+
diff --git a/polymer/src/elements/etools-prp-permissions.html b/polymer/src/elements/etools-prp-permissions.html
index 3eecd0371..f048acaf3 100644
--- a/polymer/src/elements/etools-prp-permissions.html
+++ b/polymer/src/elements/etools-prp-permissions.html
@@ -29,6 +29,7 @@
editProgressReport: [
App.Constants.PRP_ROLE.IP_AUTHORIZED_OFFICER,
App.Constants.PRP_ROLE.IP_EDITOR,
+ App.Constants.PRP_ROLE.IP_ADMIN,
],
exportSubmittedProgressReport: [
@@ -39,6 +40,7 @@
savePdReport: [
App.Constants.PRP_ROLE.IP_AUTHORIZED_OFFICER,
App.Constants.PRP_ROLE.IP_EDITOR,
+ App.Constants.PRP_ROLE.IP_ADMIN,
],
changeProgrammeDocumentCalculationMethod: [
@@ -115,9 +117,13 @@
return responsePlanClusters.some(function (cluster) {
return params.prpRoles.some(function (item) {
- return item.role === App.Constants.PRP_ROLE.CLUSTER_SYSTEM_ADMIN ||
- (String(item.cluster.id) === String(cluster.id) &&
- allowedRoles.indexOf(item.role) > -1);
+ if (item.cluster === null) {
+ return item.role === App.Constants.PRP_ROLE.CLUSTER_SYSTEM_ADMIN;
+ } else {
+ return item.role === App.Constants.PRP_ROLE.CLUSTER_SYSTEM_ADMIN ||
+ (String(item.cluster.id) === String(cluster.id) &&
+ allowedRoles.indexOf(item.role) > -1);
+ }
});
});
},
@@ -127,9 +133,13 @@
return entityClusters.some(function (cluster) {
return params.prpRoles.some(function (item) {
- return item.role === App.Constants.PRP_ROLE.CLUSTER_SYSTEM_ADMIN ||
- (String(item.cluster.id) === String(cluster.id) &&
- allowedRoles.indexOf(item.role) > -1);
+ if (item.cluster === null) {
+ return item.role === App.Constants.PRP_ROLE.CLUSTER_SYSTEM_ADMIN;
+ } else {
+ return item.role === App.Constants.PRP_ROLE.CLUSTER_SYSTEM_ADMIN ||
+ (String(item.cluster.id) === String(cluster.id) &&
+ allowedRoles.indexOf(item.role) > -1);
+ }
});
});
},
diff --git a/polymer/src/elements/etools-prp-progress-bar-alt.html b/polymer/src/elements/etools-prp-progress-bar-alt.html
index 129737ce2..c63884bf3 100644
--- a/polymer/src/elements/etools-prp-progress-bar-alt.html
+++ b/polymer/src/elements/etools-prp-progress-bar-alt.html
@@ -17,7 +17,7 @@
}
-
+
diff --git a/polymer/src/elements/filter-list.html b/polymer/src/elements/filter-list.html
index bd0aff9fa..72315822e 100644
--- a/polymer/src/elements/filter-list.html
+++ b/polymer/src/elements/filter-list.html
@@ -6,6 +6,10 @@
+
+
+
+
@@ -44,7 +48,7 @@
if="[[!hideClear]]"
restamp="true">
-
Clear
+
[[localize('clear')]]
@@ -55,6 +59,12 @@
Polymer({
is: 'filter-list',
+ behaviors: [
+ App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
+ ],
+
properties: {
queryParams: Object,
filters: Array,
diff --git a/polymer/src/elements/filters/cluster-indicator-type-filter/cluster-indicator-type-filter.html b/polymer/src/elements/filters/cluster-indicator-type-filter/cluster-indicator-type-filter.html
index 8d187ba3e..c54e541c0 100644
--- a/polymer/src/elements/filters/cluster-indicator-type-filter/cluster-indicator-type-filter.html
+++ b/polymer/src/elements/filters/cluster-indicator-type-filter/cluster-indicator-type-filter.html
@@ -38,13 +38,24 @@
],
properties: {
- isPartner: Boolean,
+ isPartner: {
+ type: Boolean,
+ computed: '_computeRole(currentUserRoles)',
+ },
+
+ currentUserRoles: {
+ type: Array,
+ statePath: 'userProfile.profile.prp_roles'
+ },
+
data: {
type: Array,
computed: '_computeData(isPartner)',
},
+
value: String,
},
+
_computeData: function (isPartner) {
if (isPartner) {
return options.filter(function (option) {
@@ -53,7 +64,13 @@
}
return options;
- }
+ },
+
+ _computeRole: function (roles) {
+ return roles.every(function (role) {
+ return role.role !== 'CLUSTER_IMO';
+ });
+ },
});
diff --git a/polymer/src/elements/filters/dropdown-filter/dropdown-filter-multi.html b/polymer/src/elements/filters/dropdown-filter/dropdown-filter-multi.html
index 1a5ad3c7a..b41b6b7c7 100644
--- a/polymer/src/elements/filters/dropdown-filter/dropdown-filter-multi.html
+++ b/polymer/src/elements/filters/dropdown-filter/dropdown-filter-multi.html
@@ -82,6 +82,10 @@
_handleData: function (data) {
if (data.length) {
this._filterReady();
+ } else if (this.name === 'location') {
+ // Locations get populated by PDs so user can filter by location, so if there are no PDs,
+ // there are no locations - in that case, fire filterReady method to have filters stop loading.
+ this._filterReady();
}
},
diff --git a/polymer/src/elements/filters/dropdown-filter/dropdown-filter.html b/polymer/src/elements/filters/dropdown-filter/dropdown-filter.html
index 9fb5e7a44..2a16c955b 100644
--- a/polymer/src/elements/filters/dropdown-filter/dropdown-filter.html
+++ b/polymer/src/elements/filters/dropdown-filter/dropdown-filter.html
@@ -5,6 +5,10 @@
+
+
+
+
@@ -47,6 +51,10 @@
behaviors: [
App.Behaviors.FilterBehavior,
+ App.Behaviors.ReduxBehavior,
+ App.Behaviors.UtilsBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
diff --git a/polymer/src/elements/filters/location-filter-multi/location-filter-multi-narrowed.html b/polymer/src/elements/filters/location-filter-multi/location-filter-multi-narrowed.html
index 838169fb2..57ad70c4b 100644
--- a/polymer/src/elements/filters/location-filter-multi/location-filter-multi-narrowed.html
+++ b/polymer/src/elements/filters/location-filter-multi/location-filter-multi-narrowed.html
@@ -7,6 +7,8 @@
@@ -32,9 +34,10 @@
@@ -47,6 +50,8 @@
behaviors: [
App.Behaviors.ReduxBehavior,
App.Behaviors.FilterDependenciesBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
@@ -92,7 +97,7 @@
this.$.locations.thunk()()
.then(function (res) {
self.set('pending', false);
- self.set('data', res.data);
+ self.set('data', res.data.results);
})
.catch(function (err) { // jshint ignore:line
// TODO: error handling
@@ -101,6 +106,13 @@
});
},
+ _onValueChanged: function (e) {
+
+ if (e.detail.value === '') {
+ return;
+ }
+ },
+
detached: function () {
if (this.isDebouncerActive('fetch-locations')) {
this.cancelDebouncer('fetch-locations');
diff --git a/polymer/src/elements/filters/location-filter-multi/location-filter-multi.html b/polymer/src/elements/filters/location-filter-multi/location-filter-multi.html
index 937a4e750..119b457f0 100644
--- a/polymer/src/elements/filters/location-filter-multi/location-filter-multi.html
+++ b/polymer/src/elements/filters/location-filter-multi/location-filter-multi.html
@@ -4,6 +4,8 @@
@@ -19,7 +21,7 @@
@@ -32,6 +34,8 @@
behaviors: [
App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
diff --git a/polymer/src/elements/filters/location-filter/location-filter.html b/polymer/src/elements/filters/location-filter/location-filter.html
index f0b20871c..35f0ba556 100644
--- a/polymer/src/elements/filters/location-filter/location-filter.html
+++ b/polymer/src/elements/filters/location-filter/location-filter.html
@@ -4,6 +4,8 @@
@@ -19,7 +21,7 @@
@@ -32,6 +34,8 @@
behaviors: [
App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
diff --git a/polymer/src/elements/filters/partner-project-filter-multi/partner-project-filter-multi.html b/polymer/src/elements/filters/partner-project-filter-multi/partner-project-filter-multi.html
new file mode 100644
index 000000000..bbe9e0b99
--- /dev/null
+++ b/polymer/src/elements/filters/partner-project-filter-multi/partner-project-filter-multi.html
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/polymer/src/elements/filters/pd-filter/pd-dropdown-filter.html b/polymer/src/elements/filters/pd-filter/pd-dropdown-filter.html
index 09b7a8196..2dc6e35ae 100644
--- a/polymer/src/elements/filters/pd-filter/pd-dropdown-filter.html
+++ b/polymer/src/elements/filters/pd-filter/pd-dropdown-filter.html
@@ -4,6 +4,8 @@
@@ -20,7 +22,7 @@
@@ -33,6 +35,8 @@
behaviors: [
App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
diff --git a/polymer/src/elements/filters/report-location-filter/report-location-filter.html b/polymer/src/elements/filters/report-location-filter/report-location-filter.html
index 98c80412d..ee8c4fb7e 100644
--- a/polymer/src/elements/filters/report-location-filter/report-location-filter.html
+++ b/polymer/src/elements/filters/report-location-filter/report-location-filter.html
@@ -4,6 +4,8 @@
@@ -19,7 +21,7 @@
@@ -32,6 +34,8 @@
behaviors: [
App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
diff --git a/polymer/src/elements/filters/reportable-filter/reportable-filter.html b/polymer/src/elements/filters/reportable-filter/reportable-filter.html
index 8e03d512c..3244d7cda 100644
--- a/polymer/src/elements/filters/reportable-filter/reportable-filter.html
+++ b/polymer/src/elements/filters/reportable-filter/reportable-filter.html
@@ -3,6 +3,8 @@
@@ -14,7 +16,7 @@
@@ -27,6 +29,8 @@
behaviors: [
App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
diff --git a/polymer/src/elements/filters/status-filter/project-status-filter.html b/polymer/src/elements/filters/status-filter/project-status-filter.html
index 298d21c10..c45d0b185 100644
--- a/polymer/src/elements/filters/status-filter/project-status-filter.html
+++ b/polymer/src/elements/filters/status-filter/project-status-filter.html
@@ -2,6 +2,9 @@
@@ -13,7 +16,7 @@
@@ -27,6 +30,9 @@
behaviors: [
App.Behaviors.UtilsBehavior,
+ App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
diff --git a/polymer/src/elements/indicator-details.html b/polymer/src/elements/indicator-details.html
index 4b8a4f770..8f28dffe2 100644
--- a/polymer/src/elements/indicator-details.html
+++ b/polymer/src/elements/indicator-details.html
@@ -8,6 +8,8 @@
+ if="[[isHfIndicator]]">
@@ -160,213 +219,223 @@
-
-
-
-
-
- Programme document:
- [[currentPD.title]]
-
-
-
-
-
- Indicator:
- [[indicatorName]]
-
-
-
-
- Indicator status:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[[indicatorName]]
behaviors: [
App.Behaviors.ReduxBehavior,
App.Behaviors.UtilsBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
@@ -486,7 +557,12 @@ [[indicatorName]]
disablePull: {
type: Boolean,
computed: '_computeDisablePull(reportStatus)'
- }
+ },
+
+ isHfIndicator: {
+ type: Boolean,
+ computed: '_computeIsHfIndicator(disaggregations)'
+ },
},
listeners: {
@@ -543,6 +619,12 @@ [[indicatorName]]
return this._clone(data[key]);
},
+ _computeIsHfIndicator: function (disaggregations) {
+ return disaggregations !== undefined
+ && this.reportIsQpr === true
+ && disaggregations.is_hf_indicator === true;
+ },
+
_computeMode: function (mode, overrideMode) {
return overrideMode || mode;
},
diff --git a/polymer/src/elements/ip-reporting/app-header.html b/polymer/src/elements/ip-reporting/app-header.html
index a67d0e46b..d0c853d75 100644
--- a/polymer/src/elements/ip-reporting/app-header.html
+++ b/polymer/src/elements/ip-reporting/app-header.html
@@ -8,7 +8,9 @@
+
+
diff --git a/polymer/src/elements/ip-reporting/authorized-officer-modal.html b/polymer/src/elements/ip-reporting/authorized-officer-modal.html
index a534416cc..1c2a74c3a 100644
--- a/polymer/src/elements/ip-reporting/authorized-officer-modal.html
+++ b/polymer/src/elements/ip-reporting/authorized-officer-modal.html
@@ -18,7 +18,10 @@
@@ -50,23 +53,20 @@
- Your report could not be submitted, because you are not the authorized officer assigned
- to the PCA that is connected to that PD. Please select the authorized officer on
- behalf of whom this report is submitted.
-
+ [[localize('could_not_be_submitted')]]
@@ -89,13 +89,13 @@ Your report could not be submitted, because you are not the authorized offic
on-tap="_save"
raised
disabled="[[busy]]">
- Submit
+ [[localize('submit')]]
- Cancel
+ [[localize('cancel')]]
Your report could not be submitted, because you are not the authorized offic
App.Behaviors.ModalBehavior,
App.Behaviors.UtilsBehavior,
App.Behaviors.RoutingBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
@@ -146,22 +148,11 @@ Your report could not be submitted, because you are not the authorized offic
},
_computePostBody: function (selectedFocalPoint) {
- return {
- submitted_by_email: selectedFocalPoint,
- };
+ return AuthorizedOfficerModalUtils.computePostBody(selectedFocalPoint);
},
_computeAuthorizedPartners: function (pd) {
- var partners = (pd.unicef_officers || []).filter(function(partner) {
- return partner.is_authorized_officer && partner.active;
- });
- var formattedPartners = partners.map(function (partner) {
- return {
- value: partner.email,
- title: partner.name + ' ' + partner.title
- };
- });
- return formattedPartners;
+ return AuthorizedOfficerModalUtils.computeAuthorizedPartners(pd);
},
_validate: function (e) {
diff --git a/polymer/src/elements/ip-reporting/indicators-filters.html b/polymer/src/elements/ip-reporting/indicators-filters.html
index 5026fcfe8..e1cbb8fc4 100644
--- a/polymer/src/elements/ip-reporting/indicators-filters.html
+++ b/polymer/src/elements/ip-reporting/indicators-filters.html
@@ -10,6 +10,9 @@
@@ -80,6 +83,9 @@
behaviors: [
App.Behaviors.UtilsBehavior,
+ App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
@@ -88,20 +94,23 @@
pd_statuses: {
type: Array,
- value: function () {
- return [
- {title: 'Signed', id: 'Sig'},
- {title: 'Active', id: 'Act'},
- {title: 'Suspended', id: 'Sus'},
- {title: 'Ended', id: 'End'},
- {title: 'Closed', id: 'Clo'},
- {title: 'Terminated', id: 'Ter'},
- ];
- },
+ computed: '_initStatuses(localize)',
},
},
+ _initStatuses: function (localize) {
+ var statuses = [
+ {title: localize('signed'), id: 'Sig'},
+ {title: localize('active'), id: 'Act'},
+ {title: localize('suspended'), id: 'Sus'},
+ {title: localize('ended'), id: 'End'},
+ {title: localize('closed'), id: 'Clo'},
+ {title: localize('terminated'), id: 'Ter'},
+ ];
+
+ return statuses;
+ },
});
diff --git a/polymer/src/elements/ip-reporting/indicators-toolbar.html b/polymer/src/elements/ip-reporting/indicators-toolbar.html
index a6db3707c..8db0b8d79 100644
--- a/polymer/src/elements/ip-reporting/indicators-toolbar.html
+++ b/polymer/src/elements/ip-reporting/indicators-toolbar.html
@@ -5,6 +5,8 @@
-
+
-
+
[[_withDefault(partner.title)]]
-
+
[[_withDefault(partner.short_title)]]
-
+
[[_withDefault(partner.alternate_title)]]
-
+
[[_withDefault(partner.vendor_number)]]
-
+
[[_computePartnerType(partner)]]
-
+
[[_withDefault(partner.shared_partner_display)]]
-
+
[[_withDefault(partner.core_values_assessment_date)]]
@@ -89,7 +93,7 @@
-
+
-
+
-
+
+
+
+
+
-
+
-
+
[[_withDefault(pd.agreement)]]
-
+
[[_withDefault(pd.document_type_display)]]
-
+
[[_withDefault(pd.reference_number)]]
-
+
[[_withDefault(pd.title)]]
@@ -118,43 +128,43 @@
-
+
[[_withDefault(pd.unicef_office)]]
-
+
[[_formatFocalPoint(pd.unicef_focal_point)]]
-
+
[[_formatFocalPoint(pd.partner_focal_point)]]
-
+
-
+
-
+
[[_withDefault(pd.start_date)]]
-
+
[[_withDefault(pd.end_date)]]
-
+
-
+
-
+
-
+
-
-
-
+
[[_commaSeparatedDictValues(pd.locations, 'title')]]
@@ -212,15 +221,15 @@
is="dom-if"
if="[[_hasAmendments(pd)]]"
restamp="true">
-
+
- Amendment Types
+ [[localize('amendment_types')]]
- Signed Date
+ [[localize('signed_date')]]
@@ -232,7 +241,7 @@
- [[amendment.types]]
+ [[_displayFullName(amendment.types)]]
[[amendment.signed_date]]
@@ -243,22 +252,22 @@
-
+
@@ -274,6 +283,8 @@
behaviors: [
App.Behaviors.UtilsBehavior,
App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
@@ -283,20 +294,64 @@
statePath: App.Selectors.ProgrammeDocuments.current,
},
+ amendmentTypes: {
+ type: Object,
+ value: {
+ dates: 'Dates',
+ results: 'Results',
+ budget: 'Budget',
+ admin_error: 'Type 1: Administrative error (correction)',
+ budget_lte_20: 'Type 2: Budget <= 20%',
+ budget_gt_20: 'Type 3: Budget > 20%',
+ change: 'Type 4: Changes to planned results',
+ no_cost: 'Type 5: No cost extension',
+ other: 'Type 6: Other'
+ }
+ },
+
loaded: {
type: Boolean,
value: false,
computed: '_computeLoaded(pd)',
},
+ locationId: {
+ type: String,
+ statePath: 'location.id',
+ },
+
reportingRequirements: {
type: Object,
computed: '_computeReportingRequirements(pd.reporting_periods)',
},
+
+ pdId: {
+ type: String,
+ statePath: 'programmeDocuments.current',
+ },
+
+ programmeDocumentsUrl: {
+ type: String,
+ computed: '_computeProgrammeDocumentsUrl(locationId)',
+ },
+
+ pdReportsCount: {
+ type: Object,
+ statePath: 'programmeDocumentReports.countByPD',
+ observer: '_getPdReports',
+ },
+ },
+
+ _computeFunds: function (num) {
+ if (num === null || num === -1) {
+ return num;
+ } else {
+ return 'N/A';
+ }
},
_computeLoaded: function (pd) {
- return !!pd.id;
+ return PdDetailsOverviewUtils.computeLoaded(pd);
},
_formatFocalPoint: function (items) {
@@ -304,32 +359,53 @@
},
_hasAmendments: function (pd) {
- return pd.amendments && !!pd.amendments.length;
+ return PdDetailsOverviewUtils.hasAmendments(pd);
},
_computeReportingRequirements: function (reportingPeriods) {
- var byType = (reportingPeriods || []).reduce(function (acc, curr) {
- var type = curr.report_type.toLowerCase();
-
- if (!acc[type]) {
- acc[type] = [];
- }
+ return PdDetailsOverviewUtils.computeReportingRequirements(reportingPeriods, moment, App.Settings.dateFormat);
+ },
- acc[type].push(curr);
+ _computeProgrammeDocumentsUrl: function (locationId) {
+ return locationId ? App.Endpoints.programmeDocuments(locationId) : '';
+ },
- return acc;
- }, {});
+ _displayFullName: function (types) {
+ var self = this;
- Object.keys(byType).forEach(function (type) {
- byType[type].sort(function (a, b) {
- var dateA = moment(a.start_date, App.Settings.dateFormat).toDate();
- var dateB = moment(b.start_date, App.Settings.dateFormat).toDate();
+ if (!types) {
+ return '';
+ }
- return dateA - dateB;
- });
- });
+ return types
+ .map(function (type) {
+ return self.amendmentTypes[type] ? self.amendmentTypes[type] : type;
+ })
+ .join(', ');
+ },
- return byType;
+ _getPdReports: function () {
+ // Status being present prevents Redux / res.data from getting reports,
+ // preventing pd-details title from rendering. In that case (which we
+ // check by seeing if this.pdReportsCount is present), just get the reports again
+ if (this.pdReportsCount[this.pdId] === undefined) {
+ this.debounce('fetch-pds', function () {
+ var pdThunk = this.$.programmeDocuments;
+ pdThunk.params = {
+ page: 1,
+ page_size: 10,
+ programme_document: this.pdId
+ };
+
+ // Cancel the pending request, if any
+ this.$.programmeDocuments.abort();
+
+ this.dispatch(App.Actions.PD.fetch(pdThunk.thunk()))
+ .catch(function (err) { // jshint ignore:line
+ // TODO: error handling
+ });
+ }, 100);
+ }
},
});
diff --git a/polymer/src/elements/ip-reporting/pd-details-reporting-requirements.html b/polymer/src/elements/ip-reporting/pd-details-reporting-requirements.html
index c18f67f78..ec503f61d 100644
--- a/polymer/src/elements/ip-reporting/pd-details-reporting-requirements.html
+++ b/polymer/src/elements/ip-reporting/pd-details-reporting-requirements.html
@@ -4,6 +4,11 @@
@@ -31,13 +36,13 @@ [[title]]
- Report #
+ [[localize('report_number')]]
- Due date
+ [[localize('due_date')]]
- Reporting period
+ [[localize('reporting_period')]]
@@ -47,7 +52,7 @@ [[title]]
- [[_getReportName(item.report_type, index)]]
+ [[_getReportName(item.report_type, index, localize)]]
[[item.due_date]]
@@ -74,6 +79,8 @@
[[title]]
behaviors: [
App.Behaviors.UtilsBehavior,
App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
@@ -82,8 +89,8 @@
[[title]]
title: String,
},
- _getReportName: function (type, index) {
- return type + (index + 1);
+ _getReportName: function (type, index, localize) {
+ return PdDetailsReportingRequirementsUtils.getReportName(type, index, localize);
},
});
diff --git a/polymer/src/elements/ip-reporting/pd-details-reports.html b/polymer/src/elements/ip-reporting/pd-details-reports.html
index b7c7c99e7..3f88a2b5b 100644
--- a/polymer/src/elements/ip-reporting/pd-details-reports.html
+++ b/polymer/src/elements/ip-reporting/pd-details-reports.html
@@ -9,6 +9,8 @@
+
+
+
+
+
+
+
+
- Import Template
+ [[localize('import_template')]]
- Generate Uploader Template
+ [[localize('generate_uploader')]]
+
+
+ [[localize('refresh')]]
+
+
@@ -42,7 +76,9 @@
behaviors: [
App.Behaviors.UtilsBehavior,
- App.Behaviors.ReduxBehavior
+ App.Behaviors.ReduxBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
@@ -80,6 +116,40 @@
type: String,
computed: '_appendQuery(pdReportUrl, query, \'export=xlsx\')',
},
+
+ currentReport: {
+ type: Object,
+ statePath: App.Selectors.ProgrammeDocumentReports.current,
+ },
+
+ currentUserRoles: {
+ type: Array,
+ statePath: 'userProfile.profile.prp_roles',
+ },
+
+ refreshData: {
+ type: Object,
+ computed: '_computeRefreshData(reportId)',
+ },
+
+ canRefresh: {
+ type: Boolean,
+ value: false,
+ computed: '_computeCanRefresh(currentReport, programmeDocument)',
+ },
+
+ showRefresh: {
+ type: Boolean,
+ value: false,
+ computed: '_computeShowRefresh(canRefresh, currentUserRoles)',
+ },
+
+ refreshUrl: {
+ type: String,
+ value: function () {
+ return App.Endpoints.reportProgressReset();
+ },
+ },
},
listeners: {
@@ -87,19 +157,35 @@
},
_computeImportTemplateUrl: function (locationId, reportId) {
- return App.Endpoints.programmeDocumentImportTemplate(locationId, reportId);
+ return PdOutputListToolbarUtils.computeImportTemplateUrl(locationId, reportId);
},
_computeImportUrl: function (locationId, reportId) {
- return App.Endpoints.programmeDocumentImport(locationId, reportId);
+ return PdOutputListToolbarUtils.computeImportUrl(locationId, reportId);
},
_computeShowImportButtons: function (programmeDocument) {
- return programmeDocument.status !== 'Sub' && programmeDocument.status !== 'Acc';
+ return PdOutputListToolbarUtils.computeShowImportButtons(programmeDocument);
},
_computePdReportUrl: function (locationId, reportId) {
- return App.Endpoints.programmeDocumentReport(locationId, reportId);
+ return PdOutputListToolbarUtils.computePdReportUrl(locationId, reportId);
+ },
+
+ _computeRefreshData: function (reportId) {
+ return PdOutputListToolbarUtils.computeRefreshData(reportId);
+ },
+
+ _computeCanRefresh: function (report, programmeDocument) {
+ return PdOutputListToolbarUtils.computeCanRefresh(report, programmeDocument);
+ },
+
+ _computeShowRefresh: function (canRefresh, currentUserRoles) {
+ return canRefresh && PdOutputListToolbarUtils.computeShowRefresh(currentUserRoles);
+ },
+
+ _refresh: function () {
+ this.$.refresh.open();
},
_onFileUploaded: function (e) {
@@ -107,6 +193,10 @@
window.location.reload();
},
+
+ detached: function () {
+ this.$.refresh.close();
+ },
});
diff --git a/polymer/src/elements/ip-reporting/pd-output-list.html b/polymer/src/elements/ip-reporting/pd-output-list.html
index d900cb643..f81c4507b 100644
--- a/polymer/src/elements/ip-reporting/pd-output-list.html
+++ b/polymer/src/elements/ip-reporting/pd-output-list.html
@@ -7,8 +7,13 @@
+
+
+
+
+
-
+
diff --git a/polymer/src/elements/ip-reporting/pd-output.html b/polymer/src/elements/ip-reporting/pd-output.html
index c4a13635d..61d0d51a5 100644
--- a/polymer/src/elements/ip-reporting/pd-output.html
+++ b/polymer/src/elements/ip-reporting/pd-output.html
@@ -12,6 +12,8 @@
-
@@ -32,13 +34,13 @@
is="dom-if"
if="[[showLink]]"
restamp="true">
- [[_getReportTitle(report)]]
+ [[_getReportTitle(report, localize)]]
- [[_getReportTitleFull(report)]]
+ [[_getReportTitleFull(report, localize)]]
final
-
-
diff --git a/polymer/src/elements/ip-reporting/pd-reports-toolbar.html b/polymer/src/elements/ip-reporting/pd-reports-toolbar.html
index 180178b8a..813c3edb3 100644
--- a/polymer/src/elements/ip-reporting/pd-reports-toolbar.html
+++ b/polymer/src/elements/ip-reporting/pd-reports-toolbar.html
@@ -6,6 +6,8 @@
-
+
+ label="[[visibleRange.0]]-[[visibleRange.1]] of [[totalResults]] [[localize('results_to_show')]]">
- PD/SSFA ToR ref. #
+ [[localize('pd_ref_number')]]
- Report #
+ [[localize('report_number')]]
- Report Status
+ [[localize('report_status')]]
- Due date
+ [[localize('due_date')]]
- Date of submission
+ [[localize('date_of_submission')]]
- Reporting period
+ [[localize('reporting_period')]]
@@ -139,6 +144,8 @@
App.Behaviors.UtilsBehavior,
App.Behaviors.ProgressReportUtilsBehavior,
App.Behaviors.SortingBehavior,
+ App.Behaviors.LocalizeBehavior,
+ Polymer.AppLocalizeBehavior,
],
properties: {
@@ -159,8 +166,8 @@
},
_getReportTitle: function (report) {
- return report.report_type + report.report_number;
+ return ProgressReportsListUtils.getReportTitle(report);
},
});
-
+
\ No newline at end of file
diff --git a/polymer/src/elements/ip-reporting/progress-reports-toolbar.html b/polymer/src/elements/ip-reporting/progress-reports-toolbar.html
index 63261c3e4..21805cefa 100644
--- a/polymer/src/elements/ip-reporting/progress-reports-toolbar.html
+++ b/polymer/src/elements/ip-reporting/progress-reports-toolbar.html
@@ -6,6 +6,8 @@
+
+
+
+
+
+ url="[[attachmentDeleteUrl]]">
+ url="[[attachmentsListUrl]]">
+ url="[[attachmentDeleteUrl]]">
-
-
+
+
+
+
+
+
+
diff --git a/polymer/src/elements/list-view-indicators.html b/polymer/src/elements/list-view-indicators.html
index 599cc84a4..f46778d34 100644
--- a/polymer/src/elements/list-view-indicators.html
+++ b/polymer/src/elements/list-view-indicators.html
@@ -5,6 +5,8 @@
+
+
@@ -41,46 +43,46 @@
permissions="{{permissions}}">
-
+
- Please make sure indicators have locations set for reports to be generated.
+ [[localize('please_make_sure_indicators')]]