Skip to content

Commit 4c73d13

Browse files
birdofpreyrubirdofpreyru
committed
Merge branch 'issue-172' into develop
2 parents c4104f0 + 18ef40c commit 4c73d13

File tree

3 files changed

+36
-12
lines changed

3 files changed

+36
-12
lines changed

‎src/shared/components/challenge-detail/Header/index.jsx

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export default function ChallengeHeader(props) {
9898
return false;
9999
}
100100
if (phaseLowerCase.includes('registration') || phaseLowerCase.includes('checkpoint') ||
101-
phaseLowerCase.includes('submission') || phaseLowerCase.includes('review')) {
101+
phaseLowerCase.includes('submission') || phaseLowerCase.includes('review')) {
102102
return true;
103103
}
104104
return false;
@@ -112,7 +112,7 @@ export default function ChallengeHeader(props) {
112112
return 1;
113113
}
114114
return (new Date(a.actualEndTime || a.scheduledEndTime)).getTime() -
115-
(new Date(b.actualEndTime || b.scheduledEndTime)).getTime();
115+
(new Date(b.actualEndTime || b.scheduledEndTime)).getTime();
116116
});
117117
if (subTrack === 'FIRST_2_FINISH' && status === 'COMPLETED') {
118118
const phases = allPhases.filter(p => p.phaseType === 'Iterative Review' && p.phaseStatus === 'Closed');
@@ -142,6 +142,33 @@ export default function ChallengeHeader(props) {
142142

143143
const checkpointCount = checkpoints && checkpoints.numberOfUniqueSubmitters;
144144

145+
let nextDeadlineMsg;
146+
switch ((status || '').toLowerCase()) {
147+
case 'active':
148+
nextDeadlineMsg = (
149+
<div styleName="next-deadline">
150+
Next Deadline: <span styleName="deadline-highlighted">
151+
{nextDeadline || '-'}</span>
152+
</div>
153+
);
154+
break;
155+
case 'completed':
156+
nextDeadlineMsg = (
157+
<div styleName="completed">
158+
The challenge is finished.
159+
</div>
160+
);
161+
break;
162+
default:
163+
nextDeadlineMsg = (
164+
<div>
165+
Status: <span styleName="deadline-highlighted">{
166+
_.capitalize(status)}</span>
167+
</div>
168+
);
169+
break;
170+
}
171+
145172
return (
146173
<ThemeProvider theme={theme} >
147174
<div styleName="challenge-outer-container">
@@ -212,15 +239,7 @@ export default function ChallengeHeader(props) {
212239
<div styleName="deadlines-view">
213240
<div styleName="deadlines-overview">
214241
<div styleName="deadlines-overview-text">
215-
{
216-
(status || '').toLowerCase() === 'active' ?
217-
(<div styleName="next-deadline">
218-
Next Deadline: <span styleName="deadline-highlighted">{nextDeadline || '-'}</span>
219-
</div>) :
220-
(<div>
221-
Status: <span styleName="deadline-highlighted">{_.capitalize(status)}</span>
222-
</div>)
223-
}
242+
{nextDeadlineMsg}
224243
{
225244
(status || '').toLowerCase() === 'active' &&
226245
<div styleName="current-phase">

‎src/shared/components/challenge-detail/Header/style.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,11 @@
295295
word-wrap: normal;
296296
border-right: $tc-gray-50 solid 1px;
297297
padding-right: 10px;
298+
display: inline;
299+
}
300+
301+
.completed {
302+
border-right: none;
298303
}
299304

300305
.current-phase {

‎src/shared/services/.exchange-rates.cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1503964800,"base":"USD","rates":{"AED":3.673097,"AFN":68.35,"ALL":110.781235,"AMD":477.145313,"ANG":1.774138,"AOA":165.9205,"ARS":17.23,"AUD":1.261753,"AWG":1.796499,"AZN":1.7,"BAM":1.633046,"BBD":2,"BDT":81.069719,"BGN":1.632125,"BHD":0.376982,"BIF":1737.205974,"BMD":1,"BND":1.35473,"BOB":6.95187,"BRL":3.167282,"BSD":1,"BTC":0.000226642488,"BTN":63.930167,"BWP":10.097964,"BYN":1.917159,"BZD":2.009,"CAD":1.251379,"CDF":1538.825758,"CHF":0.952436,"CLF":0.02337,"CLP":629.348442,"CNH":6.62355,"CNY":6.608237,"COP":2947.25,"CRC":576.011761,"CUC":1,"CUP":25.5,"CVE":92.35,"CZK":21.813207,"DJF":178.97,"DKK":6.217865,"DOP":46.921963,"DZD":109.6625,"EGP":17.677,"ERN":15.33,"ETB":23.322614,"EUR":0.835819,"FJD":2.023547,"FKP":0.773595,"GBP":0.773595,"GEL":2.41205,"GGP":0.773595,"GHS":4.415302,"GIP":0.773595,"GMD":46.075,"GNF":8855.55,"GTQ":7.255257,"GYD":206.338019,"HKD":7.823583,"HNL":23.312098,"HRK":6.197233,"HTG":66.080494,"HUF":254.47,"IDR":13296.935677,"ILS":3.578945,"IMP":0.773595,"INR":63.7993,"IQD":1163.784957,"IRR":32902.5,"ISK":104.82,"JEP":0.773595,"JMD":127.425141,"JOD":0.709001,"JPY":108.72727778,"KES":103.19,"KGS":68.553752,"KHR":4083.333333,"KMF":411.798944,"KPW":900,"KRW":1119.01,"KWD":0.301862,"KYD":0.830622,"KZT":332.928368,"LAK":8263.95,"LBP":1504.524887,"LKR":152.384084,"LRD":115.030245,"LSL":13.027047,"LYD":1.359923,"MAD":9.335073,"MDL":17.830402,"MGA":2942.75,"MKD":51.894,"MMK":1354.474087,"MNT":2430.333333,"MOP":8.031616,"MRO":363.754157,"MUR":32.852,"MVR":15.450233,"MWK":726.732859,"MXN":17.92645,"MYR":4.268,"MZN":61.148857,"NAD":13.027047,"NGN":360.948101,"NIO":29.776047,"NOK":7.776392,"NPR":101.902074,"NZD":1.380448,"OMR":0.384966,"PAB":1,"PEN":3.233615,"PGK":3.218182,"PHP":51.085,"PKR":105.058709,"PLN":3.555933,"PYG":5673.852124,"QAR":3.680008,"RON":3.8435,"RSD":99.583064,"RUB":58.465,"RWF":826.763566,"SAR":3.7503,"SBD":7.789048,"SCR":13.637173,"SDG":6.654528,"SEK":7.977607,"SGD":1.355267,"SHP":0.773595,"SLL":7540,"SOS":576.591453,"SRD":7.438,"SSP":125.4488,"STD":20516.59961,"SVC":8.721148,"SYP":515.00499,"SZL":13.023912,"THB":33.2165,"TJS":8.785795,"TMT":3.50998,"TND":2.426494,"TOP":2.23735,"TRY":3.457438,"TTD":6.767969,"TWD":30.156413,"TZS":2238.95,"UAH":25.421209,"UGX":3593,"USD":1,"UYU":28.80644,"UZS":4168.4,"VEF":10.18335,"VND":22662.933333,"VUV":104.001657,"WST":2.496098,"XAF":548.261454,"XAG":0.05718514,"XAU":0.00075884,"XCD":2.70255,"XDR":0.705414,"XOF":548.261454,"XPD":0.00107126,"XPF":99.739761,"XPT":0.00100844,"YER":250.281642,"ZAR":13.083993,"ZMW":9.029949,"ZWL":322.355011}}
1+
{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1504008000,"base":"USD","rates":{"AED":3.673158,"AFN":68.42,"ALL":110.55,"AMD":478.425,"ANG":1.779836,"AOA":165.9205,"ARS":17.2285,"AUD":1.253866,"AWG":1.796499,"AZN":1.7,"BAM":1.63464,"BBD":2,"BDT":81.223201,"BGN":1.624893,"BHD":0.377173,"BIF":1741.05,"BMD":1,"BND":1.352023,"BOB":6.974321,"BRL":3.168183,"BSD":1,"BTC":0.000226567692,"BTN":63.905066,"BWP":10.105259,"BYN":1.925664,"BZD":2.015536,"CAD":1.247363,"CDF":1550.480769,"CHF":0.945376,"CLF":0.02331,"CLP":626.45,"CNH":6.600879,"CNY":6.596,"COP":2946.55,"CRC":576.32,"CUC":1,"CUP":25.5,"CVE":92.35,"CZK":21.698691,"DJF":178.97,"DKK":6.177315,"DOP":47.090437,"DZD":109.906667,"EGP":17.6421,"ERN":15.326727,"ETB":23.387845,"EUR":0.830371,"FJD":2.010101,"FKP":0.771901,"GBP":0.771901,"GEL":2.413575,"GGP":0.771901,"GHS":4.429268,"GIP":0.771901,"GMD":46.075,"GNF":8886.6,"GTQ":7.282729,"GYD":206.253019,"HKD":7.824445,"HNL":23.393616,"HRK":6.1568,"HTG":66.28528,"HUF":253.4892,"IDR":13333.343435,"ILS":3.577819,"IMP":0.771901,"INR":63.985,"IQD":1166.9,"IRR":32919,"ISK":104.447599,"JEP":0.771901,"JMD":127.919589,"JOD":0.709001,"JPY":108.56365136,"KES":103.195,"KGS":68.606942,"KHR":4048.6,"KMF":411.798944,"KPW":900,"KRW":1123.6575,"KWD":0.30123,"KYD":0.833249,"KZT":335.562793,"LAK":8282.7,"LBP":1507.9,"LKR":152.844139,"LRD":115.030245,"LSL":13.001568,"LYD":1.363155,"MAD":9.3071,"MDL":17.80191,"MGA":2962.05,"MKD":51.11,"MMK":1350.35,"MNT":2430.401732,"MOP":8.058874,"MRO":364.99315,"MUR":32.5805,"MVR":15.450233,"MWK":725.55,"MXN":17.828889,"MYR":4.265758,"MZN":61.148857,"NAD":13.001635,"NGN":359.658899,"NIO":29.889868,"NOK":7.714787,"NPR":102.428065,"NZD":1.371709,"OMR":0.384975,"PAB":1,"PEN":3.238705,"PGK":3.184036,"PHP":51.047,"PKR":105.225,"PLN":3.541809,"PYG":5642.9,"QAR":3.680008,"RON":3.817028,"RSD":98.961351,"RUB":58.75494,"RWF":829.737066,"SAR":3.750363,"SBD":7.77689,"SCR":13.721597,"SDG":6.675627,"SEK":7.920206,"SGD":1.351116,"SHP":0.771901,"SLL":7553.652075,"SOS":579.460007,"SRD":7.438,"SSP":125.5349,"STD":20483.772901,"SVC":8.74962,"SYP":515,"SZL":13.05099,"THB":33.1675,"TJS":8.813642,"TMT":3.50998,"TND":2.417192,"TOP":2.2143,"TRY":3.438635,"TTD":6.749017,"TWD":30.0989,"TZS":2241.15,"UAH":25.450974,"UGX":3618.483069,"USD":1,"UYU":28.801823,"UZS":4181.8,"VEF":10.18335,"VND":22688.140692,"VUV":105.176794,"WST":2.493173,"XAF":544.687917,"XAG":0.05696877,"XAU":0.00075716,"XCD":2.70255,"XDR":0.705414,"XOF":544.687917,"XPD":0.00105842,"XPF":99.089663,"XPT":0.00100001,"YER":250.281642,"ZAR":12.960817,"ZMW":9.058585,"ZWL":322.355011}}

0 commit comments

Comments
 (0)