Merge pull request #167 from partio-scout/feature/participant-list-co…

…lumn-order Feature/participant list column order
partio-scout · Jul 21, 2016 · 20b3e85 · 20b3e85
2 parents 7ab4fb4 + a025c13
commit 20b3e85
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/client/components/ParticipantListPage/ParticipantListPage.jsx b/src/client/components/ParticipantListPage/ParticipantListPage.jsx
@@ -250,17 +250,17 @@ export function getParticipantListPage(participantStore, participantActions, sea
 
       const columnPropertyToLabelMapping = {
         presence: 'Tila',
-        campOfficeNotes: campOfficeNotes,
-        editableInfo: editableInfo,
         firstName: 'Etunimi',
         lastName: 'Sukunimi',
         dateOfBirth: 'Syntymäpäivä',
-        nonScout: 'Onko partiolainen?',
-        memberNumber: 'Jäsennumero',
+        staffPosition: 'Pesti',
         billedDate: 'Laskutettu',
         paidDate: 'Maksettu',
+        memberNumber: 'Jäsennumero',
+        campOfficeNotes: campOfficeNotes,
+        editableInfo: editableInfo,
+        nonScout: 'Onko partiolainen?',
         homeCity: 'Kotikaupunki',
-        staffPosition: 'Pesti',
         interestedInHomeHospitality: 'Home hospitality',
         email: 'Sähköposti',
         phoneNumber: 'Puhelinnumero',

diff --git a/src/client/components/ParticipantListPage/ParticipantRow.jsx b/src/client/components/ParticipantListPage/ParticipantRow.jsx
@@ -103,17 +103,17 @@ export class ParticipantRow extends React.Component {
       <tr>
         <td><Input type="checkbox" onChange={ onChange } checked={ checked }  /></td>
         <td><Presence value={ presence } /></td>
-        <td>{ notes }</td>
-        <td>{ info }</td>
         <LinkCell href={ href } title={ firstName }>{ firstName }</LinkCell>
         <LinkCell href={ href } title={ lastName }>{ lastName }</LinkCell>
         <TdWithTitle value={ formatDate(dateOfBirth) } />
-        <TdWithTitle value={ formatNonScout(nonScout) } />
-        <TdWithTitle value={ memberNumber } />
+        <TdWithTitle value={ formatNullableString(staffPosition) } />
         <TdWithTitle value={ formatDate(billedDate) || 'Ei' } />
         <TdWithTitle value={ formatDate(paidDate) || 'Ei' } />
+        <TdWithTitle value={ memberNumber } />
+        <td>{ notes }</td>
+        <td>{ info }</td>
+        <TdWithTitle value={ formatNonScout(nonScout) } />
         <TdWithTitle value={ formatNullableString(homeCity) } />
-        <TdWithTitle value={ formatNullableString(staffPosition) } />
         <TdWithTitle value={ formatNullableBoolean(interestedInHomeHospitality) } />
         <TdWithTitle value={ formatNullableString(email) } />
         <TdWithTitle value={ formatNullableString(phoneNumber) } />

diff --git a/src/client/components/RegistryUserListPage/RegistryUserTable.jsx b/src/client/components/RegistryUserListPage/RegistryUserTable.jsx
@@ -21,7 +21,7 @@ const RegistryUserRow = props => {
 
   const blockStatusToggleButton = status === 'blocked'
     ? <Button onClick={ onUnblock } bsStyle="danger">Salli sisäänkirjautuminen</Button>
-    : <Button onClick={ onBlock } bsStyle="danger">Estä sisäänkirjautuminen</Button>;
+    : <Button onClick={ onBlock } bsStyle="success">Estä sisäänkirjautuminen</Button>;
 
   return (
     <tr>