(Contributor Recognition Infrastructure) Milestone2.4: Add certificate generation for contributors (including service method, API controller) #16513

chris7716 · 2022-11-08T21:39:10Z

Overview

This PR fixes or fixes part of n/a.
This PR does the following: This PR adds the certificate generation in the contributor dashboard.3.

This branch is taken from the milestone2.2 branch so there are some optional files changed that is not related to this PR. You can review the below files which are only related to this PR.

core/controllers/*
core/domain/suggestion_services*
core/feconf.py
core/storage/suggestion/*
core/templates/pages/contributor-dashboard-page/contributor-stats/contributor-stats.component.spec.ts(Line 186 - 189)
core/templates/pages/contributor-dashboard-page/contributor-stats/contributor-stats.component.ts (Line 372 - 389)
core/templates/pages/contributor-dashboard-page/modal-templates/*
core/templates/pages/contributor-dashboard-page/services/*
main.py
requirements.in
requirements.txt

Essential Checklist

The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
The linter/Karma presubmit checks have passed locally on your machine.
"Allow edits from maintainers" is checked. (See here for instructions on how to enable it.)
- This lets reviewers restart your CircleCI tests for you.
The PR is made from a branch that's not called "develop".

Proof that changes are correct

Screen.Recording.2022-12-07.at.08.57.09.mov

Proof of changes on desktop with slow/throttled network

Proof of changes on mobile phone

Proof of changes in Arabic language

PR Pointers

Make sure to follow the instructions for making a code change.
If you need a review or an answer to a question, and don't have permissions to assign people, leave a comment like the following: "{{Question/comment}} @{{reviewer_username}} PTAL". Oppiabot will help assign that person for you.
For what code owners will expect, see the Code Owner's wiki page.
Make sure your PR follows conventions in the style guide, otherwise this will lead to review delays.
Never force push. If you do, your PR will be closed.
Some of the e2e tests are flaky, and can fail for reasons unrelated to your PR. We are working on fixing this, but in the meantime, if you need to restart the tests, please check the "If your build fails" wiki page.

Merged with uostream

merged with develop

uptodated

Update branch

Update local

oppiabot · 2023-01-17T17:47:10Z

Hi @chris7716, it looks like some changes were requested on this pull request by @vojtechjelinek. PTAL. Thanks!

oppiabot · 2023-01-24T18:12:58Z

Hi @chris7716, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 4 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 4 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

…ne2.4 Update branch

vojtechjelinek

Thanks! Took a pass.

vojtechjelinek · 2023-01-27T10:20:37Z

core/controllers/contributor_dashboard.py

-
-        if suggestion_type == feconf.SUGGESTION_TYPE_TRANSLATE_CONTENT:
-            language = self.normalized_request['language']
+        language = self.normalized_request.get('language')


Suggested change

language = self.normalized_request.get('language')

language = self.normalized_request['language']

I think we will have to use the self.normalized_request.get('language') because when generating the question certificate, we do not include language param in the request and it throws KeyError: 'language' if we use self.normalized_request['language']

We can get the the default value which is set as None if we use self.normalized_request.get('language') when language is not included in the request.

Ah, right, sorry.

vojtechjelinek · 2023-01-27T10:24:10Z

core/domain/suggestion_services.py

+    # Go to the below link for more information about how we count hours
+    # contributed.# Goto the below link for more information.
+    # https://docs.google.com/spreadsheets/d/1ykSNwPLZ5qTCkuO21VLdtm_2SjJ5QJ0z0PlVjjSB4ZQ/edit?usp=sharing
+    hours_contributed = round((words_count / 300), 2)


Suggested change

hours_contributed = round((words_count / 300), 2)

hours_contributed = round(words_count / 300, 2)

vojtechjelinek · 2023-01-27T10:24:29Z

core/domain/suggestion_services.py

+    # Go to the below link for more information about how we count hours
+    # contributed.
+    # https://docs.google.com/spreadsheets/d/1ykSNwPLZ5qTCkuO21VLdtm_2SjJ5QJ0z0PlVjjSB4ZQ/edit?usp=sharing
+    hours_contributed = round((minutes_contributed / 60), 2)


Suggested change

hours_contributed = round((minutes_contributed / 60), 2)

hours_contributed = round(minutes_contributed / 60, 2)

vojtechjelinek · 2023-01-27T10:26:08Z

...tes/pages/contributor-dashboard-page/modal-templates/certificate-download-modal.component.ts

+  createCertificate(response: ContributorCertificateResponse): void {
+    const canvas = document.createElement('canvas');
+    const currentDate = new Date();
+    const dateOptions: Intl.DateTimeFormatOptions = {


Can you explain that in code comment?

vojtechjelinek · 2023-01-27T10:27:27Z

...tes/pages/contributor-dashboard-page/modal-templates/certificate-download-modal.component.ts

+    // Textual parts are starting when y coordinate is equals to 350.
+    let linePosition = 350;
+    const image = new Image(this.LOGO_WIDTH, this.LOGO_HEIGHT);
+    image.src = '/assets/images/contributor_dashboard/oppia-logo.jpg';


Should this path be placed into a constant?

oppiabot · 2023-01-27T10:33:24Z

Unassigning @vojtechjelinek since the review is done.

oppiabot · 2023-01-27T10:33:27Z

Hi @chris7716, it looks like some changes were requested on this pull request by @vojtechjelinek. PTAL. Thanks!

…ne2.4 Update branch

vojtechjelinek

Thanks! LGTM!

vojtechjelinek · 2023-01-27T11:55:32Z

core/controllers/contributor_dashboard.py

-
-        if suggestion_type == feconf.SUGGESTION_TYPE_TRANSLATE_CONTENT:
-            language = self.normalized_request['language']
+        language = self.normalized_request.get('language')


Ah, right, sorry.

oppiabot · 2023-01-27T11:59:28Z

Hi @chris7716, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks!

…ne2.4 Update branch

chris7716 and others added 28 commits January 10, 2021 01:32

service file name changed to backend-api

c798e78

backend api file added

218b79c

previous service file removed from CODEOWNERS

d03d579

new backend service file added to CODEOWNERS

536a551

Merge remote-tracking branch 'upstream/develop' into develop

b853c9a

Merged with uostream

Merge remote-tracking branch 'upstream/develop' into develop

cab061f

merged with develop

Merge remote-tracking branch 'upstream/develop' into develop

7f746b9

uptodated

Merge branch 'oppia:develop' into develop

63a9988

Merge branch 'oppia:develop' into develop

40e6c29

Merge branch 'develop' of https://github.com/oppia/oppia into develop

1e042a8

Update branch

Merge branch 'develop' of https://github.com/oppia/oppia into develop

6d2e59b

Update branch

Merge branch 'develop' of https://github.com/oppia/oppia into develop

ec06909

Update local

Merge branch 'develop' of https://github.com/oppia/oppia into develop

82b8dae

Update local

First pass

ac53598

First pass

e211ca5

Finalize views

4573973

Add stats component

fb63259

Resolve conflicts and refactor new component

09f468a

Cover tests for stats component

d214681

Improve mobile views

53b2d18

Remove mock responses

2fb9fee

Remove unwanted spaces

d0da489

Add question stats update

99f6370

First pass

e7b36a9

Add minor changes

9f920c5

Address comments

d0d071b

First pass

f9f5aea

Add new component

9b30d40

chris7716 requested a review from a team as a code owner November 8, 2022 21:39

chris7716 requested a review from a team November 8, 2022 21:39

oppiabot bot assigned chris7716 Jan 17, 2023

oppiabot bot added the stale label Jan 24, 2023

chris7716 added 2 commits January 26, 2023 22:54

Merge branch 'develop' of https://github.com/oppia/oppia into milesto…

2ca1cb0

…ne2.4 Update branch

Address comments

43c8d6e

oppiabot bot removed stale PR: don't merge - STALE BUILD labels Jan 26, 2023

Reduce signature font size

7596dbc

chris7716 requested a review from vojtechjelinek January 27, 2023 03:23

chris7716 assigned vojtechjelinek and unassigned chris7716 Jan 27, 2023

vojtechjelinek suggested changes Jan 27, 2023

View reviewed changes

oppiabot bot unassigned vojtechjelinek Jan 27, 2023

oppiabot bot assigned chris7716 Jan 27, 2023

chris7716 added 2 commits January 27, 2023 16:50

Merge branch 'develop' of https://github.com/oppia/oppia into milesto…

aa5f20d

…ne2.4 Update branch

Address comments

1d54ca8

chris7716 requested a review from vojtechjelinek January 27, 2023 11:52

chris7716 assigned vojtechjelinek and unassigned chris7716 Jan 27, 2023

vojtechjelinek approved these changes Jan 27, 2023

View reviewed changes

vojtechjelinek assigned chris7716 and unassigned vojtechjelinek Jan 27, 2023

oppiabot bot added the PR: LGTM label Jan 27, 2023

Merge branch 'develop' of https://github.com/oppia/oppia into milesto…

718a103

…ne2.4 Update branch

chris7716 merged commit 0455f14 into oppia:develop Jan 27, 2023

chris7716 mentioned this pull request Apr 21, 2023

Investigate proper file handling for contributor dashboard certificate generation #16632

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(Contributor Recognition Infrastructure) Milestone2.4: Add certificate generation for contributors (including service method, API controller) #16513

(Contributor Recognition Infrastructure) Milestone2.4: Add certificate generation for contributors (including service method, API controller) #16513

chris7716 commented Nov 8, 2022 •

edited

Loading

oppiabot bot commented Jan 17, 2023

oppiabot bot commented Jan 24, 2023

vojtechjelinek left a comment

vojtechjelinek Jan 27, 2023

chris7716 Jan 27, 2023

vojtechjelinek Jan 27, 2023

vojtechjelinek Jan 27, 2023

chris7716 Jan 27, 2023

vojtechjelinek Jan 27, 2023

chris7716 Jan 27, 2023

vojtechjelinek Jan 27, 2023

vojtechjelinek Jan 27, 2023

chris7716 Jan 27, 2023

oppiabot bot commented Jan 27, 2023

oppiabot bot commented Jan 27, 2023

vojtechjelinek left a comment

vojtechjelinek Jan 27, 2023

oppiabot bot commented Jan 27, 2023

	language = self.normalized_request.get('language')
	language = self.normalized_request['language']

	hours_contributed = round((words_count / 300), 2)
	hours_contributed = round(words_count / 300, 2)

	hours_contributed = round((minutes_contributed / 60), 2)
	hours_contributed = round(minutes_contributed / 60, 2)

(Contributor Recognition Infrastructure) Milestone2.4: Add certificate generation for contributors (including service method, API controller) #16513

(Contributor Recognition Infrastructure) Milestone2.4: Add certificate generation for contributors (including service method, API controller) #16513

Conversation

chris7716 commented Nov 8, 2022 • edited Loading

Overview

Essential Checklist

Proof that changes are correct

Proof of changes on desktop with slow/throttled network

Proof of changes on mobile phone

Proof of changes in Arabic language

PR Pointers

oppiabot bot commented Jan 17, 2023

oppiabot bot commented Jan 24, 2023

vojtechjelinek left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oppiabot bot commented Jan 27, 2023

oppiabot bot commented Jan 27, 2023

vojtechjelinek left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oppiabot bot commented Jan 27, 2023

chris7716 commented Nov 8, 2022 •

edited

Loading