Merge pull request topcoder-archive#992 from ThomasKranitsas/appeals-button

birdofpreyru · web-flow · commit 03bcd0168045 · 2017-02-10T04:37:25.000+01:00
Add a Complete appeals button on challenge card
diff --git 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
@@ -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
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,10 @@ import _ from 'lodash'`
`69`	`69`	`return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data)`
`70`	`70`	`case 'detail':`
`71`	`71`	`return String.supplant('https://{subdomain}.{domain}/challenge-details/{id}/?type={track}', data)`
	`72`	`+ case 'viewScorecards':`
	`73`	`+ return String.supplant('https://software.{domain}/review/actions/ViewProjectDetails?pid={id}', data)`
	`74`	`+ case 'completeAppeals':`
	`75`	`+ return String.supplant('https://software.{domain}/review/actions/EarlyAppeals?pid={id}', data)`
`72`	`76`	`}`
`73`	`77`	`}`
`74`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,9 @@ import moment from 'moment'`
`105`	`105`	`}`
`106`	`106`	`})`
`107`	`107`	`}`
	`108`	`+ if (challenge.userCurrentPhase === 'Appeals') {`
	`109`	`+ challenge.userAction = 'Appeal'`
	`110`	`+ }`
`108`	`111`
`109`	`112`	`if (challenge.userCurrentPhaseEndTime) {`
`110`	`113`	`var fullTime = challenge.userCurrentPhaseEndTime`