From b8a604751b4305400f7a0bac34303c55155dd465 Mon Sep 17 00:00:00 2001 From: gautamjajoo Date: Mon, 31 May 2021 00:43:16 +0530 Subject: [PATCH 1/4] Show error message when submissions > 5k --- .../challengeviewallsubmissions.component.ts | 52 ++++++------------- .../src/app/services/endpoints.service.ts | 2 +- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts index 0daa83fcac..302172ab07 100644 --- a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts +++ b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts @@ -238,7 +238,6 @@ export class ChallengeviewallsubmissionsComponent implements OnInit, AfterViewIn SELF.submissionCount = 0; if (SELF.challenge['id'] && phase['id']) { SELF.fetchSubmissions(SELF.challenge['id'], phase['id']); - SELF.fetchSubmissionCounts(this.challenge['id'], phase['id']); } }; } @@ -263,6 +262,7 @@ export class ChallengeviewallsubmissionsComponent implements OnInit, AfterViewIn SELF.apiService.getUrl(API_PATH).subscribe( (data) => { SELF.submissions = data['results']; + this.submissionCount = data.count; let index = 0; SELF.submissions.forEach((submission) => { submission['s_no'] = index + 1; @@ -335,17 +335,22 @@ export class ChallengeviewallsubmissionsComponent implements OnInit, AfterViewIn ); const SELF = this; if (SELF.fieldsToGetExport.length === 0 || SELF.fieldsToGetExport === undefined) { - SELF.apiService.getUrl(API_PATH, false).subscribe( - (data) => { - SELF.windowService.downloadFile(data, 'all_submissions.csv'); - }, - (err) => { - SELF.globalService.handleApiError(err); - }, - () => { - this.logger.info('Download complete.', SELF.challenge['id'], SELF.selectedPhase['id']); - } - ); + if(this.submissionCount > 5000) { + this.globalService.showToast('error', 'Results are greater than 5k you should use the ' + ('get_all_submissions ').link('https://eval.ai/api/docs/#operation/get_all_submissions_for_a_challenge') + 'API to download results', 10); + } + else { + SELF.apiService.getUrl(API_PATH, false).subscribe( + (data) => { + SELF.windowService.downloadFile(data, 'all_submissions.csv'); + }, + (err) => { + SELF.globalService.handleApiError(err); + }, + () => { + this.logger.info('Download complete.', SELF.challenge['id'], SELF.selectedPhase['id']); + } + ); + } } } else { if (this.selectedPhase === null) { @@ -504,29 +509,6 @@ export class ChallengeviewallsubmissionsComponent implements OnInit, AfterViewIn SELF.globalService.showConfirm(PARAMS); } - /** - * Fetch number of submissions for a challenge phase. - * @param challenge challenge id - * @param phase phase id - */ - fetchSubmissionCounts(challenge, phase) { - const API_PATH = this.endpointsService.challengeSubmissionCountURL(challenge, phase); - const SELF = this; - this.apiService.getUrl(API_PATH).subscribe( - (data) => { - if (data['participant_team_submission_count']) { - SELF.submissionCount = data['participant_team_submission_count']; - } - }, - (err) => { - SELF.globalService.handleApiError(err); - }, - () => { - this.logger.info('Fetched submission counts', challenge, phase); - } - ); - } - /** * Modal to confirm the change of submission visibility * @param submission Selected submission diff --git a/frontend_v2/src/app/services/endpoints.service.ts b/frontend_v2/src/app/services/endpoints.service.ts index 4e8fa5f6f2..60805252ec 100644 --- a/frontend_v2/src/app/services/endpoints.service.ts +++ b/frontend_v2/src/app/services/endpoints.service.ts @@ -309,7 +309,7 @@ ${phase}/submission?participant_team__team_name=${participantTeamName}`; } /** - * Challenge Submission Counts + * Challenge Submission Counts of the participant Team * @param challenge challenge id * @param phase phase id */ From 0bd500edaeec90a6eff7835b3a21f81833dc7c17 Mon Sep 17 00:00:00 2001 From: gautamjajoo Date: Wed, 2 Jun 2021 23:31:57 +0530 Subject: [PATCH 2/4] add card for results> 5k --- ...challengeviewallsubmissions.component.html | 22 ++++++++++++-- .../challengeviewallsubmissions.component.ts | 29 ++++++++----------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html index 7830878acc..9cb0916a95 100644 --- a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html +++ b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html @@ -1,11 +1,26 @@
+ + +
+
+
+
+

+ Note: Results are greater than 5k, please use the + get_all_submissions API to download results. +

+
+
+
+
+
All Submissions
-
+
All Submissions
- Download +
diff --git a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts index 302172ab07..c1bea61ae3 100644 --- a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts +++ b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts @@ -262,7 +262,7 @@ export class ChallengeviewallsubmissionsComponent implements OnInit, AfterViewIn SELF.apiService.getUrl(API_PATH).subscribe( (data) => { SELF.submissions = data['results']; - this.submissionCount = data.count; + SELF.submissionCount = data.count; let index = 0; SELF.submissions.forEach((submission) => { submission['s_no'] = index + 1; @@ -335,22 +335,17 @@ export class ChallengeviewallsubmissionsComponent implements OnInit, AfterViewIn ); const SELF = this; if (SELF.fieldsToGetExport.length === 0 || SELF.fieldsToGetExport === undefined) { - if(this.submissionCount > 5000) { - this.globalService.showToast('error', 'Results are greater than 5k you should use the ' + ('get_all_submissions ').link('https://eval.ai/api/docs/#operation/get_all_submissions_for_a_challenge') + 'API to download results', 10); - } - else { - SELF.apiService.getUrl(API_PATH, false).subscribe( - (data) => { - SELF.windowService.downloadFile(data, 'all_submissions.csv'); - }, - (err) => { - SELF.globalService.handleApiError(err); - }, - () => { - this.logger.info('Download complete.', SELF.challenge['id'], SELF.selectedPhase['id']); - } - ); - } + SELF.apiService.getUrl(API_PATH, false).subscribe( + (data) => { + SELF.windowService.downloadFile(data, 'all_submissions.csv'); + }, + (err) => { + SELF.globalService.handleApiError(err); + }, + () => { + this.logger.info('Download complete.', SELF.challenge['id'], SELF.selectedPhase['id']); + } + ); } } else { if (this.selectedPhase === null) { From e2ab9c966f4100a2cf344737e0aef8b988829db8 Mon Sep 17 00:00:00 2001 From: gautamjajoo Date: Wed, 9 Jun 2021 14:03:00 +0530 Subject: [PATCH 3/4] update card --- .../challengeviewallsubmissions.component.html | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html index 9cb0916a95..53f8fb9920 100644 --- a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html +++ b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html @@ -1,20 +1,18 @@
-
-
-
-
+
+
+

- Note: Results are greater than 5k, please use the - get_all_submissions API to download results. -

+ Note: Results are greater than 5k, please use the + get_all_submissions API to download results. +

-
-
+
-
+
From ee4c843fadd184cbb19eb74b6c08d8df80e610d9 Mon Sep 17 00:00:00 2001 From: Gautam Jajoo Date: Wed, 9 Jun 2021 18:31:54 +0530 Subject: [PATCH 4/4] remove merge conflicts --- .../challengeviewallsubmissions.component.ts | 65 +++++++------------ 1 file changed, 24 insertions(+), 41 deletions(-) diff --git a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts index 3c1fb9dce0..5b90096306 100644 --- a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts +++ b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.ts @@ -244,6 +244,7 @@ export class ChallengeviewallsubmissionsComponent implements OnInit, AfterViewIn SELF.submissionCount = 0; if (SELF.challenge['id'] && phase['id']) { SELF.fetchSubmissions(SELF.challenge['id'], phase['id']); + SELF.fetchSubmissionCounts(this.challenge['id'], phase['id']); } }; } @@ -271,47 +272,6 @@ export class ChallengeviewallsubmissionsComponent implements OnInit, AfterViewIn let name = SELF.filterSubmissionsQuery; SELF.apiService.getUrl(API_PATH).subscribe( (data) => { - SELF.submissions = data['results']; - SELF.submissionCount = data.count; - let index = 0; - SELF.submissions.forEach((submission) => { - submission['s_no'] = index + 1; - index += 1; - }); - for (let i = 0; i < SELF.submissions.length; i++) { - // Update view for submission visibility setting - SELF.submissions[i].submissionVisibilityIcon = SELF.submissions[i].is_public - ? 'visibility' - : 'visibility_off'; - SELF.submissions[i].submissionVisibilityText = SELF.submissions[i].is_public ? 'Public' : 'Private'; - // Update view for flag submission setting - SELF.submissions[i].submissionFlagIcon = SELF.submissions[i].is_flagged ? 'flag' : 'outlined_flag'; - SELF.submissions[i].submissionFlagText = SELF.submissions[i].is_flagged ? 'Flagged' : 'UnFlagged'; - } - SELF.paginationDetails.next = data.next; - SELF.paginationDetails.previous = data.previous; - SELF.paginationDetails.totalPage = Math.ceil(data.count / 100); - - if (data.count === 0) { - SELF.paginationDetails.showPagination = false; - SELF.paginationDetails.paginationMessage = 'No results found'; - } else { - SELF.paginationDetails.showPagination = true; - SELF.paginationDetails.paginationMessage = ''; - } - - // condition for pagination - if (data.next === null) { - SELF.paginationDetails.isNext = 'disabled'; - SELF.paginationDetails.currentPage = 1; - } else { - SELF.paginationDetails.isNext = ''; - SELF.paginationDetails.currentPage = Math.ceil(data.next.split('page=')[1] - 1); - } - if (data.previous === null) { - SELF.paginationDetails.isPrev = 'disabled'; - } else { - SELF.paginationDetails.isPrev = ''; if(name == SELF.filterSubmissionsQuery) { SELF.submissions = data['results']; let index = 0; @@ -571,6 +531,29 @@ export class ChallengeviewallsubmissionsComponent implements OnInit, AfterViewIn SELF.globalService.showConfirm(PARAMS); } + /** + * Fetch number of submissions for a challenge phase. + * @param challenge challenge id + * @param phase phase id + */ + fetchSubmissionCounts(challenge, phase) { + const API_PATH = this.endpointsService.challengeSubmissionCountURL(challenge, phase); + const SELF = this; + this.apiService.getUrl(API_PATH).subscribe( + (data) => { + if (data['participant_team_submission_count']) { + SELF.submissionCount = data['participant_team_submission_count']; + } + }, + (err) => { + SELF.globalService.handleApiError(err); + }, + () => { + this.logger.info('Fetched submission counts', challenge, phase); + } + ); + } + /** * Modal to confirm the change of submission visibility * @param submission Selected submission