diff --git a/app/directives/challenge-tile/challenge-tile.jade b/app/directives/challenge-tile/challenge-tile.jade index 092f8e700..0cbb43640 100644 --- a/app/directives/challenge-tile/challenge-tile.jade +++ b/app/directives/challenge-tile/challenge-tile.jade @@ -21,6 +21,8 @@ .phase-action(ng-show="challenge.userAction", ng-switch="challenge.userAction") a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'submit'}}") Submit + a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'viewScorecards'}}") View Scorecards + a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals .submitted(ng-switch-when="Submitted") Submitted @@ -97,6 +99,8 @@ .phase-action(ng-switch="challenge.userAction") a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'submit'}}") Submit + a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'viewScorecards'}}") View Scorecards + a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals .submitted(ng-switch-when="Submitted") Submitted diff --git a/app/filters/challengeLinks.filter.js b/app/filters/challengeLinks.filter.js index 67439916c..d68ad4f53 100644 --- a/app/filters/challengeLinks.filter.js +++ b/app/filters/challengeLinks.filter.js @@ -69,6 +69,10 @@ import _ from 'lodash' return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data) case 'detail': return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data) + case 'viewScorecards': + return String.supplant('https://software.{domain}/review/actions/ViewProjectDetails?pid={id}', data) + case 'completeAppeals': + return String.supplant('https://software.{domain}/review/actions/EarlyAppeals?pid={id}', data) } } } diff --git a/app/services/challenge.service.js b/app/services/challenge.service.js index a9ecd0492..0a22232ce 100644 --- a/app/services/challenge.service.js +++ b/app/services/challenge.service.js @@ -105,6 +105,9 @@ import moment from 'moment' } }) } + if (challenge.userCurrentPhase === 'Appeals') { + challenge.userAction = 'Appeal' + } if (challenge.userCurrentPhaseEndTime) { var fullTime = challenge.userCurrentPhaseEndTime diff --git a/assets/css/directives/challenge-tile.scss b/assets/css/directives/challenge-tile.scss index ef8b13dc8..28e6de3e3 100644 --- a/assets/css/directives/challenge-tile.scss +++ b/assets/css/directives/challenge-tile.scss @@ -245,8 +245,8 @@ challenge-tile .challenge.tile-view { min-height: 55px; .submit { - margin-bottom: 25px; - display: inline-block; + margin: 12px; + display: block; } .submitted { @@ -498,7 +498,8 @@ challenge-tile .challenge.list-view { .phase-action { .submit { - display: inline-block; + display: block; + margin: 6px 0; } .submitted {