From 293afb1c35aaf625e8d99c6ea126306d13388939 Mon Sep 17 00:00:00 2001
From: Valeriy Panov <v.panov@aimprosoft.com>
Date: Tue, 19 Dec 2017 16:08:17 +0200
Subject: [PATCH] #132 Location: editable latitude and longitude

---
 assets/components/common/tables/DataTable.tsx |  3 ++-
 .../pages/dataset/dataset-stepper/index.tsx   | 22 +++++++++----------
 .../steps/timing-and-location/FormMap.tsx     |  6 +++--
 .../TimingAndLocationForm.tsx                 |  4 ++--
 assets/utilities/index.ts                     |  4 ++++
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/assets/components/common/tables/DataTable.tsx b/assets/components/common/tables/DataTable.tsx
index ead681b..b536f31 100644
--- a/assets/components/common/tables/DataTable.tsx
+++ b/assets/components/common/tables/DataTable.tsx
@@ -5,6 +5,7 @@ import Table, {TableBody, TableCell, TableFooter, TableHead, TableRow} from 'mat
 import Paper from 'material-ui/Paper';
 import Button from 'material-ui/Button';
 import * as PropTypes from 'prop-types';
+import * as moment from 'moment';
 
 import {Page} from '../../../model/common.model';
 
@@ -103,7 +104,7 @@ class DataTable extends React.Component<IDataTableProps, any> {
                                             { e.title }
                                         </Link>
                                     </TableCell>
-                                    <TableCell className={ `${ classes.tableCell } ${ classes.creationDate }` }>{ e.createdDate }</TableCell>
+                                    <TableCell className={ `${ classes.tableCell } ${ classes.creationDate }` }>{ e.createdDate && moment(e.createdDate).format('YYYY-DD-MM h:mm') }</TableCell>
                                     { showStatus && <TableCell className={ `${ classes.tableCell }` }>{ e.published ? 'published' : 'ongoing' }</TableCell> }
                                     <TableCell className={ `${ classes.tableCell } ${ classes.edit }` }>
                                         <Link to={ `${path}/${e.uuid}` }>
diff --git a/assets/components/pages/dataset/dataset-stepper/index.tsx b/assets/components/pages/dataset/dataset-stepper/index.tsx
index 0f45adf..2336203 100644
--- a/assets/components/pages/dataset/dataset-stepper/index.tsx
+++ b/assets/components/pages/dataset/dataset-stepper/index.tsx
@@ -52,25 +52,25 @@ class DatasetStepper extends React.Component<IDatasetProps, any> {
         const {children, classes, ...rest} = this.props;
 
         return (
-            <Grid container spacing={0}>
+            <Grid container spacing={ 0 }>
                 <TopSection/>
-                <Grid item xs={12} md={9} xl={10} className={classes.leftColumn}>
-                    <Grid container spacing={0} className={classes.contentWrapper}>
-                        <StepNavigation showStepName bottomDivider {...rest}/>
-                        <Grid item xs={12} className={classes.content}>
-                            <div className={classes.greyBackground}>
-                                {React.cloneElement(children, rest)}
+                <Grid item xs={ 12 } md={ 9 } xl={ 10 } className={ classes.leftColumn }>
+                    <Grid container spacing={ 0 } className={ classes.contentWrapper }>
+                        <StepNavigation showStepName bottomDivider { ...rest }/>
+                        <Grid item xs={ 12 } className={ classes.content }>
+                            <div className={ classes.greyBackground }>
+                                { React.cloneElement(children, rest) }
                             </div>
                         </Grid>
-                        <StepNavigation topDivider {...rest}/>
+                        <StepNavigation topDivider { ...rest }/>
                     </Grid>
                 </Grid>
-                <Grid item xs={12} md={3} xl={2}>
-                    <ProgressMenu {...rest} />
+                <Grid item xs={ 12 } md={ 3 } xl={ 2 }>
+                    <ProgressMenu { ...rest } />
                 </Grid>
                 <BottomSection/>
             </Grid>
-        )
+        );
     };
 
 }
diff --git a/assets/components/pages/dataset/dataset-stepper/steps/timing-and-location/FormMap.tsx b/assets/components/pages/dataset/dataset-stepper/steps/timing-and-location/FormMap.tsx
index edbe147..652a7c6 100644
--- a/assets/components/pages/dataset/dataset-stepper/steps/timing-and-location/FormMap.tsx
+++ b/assets/components/pages/dataset/dataset-stepper/steps/timing-and-location/FormMap.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 import {withStyles} from 'material-ui/styles';
 
+import {isNumeric} from '../../../../../../utilities';
+
 let Map;
 let Marker;
 let TileLayer;
@@ -74,7 +76,7 @@ class FormMap extends React.Component<IFormMapProps, any> {
         const {decimalLatitude, decimalLongitude} = locations.find((e) => !!e);
 
         let position = null;
-        if (decimalLatitude.input.value && decimalLongitude.input.value) {
+        if (isNumeric(decimalLatitude.input.value) && isNumeric(decimalLongitude.input.value)) {
             position = {
                 lat: decimalLatitude.input.value,
                 lng: decimalLongitude.input.value,
@@ -84,7 +86,7 @@ class FormMap extends React.Component<IFormMapProps, any> {
         return (
             <div className={ classes.leafletContainer }>
                 <Map
-                    center={ this.state }
+                    center={ position || this.state }
                     onClick={ this.onMapClick }
                     onMouseout={ this.props.onMouseOut }
                     zoom={ 6 }
diff --git a/assets/components/pages/dataset/dataset-stepper/steps/timing-and-location/TimingAndLocationForm.tsx b/assets/components/pages/dataset/dataset-stepper/steps/timing-and-location/TimingAndLocationForm.tsx
index a39efdf..82c28a9 100644
--- a/assets/components/pages/dataset/dataset-stepper/steps/timing-and-location/TimingAndLocationForm.tsx
+++ b/assets/components/pages/dataset/dataset-stepper/steps/timing-and-location/TimingAndLocationForm.tsx
@@ -92,13 +92,13 @@ class TimingAndLocationForm extends React.Component<ILoginContainerProps, any> {
                         name={ `${location}.decimalLatitude` }
                         component={ TextField }
                         label="Latitude*"
-                        disabled
+                        onBlur={ this.save(fields, index) }
                     />
                     <Field
                         name={ `${location}.decimalLongitude` }
                         component={ TextField }
                         label="Longitude*"
-                        disabled
+                        onBlur={ this.save(fields, index) }
                     />
 
                     <Fields
diff --git a/assets/utilities/index.ts b/assets/utilities/index.ts
index e579c6b..d7835c5 100644
--- a/assets/utilities/index.ts
+++ b/assets/utilities/index.ts
@@ -75,3 +75,7 @@ export function clearCookies() {
 	const cookies = require('es-cookie');
 	['authorities', 'access_token'].forEach((key) => cookies.remove(key));
 }
+
+export function isNumeric(value: any): boolean {
+    return !isNaN(value - parseFloat(value));
+}
-- 
GitLab