From abda2b5eabfd3ed4a33b336cca3d470b9dde390d Mon Sep 17 00:00:00 2001 From: shubhu Date: Wed, 15 Mar 2017 01:58:14 +0530 Subject: [PATCH 1/5] fixed appirio-tech/topcoder-app/issues/990 --- .../js/controllers/challenge-details-controller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js index c2e0dbe0..68cec1d5 100644 --- a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js +++ b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js @@ -396,7 +396,8 @@ } // If is not submited, then enable submission - if (((moment(challenge.submissionEndDate)) > moment()) && regList.indexOf(handle) > -1) { + var challengeSubmissionPhase = _.find(vm.challenge.phases, function(phase) { return phase.type === 'Submission'; }) + if ((challengeSubmissionPhase && challengeSubmissionPhase.status === 'Open') && regList.indexOf(handle) > -1) { vm.challenge.submissionDisabled = false; } From 509079535cad6b280e4382eaad2644c2213633cf Mon Sep 17 00:00:00 2001 From: shubhu Date: Wed, 15 Mar 2017 23:24:13 +0530 Subject: [PATCH 2/5] fixed appirio-tech/topcoder-app/issues/1054 refactor for design buttons --- src/js/app/challenge-details/index.html | 32 ++--------- .../challenge-details-controller.js | 57 +++++++++++++++---- 2 files changed, 51 insertions(+), 38 deletions(-) diff --git a/src/js/app/challenge-details/index.html b/src/js/app/challenge-details/index.html index 6f8ed0cb..1ac0e429 100644 --- a/src/js/app/challenge-details/index.html +++ b/src/js/app/challenge-details/index.html @@ -11,34 +11,12 @@
-
- + - - 1 - - Register For This Challenge - - - Unregister From This Challenge - - - - 2 Submit Your Entries - - - 3 View Your Submission - - - 3Review This Challenge -
diff --git a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js index c2e0dbe0..bfddf1de 100644 --- a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js +++ b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js @@ -562,17 +562,7 @@ function initButtons(vm) { vm.buttons = []; - if (vm.challenge.currentPhaseName === 'Appeals' && vm.hasSubmitted) { - vm.buttons.push(newButton({ - text: 'View Scorecard', - href: '//' + vm.reviewAppURL + '/actions/ViewProjectDetails?pid=' + vm.challenge.challengeId, - })); - vm.buttons.push(newButton({ - text: 'Complete Appeals', - href: '//' + vm.reviewAppURL + '/actions/EarlyAppeals?pid=' + vm.challenge.challengeId, - classes: 'unregister' - })); - } else { + if (vm.isDesign) { if (vm.challenge.allowToUnregister) { vm.buttons.push(newButton({ classes: 'challengeRegisterBtn unregister', @@ -591,6 +581,51 @@ classes: (vm.challenge.submissionDisabled ? 'disabled ' : 'disabledNOT'), text: 'Submit Your Entries' })); + vm.buttons.push(newButton({ + href: '//studio.' + vm.domain + '/?module=ViewSubmission&ct=' + vm.challenge.challengeId, + text: 'View Your Submission', + classes: (vm.challenge.submissionDisabled ? 'disabled ' : 'disabledNOT'), + })) + } else { + if (vm.challenge.currentPhaseName === 'Appeals') { + vm.buttons.push(newButton({ + text: 'View Scorecard', + href: '//' + vm.reviewAppURL + '/actions/ViewProjectDetails?pid=' + vm.challenge.challengeId, + })); + if (vm.hasSubmitted) { + vm.buttons.push(newButton({ + text: 'Complete Appeals', + href: '//' + vm.reviewAppURL + '/actions/EarlyAppeals?pid=' + vm.challenge.challengeId, + classes: 'unregister' + })); + } + } else { + if (vm.challenge.allowToUnregister) { + vm.buttons.push(newButton({ + classes: 'challengeRegisterBtn unregister', + onClick: vm.unregisterFromChallenge, + text: 'Unregister From This Challenge' + })); + } else { + vm.buttons.push(newButton({ + classes: 'challengeRegisterBtn ' + (vm.challenge.registrationDisabled ? 'disabled ' : 'disabledNOT'), + onClick: vm.registerToChallenge, + text: 'Register For This Challenge' + })); + } + vm.buttons.push(newButton({ + href: '/challenge-details/' + vm.challenge.challengeId + '/submit/?type=develop', + classes: (vm.challenge.submissionDisabled ? 'disabled ' : 'disabledNOT'), + text: 'Submit Your Entries' + })); + if (!vm.challenge.peerReviewDisabled) { + vm.buttons.push(newButton({ + href: '/challenges/' + vm.challenge.challengeId + '/reviews/', + classes: (vm.challenge.peerReviewDisabled ? 'disabled ' : 'disabledNOT'), + text: 'Review This Challenge' + })); + } + } } } From fc2cb314bb0dcb54969fa7a455ec7694363c36ed Mon Sep 17 00:00:00 2001 From: shubhu Date: Thu, 16 Mar 2017 00:22:50 +0530 Subject: [PATCH 3/5] fixed appirio-tech/topcoder-app/issues/1053 getuserrole funciton --- .../challenge-details-controller.js | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js index c2e0dbe0..396eb374 100644 --- a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js +++ b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js @@ -183,18 +183,7 @@ ChallengeService.getChallengeTerms(challengeId).then(function (termsList) { vm.termsList = termsList; }); - ChallengeService - .getUserChallenges(vm.handle, vm.challengeApiParams) - .then(function (challenge) { - if (challenge[0] && challenge[0].result.content.length) { - challenge = challenge[0].result.content[0]; - vm.userRole = challenge.userDetails ? challenge.userDetails.roles : []; - } else { - vm.userRole = []; - } - //Set to test value if defined - vm.userRole = vm.mockUserRole ? vm.mockUserRole : vm.userRole; - }); + getUserRole(); ChallengeService .getChallenge(challengeId) .then(function (challenge) { @@ -213,6 +202,27 @@ .then(function (challenge) { processChallenge(challenge, vm.handle, vm, ChallengeService); }); + getUserRole(); + } + + /** + * + * Updates User Role for the challenge + * @param ChallengeService + */ + function getUserRole() { + ChallengeService + .getUserChallenges(vm.handle, vm.challengeApiParams) + .then(function (challenge) { + if (challenge[0] && challenge[0].result.content.length) { + challenge = challenge[0].result.content[0]; + vm.userRole = challenge.userDetails ? challenge.userDetails.roles : []; + } else { + vm.userRole = []; + } + //Set to test value if defined + vm.userRole = vm.mockUserRole ? vm.mockUserRole : vm.userRole; + }); } /** From f4fa672fe8a35afe1df680f003832a311da84cdd Mon Sep 17 00:00:00 2001 From: shubhu Date: Fri, 17 Mar 2017 00:16:36 +0530 Subject: [PATCH 4/5] fixed appirio-tech/topcoder-app/issues/1091 added scroll to x overflow --- src/css/challenge-detail-software.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/css/challenge-detail-software.css b/src/css/challenge-detail-software.css index add4a761..fdfc82ac 100644 --- a/src/css/challenge-detail-software.css +++ b/src/css/challenge-detail-software.css @@ -429,6 +429,9 @@ h1.center { padding-right: 20px; } +.challenge-detail .tableWrap pre { + overflow-x: auto; +} .challenge-detail .currentTab-checkpoints .tableWrap, .challenge-detail .currentTab-submissions .tableWrap, .challenge-detail .currentTab-winner .tableWrap { From b104197aa7df8ec0ebf9273203989ce828138b6a Mon Sep 17 00:00:00 2001 From: Savvas-cl Date: Sat, 18 Mar 2017 15:29:15 +0200 Subject: [PATCH 5/5] Fix for issue #1093 Add TCO link to the top nav The TCO link for the top nav has been added fore the tc-site. Just like it is in topcoder-app. For test visit challenge-details page and hover over menu. --- src/footer.html | 1 + wp/wp-content/themes/tcs-responsive/footer.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/footer.html b/src/footer.html index a92cd3a4..50a02505 100644 --- a/src/footer.html +++ b/src/footer.html @@ -249,6 +249,7 @@

Comment Examples

], 'community': [ { 'href': '/community/members/', 'text': 'OVERVIEW', 'icon': '/mf/i/nav/members.svg' }, + { 'href': '/tco', 'text': 'TCO', 'icon': '/mf/i/nav/tco-generic.svg', 'target': '_blank' }, { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': '/mf/i/nav/programs.svg' }, { 'href': 'https://' + tcconfig.forumsAppURL, 'text': 'FORUMS', 'icon': '/mf/i/nav/forums.svg' }, { 'href': '/community/statistics/', 'text': 'STATISTICS', 'icon': '/mf/i/nav/statistics.svg' }, diff --git a/wp/wp-content/themes/tcs-responsive/footer.php b/wp/wp-content/themes/tcs-responsive/footer.php index fbb6cb15..03ec7a90 100644 --- a/wp/wp-content/themes/tcs-responsive/footer.php +++ b/wp/wp-content/themes/tcs-responsive/footer.php @@ -268,7 +268,7 @@ function getHashParameterByName(name, source) { ], 'community': [ { 'href': '/community/members/', 'text': 'OVERVIEW', 'icon': '/mf/i/nav/members.svg' }, - { 'href': '/tco', 'text': 'TCO', 'icon': '/mf/i/nav/tco-generic.svg' }, + { 'href': '/tco', 'text': 'TCO', 'icon': '/mf/i/nav/tco-generic.svg' }, { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': '/mf/i/nav/programs.svg' }, { 'href': 'https://' + tcconfig.forumsAppURL, 'text': 'FORUMS', 'icon': '/mf/i/nav/forums.svg' }, { 'href': '/community/statistics/', 'text': 'STATISTICS', 'icon': '/mf/i/nav/statistics.svg' },