From 1620437c86ace2a7615eb4bf89c03ce366c0fe05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Wed, 12 Aug 2015 13:53:17 +0200
Subject: [PATCH] add defaultValue to inputdate

---
 js/components/ascribe_forms/form_loan.js      |  8 +++----
 js/components/ascribe_forms/input_date.js     |  9 +++++++-
 .../cyland/cyland_register_piece.js           | 14 +++++++-----
 js/utils/general_utils.js                     | 22 -------------------
 package.json                                  |  1 +
 5 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/js/components/ascribe_forms/form_loan.js b/js/components/ascribe_forms/form_loan.js
index a96f12b9..fe6f1810 100644
--- a/js/components/ascribe_forms/form_loan.js
+++ b/js/components/ascribe_forms/form_loan.js
@@ -25,8 +25,8 @@ let LoanForm = React.createClass({
         fullform: React.PropTypes.bool,
         email: React.PropTypes.string,
         gallery: React.PropTypes.string,
-        startdate: React.PropTypes.string,
-        enddate: React.PropTypes.string,
+        startdate: React.PropTypes.object,
+        enddate: React.PropTypes.object,
         showPersonalMessage: React.PropTypes.bool,
 
         url: React.PropTypes.string,
@@ -167,7 +167,7 @@ let LoanForm = React.createClass({
                     label={getLangText('Start date')}
                     hidden={!this.props.startdate}>
                     <InputDate
-                        value={this.props.startdate}
+                        defaultValue={this.props.startdate}
                         placeholderText={getLangText('Loan start date')} />
                 </Property>
                 <Property
@@ -175,7 +175,7 @@ let LoanForm = React.createClass({
                     label={getLangText('End date')}
                     hidden={!this.props.enddate}>
                     <InputDate
-                        value={this.props.enddate}
+                        defaultValue={this.props.enddate}
                         placeholderText={getLangText('Loan end date')} />
                 </Property>
                 <Property
diff --git a/js/components/ascribe_forms/input_date.js b/js/components/ascribe_forms/input_date.js
index e77f70b7..2e25fc00 100644
--- a/js/components/ascribe_forms/input_date.js
+++ b/js/components/ascribe_forms/input_date.js
@@ -8,7 +8,8 @@ let InputDate = React.createClass({
     propTypes: {
         submitted: React.PropTypes.bool,
         placeholderText: React.PropTypes.string,
-        onChange: React.PropTypes.func
+        onChange: React.PropTypes.func,
+        defaultValue: React.PropTypes.object
     },
 
     getInitialState() {
@@ -17,6 +18,12 @@ let InputDate = React.createClass({
         };
     },
 
+    componentWillReceiveProps(nextProps) {
+        if(!this.state.value && !this.state.value_moment && nextProps.defaultValue) {
+            this.handleChange(this.props.defaultValue);
+        }
+    },
+
     handleChange(date) {
         let formattedDate = date.format('YYYY-MM-DD');
         this.setState({
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
index cb842df9..cc1a629a 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
@@ -3,6 +3,8 @@
 import React from 'react';
 import Router from 'react-router';
 
+import Moment from 'moment';
+
 import Col from 'react-bootstrap/lib/Col';
 import Row from 'react-bootstrap/lib/Row';
 
@@ -32,7 +34,7 @@ import SlidesContainer from '../../../../ascribe_slides_container/slides_contain
 import ApiUrls from '../../../../../constants/api_urls';
 
 import { getLangText } from '../../../../../utils/lang_utils';
-import { mergeOptions, dateToString } from '../../../../../utils/general_utils';
+import { mergeOptions } from '../../../../../utils/general_utils';
 import { getAclFormMessage } from '../../../../../utils/form_utils';
 
 let CylandRegisterPiece = React.createClass({
@@ -115,9 +117,9 @@ let CylandRegisterPiece = React.createClass({
 
     render() {
 
-        let today = new Date();
-        let datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain = new Date();
-        datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain.setFullYear(3000);
+        let today = new Moment();
+        let datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain = new Moment();
+        datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain.add(1000, 'years');
 
         return (
             <SlidesContainer ref="slidesContainer">
@@ -167,8 +169,8 @@ let CylandRegisterPiece = React.createClass({
                                 url={ApiUrls.ownership_loans_pieces}
                                 email="videoarchive@cyland.org"
                                 gallery="Cyland Archive"
-                                startdate={dateToString(today)}
-                                enddate={dateToString(datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain)}/>
+                                startdate={today}
+                                enddate={datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain}/>
                         </Col>
                     </Row>
                 </div>
diff --git a/js/utils/general_utils.js b/js/utils/general_utils.js
index 85472fea..70c94a97 100644
--- a/js/utils/general_utils.js
+++ b/js/utils/general_utils.js
@@ -177,26 +177,4 @@ function _mergeOptions(obj1, obj2) {
  */
 export function escapeHTML(s) {
     return document.createElement('div').appendChild(document.createTextNode(s)).parentNode.innerHTML;
-}
-
-/**
- * Converts a date object to a string.
- * Taken from: http://stackoverflow.com/a/4929629/1263876
- * @param  {date} date a javascript date
- * @return {string}      a string, in format: DD-MM-YYY
- */
-export function dateToString(date) {
-    var dd = date.getDate();
-    var mm = date.getMonth() + 1; //January is 0!
-    var yyyy = date.getFullYear();
-
-    if(dd < 10) {
-        dd = '0' + dd;
-    }
-
-    if(mm < 10) {
-        mm = '0' + mm;
-    }
-
-    return dd + '-' + mm + '-' + yyyy;
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index ddf45059..8162df06 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "isomorphic-fetch": "^2.0.2",
     "jest-cli": "^0.4.0",
     "lodash": "^3.9.3",
+    "moment": "^2.10.6",
     "object-assign": "^2.0.0",
     "q": "^1.4.1",
     "raven-js": "^1.1.19",