Address comments

oppia · chris7716 · Jan 27, 2023 · Jan 9, 2021 · Jan 9, 2021 · Jan 9, 2021
commit 77493b7e525ae8df43770ac1d0f6c54e491b36b6
@@ -968,6 +968,13 @@ def get(self, username, suggestion_type, language, from_date, to_date):
         """Handles GET requests."""
         from_datetime = datetime.datetime.strptime(from_date, '%Y-%m-%d')
         to_datetime = datetime.datetime.strptime(to_date, '%Y-%m-%d')
+        if (to_datetime.date() > datetime.datetime.now().date()):
+            raise self.InvalidInputException(
+                'To date should not be a future date.')
+
+        # Adds one date to the to_date to make sure the contributions within
+        # the to_date are also counted for the certificate.
+        to_datetime = to_datetime + datetime.timedelta(days=1)
 
         file = suggestion_services.generate_contributor_certificate(
             username, suggestion_type, language, from_datetime,

@@ -3225,7 +3225,7 @@ def _generate_translation_contributor_certificate(
                           text-align: center;">
                       <div style="font-family: 'Roboto';
                             font-size: 24px; color: #000000; line-height: 10px;">
-                        """ + date + """
+                        """ + date.strftime('%d %b %Y') + """
                       </div>
                       <center>
                         <p style="width: 186px;
@@ -3446,7 +3446,7 @@ def _generate_question_contributor_certificate(
                           text-align: center;">
                       <div style="font-family: 'Roboto';
                             font-size: 24px; color: #000000; line-height: 10px;">
-                        """ + date + """
+                        """ + date.strftime('%d %b %Y') + """
                       </div>
                       <center>
                         <p style="width: 186px;

@@ -24,7 +24,7 @@
   </div>
 </div>
 <div *ngIf="!isUnlocked"
-     ngbTooltip="{{contributionCount}} more {{contributionSubTypeText.toLowerCase()}} to achieve this badge"
+     ngbPopover="{{contributionCount}} more {{contributionSubTypeText.toLowerCase()}} to achieve this badge"
      class="locked-badge-container"
      container="body"
      placement="bottom">

@@ -60,6 +60,11 @@ export class CertificateDownloadModalComponent {
       this.errorMessage = 'Invalid date range.';
       return;
     }
+    if (new Date() < new Date(this.toDate)) {
+      this.errorsFound = true;
+      this.errorMessage = 'To date should not be a future date';
+      return;
+    }
     this.certificateDownloading = true;
     this.contributionAndReviewService.downloadContributorCertificateAsync(
       this.username,
@@ -69,12 +74,11 @@ export class CertificateDownloadModalComponent {
       this.toDate
     ).then((response: Blob) => {
       const dataType = response.type;
-
       const downloadLink = document.createElement('a');
+
       downloadLink.href = window.URL.createObjectURL(
         new Blob([response], {type: dataType}));
       downloadLink.setAttribute('download', 'certificate');
-
       document.body.appendChild(downloadLink);
       downloadLink.click();
       this.certificateDownloading = false;