Procházet zdrojové kódy

add moment for date consistency

David před 9 roky
rodič
revize
b2996b054d
3 změnil soubory, kde provedl 11 přidání a 6 odebrání
  1. 1 0
      package.json
  2. 6 4
      src/components/Cursada.js
  3. 4 2
      src/components/ItemCursada.js

+ 1 - 0
package.json

@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "lodash": "^4.17.2",
+    "moment": "^2.16.0",
     "react": "15.3.2",
     "react-native": "0.37.0",
     "react-native-router-flux": "^3.37.0",

+ 6 - 4
src/components/Cursada.js

@@ -7,7 +7,6 @@ import { cursadaFetch } from '../actions/';
 import { Card, CardSection, Button } from './common';
 
 class Cursada extends Component  {
-
 	componentWillMount() {
     this.props.cursadaFetch(this.props);
     this.createDataSource(this.props);
@@ -41,7 +40,9 @@ class Cursada extends Component  {
 	}
 
   renderRow(data) {
-    const fecha = new Date(data.fecha).toDateString();
+		const moment = require('moment');
+		const fecha = moment(data.fecha).local().format('DD/MM/YY');
+
 		return (
       <Card>
         <CardSection>
@@ -83,10 +84,11 @@ class Cursada extends Component  {
 };
 
 const mapStateToProps = state => {
+	const moment = require('moment');
   const { curCursada } = state.cursadasR;
   const clases = _.partition(curCursada.clases, n => n.desactivada);
-	const inactivas = _.sortBy(clases[0], [ o => new Date(o.fecha) ]);
-	const activas = _.reverse(_.sortBy(clases[1], [ o => new Date(o.fecha) ]));
+	const inactivas = _.sortBy(clases[0], [ o => moment(o.fecha).toDate() ]);
+	const activas = _.reverse(_.sortBy(clases[1], [ o => moment(o.fecha).toDate() ]));
 
 	return { cursada: curCursada, clases: _.concat(activas,inactivas) };
 };

+ 4 - 2
src/components/ItemCursada.js

@@ -3,15 +3,17 @@ import { Text, ScrollView, View } from 'react-native';
 import { Actions } from 'react-native-router-flux';
 import { Button, Card, CardSection } from './common';
 
+
 class ItemCursada extends Component {
   onRowPress(){
     Actions.ViewCursada( { _id: this.props.data._id } );
   }
 
   render() {
+    var moment = require('moment');
     const { data } = this.props;
-    const horaIni = (new Date(data.horaIni)).toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'});
-    const horaFin = (new Date(data.horaFin)).toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'});
+    const horaIni = moment(data.horaIni).local().format('HH:mm');
+    const horaFin = moment(data.horaFin).local().format('HH:mm');
     return (
       <ScrollView>
         <Card>