ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-01-03 18:35:09 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/AD-661-due-1208-implement-jury-rating-an' into AD-661-due-1208-implement-jury-rating-an

Browse Source
This commit is contained in:
diminator 2015-08-27 09:22:08 +02:00
commit 144b823777
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/ascribe_forms/form_loan.js
View File

@ -173,6 +173,8 @@ let LoanForm = React.createClass({
<Property <Property
name='startdate' name='startdate'
label={getLangText('Start date')} label={getLangText('Start date')}
editable={!this.props.startdate}
overrideForm={!!this.props.startdate}
hidden={!this.props.showStartDate}> hidden={!this.props.showStartDate}>
<InputDate <InputDate
defaultValue={this.props.startdate} defaultValue={this.props.startdate}
@ -180,6 +182,8 @@ let LoanForm = React.createClass({
</Property> </Property>
<Property <Property
name='enddate' name='enddate'
editable={!this.props.enddate}
overrideForm={!!this.props.enddate}
label={getLangText('End date')} label={getLangText('End date')}
hidden={!this.props.showEndDate}> hidden={!this.props.showEndDate}>
<InputDate <InputDate

9
js/components/ascribe_forms/input_date.js
View File

@ -9,7 +9,11 @@ let InputDate = React.createClass({
submitted: React.PropTypes.bool, submitted: React.PropTypes.bool,
placeholderText: React.PropTypes.string, placeholderText: React.PropTypes.string,
onChange: React.PropTypes.func, onChange: React.PropTypes.func,
defaultValue: React.PropTypes.object defaultValue: React.PropTypes.object,
// DatePicker implements the disabled attribute
// https://github.com/Hacker0x01/react-datepicker/blob/master/src/datepicker.jsx#L30
disabled: React.PropTypes.bool
}, },
getInitialState() { getInitialState() {
@ -41,10 +45,11 @@ let InputDate = React.createClass({
}); });
}, },
render: function () { render() {
return ( return (
<div> <div>
<DatePicker <DatePicker
disabled={this.props.disabled}
dateFormat="YYYY-MM-DD" dateFormat="YYYY-MM-DD"
selected={this.state.value_moment} selected={this.state.value_moment}
onChange={this.handleChange} onChange={this.handleChange}

2
package.json
View File

@ -73,7 +73,7 @@
"raven-js": "^1.1.19", "raven-js": "^1.1.19",
"react": "^0.13.2", "react": "^0.13.2",
"react-bootstrap": "^0.24.3", "react-bootstrap": "^0.24.3",
"react-datepicker": "~0.8.0", "react-datepicker": "^0.12.0",
"react-progressbar": "^1.1.0", "react-progressbar": "^1.1.0",
"react-router": "^0.13.3", "react-router": "^0.13.3",
"react-router-bootstrap": "~0.16.0", "react-router-bootstrap": "~0.16.0",