Merge pull request #138 from partio-scout/bugfix/country-nickname-labels

Add labels to nickname and country on ParticipantDetailsPage
partio-scout · Jul 18, 2016 · 1c8e825 · 1c8e825
2 parents cb105d8 + 4978d08
commit 1c8e825
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/client/components/ParticipantDetailsPage/ParticipantDetailsPage.jsx b/src/client/components/ParticipantDetailsPage/ParticipantDetailsPage.jsx
@@ -93,7 +93,7 @@ export function getParticipantDetailsPage(participantStore, participantActions)
         } = this.state.participantDetails;
 
         const participantName = `${firstName} ${lastName}`;
-        const participantStatus = internationalGuest ? `KV-osallistuja, ${country}` : ( nonScout ? 'EVP' : `Partiolainen (jäsennumero: ${memberNumber})` );
+        const participantStatus = internationalGuest ? 'KV-osallistuja' : ( nonScout ? 'EVP' : `Partiolainen (jäsennumero: ${memberNumber})` );
 
         const formattedBilledDate = billedDate ? moment(billedDate).format('D.M.YYYY') : '–';
         const formattedPaidDate = paidDate ? moment(paidDate).format('D.M.YYYY') : '–';
@@ -119,7 +119,6 @@ export function getParticipantDetailsPage(participantStore, participantActions)
               <Col md={ 12 }>
                 <h2>
                   { participantName }
-                  <small> { nickname || '' } </small>
                   <small> (synt. { moment(dateOfBirth).format('D.M.YYYY') })</small>
                 </h2>
                 <h4 className="text-muted margin-bottom">{ participantStatus }</h4>
@@ -152,12 +151,16 @@ export function getParticipantDetailsPage(participantStore, participantActions)
                 </Panel>
                 <Panel header="Osallistujan tiedot">
                   <dl>
+                    <dt>Partionimi</dt>
+                    <dd>{ nickname || '' }</dd>
                     <dt>Ikäkausi</dt>
                     <dd>{ ageGroup }</dd>
                     { swimmingSkill ? <dt>Uimataito</dt> : '' }
                     { swimmingSkill ? <dd>{ swimmingSkill }</dd> : '' }
                     <dt>Lippukunta</dt>
-                    <dd>{ `${localGroup}, ${country}` }</dd>
+                    <dd>{ localGroup }</dd>
+                    <dt>Maa</dt>
+                    <dd>{ country }</dd>
                     <dt>Leirilippukunta</dt>
                     <dd>{ campGroup }</dd>
                     <dt>Kylä</dt>